[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdepim/kontact/plugins/planner
From:       Allen Winter <winter () kde ! org>
Date:       2009-01-29 23:19:49
Message-ID: 1233271189.620341.20408.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 918481 by winterz:

follow kholidays api changes
deprecated--


 M  +5 -6      planner.cpp  


--- trunk/KDE/kdepim/kontact/plugins/planner/planner.cpp #918480:918481
@@ -597,7 +597,7 @@
 
       QString tipText( KCal::IncidenceFormatter::toolTipString( ev, true ) );
       if ( !tipText.isEmpty() ) {
-         QToolTip::add( urlLabel, tipText );
+        urlLabel->setToolTip( tipText );
       }
 
       counter++;
@@ -621,7 +621,6 @@
 void Planner::initSdList( const QDate &date )
 {
   mDates.clear();
-  QLabel *label = 0;
 
   Q_FOREACH( KABC::Addressee addressee, mAddressBook->allAddressees() ){
     QDate birthday = addressee.birthday().date();
@@ -654,16 +653,16 @@
 
   if( mHolidaysCal ){
     if( initHolidays() ){
-      Q_FOREACH( LibKHolidays::KHoliday holiday, mHolidays->getHolidays( date ) ){
-        if( !mSpecialOccasionsCal && holiday.Category != LibKHolidays::KHoliday::Holiday){
+      Q_FOREACH( LibKHolidays::KHoliday holiday, mHolidays->holidays( date ) ){
+        if( !mSpecialOccasionsCal && holiday.dayType() != LibKHolidays::KHoliday::Holiday){
           continue;
         }
         SDEntry entry;
         entry.type = IncidenceTypeEvent;
-        entry.category = ( holiday.Category == LibKHolidays::KHoliday::Holiday )?
+        entry.category = ( holiday.dayType() == LibKHolidays::KHoliday::Holiday )?
                           CategoryHoliday : CategoryOther;
         entry.date = date;
-        entry.summary = holiday.text;
+        entry.summary = holiday.text();
         mDates.append( entry );
       }
     }
[prev in list] [next in list] [prev in thread] [next in thread]