author | zecke <zecke> | 2004-09-18 19:43:37 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-09-18 19:43:37 (UTC) |
commit | af0d773a9991dec27d25c2ad6859ee2abe23c73a (patch) (side-by-side diff) | |
tree | db35921190287e0c0b19c6207e8d87f679c513ee /core | |
parent | 3f56f22d205a7f2a60262aa026542e9dc844810f (diff) | |
download | opie-af0d773a9991dec27d25c2ad6859ee2abe23c73a.zip opie-af0d773a9991dec27d25c2ad6859ee2abe23c73a.tar.gz opie-af0d773a9991dec27d25c2ad6859ee2abe23c73a.tar.bz2 |
-Killl Magic Numbers and introduce an enum
-Split the Command Line on Creation, this way we do not need to
split the command afterwards
-rw-r--r-- | core/applets/cardmon/cardmon.cpp | 35 | ||||
-rw-r--r-- | core/applets/cardmon/cardmon.h | 8 |
2 files changed, 27 insertions, 16 deletions
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp index 43ccce2..fb140fe 100644 --- a/core/applets/cardmon/cardmon.cpp +++ b/core/applets/cardmon/cardmon.cpp @@ -110,3 +110,4 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) { QPopupMenu * menu = new QPopupMenu( this ); - QString cmd; + QStringList cmd; + bool execute = true; @@ -137,11 +138,16 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) { if ( opt == 1 ) { - m_commandOrig = 1; - execCommand("/sbin/cardctl eject 0"); + m_commandOrig = PCMCIA_Socket1; + cmd << "/sbin/cardctl" << "eject" << "0"; } else if ( opt == 0 ) { - m_commandOrig = 2; - execCommand( QString("umount %1").arg(cardSdName)); + m_commandOrig = MMC_Socket; + cmd << "umount" << cardSdName; } else if ( opt == 2 ) { - m_commandOrig = 3; - execCommand( "/sbin/cardctl eject 1" ); - } + m_commandOrig = PCMCIA_Socket2; + cmd << "/sbin/cardctl" << "eject" << "1"; + }else + execute = false; + + if ( execute ) + execCommand( cmd ); + delete menu; @@ -335,3 +341,3 @@ int CardMonitor::position() { -void CardMonitor::execCommand( const QString &command ) { +void CardMonitor::execCommand( const QStringList &strList ) { delete m_process; @@ -341,5 +347,5 @@ void CardMonitor::execCommand( const QString &command ) { m_process = new OProcess(); - QStringList strList = QStringList::split( " ", command ); - for ( QStringList::Iterator it = strList.begin(); it != strList.end(); ++it ) { + + for ( QStringList::ConstIterator it = strList.begin(); it != strList.end(); ++it ) { *m_process << *it; @@ -362,8 +368,7 @@ void CardMonitor::slotExited( OProcess* ) { if( ret != 0 ) { - if ( m_commandOrig == 1 ) { + if ( m_commandOrig == PCMCIA_Socket1 || + m_commandOrig == PCMCIA_Socket2 ) { popUp( tr( "CF/PCMCIA card eject failed!" ) ); - } else if ( m_commandOrig == 2 ) { + } else if ( m_commandOrig == MMC_Socket ) { popUp( tr( "SD/MMC card eject failed!" ) ); - } else if ( m_commandOrig == 3 ) { - popUp( tr( "CF/PCMCIA card eject failed!" ) ); } diff --git a/core/applets/cardmon/cardmon.h b/core/applets/cardmon/cardmon.h index b02c8b1..400f5ae 100644 --- a/core/applets/cardmon/cardmon.h +++ b/core/applets/cardmon/cardmon.h @@ -34,2 +34,8 @@ class CardMonitor : public QWidget { public: + enum { + PCMCIA_Socket1, + PCMCIA_Socket2, + MMC_Socket + }; + CardMonitor( QWidget *parent = 0 ); @@ -49,3 +55,3 @@ protected: private: - void execCommand( const QString &command ); + void execCommand( const QStringList &command ); int m_commandOrig; |