fixed first start and cleanups

1 files changed, 6 insertions, 5 deletions

diff --git a/core/applets/cardmon/cardmon.h b/core/applets/cardmon/cardmon.h
index 34b8d95..e424192 100644
--- a/core/applets/cardmon/cardmon.h
+++ b/core/applets/cardmon/cardmon.h
@@ -19,40 +19,41 @@
 #ifndef CARDMON_H
 #define CARDMON_H
 
 #include <qwidget.h>
 #include <qpixmap.h>
 #include <qpopupmenu.h>
-#include <qtimer.h>
 
 class CardMonitor : public QWidget {
     Q_OBJECT
 public:
     CardMonitor( QWidget *parent = 0 );
     ~CardMonitor();
     bool getStatusPcmcia( int showPopUp = FALSE );
     bool getStatusSd( int showPopUp = FALSE );
 
 private slots:
     void cardMessage( const QCString &msg, const QByteArray & );
-    void popUpTimeout();
+    void popupTimeout();
 
 protected:
     void paintEvent( QPaintEvent* );
     void mousePressEvent( QMouseEvent * );
 private:
     QPixmap pm;
-    QPopupMenu *popUpMenu;
-    QTimer *popUpMenuTimer;
     // pcmcia socket 0
     bool cardInPcmcia0;
     QString cardInPcmcia0Name;
+    QString cardInPcmcia0Type;
     // pcmcia socket 1
     bool cardInPcmcia1;
     QString cardInPcmcia1Name;
+    QString cardInPcmcia1Type;
     bool cardInSd;
     void iconShow();
-    void popUp(QString message);
+    QPopupMenu *popupMenu;
+    void popup(QString message, QString icon="");
+    QString getIconName(QString type);
 };
 
 #endif