author | zecke <zecke> | 2004-09-18 19:43:37 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-09-18 19:43:37 (UTC) |
commit | af0d773a9991dec27d25c2ad6859ee2abe23c73a (patch) (unidiff) | |
tree | db35921190287e0c0b19c6207e8d87f679c513ee | |
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 | |||
@@ -109,5 +109,6 @@ void CardMonitor::popupTimeout() { | |||
109 | void CardMonitor::mousePressEvent( QMouseEvent * ) { | 109 | void CardMonitor::mousePressEvent( QMouseEvent * ) { |
110 | QPopupMenu * menu = new QPopupMenu( this ); | 110 | QPopupMenu * menu = new QPopupMenu( this ); |
111 | QString cmd; | 111 | QStringList cmd; |
112 | bool execute = true; | ||
112 | 113 | ||
113 | if ( cardInSd ) { | 114 | if ( cardInSd ) { |
@@ -136,13 +137,18 @@ void CardMonitor::mousePressEvent( QMouseEvent * ) { | |||
136 | 137 | ||
137 | if ( opt == 1 ) { | 138 | if ( opt == 1 ) { |
138 | m_commandOrig = 1; | 139 | m_commandOrig = PCMCIA_Socket1; |
139 | execCommand("/sbin/cardctl eject 0"); | 140 | cmd << "/sbin/cardctl" << "eject" << "0"; |
140 | } else if ( opt == 0 ) { | 141 | } else if ( opt == 0 ) { |
141 | m_commandOrig = 2; | 142 | m_commandOrig = MMC_Socket; |
142 | execCommand( QString("umount %1").arg(cardSdName)); | 143 | cmd << "umount" << cardSdName; |
143 | } else if ( opt == 2 ) { | 144 | } else if ( opt == 2 ) { |
144 | m_commandOrig = 3; | 145 | m_commandOrig = PCMCIA_Socket2; |
145 | execCommand( "/sbin/cardctl eject 1" ); | 146 | cmd << "/sbin/cardctl" << "eject" << "1"; |
146 | } | 147 | }else |
148 | execute = false; | ||
149 | |||
150 | if ( execute ) | ||
151 | execCommand( cmd ); | ||
152 | |||
147 | delete menu; | 153 | delete menu; |
148 | } | 154 | } |
@@ -334,5 +340,5 @@ int CardMonitor::position() { | |||
334 | } | 340 | } |
335 | 341 | ||
336 | void CardMonitor::execCommand( const QString &command ) { | 342 | void CardMonitor::execCommand( const QStringList &strList ) { |
337 | delete m_process; | 343 | delete m_process; |
338 | m_process = 0; | 344 | m_process = 0; |
@@ -340,7 +346,7 @@ void CardMonitor::execCommand( const QString &command ) { | |||
340 | if ( m_process == 0 ) { | 346 | if ( m_process == 0 ) { |
341 | m_process = new OProcess(); | 347 | m_process = new OProcess(); |
342 | QStringList strList = QStringList::split( " ", command ); | ||
343 | 348 | ||
344 | for ( QStringList::Iterator it = strList.begin(); it != strList.end(); ++it ) { | 349 | |
350 | for ( QStringList::ConstIterator it = strList.begin(); it != strList.end(); ++it ) { | ||
345 | *m_process << *it; | 351 | *m_process << *it; |
346 | } | 352 | } |
@@ -361,10 +367,9 @@ void CardMonitor::slotExited( OProcess* ) { | |||
361 | int ret = m_process->exitStatus(); | 367 | int ret = m_process->exitStatus(); |
362 | if( ret != 0 ) { | 368 | if( ret != 0 ) { |
363 | if ( m_commandOrig == 1 ) { | 369 | if ( m_commandOrig == PCMCIA_Socket1 || |
370 | m_commandOrig == PCMCIA_Socket2 ) { | ||
364 | popUp( tr( "CF/PCMCIA card eject failed!" ) ); | 371 | popUp( tr( "CF/PCMCIA card eject failed!" ) ); |
365 | } else if ( m_commandOrig == 2 ) { | 372 | } else if ( m_commandOrig == MMC_Socket ) { |
366 | popUp( tr( "SD/MMC card eject failed!" ) ); | 373 | popUp( tr( "SD/MMC card eject failed!" ) ); |
367 | } else if ( m_commandOrig == 3 ) { | ||
368 | popUp( tr( "CF/PCMCIA card eject failed!" ) ); | ||
369 | } | 374 | } |
370 | } | 375 | } |
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 | |||
@@ -33,4 +33,10 @@ class CardMonitor : public QWidget { | |||
33 | Q_OBJECT | 33 | Q_OBJECT |
34 | public: | 34 | public: |
35 | enum { | ||
36 | PCMCIA_Socket1, | ||
37 | PCMCIA_Socket2, | ||
38 | MMC_Socket | ||
39 | }; | ||
40 | |||
35 | CardMonitor( QWidget *parent = 0 ); | 41 | CardMonitor( QWidget *parent = 0 ); |
36 | ~CardMonitor(); | 42 | ~CardMonitor(); |
@@ -48,5 +54,5 @@ protected: | |||
48 | 54 | ||
49 | private: | 55 | private: |
50 | void execCommand( const QString &command ); | 56 | void execCommand( const QStringList &command ); |
51 | int m_commandOrig; | 57 | int m_commandOrig; |
52 | QPixmap pm; | 58 | QPixmap pm; |