author | harlekin <harlekin> | 2002-07-31 13:30:45 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-07-31 13:30:45 (UTC) |
commit | 3cd137ee5784ac9552650e4f8edb1696880ced28 (patch) (unidiff) | |
tree | f1668f52a53583843c68c51a8e636b8967b19064 | |
parent | 012abe9b9c667d24052a9f078030bfa7874b404e (diff) | |
download | opie-3cd137ee5784ac9552650e4f8edb1696880ced28.zip opie-3cd137ee5784ac9552650e4f8edb1696880ced28.tar.gz opie-3cd137ee5784ac9552650e4f8edb1696880ced28.tar.bz2 |
try to make gcc3.x happy
-rw-r--r-- | core/applets/cardmon/cardmon.cpp | 10 | ||||
-rw-r--r-- | core/applets/cardmon/cardmon.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp index 0bd1ed3..ffead4d 100644 --- a/core/applets/cardmon/cardmon.cpp +++ b/core/applets/cardmon/cardmon.cpp | |||
@@ -67,3 +67,3 @@ CardMonitor::~CardMonitor() { | |||
67 | 67 | ||
68 | void CardMonitor::popUp(QString message, QString icon="") { | 68 | void CardMonitor::popUp( QString message, QString icon = QString::null ) { |
69 | if ( ! popupMenu ) { | 69 | if ( ! popupMenu ) { |
@@ -72,3 +72,3 @@ void CardMonitor::popUp(QString message, QString icon="") { | |||
72 | popupMenu->clear(); | 72 | popupMenu->clear(); |
73 | if( icon == "" ) { | 73 | if( icon.isEmpty() ) { |
74 | popupMenu->insertItem( message, 0 ); | 74 | popupMenu->insertItem( message, 0 ); |
@@ -213,4 +213,4 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) { | |||
213 | if( !showPopUp && (cardWas0 != cardInPcmcia0 || cardWas1 != cardInPcmcia1)) { | 213 | if( !showPopUp && (cardWas0 != cardInPcmcia0 || cardWas1 != cardInPcmcia1)) { |
214 | QString text = ""; | 214 | QString text = QString::null; |
215 | QString what = ""; | 215 | QString what = QString::null; |
216 | if(cardWas0 != cardInPcmcia0) { | 216 | if(cardWas0 != cardInPcmcia0) { |
@@ -260,3 +260,3 @@ bool CardMonitor::getStatusSd( int showPopUp ) { | |||
260 | if(!showPopUp && cardWas != cardInSd) { | 260 | if(!showPopUp && cardWas != cardInSd) { |
261 | QString text = ""; | 261 | QString text = QString::null; |
262 | if(cardInSd) { text += "SD Inserted"; } | 262 | if(cardInSd) { text += "SD Inserted"; } |
diff --git a/core/applets/cardmon/cardmon.h b/core/applets/cardmon/cardmon.h index 9651783..49bcae8 100644 --- a/core/applets/cardmon/cardmon.h +++ b/core/applets/cardmon/cardmon.h | |||
@@ -53,3 +53,3 @@ private: | |||
53 | QPopupMenu *popupMenu; | 53 | QPopupMenu *popupMenu; |
54 | void popUp(QString message, QString icon=""); | 54 | void popUp(QString message, QString icon = QString::null ); |
55 | }; | 55 | }; |