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

List:       kde-commits
Subject:    branches/work/akonadi-ports/kdepim
From:       Frank Osterfeld <frank.osterfeld () kdemail ! net>
Date:       2009-10-06 13:49:07
Message-ID: 1254836947.328175.7410.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1031951 by osterfeld:

allow null pointers, the calendar-version did that, too


 M  +2 -2      korganizer/koeditorgeneralevent.cpp  
 M  +2 -2      korganizer/koeditorgeneraltodo.cpp  
 M  +6 -5      libkdepim/ktimezonecombobox.cpp  


--- branches/work/akonadi-ports/kdepim/korganizer/koeditorgeneralevent.cpp \
#1031950:1031951 @@ -120,8 +120,8 @@
                              "Select the timezone for this event. "
                              "It will also affect recurrences" );
 
-  mTimeZoneComboStart = new KPIM::KTimeZoneComboBox( mCalendar->timeZones(), \
                timeGroupBox );
-  mTimeZoneComboEnd = new KPIM::KTimeZoneComboBox( mCalendar->timeZones(), \
timeGroupBox ); +  mTimeZoneComboStart = new KPIM::KTimeZoneComboBox( mCalendar ? \
mCalendar->timeZones() : 0, timeGroupBox ); +  mTimeZoneComboEnd = new \
KPIM::KTimeZoneComboBox( mCalendar ? mCalendar->timeZones() : 0, timeGroupBox );  
   if ( !KOPrefs::instance()->showTimeZoneSelectorInIncidenceEditor() ) {
     mTimeZoneComboStart->hide();
--- branches/work/akonadi-ports/kdepim/korganizer/koeditorgeneraltodo.cpp \
#1031950:1031951 @@ -97,8 +97,8 @@
 
   // Timezone
   QString whatsThis = i18n( "Select the timezone for this event. It will also affect \
                recurrences" );
-  mTimeZoneComboStart = new KPIM::KTimeZoneComboBox( mCalendar->timeZones(), \
                timeGroupBox );
-  mTimeZoneComboDue = new KPIM::KTimeZoneComboBox( mCalendar->timeZones(), \
timeGroupBox ); +  mTimeZoneComboStart = new KPIM::KTimeZoneComboBox( mCalendar ? \
mCalendar->timeZones() : 0, timeGroupBox ); +  mTimeZoneComboDue = new \
KPIM::KTimeZoneComboBox( mCalendar ? mCalendar->timeZones() : 0, timeGroupBox );  
   if ( !KOPrefs::instance()->showTimeZoneSelectorInIncidenceEditor() ) {
     mTimeZoneComboStart->hide();
--- branches/work/akonadi-ports/kdepim/libkdepim/ktimezonecombobox.cpp \
#1031950:1031951 @@ -55,12 +55,13 @@
   mZones.sort();
 
   // Prepend the list of additional timezones
-  const ICalTimeZones::ZoneMap calzones = mAdditionalZones->zones();
-  for ( ICalTimeZones::ZoneMap::ConstIterator it=calzones.begin(); it != \
                calzones.end(); ++it ) {
-    kDebug() << "Prepend timezone " << it.key().toUtf8();
-    mZones.prepend( it.key().toUtf8() );
+  if ( mAdditionalZones ) {
+    const ICalTimeZones::ZoneMap calzones = mAdditionalZones->zones();
+    for ( ICalTimeZones::ZoneMap::ConstIterator it=calzones.begin(); it != \
calzones.end(); ++it ) { +      kDebug() << "Prepend timezone " << it.key().toUtf8();
+      mZones.prepend( it.key().toUtf8() );
+    }
   }
-
   // Prepend UTC and Floating, for convenience
   mZones.prepend( "UTC" );      // do not use i18n here
   mZones.prepend( "Floating" ); // do not use i18n here


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