summaryrefslogtreecommitdiff
path: root/core/applets/cardmon/cardmon.cpp
Unidiff
Diffstat (limited to 'core/applets/cardmon/cardmon.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/cardmon/cardmon.cpp22
1 files changed, 11 insertions, 11 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() {
67 67
68void CardMonitor::popUp(QString message, QString icon="") { 68void CardMonitor::popUp( QString message, QString icon = QString::null ) {
69 if ( ! popupMenu ) { 69 if ( ! popupMenu ) {
@@ -72,6 +72,6 @@ void CardMonitor::popUp(QString message, QString icon="") {
72 popupMenu->clear(); 72 popupMenu->clear();
73 if( icon == "" ) { 73 if( icon.isEmpty() ) {
74 popupMenu->insertItem( message, 0 ); 74 popupMenu->insertItem( message, 0 );
75 } else { 75 } else {
76 popupMenu->insertItem( QIconSet ( Resource::loadPixmap ( icon )), 76 popupMenu->insertItem( QIconSet ( Resource::loadPixmap ( icon )),
77 message, 0 ); 77 message, 0 );
@@ -102,3 +102,3 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
102 if ( cardInPcmcia0 ) { 102 if ( cardInPcmcia0 ) {
103 menu->insertItem( QIconSet ( Resource::loadPixmap ( "cardmon/" + cardInPcmcia0Type )), 103 menu->insertItem( QIconSet ( Resource::loadPixmap ( "cardmon/" + cardInPcmcia0Type )),
104 tr("Eject card 0: %1").arg(cardInPcmcia0Name), 1 ); 104 tr("Eject card 0: %1").arg(cardInPcmcia0Name), 1 );
@@ -107,3 +107,3 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
107 if ( cardInPcmcia1 ) { 107 if ( cardInPcmcia1 ) {
108 menu->insertItem( QIconSet ( Resource::loadPixmap ( "cardmon/" + cardInPcmcia1Type )), 108 menu->insertItem( QIconSet ( Resource::loadPixmap ( "cardmon/" + cardInPcmcia1Type )),
109 tr("Eject card 1: %1").arg(cardInPcmcia1Name), 2 ); 109 tr("Eject card 1: %1").arg(cardInPcmcia1Name), 2 );
@@ -124,3 +124,3 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
124 popUp( tr("CF/PCMCIA card eject failed!")); 124 popUp( tr("CF/PCMCIA card eject failed!"));
125 } 125 }
126 } else if ( opt == 0 ) { 126 } else if ( opt == 0 ) {
@@ -131,3 +131,3 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
131 popUp( tr("SD/MMC card eject failed!")); 131 popUp( tr("SD/MMC card eject failed!"));
132 } 132 }
133 } else if ( opt == 2 ) { 133 } else if ( opt == 2 ) {
@@ -138,3 +138,3 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) {
138 popUp( tr("CF/PCMCIA card eject failed!")); 138 popUp( tr("CF/PCMCIA card eject failed!"));
139 } 139 }
140 } 140 }
@@ -213,4 +213,4 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) {
213 if( !showPopUp && (cardWas0 != cardInPcmcia0 || cardWas1 != cardInPcmcia1)) { 213 if( !showPopUp && (cardWas0 != cardInPcmcia0 || cardWas1 != cardInPcmcia1)) {
214 QString text = ""; 214 QString text = QString::null;
215 QString what = ""; 215 QString what = QString::null;
216 if(cardWas0 != cardInPcmcia0) { 216 if(cardWas0 != cardInPcmcia0) {
@@ -260,3 +260,3 @@ bool CardMonitor::getStatusSd( int showPopUp ) {
260 if(!showPopUp && cardWas != cardInSd) { 260 if(!showPopUp && cardWas != cardInSd) {
261 QString text = ""; 261 QString text = QString::null;
262 if(cardInSd) { text += "SD Inserted"; } 262 if(cardInSd) { text += "SD Inserted"; }