summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-12-08 15:56:09 (UTC)
committer mickeyl <mickeyl>2003-12-08 15:56:09 (UTC)
commit466d396717be9ec10bdc1472bce5e733cd268ce4 (patch) (side-by-side diff)
tree29490045306e1241ba315d789cfb6632e20587dd
parent8753d6a11a4e837df09f4fb2474cfae84d28320a (diff)
downloadopie-466d396717be9ec10bdc1472bce5e733cd268ce4.zip
opie-466d396717be9ec10bdc1472bce5e733cd268ce4.tar.gz
opie-466d396717be9ec10bdc1472bce5e733cd268ce4.tar.bz2
work around sucky gcc2, which doesn't understand when the two arguments
for ? need an implicit type conversion
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie/pim/oevent.cpp2
-rw-r--r--libopie2/opiepim/oevent.cpp2
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
@@ -378,7 +378,7 @@ QMap<int, QString> OEvent::toMap()const {
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() ){
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
@@ -378,7 +378,7 @@ QMap<int, QString> OEvent::toMap()const {
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() ){