-rw-r--r-- | core/applets/cardmon/cardmon.cpp | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp index 1ad8b55..3a6ad27 100644 --- a/core/applets/cardmon/cardmon.cpp +++ b/core/applets/cardmon/cardmon.cpp @@ -21,2 +21,3 @@ /* OPIE */ +#include <opie2/odebug.h> #include <opie2/odevice.h> @@ -25,2 +26,4 @@ #include <qpe/resource.h> +using namespace Opie::Core; +using namespace Opie::Ui; @@ -40,3 +43,2 @@ #include <fcntl.h> - #if defined(_OS_LINUX_) || defined(Q_OS_LINUX) @@ -46,8 +48,2 @@ -using namespace Opie; - -using namespace Opie::Ui; -using namespace Opie::Ui; -using namespace Opie::Core; - CardMonitor::CardMonitor( QWidget * parent ) : QWidget( parent ), @@ -199,3 +195,3 @@ void CardMonitor::cardMessage( const QCString & msg, const QByteArray & ) { - // qDebug("Pcmcia: stabchanged"); + // odebug << "Pcmcia: stabchanged" << oendl; getStatusPcmcia(); @@ -204,3 +200,3 @@ void CardMonitor::cardMessage( const QCString & msg, const QByteArray & ) { - // qDebug("CARDMONAPPLET: mtabchanged"); + // odebug << "CARDMONAPPLET: mtabchanged" << oendl; getStatusSd(); @@ -212,3 +208,3 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) - bool cardWas0 = cardInPcmcia0; // remember last state + bool cardWas0 = cardInPcmcia0; // remember last state bool cardWas1 = cardInPcmcia1; @@ -333,3 +329,3 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) // no file found - qDebug( "no file found" ); + odebug << "no file found" << oendl; cardInPcmcia0 = FALSE; @@ -347,3 +343,3 @@ bool CardMonitor::getStatusSd( int showPopUp ) - bool cardWas = cardInSd; // remember last state + bool cardWas = cardInSd; // remember last state cardInSd = FALSE; @@ -359,3 +355,3 @@ bool CardMonitor::getStatusSd( int showPopUp ) QString fs = me->mnt_fsname; - //qDebug( fs ); + //odebug << fs << oendl; if ( fs.left( 14 ) == "/dev/mmc/part1" || fs.left( 7 ) == "/dev/sd" @@ -387,3 +383,3 @@ bool CardMonitor::getStatusSd( int showPopUp ) } - //qDebug("TEXT: " + text ); + //odebug << "TEXT: " + text << oendl; #ifndef QT_NO_SOUND @@ -391,3 +387,3 @@ bool CardMonitor::getStatusSd( int showPopUp ) #endif - popUp( text, "cardmon/ide" ); // XX add SD pic + popUp( text, "cardmon/ide" ); // XX add SD pic } |