summaryrefslogtreecommitdiff
path: root/core/applets/cardmon/cardmon.h
Side-by-side diff
Diffstat (limited to 'core/applets/cardmon/cardmon.h') (more/less context) (show whitespace changes)
-rw-r--r--core/applets/cardmon/cardmon.h11
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
@@ -24,3 +24,2 @@
#include <qpopupmenu.h>
-#include <qtimer.h>
@@ -36,3 +35,3 @@ private slots:
void cardMessage( const QCString &msg, const QByteArray & );
- void popUpTimeout();
+ void popupTimeout();
@@ -43,4 +42,2 @@ private:
QPixmap pm;
- QPopupMenu *popUpMenu;
- QTimer *popUpMenuTimer;
// pcmcia socket 0
@@ -48,2 +45,3 @@ private:
QString cardInPcmcia0Name;
+ QString cardInPcmcia0Type;
// pcmcia socket 1
@@ -51,5 +49,8 @@ private:
QString cardInPcmcia1Name;
+ QString cardInPcmcia1Type;
bool cardInSd;
void iconShow();
- void popUp(QString message);
+ QPopupMenu *popupMenu;
+ void popup(QString message, QString icon="");
+ QString getIconName(QString type);
};