summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/applets/cardmon/cardmon.cpp2
-rw-r--r--core/applets/irdaapplet/irda.cpp2
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
@@ -348,25 +348,25 @@ void CardMonitor::execCommand( const QString &command ) {
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
360void CardMonitor::slotExited( OProcess* proc ) { 360void 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 }
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
@@ -322,25 +322,25 @@ void IrdaApplet::paintEvent ( QPaintEvent * )
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 */
334void IrdaApplet::slotMessage( const QCString& str, const QByteArray& ar ) { 334void 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 );