try to make gcc3.x happy

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
@@ -67,3 +67,3 @@ CardMonitor::~CardMonitor() {
 
-void CardMonitor::popUp(QString message, QString icon="") {
+void CardMonitor::popUp( QString message, QString icon = QString::null ) {
     if ( ! popupMenu ) {
@@ -72,6 +72,6 @@ void CardMonitor::popUp(QString message, QString icon="") {
     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 );
@@ -102,3 +102,3 @@ 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 );
@@ -107,3 +107,3 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
     if ( cardInPcmcia1 ) {
-        menu->insertItem( QIconSet ( Resource::loadPixmap ( "cardmon/" + cardInPcmcia1Type )), 
+        menu->insertItem( QIconSet ( Resource::loadPixmap ( "cardmon/" + cardInPcmcia1Type )),
                 tr("Eject card 1: %1").arg(cardInPcmcia1Name), 2 );
@@ -124,3 +124,3 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
             popUp( tr("CF/PCMCIA card eject failed!"));
-        } 
+        }
     } else if ( opt == 0 ) {
@@ -131,3 +131,3 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
             popUp( tr("SD/MMC card eject failed!"));
-        } 
+        }
     } else if ( opt == 2 ) {
@@ -138,3 +138,3 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
             popUp( tr("CF/PCMCIA card eject failed!"));
-        } 
+        }
     }
@@ -213,4 +213,4 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) {
         if( !showPopUp && (cardWas0 != cardInPcmcia0 || cardWas1 != cardInPcmcia1)) {
-            QString text = "";
-            QString what = "";
+            QString text = QString::null;
+            QString what = QString::null;
             if(cardWas0 != cardInPcmcia0) {
@@ -260,3 +260,3 @@ bool CardMonitor::getStatusSd( int showPopUp ) {
     if(!showPopUp && cardWas != cardInSd) {
-        QString text = "";
+        QString text = QString::null;
         if(cardInSd) { text += "SD Inserted"; }
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
@@ -53,3 +53,3 @@ private:
     QPopupMenu *popupMenu;
-    void popUp(QString message, QString icon="");
+    void popUp(QString message, QString icon = QString::null );
  };