summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--korganizer/datenavigatorcontainer.cpp22
-rw-r--r--korganizer/koeditordetails.cpp4
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
@@ -47,9 +47,8 @@ DateNavigatorContainer::DateNavigatorContainer( QWidget *parent,
mNavigatorView->hide();
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();
mSelectedDateCount = 1;
@@ -150,9 +149,9 @@ void DateNavigatorContainer::computeMonthSelected( int month , bool forceEmit )
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 );
}
}
@@ -189,9 +188,8 @@ void DateNavigatorContainer::checkUpdateDayMatrixDates()
fo = mNavigatorView->yourFontHint( size() , &ok );
//mNavigatorView->resize( size() );
//if ( ! ok )
// return;
- int butt = 2;
horizontalCount = size().width() / mNavigatorView->sizeHintTwoButtons( ).width();
if ( horizontalCount <= 1 )
minSize = mNavigatorView->sizeHintTwoButtons( 4 );
else
@@ -254,9 +252,9 @@ void DateNavigatorContainer::checkUpdateDayMatrixDates()
else bar->showButtons( true, true );
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;
KDateNavigator *view = mExtraViews.at( i );
@@ -268,10 +266,10 @@ 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 )
mExtraViews.at( iii )->show();
@@ -299,9 +297,9 @@ void DateNavigatorContainer::updateDayMatrixDates()
QDate fDate = mFirstSelectedDate;
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 );
}
@@ -310,9 +308,9 @@ 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();
}
}
@@ -331,18 +329,18 @@ 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();
}
}
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();
}
}
@@ -399,9 +397,9 @@ void DateNavigatorContainer::selectDates( const DateList &dateList )
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 );
}
@@ -411,9 +409,9 @@ void DateNavigatorContainer::setResizeEnabled()
mResizeEnabled = true;
//qDebug("DateNavigatorContainer::setResizeEnabled ");
checkUpdateDayMatrixDates();
}
-void DateNavigatorContainer::resizeEvent( QResizeEvent * e )
+void DateNavigatorContainer::resizeEvent( QResizeEvent * )
{
//qDebug("DateNavigatorContainer::resizeEvent %d %d ", width(), height());
//qDebug("COUNT %d ", mExtraViews.count());
diff --git a/korganizer/koeditordetails.cpp b/korganizer/koeditordetails.cpp
index b90b9eb..9a4b4ec 100644
--- a/korganizer/koeditordetails.cpp
+++ b/korganizer/koeditordetails.cpp
@@ -53,15 +53,15 @@
#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());
setText(2,mData->roleStr());