| -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, connectNavigatorView( mNavigatorView ); //setSizePolicy( QSizePolicy (QSizePolicy::Expanding,QSizePolicy::Expanding) ); mLastDisplayedDN = 0; - mUpdateTimer; mUpdateTimer = new QTimer( this ); connect (mUpdateTimer ,SIGNAL(timeout()), this, SLOT ( checkUpdateDayMatrixDates() )); mFirstSelectedDate = QDate::currentDate(); @@ -151,7 +150,7 @@ void DateNavigatorContainer::setCalendar( Calendar *cal ) { mCalendar = cal; mNavigatorView->setCalendar( cal ); - for( uint i = 0; i < mLastDisplayedDN; ++i ) { + for( int i = 0; i < mLastDisplayedDN; ++i ) { KDateNavigator *n = mExtraViews.at( i ); n->setCalendar( cal ); } @@ -190,7 +189,6 @@ void DateNavigatorContainer::checkUpdateDayMatrixDates() //mNavigatorView->resize( size() ); //if ( ! ok ) // return; - int butt = 2; horizontalCount = size().width() / mNavigatorView->sizeHintTwoButtons( ).width(); if ( horizontalCount <= 1 ) minSize = mNavigatorView->sizeHintTwoButtons( 4 ); @@ -255,7 +253,7 @@ void DateNavigatorContainer::checkUpdateDayMatrixDates() mNavigatorView->setGeometry(0, 0, twidth, theight ); - for( uint i = 0; i < mLastDisplayedDN; ++i ) { + for( int i = 0; i < mLastDisplayedDN; ++i ) { int x = ( i + 1 ) % mHorizontalCount; int y = ( i + 1 ) / mHorizontalCount; @@ -269,8 +267,8 @@ void DateNavigatorContainer::checkUpdateDayMatrixDates() view->setGeometry( x * twidth, y * theight, twidth, theight ); } - int iii = 0; - int ccc = mHorizontalCount * mVerticalCount; + uint iii = 0; + uint ccc = mHorizontalCount * mVerticalCount; mNavigatorView->show(); while ( iii < ( mExtraViews.count() ) ) { if ( iii < ccc-1 ) @@ -300,7 +298,7 @@ void DateNavigatorContainer::updateDayMatrixDates() QDate lDate = fDate.addDays( mSelectedDateCount - 1 ); mNavigatorView->dayMatrix()->setSelectedDaysFrom( fDate , lDate ); mNavigatorView->dayMatrix()->repaint( false ); - for( uint i = 0; i < mLastDisplayedDN; ++i ) { + for( int i = 0; i < mLastDisplayedDN; ++i ) { KDateNavigator *n = mExtraViews.at( i ); if ( n->dayMatrix()->setSelectedDaysFrom( fDate , lDate ) ) { n->dayMatrix()->repaint( false ); @@ -311,7 +309,7 @@ void DateNavigatorContainer::updateDayMatrixDates() void DateNavigatorContainer::updateDayMatrix() { mNavigatorView->updateDayMatrix(); - for( uint i = 0; i < mLastDisplayedDN; ++i ) { + for( int i = 0; i < mLastDisplayedDN; ++i ) { KDateNavigator *n = mExtraViews.at( i ); n->updateDayMatrix(); } @@ -332,7 +330,7 @@ void DateNavigatorContainer::updateToday() void DateNavigatorContainer::updateView() { mNavigatorView->updateView(); - for( uint i = 0; i < mLastDisplayedDN; ++i ) { + for( int i = 0; i < mLastDisplayedDN; ++i ) { KDateNavigator *n = mExtraViews.at( i ); n->updateView(); } @@ -341,7 +339,7 @@ void DateNavigatorContainer::updateView() void DateNavigatorContainer::updateConfig() { mNavigatorView->updateConfig(); - for( uint i = 0; i < mLastDisplayedDN; ++i ) { + for( int i = 0; i < mLastDisplayedDN; ++i ) { KDateNavigator *n = mExtraViews.at( i ); n->updateConfig(); } @@ -400,7 +398,7 @@ void DateNavigatorContainer::setBaseDates() { QDate baseDate = mNavigatorView->baseDate(); bool doRepaint = true; - for( uint i = 0; i < mLastDisplayedDN; ++i ) { + for( int i = 0; i < mLastDisplayedDN; ++i ) { KDateNavigator *n = mExtraViews.at( i ); baseDate = baseDate.addDays( baseDate.daysInMonth () - baseDate.day() +1 ); n->setBaseDate( baseDate, doRepaint ); @@ -412,7 +410,7 @@ void DateNavigatorContainer::setResizeEnabled() //qDebug("DateNavigatorContainer::setResizeEnabled "); checkUpdateDayMatrixDates(); } -void DateNavigatorContainer::resizeEvent( QResizeEvent * e ) +void DateNavigatorContainer::resizeEvent( QResizeEvent * ) { //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 @@ #include "koeditordetails.h" template <> -CustomListViewItem<class Attendee *>::~CustomListViewItem() +CustomListViewItem<Attendee *>::~CustomListViewItem() { delete mData; } template <> -void CustomListViewItem<class Attendee *>::updateItem() +void CustomListViewItem<Attendee *>::updateItem() { setText(0,mData->name()); setText(1,mData->email()); |