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 @@ -62,18 +62,18 @@ CardMonitor::CardMonitor( QWidget *parent ) : QWidget( parent ), } 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 )), message, 0 ); } @@ -208,14 +208,14 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) { cardInPcmcia1Type = (*line).mid( pos, (*line).find("\t", pos) - pos); } } } 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";} text += cardInPcmcia0Name; popUp( text, "cardmon/" + cardInPcmcia0Type ); } @@ -255,13 +255,13 @@ bool CardMonitor::getStatusSd( int showPopUp ) { cardInSd=true; } } 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 } #else |