author | llornkcor <llornkcor> | 2002-10-25 16:17:24 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-10-25 16:17:24 (UTC) |
commit | 8d7cfaf101c780c7b870234de5cc14b51544f6d6 (patch) (side-by-side diff) | |
tree | 5e8b7093309305de1d6a19aee20ca8d30f85d5ec /core/applets/cardmon/cardmon.cpp | |
parent | e26cf0e83db11d6d135176f874c0781b4b6481d2 (diff) | |
download | opie-8d7cfaf101c780c7b870234de5cc14b51544f6d6.zip opie-8d7cfaf101c780c7b870234de5cc14b51544f6d6.tar.gz opie-8d7cfaf101c780c7b870234de5cc14b51544f6d6.tar.bz2 |
fix
Diffstat (limited to 'core/applets/cardmon/cardmon.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | core/applets/cardmon/cardmon.cpp | 4 |
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 @@ -65,47 +65,45 @@ CardMonitor::CardMonitor( QWidget *parent ) : QWidget( parent ), repaint( FALSE ); popupMenu = 0; } CardMonitor::~CardMonitor() { if( popupMenu ) { 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 { popupMenu->insertItem( QIconSet ( Resource::loadPixmap ( icon ) ), message, 0 ); } QPoint p = mapToGlobal ( QPoint ( 0, 0 ) ); QSize s = popupMenu->sizeHint (); popupMenu->popup( QPoint ( p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ), p. y ( ) - s. height ( ) ), 0); 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; if ( cardInSd ) { menu->insertItem( tr("Eject SD/MMC card"), 0 ); } if ( cardInPcmcia0 ) { |