work around sucky gcc2, which doesn't understand when the two arguments

for ? need an implicit type conversion

2 files changed, 2 insertions, 2 deletions

diff --git a/libopie/pim/oevent.cpp b/libopie/pim/oevent.cpp
index c916297..ec05e77 100644
--- a/libopie/pim/oevent.cpp
+++ b/libopie/pim/oevent.cpp
@@ -349,65 +349,65 @@ void OEvent::changeOrModify() {
         }
 
         data = d2;
     }
 }
 void OEvent::deref() {
     if ( data->deref() ) {
         delete data;
         data = 0;
     }
 }
 // Exporting Event data to map. Using the same
 // encoding as ODateBookAccessBackend_xml does..
 // Thus, we could remove the stuff there and use this
 // for it and for all other places..
 // Encoding should happen at one place, only ! (eilers)
 QMap<int, QString> OEvent::toMap()const {
     QMap<int, QString> retMap;
 
     retMap.insert( OEvent::FUid, QString::number( uid() ) );
     retMap.insert( OEvent::FCategories, Qtopia::escapeString( Qtopia::Record::idsToString( categories() ) ));
     retMap.insert( OEvent::FDescription, Qtopia::escapeString( description() ) );
     retMap.insert( OEvent::FLocation, Qtopia::escapeString( location() ) );
     retMap.insert( OEvent::FType, isAllDay() ? "AllDay" : "" );
     OPimAlarm alarm = notifiers().alarms()[0];
     retMap.insert( OEvent::FAlarm, QString::number( alarm.dateTime().secsTo(  startDateTime() ) / 60 ) );
     retMap.insert( OEvent::FSound, (alarm.sound() == OPimAlarm::Loud) ? "loud" : "silent" );
 
     OTimeZone zone(  timeZone().isEmpty() ? OTimeZone::current() : timeZone() );
     retMap.insert( OEvent::FStart, QString::number( zone.fromUTCDateTime( zone.toDateTime(  startDateTime(), OTimeZone::utc() ) ) ) );
     retMap.insert( OEvent::FEnd, QString::number( zone.fromUTCDateTime( zone.toDateTime(  endDateTime(), OTimeZone::utc() ) ) ) );
     retMap.insert( OEvent::FNote, Qtopia::escapeString( note() ) );
-    retMap.insert( OEvent::FTimeZone, timeZone().isEmpty() ? "None" : timeZone() );
+    retMap.insert( OEvent::FTimeZone, timeZone().isEmpty() ? QString( "None" ) : timeZone() );
     if( parent() )
             retMap.insert( OEvent::FRecParent, QString::number( parent() ) );
     if( children().count() ){
             QArray<int> childr = children();
             QString buf;
             for ( uint i = 0; i < childr.count(); i++ ) {
                     if ( i != 0 ) buf += " ";
                     buf += QString::number( childr[i] );
                     }    
             retMap.insert( OEvent::FRecChildren, buf );
     }
     
     // Add recurrence stuff
     if( hasRecurrence() ){
             ORecur recur = recurrence();
             QMap<int, QString> recFields = recur.toMap();
             retMap.insert( OEvent::FRType, recFields[ORecur::RType] );
             retMap.insert( OEvent::FRWeekdays, recFields[ORecur::RWeekdays] );
             retMap.insert( OEvent::FRPosition, recFields[ORecur::RPosition] );
             retMap.insert( OEvent::FRFreq, recFields[ORecur::RFreq] );
             retMap.insert( OEvent::FRHasEndDate, recFields[ORecur::RHasEndDate] );
             retMap.insert( OEvent::FREndDate, recFields[ORecur::EndDate] );
             retMap.insert( OEvent::FRCreated, recFields[ORecur::Created] );
             retMap.insert( OEvent::FRExceptions, recFields[ORecur::Exceptions] );
     }
    
     return retMap;
 }
 
 void OEvent::fromMap( const QMap<int, QString>& map )
 {
 
diff --git a/libopie2/opiepim/oevent.cpp b/libopie2/opiepim/oevent.cpp
index c916297..ec05e77 100644
--- a/libopie2/opiepim/oevent.cpp
+++ b/libopie2/opiepim/oevent.cpp
@@ -349,65 +349,65 @@ void OEvent::changeOrModify() {
         }
 
         data = d2;
     }
 }
 void OEvent::deref() {
     if ( data->deref() ) {
         delete data;
         data = 0;
     }
 }
 // Exporting Event data to map. Using the same
 // encoding as ODateBookAccessBackend_xml does..
 // Thus, we could remove the stuff there and use this
 // for it and for all other places..
 // Encoding should happen at one place, only ! (eilers)
 QMap<int, QString> OEvent::toMap()const {
     QMap<int, QString> retMap;
 
     retMap.insert( OEvent::FUid, QString::number( uid() ) );
     retMap.insert( OEvent::FCategories, Qtopia::escapeString( Qtopia::Record::idsToString( categories() ) ));
     retMap.insert( OEvent::FDescription, Qtopia::escapeString( description() ) );
     retMap.insert( OEvent::FLocation, Qtopia::escapeString( location() ) );
     retMap.insert( OEvent::FType, isAllDay() ? "AllDay" : "" );
     OPimAlarm alarm = notifiers().alarms()[0];
     retMap.insert( OEvent::FAlarm, QString::number( alarm.dateTime().secsTo(  startDateTime() ) / 60 ) );
     retMap.insert( OEvent::FSound, (alarm.sound() == OPimAlarm::Loud) ? "loud" : "silent" );
 
     OTimeZone zone(  timeZone().isEmpty() ? OTimeZone::current() : timeZone() );
     retMap.insert( OEvent::FStart, QString::number( zone.fromUTCDateTime( zone.toDateTime(  startDateTime(), OTimeZone::utc() ) ) ) );
     retMap.insert( OEvent::FEnd, QString::number( zone.fromUTCDateTime( zone.toDateTime(  endDateTime(), OTimeZone::utc() ) ) ) );
     retMap.insert( OEvent::FNote, Qtopia::escapeString( note() ) );
-    retMap.insert( OEvent::FTimeZone, timeZone().isEmpty() ? "None" : timeZone() );
+    retMap.insert( OEvent::FTimeZone, timeZone().isEmpty() ? QString( "None" ) : timeZone() );
     if( parent() )
             retMap.insert( OEvent::FRecParent, QString::number( parent() ) );
     if( children().count() ){
             QArray<int> childr = children();
             QString buf;
             for ( uint i = 0; i < childr.count(); i++ ) {
                     if ( i != 0 ) buf += " ";
                     buf += QString::number( childr[i] );
                     }    
             retMap.insert( OEvent::FRecChildren, buf );
     }
     
     // Add recurrence stuff
     if( hasRecurrence() ){
             ORecur recur = recurrence();
             QMap<int, QString> recFields = recur.toMap();
             retMap.insert( OEvent::FRType, recFields[ORecur::RType] );
             retMap.insert( OEvent::FRWeekdays, recFields[ORecur::RWeekdays] );
             retMap.insert( OEvent::FRPosition, recFields[ORecur::RPosition] );
             retMap.insert( OEvent::FRFreq, recFields[ORecur::RFreq] );
             retMap.insert( OEvent::FRHasEndDate, recFields[ORecur::RHasEndDate] );
             retMap.insert( OEvent::FREndDate, recFields[ORecur::EndDate] );
             retMap.insert( OEvent::FRCreated, recFields[ORecur::Created] );
             retMap.insert( OEvent::FRExceptions, recFields[ORecur::Exceptions] );
     }
    
     return retMap;
 }
 
 void OEvent::fromMap( const QMap<int, QString>& map )
 {