summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-07-31 13:30:45 (UTC)
committer harlekin <harlekin>2002-07-31 13:30:45 (UTC)
commit3cd137ee5784ac9552650e4f8edb1696880ced28 (patch) (side-by-side diff)
treef1668f52a53583843c68c51a8e636b8967b19064
parent012abe9b9c667d24052a9f078030bfa7874b404e (diff)
downloadopie-3cd137ee5784ac9552650e4f8edb1696880ced28.zip
opie-3cd137ee5784ac9552650e4f8edb1696880ced28.tar.gz
opie-3cd137ee5784ac9552650e4f8edb1696880ced28.tar.bz2
try to make gcc3.x happy
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
@@ -66,13 +66,13 @@ CardMonitor::~CardMonitor() {
}
-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 );
}
@@ -101,10 +101,10 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
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 );
}
@@ -123,5 +123,5 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
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";
@@ -130,5 +130,5 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
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";
@@ -137,5 +137,5 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
qDebug("Could not execute `/sbin/cardctl eject 1'! err=%d", err);
popUp( tr("CF/PCMCIA card eject failed!"));
- }
+ }
}
@@ -212,6 +212,6 @@ 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";}
@@ -259,5 +259,5 @@ bool CardMonitor::getStatusSd( int showPopUp ) {
}
if(!showPopUp && cardWas != cardInSd) {
- QString text = "";
+ QString text = QString::null;
if(cardInSd) { text += "SD Inserted"; }
else { text += "SD Removed"; }
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
@@ -52,5 +52,5 @@ private:
void iconShow();
QPopupMenu *popupMenu;
- void popUp(QString message, QString icon="");
+ void popUp(QString message, QString icon = QString::null );
};