summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/cardmon/cardmon.cpp22
-rw-r--r--core/applets/cardmon/cardmon.h2
2 files changed, 12 insertions, 12 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,21 +62,21 @@ 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 )),
+ popupMenu->insertItem( QIconSet ( Resource::loadPixmap ( icon )),
message, 0 );
}
QPoint p = mapToGlobal ( QPoint ( 0, 0 ));
QSize s = popupMenu->sizeHint ( );
popupMenu->popup( QPoint (
@@ -97,18 +97,18 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
if ( cardInSd ) {
menu->insertItem( tr("Eject SD/MMC card"), 0 );
}
if ( cardInPcmcia0 ) {
- menu->insertItem( QIconSet ( Resource::loadPixmap ( "cardmon/" + cardInPcmcia0Type )),
+ menu->insertItem( QIconSet ( Resource::loadPixmap ( "cardmon/" + cardInPcmcia0Type )),
tr("Eject card 0: %1").arg(cardInPcmcia0Name), 1 );
}
if ( cardInPcmcia1 ) {
- menu->insertItem( QIconSet ( Resource::loadPixmap ( "cardmon/" + cardInPcmcia1Type )),
+ menu->insertItem( QIconSet ( Resource::loadPixmap ( "cardmon/" + cardInPcmcia1Type )),
tr("Eject card 1: %1").arg(cardInPcmcia1Name), 2 );
}
QPoint p = mapToGlobal ( QPoint ( 0, 0 ));
QSize s = menu->sizeHint ( );
int opt = menu->exec( QPoint (
@@ -119,27 +119,27 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
cmd = "/sbin/cardctl eject 0";
err = system( (const char *) cmd );
if ( ( err == 127 ) || ( err < 0 ) ) {
qDebug("Could not execute `/sbin/cardctl eject 0'! err=%d", err);
popUp( tr("CF/PCMCIA card eject failed!"));
- }
+ }
} else if ( opt == 0 ) {
cmd = "/etc/sdcontrol compeject";
err = system( (const char *) cmd );
if ( ( err != 0 ) ) {
qDebug("Could not execute `/etc/sdcontrol comeject'! err=%d", err);
popUp( tr("SD/MMC card eject failed!"));
- }
+ }
} else if ( opt == 2 ) {
cmd = "/sbin/cardctl eject 1";
err = system( (const char *) cmd );
if ( ( err == 127 ) || ( err < 0 ) ) {
qDebug("Could not execute `/sbin/cardctl eject 1'! err=%d", err);
popUp( tr("CF/PCMCIA card eject failed!"));
- }
+ }
}
delete menu;
}
@@ -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
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
@@ -48,11 +48,11 @@ private:
bool cardInPcmcia1;
QString cardInPcmcia1Name;
QString cardInPcmcia1Type;
bool cardInSd;
void iconShow();
QPopupMenu *popupMenu;
- void popUp(QString message, QString icon="");
+ void popUp(QString message, QString icon = QString::null );
};
#endif