summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2002-10-25 16:17:24 (UTC)
committer llornkcor <llornkcor>2002-10-25 16:17:24 (UTC)
commit8d7cfaf101c780c7b870234de5cc14b51544f6d6 (patch) (unidiff)
tree5e8b7093309305de1d6a19aee20ca8d30f85d5ec
parente26cf0e83db11d6d135176f874c0781b4b6481d2 (diff)
downloadopie-8d7cfaf101c780c7b870234de5cc14b51544f6d6.zip
opie-8d7cfaf101c780c7b870234de5cc14b51544f6d6.tar.gz
opie-8d7cfaf101c780c7b870234de5cc14b51544f6d6.tar.bz2
fix
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
@@ -69,17 +69,17 @@ CardMonitor::CardMonitor( QWidget *parent ) : QWidget( parent ),
69CardMonitor::~CardMonitor() { 69CardMonitor::~CardMonitor() {
70 if( popupMenu ) { 70 if( popupMenu ) {
71 delete popupMenu; 71 delete popupMenu;
72 } 72 }
73} 73}
74 74
75void CardMonitor::popUp( QString message, QString icon ) { 75void CardMonitor::popUp( QString message, QString icon ) {
76 if ( ! popupMenu ) { 76 if ( ! popupMenu ) {
77 popupMenu = new QPopupMenu(0); 77 popupMenu = new QPopupMenu();
78 } 78 }
79 79
80 popupMenu->clear(); 80 popupMenu->clear();
81 if( icon.isEmpty() ) { 81 if( icon.isEmpty() ) {
82 popupMenu->insertItem( message, 0 ); 82 popupMenu->insertItem( message, 0 );
83 } else { 83 } else {
84 popupMenu->insertItem( QIconSet ( Resource::loadPixmap ( icon ) ), message, 0 ); 84 popupMenu->insertItem( QIconSet ( Resource::loadPixmap ( icon ) ), message, 0 );
85 } 85 }
@@ -90,18 +90,16 @@ void CardMonitor::popUp( QString message, QString icon ) {
90 p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ), 90 p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ),
91 p. y ( ) - s. height ( ) ), 0); 91 p. y ( ) - s. height ( ) ), 0);
92 92
93 QTimer::singleShot( 2000, this, SLOT(popupTimeout() ) ); 93 QTimer::singleShot( 2000, this, SLOT(popupTimeout() ) );
94} 94}
95 95
96void CardMonitor::popupTimeout() { 96void CardMonitor::popupTimeout() {
97 popupMenu->hide(); 97 popupMenu->hide();
98 popupMenu=0;
99 if(popupMenu) delete popupMenu;
100} 98}
101 99
102void CardMonitor::mousePressEvent( QMouseEvent * ) { 100void CardMonitor::mousePressEvent( QMouseEvent * ) {
103 QPopupMenu *menu = new QPopupMenu(); 101 QPopupMenu *menu = new QPopupMenu();
104 QString cmd; 102 QString cmd;
105 int err=0; 103 int err=0;
106 104
107 if ( cardInSd ) { 105 if ( cardInSd ) {