summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-08-07 14:25:20 (UTC)
committer harlekin <harlekin>2002-08-07 14:25:20 (UTC)
commit7effde67fd121736ec658e690858c6c54bd6d125 (patch) (unidiff)
tree3209a4af6ce12e1dbfeccb67b71ecdda1c029256
parentc829f4047a79947310b8ae759594c3fcf70a6df7 (diff)
downloadopie-7effde67fd121736ec658e690858c6c54bd6d125.zip
opie-7effde67fd121736ec658e690858c6c54bd6d125.tar.gz
opie-7effde67fd121736ec658e690858c6c54bd6d125.tar.bz2
small gcc3.x fix
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/cardmon/cardmon.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp
index ffead4d..e94f1dc 100644
--- a/core/applets/cardmon/cardmon.cpp
+++ b/core/applets/cardmon/cardmon.cpp
@@ -60,17 +60,17 @@ CardMonitor::CardMonitor( QWidget *parent ) : QWidget( parent ),
60 repaint(FALSE); 60 repaint(FALSE);
61 popupMenu = 0; 61 popupMenu = 0;
62} 62}
63 63
64CardMonitor::~CardMonitor() { 64CardMonitor::~CardMonitor() {
65 if( popupMenu ) { delete popupMenu; } 65 if( popupMenu ) { delete popupMenu; }
66} 66}
67 67
68void CardMonitor::popUp( QString message, QString icon = QString::null ) { 68void CardMonitor::popUp( QString message, QString icon ) {
69 if ( ! popupMenu ) { 69 if ( ! popupMenu ) {
70 popupMenu = new QPopupMenu(); 70 popupMenu = new QPopupMenu();
71 } 71 }
72 popupMenu->clear(); 72 popupMenu->clear();
73 if( icon.isEmpty() ) { 73 if( icon.isEmpty() ) {
74 popupMenu->insertItem( message, 0 ); 74 popupMenu->insertItem( message, 0 );
75 } else { 75 } else {
76 popupMenu->insertItem( QIconSet ( Resource::loadPixmap ( icon )), 76 popupMenu->insertItem( QIconSet ( Resource::loadPixmap ( icon )),