summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/applets/cardmon/cardmon.cpp10
-rw-r--r--core/applets/cardmon/cardmon.h2
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
@@ -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
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
@@ -51,7 +51,7 @@ private:
bool cardInSd;
void iconShow();
QPopupMenu *popupMenu;
- void popUp(QString message, QString icon="");
+ void popUp(QString message, QString icon = QString::null );
};
#endif