-rw-r--r-- | korganizer/datenavigatorcontainer.cpp | 22 | ||||
-rw-r--r-- | korganizer/koeditordetails.cpp | 4 |
2 files changed, 12 insertions, 14 deletions
diff --git a/korganizer/datenavigatorcontainer.cpp b/korganizer/datenavigatorcontainer.cpp index f9c8b73..ea510f1 100644 --- a/korganizer/datenavigatorcontainer.cpp +++ b/korganizer/datenavigatorcontainer.cpp | |||
@@ -48,7 +48,6 @@ DateNavigatorContainer::DateNavigatorContainer( QWidget *parent, | |||
48 | connectNavigatorView( mNavigatorView ); | 48 | connectNavigatorView( mNavigatorView ); |
49 | //setSizePolicy( QSizePolicy (QSizePolicy::Expanding,QSizePolicy::Expanding) ); | 49 | //setSizePolicy( QSizePolicy (QSizePolicy::Expanding,QSizePolicy::Expanding) ); |
50 | mLastDisplayedDN = 0; | 50 | mLastDisplayedDN = 0; |
51 | mUpdateTimer; | ||
52 | mUpdateTimer = new QTimer( this ); | 51 | mUpdateTimer = new QTimer( this ); |
53 | connect (mUpdateTimer ,SIGNAL(timeout()), this, SLOT ( checkUpdateDayMatrixDates() )); | 52 | connect (mUpdateTimer ,SIGNAL(timeout()), this, SLOT ( checkUpdateDayMatrixDates() )); |
54 | mFirstSelectedDate = QDate::currentDate(); | 53 | mFirstSelectedDate = QDate::currentDate(); |
@@ -151,7 +150,7 @@ void DateNavigatorContainer::setCalendar( Calendar *cal ) | |||
151 | { | 150 | { |
152 | mCalendar = cal; | 151 | mCalendar = cal; |
153 | mNavigatorView->setCalendar( cal ); | 152 | mNavigatorView->setCalendar( cal ); |
154 | for( uint i = 0; i < mLastDisplayedDN; ++i ) { | 153 | for( int i = 0; i < mLastDisplayedDN; ++i ) { |
155 | KDateNavigator *n = mExtraViews.at( i ); | 154 | KDateNavigator *n = mExtraViews.at( i ); |
156 | n->setCalendar( cal ); | 155 | n->setCalendar( cal ); |
157 | } | 156 | } |
@@ -190,7 +189,6 @@ void DateNavigatorContainer::checkUpdateDayMatrixDates() | |||
190 | //mNavigatorView->resize( size() ); | 189 | //mNavigatorView->resize( size() ); |
191 | //if ( ! ok ) | 190 | //if ( ! ok ) |
192 | // return; | 191 | // return; |
193 | int butt = 2; | ||
194 | horizontalCount = size().width() / mNavigatorView->sizeHintTwoButtons( ).width(); | 192 | horizontalCount = size().width() / mNavigatorView->sizeHintTwoButtons( ).width(); |
195 | if ( horizontalCount <= 1 ) | 193 | if ( horizontalCount <= 1 ) |
196 | minSize = mNavigatorView->sizeHintTwoButtons( 4 ); | 194 | minSize = mNavigatorView->sizeHintTwoButtons( 4 ); |
@@ -255,7 +253,7 @@ void DateNavigatorContainer::checkUpdateDayMatrixDates() | |||
255 | 253 | ||
256 | mNavigatorView->setGeometry(0, | 254 | mNavigatorView->setGeometry(0, |
257 | 0, twidth, theight ); | 255 | 0, twidth, theight ); |
258 | for( uint i = 0; i < mLastDisplayedDN; ++i ) { | 256 | for( int i = 0; i < mLastDisplayedDN; ++i ) { |
259 | int x = ( i + 1 ) % mHorizontalCount; | 257 | int x = ( i + 1 ) % mHorizontalCount; |
260 | int y = ( i + 1 ) / mHorizontalCount; | 258 | int y = ( i + 1 ) / mHorizontalCount; |
261 | 259 | ||
@@ -269,8 +267,8 @@ void DateNavigatorContainer::checkUpdateDayMatrixDates() | |||
269 | view->setGeometry( x * twidth, | 267 | view->setGeometry( x * twidth, |
270 | y * theight, twidth, theight ); | 268 | y * theight, twidth, theight ); |
271 | } | 269 | } |
272 | int iii = 0; | 270 | uint iii = 0; |
273 | int ccc = mHorizontalCount * mVerticalCount; | 271 | uint ccc = mHorizontalCount * mVerticalCount; |
274 | mNavigatorView->show(); | 272 | mNavigatorView->show(); |
275 | while ( iii < ( mExtraViews.count() ) ) { | 273 | while ( iii < ( mExtraViews.count() ) ) { |
276 | if ( iii < ccc-1 ) | 274 | if ( iii < ccc-1 ) |
@@ -300,7 +298,7 @@ void DateNavigatorContainer::updateDayMatrixDates() | |||
300 | QDate lDate = fDate.addDays( mSelectedDateCount - 1 ); | 298 | QDate lDate = fDate.addDays( mSelectedDateCount - 1 ); |
301 | mNavigatorView->dayMatrix()->setSelectedDaysFrom( fDate , lDate ); | 299 | mNavigatorView->dayMatrix()->setSelectedDaysFrom( fDate , lDate ); |
302 | mNavigatorView->dayMatrix()->repaint( false ); | 300 | mNavigatorView->dayMatrix()->repaint( false ); |
303 | for( uint i = 0; i < mLastDisplayedDN; ++i ) { | 301 | for( int i = 0; i < mLastDisplayedDN; ++i ) { |
304 | KDateNavigator *n = mExtraViews.at( i ); | 302 | KDateNavigator *n = mExtraViews.at( i ); |
305 | if ( n->dayMatrix()->setSelectedDaysFrom( fDate , lDate ) ) { | 303 | if ( n->dayMatrix()->setSelectedDaysFrom( fDate , lDate ) ) { |
306 | n->dayMatrix()->repaint( false ); | 304 | n->dayMatrix()->repaint( false ); |
@@ -311,7 +309,7 @@ void DateNavigatorContainer::updateDayMatrixDates() | |||
311 | void DateNavigatorContainer::updateDayMatrix() | 309 | void DateNavigatorContainer::updateDayMatrix() |
312 | { | 310 | { |
313 | mNavigatorView->updateDayMatrix(); | 311 | mNavigatorView->updateDayMatrix(); |
314 | for( uint i = 0; i < mLastDisplayedDN; ++i ) { | 312 | for( int i = 0; i < mLastDisplayedDN; ++i ) { |
315 | KDateNavigator *n = mExtraViews.at( i ); | 313 | KDateNavigator *n = mExtraViews.at( i ); |
316 | n->updateDayMatrix(); | 314 | n->updateDayMatrix(); |
317 | } | 315 | } |
@@ -332,7 +330,7 @@ void DateNavigatorContainer::updateToday() | |||
332 | void DateNavigatorContainer::updateView() | 330 | void DateNavigatorContainer::updateView() |
333 | { | 331 | { |
334 | mNavigatorView->updateView(); | 332 | mNavigatorView->updateView(); |
335 | for( uint i = 0; i < mLastDisplayedDN; ++i ) { | 333 | for( int i = 0; i < mLastDisplayedDN; ++i ) { |
336 | KDateNavigator *n = mExtraViews.at( i ); | 334 | KDateNavigator *n = mExtraViews.at( i ); |
337 | n->updateView(); | 335 | n->updateView(); |
338 | } | 336 | } |
@@ -341,7 +339,7 @@ void DateNavigatorContainer::updateView() | |||
341 | void DateNavigatorContainer::updateConfig() | 339 | void DateNavigatorContainer::updateConfig() |
342 | { | 340 | { |
343 | mNavigatorView->updateConfig(); | 341 | mNavigatorView->updateConfig(); |
344 | for( uint i = 0; i < mLastDisplayedDN; ++i ) { | 342 | for( int i = 0; i < mLastDisplayedDN; ++i ) { |
345 | KDateNavigator *n = mExtraViews.at( i ); | 343 | KDateNavigator *n = mExtraViews.at( i ); |
346 | n->updateConfig(); | 344 | n->updateConfig(); |
347 | } | 345 | } |
@@ -400,7 +398,7 @@ void DateNavigatorContainer::setBaseDates() | |||
400 | { | 398 | { |
401 | QDate baseDate = mNavigatorView->baseDate(); | 399 | QDate baseDate = mNavigatorView->baseDate(); |
402 | bool doRepaint = true; | 400 | bool doRepaint = true; |
403 | for( uint i = 0; i < mLastDisplayedDN; ++i ) { | 401 | for( int i = 0; i < mLastDisplayedDN; ++i ) { |
404 | KDateNavigator *n = mExtraViews.at( i ); | 402 | KDateNavigator *n = mExtraViews.at( i ); |
405 | baseDate = baseDate.addDays( baseDate.daysInMonth () - baseDate.day() +1 ); | 403 | baseDate = baseDate.addDays( baseDate.daysInMonth () - baseDate.day() +1 ); |
406 | n->setBaseDate( baseDate, doRepaint ); | 404 | n->setBaseDate( baseDate, doRepaint ); |
@@ -412,7 +410,7 @@ void DateNavigatorContainer::setResizeEnabled() | |||
412 | //qDebug("DateNavigatorContainer::setResizeEnabled "); | 410 | //qDebug("DateNavigatorContainer::setResizeEnabled "); |
413 | checkUpdateDayMatrixDates(); | 411 | checkUpdateDayMatrixDates(); |
414 | } | 412 | } |
415 | void DateNavigatorContainer::resizeEvent( QResizeEvent * e ) | 413 | void DateNavigatorContainer::resizeEvent( QResizeEvent * ) |
416 | { | 414 | { |
417 | 415 | ||
418 | //qDebug("DateNavigatorContainer::resizeEvent %d %d ", width(), height()); | 416 | //qDebug("DateNavigatorContainer::resizeEvent %d %d ", width(), height()); |
diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp index b90b9eb..9a4b4ec 100644 --- a/korganizer/koeditordetails.cpp +++ b/korganizer/koeditordetails.cpp | |||
@@ -54,13 +54,13 @@ | |||
54 | #include "koeditordetails.h" | 54 | #include "koeditordetails.h" |
55 | 55 | ||
56 | template <> | 56 | template <> |
57 | CustomListViewItem<class Attendee *>::~CustomListViewItem() | 57 | CustomListViewItem<Attendee *>::~CustomListViewItem() |
58 | { | 58 | { |
59 | delete mData; | 59 | delete mData; |
60 | } | 60 | } |
61 | 61 | ||
62 | template <> | 62 | template <> |
63 | void CustomListViewItem<class Attendee *>::updateItem() | 63 | void CustomListViewItem<Attendee *>::updateItem() |
64 | { | 64 | { |
65 | setText(0,mData->name()); | 65 | setText(0,mData->name()); |
66 | setText(1,mData->email()); | 66 | setText(1,mData->email()); |