author | harlekin <harlekin> | 2002-07-31 13:30:45 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-07-31 13:30:45 (UTC) |
commit | 3cd137ee5784ac9552650e4f8edb1696880ced28 (patch) (side-by-side diff) | |
tree | f1668f52a53583843c68c51a8e636b8967b19064 /core/applets/cardmon/cardmon.cpp | |
parent | 012abe9b9c667d24052a9f078030bfa7874b404e (diff) | |
download | opie-3cd137ee5784ac9552650e4f8edb1696880ced28.zip opie-3cd137ee5784ac9552650e4f8edb1696880ced28.tar.gz opie-3cd137ee5784ac9552650e4f8edb1696880ced28.tar.bz2 |
try to make gcc3.x happy
Diffstat (limited to 'core/applets/cardmon/cardmon.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | core/applets/cardmon/cardmon.cpp | 10 |
1 files changed, 5 insertions, 5 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 @@ -65,12 +65,12 @@ CardMonitor::~CardMonitor() { if( popupMenu ) { delete popupMenu; } } -void CardMonitor::popUp(QString message, QString icon="") { +void CardMonitor::popUp( QString message, QString icon = QString::null ) { if ( ! popupMenu ) { popupMenu = new QPopupMenu(); } popupMenu->clear(); - if( icon == "" ) { + if( icon.isEmpty() ) { popupMenu->insertItem( message, 0 ); } else { popupMenu->insertItem( QIconSet ( Resource::loadPixmap ( icon )), @@ -211,8 +211,8 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) { } f.close(); if( !showPopUp && (cardWas0 != cardInPcmcia0 || cardWas1 != cardInPcmcia1)) { - QString text = ""; - QString what = ""; + QString text = QString::null; + QString what = QString::null; if(cardWas0 != cardInPcmcia0) { if(cardInPcmcia0) { text += tr("New card: "); what="on";} else { text += tr("Ejected: "); what="off";} @@ -258,7 +258,7 @@ bool CardMonitor::getStatusSd( int showPopUp ) { endmntent( mntfp ); } if(!showPopUp && cardWas != cardInSd) { - QString text = ""; + QString text = QString::null; if(cardInSd) { text += "SD Inserted"; } else { text += "SD Removed"; } popUp( text); // XX add SD pic |