1 files changed, 0 insertions, 2 deletions

diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp
index 8ffaada..7625545 100644
--- a/core/applets/cardmon/cardmon.cpp
+++ b/core/applets/cardmon/cardmon.cpp
@@ -1,127 +1,125 @@
 /*
 * cardmon.cpp
 *
 * ---------------------
 *
 * copyright   : (c) 2002 by Maximilian Reiss
 * email       : max.reiss@gmx.de
 * based on two apps by Devin Butterfield
 */
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #include "cardmon.h"
 
 /* OPIE */
 #include <opie2/odevice.h>
 #include <opie2/otaskbarapplet.h>
 #include <qpe/applnk.h>
 #include <qpe/resource.h>
 
 /* QT */
-#include <qapplication.h>
 #include <qcopchannel_qws.h>
 #include <qpainter.h>
-#include <qmessagebox.h>
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qsound.h>
 #include <qtimer.h>
 
 /* STD */
 #include <stdio.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <fcntl.h>
 
 #if defined(_OS_LINUX_) || defined(Q_OS_LINUX)
 #include <sys/vfs.h>
 #include <mntent.h>
 #endif
 
 using namespace Opie;
 
 CardMonitor::CardMonitor( QWidget * parent ) : QWidget( parent ),
         pm( Resource::loadPixmap( "cardmon/pcmcia" ) )
 {
 
     QCopChannel * pcmciaChannel = new QCopChannel( "QPE/Card", this );
     connect( pcmciaChannel,
              SIGNAL( received( const QCString &, const QByteArray & ) ), this,
              SLOT( cardMessage( const QCString &, const QByteArray & ) ) );
 
     QCopChannel *sdChannel = new QCopChannel( "QPE/Card", this );
     connect( sdChannel,
              SIGNAL( received( const QCString &, const QByteArray & ) ), this,
              SLOT( cardMessage( const QCString &, const QByteArray & ) ) );
 
     cardInPcmcia0 = FALSE;
     cardInPcmcia1 = FALSE;
     cardInSd = FALSE;
 
     setFocusPolicy( NoFocus );
 
     setFixedWidth ( AppLnk::smallIconSize() );
     setFixedHeight ( AppLnk::smallIconSize() );
 
     getStatusPcmcia( TRUE );
     getStatusSd( TRUE );
     repaint( FALSE );
     popupMenu = 0;
 }
 
 CardMonitor::~CardMonitor()
 {
     if ( popupMenu )
     {
         delete popupMenu;
     }
 }
 
 void CardMonitor::popUp( QString message, QString icon )
 {
     if ( !popupMenu )
     {
         popupMenu = new QPopupMenu( this );
     }
 
     popupMenu->clear();
     if ( icon.isEmpty() )
     {
         popupMenu->insertItem( message, 0 );
     }
     else
     {
         popupMenu->insertItem( QIconSet( Resource::loadPixmap( icon ) ),
                                message, 0 );
     }
 
     QPoint p = mapToGlobal( QPoint( 0, 0 ) );
     QSize s = popupMenu->sizeHint();
     popupMenu->popup( QPoint( p.x() + ( width() / 2 ) - ( s.width() / 2 ),
                               p.y() - s.height() ), 0 );
 
     QTimer::singleShot( 2000, this, SLOT( popupTimeout() ) );
 }
 
 void CardMonitor::popupTimeout()
 {
     popupMenu->hide();
 }
 
 void CardMonitor::mousePressEvent( QMouseEvent * )
 {
     QPopupMenu * menu = new QPopupMenu( this );
     QString cmd;
     int err = 0;
 
     if ( cardInSd )
     {
         menu->insertItem( QIconSet( Resource::loadPixmap( "cardmon/ide" ) ),