1 files changed, 5 insertions, 0 deletions

diff --git a/library/datebookmonth.cpp b/library/datebookmonth.cpp
index e8be313..728045f 100644
--- a/library/datebookmonth.cpp
+++ b/library/datebookmonth.cpp
@@ -75,192 +75,197 @@ DateBookMonthHeader::DateBookMonthHeader( QWidget *parent, const char *name )
     QWhatsThis::add( end, tr("Show December in the selected year") );
 
     connect( month, SIGNAL( activated( int ) ),
 	     this, SLOT( updateDate() ) );
     connect( year, SIGNAL( valueChanged( int ) ),
 	     this, SLOT( updateDate() ) );
     connect( begin, SIGNAL( clicked() ),
 	     this, SLOT( firstMonth() ) );
     connect( end, SIGNAL( clicked() ),
 	     this, SLOT( lastMonth() ) );
     connect( back, SIGNAL( clicked() ),
 	     this, SLOT( monthBack() ) );
     connect( next, SIGNAL( clicked() ),
 	     this, SLOT( monthForward() ) );
     back->setAutoRepeat( TRUE );
     next->setAutoRepeat( TRUE );
 }
 
 
 DateBookMonthHeader::~DateBookMonthHeader()
 {
 
 }
 
 void DateBookMonthHeader::updateDate()
 {
     emit dateChanged( year->value(), month->currentItem() + 1 );
 }
 
 void DateBookMonthHeader::firstMonth()
 {
     emit dateChanged( year->value(), 1 );
     month->setCurrentItem( 0 );
 }
 
 void DateBookMonthHeader::lastMonth()
 {
     emit dateChanged( year->value(), 12 );
     month->setCurrentItem( 11 );
 }
 
 void DateBookMonthHeader::monthBack()
 {
     if ( month->currentItem() > 0 ) {
 	emit dateChanged( year->value(), month->currentItem() );
 	month->setCurrentItem( month->currentItem() - 1 );
     } else {
 	emit dateChanged( year->value() - 1, 12 );
 	// we have a signal set to a changed value in year so we only need to change
 	// year to get the result...
 	month->setCurrentItem( 11 );
 	year->setValue( year->value() - 1 );
     }
 }
 
 void DateBookMonthHeader::monthForward()
 {
     if ( month->currentItem() < 11 ) {
 	emit dateChanged( year->value(), month->currentItem() + 2 );
 	month->setCurrentItem( month->currentItem() + 1 );
     } else {
 	// we have a signal set to a changed value in year so we only need to change
 	// year to get the result...
 	month->setCurrentItem( 0 );
 	year->setValue( year->value() + 1 );
     }
 }
 
 void DateBookMonthHeader::setDate( int y, int m )
 {
     year->setValue( y );
     month->setCurrentItem( m - 1 );
 }
 
 //---------------------------------------------------------------------------
 
 class DateBookMonthTablePrivate
 {
 public:
     DateBookMonthTablePrivate() {};
     ~DateBookMonthTablePrivate() { mMonthEvents.clear(); };
 
     QValueList<EffectiveEvent> mMonthEvents;
     bool onMonday;
 };
 
 DateBookMonthTable::DateBookMonthTable( QWidget *parent, const char *name,
                                         DateBookDB *newDb  )
     : QTable( 6, 7, parent, name ),
       db( newDb )
 {
     d = new DateBookMonthTablePrivate();
     selYear = -1;
     selMonth = -1;
     selDay = -1;
 
+    /* init these as well  make valgrind happy and be consistent with Qtopia1.6 -zecke */
+    year = -1;
+    month = -1;
+    day = -1;
+
     Config cfg( "qpe" );
     cfg.setGroup( "Time" );
     d->onMonday = cfg.readBoolEntry( "MONDAY" );
 
     horizontalHeader()->setResizeEnabled( FALSE );
     // we have to do this here... or suffer the consequences later...
     for ( int i = 0; i < 7; i++ ){
 	horizontalHeader()->resizeSection( i, 30 );
 	setColumnStretchable( i, TRUE );
     }
     setupLabels();
 
     verticalHeader()->hide();
     setLeftMargin( 0 );
     for ( int i = 0; i < 6; ++i )
 	    setRowStretchable( i, TRUE );
 
     setSelectionMode( NoSelection );
 
     connect( this, SIGNAL( clicked( int, int, int, const QPoint & ) ),
 	     this, SLOT( dayClicked( int, int ) ) );
     connect( this, SIGNAL( currentChanged( int, int ) ),
              this, SLOT( dragDay( int, int ) ) );
     setVScrollBarMode( AlwaysOff );
     setHScrollBarMode( AlwaysOff );
 }
 
 DateBookMonthTable::~DateBookMonthTable()
 {
     monthsEvents.clear();
     delete d;
 }
 
 void DateBookMonthTable::setDate(int y, int m, int d)
 {
     if (month == m && year == y) {
 	if ( selYear == -1 )
 	    year = selYear;
 	if ( selMonth == -1 )
 	    month = selMonth;
 	int r1, c1, r2, c2;
 	findDay(selDay, r1, c1);
 	selDay = day = d;
 	findDay(selDay, r2, c2);
 	setCurrentCell( r2, c2 );
 	//updateCell(r1,c1);
 	//updateCell(r2,c2);
     } else {
 	selYear = year = y;
 	selMonth = month = m;
 	selDay = day = d;
 	setupTable();
     }
 }
 
 void DateBookMonthTable::redraw()
 {
     setupLabels();
     setupTable();
 }
 
 void DateBookMonthTable::setWeekStart( bool onMonday )
 {
     d->onMonday = onMonday;
     setupLabels();
     setupTable();
 }
 
 void DateBookMonthTable::setupTable()
 {
     QValueList<Calendar::Day> days = Calendar::daysOfMonth( year, month, d->onMonday );
     QValueList<Calendar::Day>::Iterator it = days.begin();
     int row = 0, col = 0;
     int crow = 0;
     int ccol = 0;
     for ( ; it != days.end(); ++it ) {
 	DayItemMonth *i = (DayItemMonth *)item( row, col );
 	if ( !i ) {
 	    i = new DayItemMonth( this, QTableItem::Never, "" );
 	    setItem( row, col, i );
 	}
 	Calendar::Day calDay = *it;
 	i->clearEffEvents();
 	i->setDay( calDay.date );
 	i->setType( calDay.type );
 	if ( i->day() == day && calDay.type == Calendar::Day::ThisMonth ) {
 	    crow = row;
 	    ccol = col;
 	}
 
 	updateCell( row, col );
 
 	if ( col == 6 ) {
 	    ++row;
 	    col = 0;
 	} else {