-rw-r--r-- | core/applets/cardmon/cardmon.cpp | 2 | ||||
-rw-r--r-- | core/applets/irdaapplet/irda.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp index 3f07b41..48146ab 100644 --- a/core/applets/cardmon/cardmon.cpp +++ b/core/applets/cardmon/cardmon.cpp | |||
@@ -336,45 +336,45 @@ void CardMonitor::paintEvent( QPaintEvent * ) { | |||
336 | int CardMonitor::position() { | 336 | int CardMonitor::position() { |
337 | return 7; | 337 | return 7; |
338 | } | 338 | } |
339 | 339 | ||
340 | void CardMonitor::execCommand( const QString &command ) { | 340 | void CardMonitor::execCommand( const QString &command ) { |
341 | 341 | ||
342 | if ( m_process == 0 ) { | 342 | if ( m_process == 0 ) { |
343 | m_process = new OProcess(); | 343 | m_process = new OProcess(); |
344 | QStringList strList = QStringList::split( " ", command ); | 344 | QStringList strList = QStringList::split( " ", command ); |
345 | 345 | ||
346 | for ( QStringList::Iterator it = strList.begin(); it != strList.end(); ++it ) { | 346 | for ( QStringList::Iterator it = strList.begin(); it != strList.end(); ++it ) { |
347 | *m_process << *it; | 347 | *m_process << *it; |
348 | } | 348 | } |
349 | 349 | ||
350 | connect(m_process, SIGNAL( processExited(Opie::Core::OProcess*) ), | 350 | connect(m_process, SIGNAL( processExited(Opie::Core::OProcess*) ), |
351 | this, SLOT( slotExited(Opie::Core::OProcess* ) ) ); | 351 | this, SLOT( slotExited(Opie::Core::OProcess* ) ) ); |
352 | 352 | ||
353 | if(!m_process->start(OProcess::NotifyOnExit, OProcess::AllOutput ) ) { | 353 | if(!m_process->start(OProcess::NotifyOnExit, OProcess::AllOutput ) ) { |
354 | delete m_process; | 354 | delete m_process; |
355 | m_process = 0; | 355 | m_process = 0; |
356 | } | 356 | } |
357 | } | 357 | } |
358 | } | 358 | } |
359 | 359 | ||
360 | void CardMonitor::slotExited( OProcess* proc ) { | 360 | void CardMonitor::slotExited( OProcess* ) { |
361 | 361 | ||
362 | if( m_process->normalExit() ) { | 362 | if( m_process->normalExit() ) { |
363 | int ret = m_process->exitStatus(); | 363 | int ret = m_process->exitStatus(); |
364 | if( ret != 0 ) { | 364 | if( ret != 0 ) { |
365 | if ( m_commandOrig == 1 ) { | 365 | if ( m_commandOrig == 1 ) { |
366 | popUp( tr( "CF/PCMCIA card eject failed!" ) ); | 366 | popUp( tr( "CF/PCMCIA card eject failed!" ) ); |
367 | } else if ( m_commandOrig == 2 ) { | 367 | } else if ( m_commandOrig == 2 ) { |
368 | popUp( tr( "SD/MMC card eject failed!" ) ); | 368 | popUp( tr( "SD/MMC card eject failed!" ) ); |
369 | } else if ( m_commandOrig == 3 ) { | 369 | } else if ( m_commandOrig == 3 ) { |
370 | popUp( tr( "CF/PCMCIA card eject failed!" ) ); | 370 | popUp( tr( "CF/PCMCIA card eject failed!" ) ); |
371 | } | 371 | } |
372 | } | 372 | } |
373 | } | 373 | } |
374 | 374 | ||
375 | delete m_process; | 375 | delete m_process; |
376 | m_process = 0; | 376 | m_process = 0; |
377 | } | 377 | } |
378 | 378 | ||
379 | EXPORT_OPIE_APPLET_v1( CardMonitor ) | 379 | EXPORT_OPIE_APPLET_v1( CardMonitor ) |
380 | 380 | ||
diff --git a/core/applets/irdaapplet/irda.cpp b/core/applets/irdaapplet/irda.cpp index 7122b40..267714e 100644 --- a/core/applets/irdaapplet/irda.cpp +++ b/core/applets/irdaapplet/irda.cpp | |||
@@ -310,49 +310,49 @@ void IrdaApplet::timerEvent ( QTimerEvent * ) | |||
310 | 310 | ||
311 | if (( m_irda_active != oldactive ) || ( m_irda_discovery_active != olddiscovery ) || receiveUpdate ) | 311 | if (( m_irda_active != oldactive ) || ( m_irda_discovery_active != olddiscovery ) || receiveUpdate ) |
312 | update ( ); | 312 | update ( ); |
313 | } | 313 | } |
314 | 314 | ||
315 | void IrdaApplet::paintEvent ( QPaintEvent * ) | 315 | void IrdaApplet::paintEvent ( QPaintEvent * ) |
316 | { | 316 | { |
317 | QPainter p ( this ); | 317 | QPainter p ( this ); |
318 | 318 | ||
319 | p. drawPixmap ( 0, 1, m_irda_active ? m_irdaOnPixmap : m_irdaOffPixmap ); | 319 | p. drawPixmap ( 0, 1, m_irda_active ? m_irdaOnPixmap : m_irdaOffPixmap ); |
320 | 320 | ||
321 | if ( m_irda_discovery_active ) | 321 | if ( m_irda_discovery_active ) |
322 | p. drawPixmap( 0, 1, m_irdaDiscoveryOnPixmap ); | 322 | p. drawPixmap( 0, 1, m_irdaDiscoveryOnPixmap ); |
323 | 323 | ||
324 | if ( m_receive_active ) | 324 | if ( m_receive_active ) |
325 | p. drawPixmap( 0, 1, m_receiveActivePixmap ); | 325 | p. drawPixmap( 0, 1, m_receiveActivePixmap ); |
326 | } | 326 | } |
327 | /* | 327 | /* |
328 | * We know 3 calls | 328 | * We know 3 calls |
329 | * a) enable | 329 | * a) enable |
330 | * b) disable | 330 | * b) disable |
331 | * a and b will temp enable the IrDa device and disable will disable it again if it wasn't on | 331 | * a and b will temp enable the IrDa device and disable will disable it again if it wasn't on |
332 | * c) listDevices: We will return a list of known devices | 332 | * c) listDevices: We will return a list of known devices |
333 | */ | 333 | */ |
334 | void IrdaApplet::slotMessage( const QCString& str, const QByteArray& ar ) { | 334 | void IrdaApplet::slotMessage( const QCString& str, const QByteArray& ) { |
335 | if ( str == "enableIrda()") { | 335 | if ( str == "enableIrda()") { |
336 | m_wasOn = checkIrdaStatus(); | 336 | m_wasOn = checkIrdaStatus(); |
337 | m_wasDiscover = checkIrdaDiscoveryStatus(); | 337 | m_wasDiscover = checkIrdaDiscoveryStatus(); |
338 | if (!m_wasOn) { | 338 | if (!m_wasOn) { |
339 | setIrdaStatus( true ); | 339 | setIrdaStatus( true ); |
340 | } | 340 | } |
341 | if ( !m_wasDiscover ) { | 341 | if ( !m_wasDiscover ) { |
342 | setIrdaDiscoveryStatus ( true ); | 342 | setIrdaDiscoveryStatus ( true ); |
343 | } | 343 | } |
344 | } else if ( str == "disableIrda()") { | 344 | } else if ( str == "disableIrda()") { |
345 | if (!m_wasOn) { | 345 | if (!m_wasOn) { |
346 | setIrdaStatus( false ); | 346 | setIrdaStatus( false ); |
347 | } | 347 | } |
348 | if ( !m_wasDiscover ) { | 348 | if ( !m_wasDiscover ) { |
349 | setIrdaDiscoveryStatus ( false ); | 349 | setIrdaDiscoveryStatus ( false ); |
350 | } | 350 | } |
351 | } else if ( str == "listDevices()") { | 351 | } else if ( str == "listDevices()") { |
352 | QCopEnvelope e("QPE/IrDaAppletBack", "devices(QStringList)"); | 352 | QCopEnvelope e("QPE/IrDaAppletBack", "devices(QStringList)"); |
353 | 353 | ||
354 | QStringList list; | 354 | QStringList list; |
355 | QMap<QString, QString>::Iterator it; | 355 | QMap<QString, QString>::Iterator it; |
356 | for (it = m_devices.begin(); it != m_devices.end(); ++it ) | 356 | for (it = m_devices.begin(); it != m_devices.end(); ++it ) |
357 | list << (*it); | 357 | list << (*it); |
358 | 358 | ||