summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/cardmon/cardmon.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp
index 4199273..1663af2 100644
--- a/core/applets/cardmon/cardmon.cpp
+++ b/core/applets/cardmon/cardmon.cpp
@@ -71,13 +71,13 @@ CardMonitor::~CardMonitor() {
delete popupMenu;
}
}
void CardMonitor::popUp( QString message, QString icon ) {
if ( ! popupMenu ) {
- popupMenu = new QPopupMenu(0);
+ popupMenu = new QPopupMenu();
}
popupMenu->clear();
if( icon.isEmpty() ) {
popupMenu->insertItem( message, 0 );
} else {
@@ -92,14 +92,12 @@ void CardMonitor::popUp( QString message, QString icon ) {
QTimer::singleShot( 2000, this, SLOT(popupTimeout() ) );
}
void CardMonitor::popupTimeout() {
popupMenu->hide();
- popupMenu=0;
- if(popupMenu) delete popupMenu;
}
void CardMonitor::mousePressEvent( QMouseEvent * ) {
QPopupMenu *menu = new QPopupMenu();
QString cmd;
int err=0;