summaryrefslogtreecommitdiff
Unidiff
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
@@ -52,33 +52,33 @@ CardMonitor::CardMonitor( QWidget *parent ) : QWidget( parent ),
52 this, SLOT(cardMessage( const QCString &, const QByteArray &)) ); 52 this, SLOT(cardMessage( const QCString &, const QByteArray &)) );
53 53
54 cardInPcmcia0 = FALSE; 54 cardInPcmcia0 = FALSE;
55 cardInPcmcia1 = FALSE; 55 cardInPcmcia1 = FALSE;
56 56
57 setFixedSize( pm.size() ); 57 setFixedSize( pm.size() );
58 getStatusPcmcia(TRUE); 58 getStatusPcmcia(TRUE);
59 getStatusSd(TRUE); 59 getStatusSd(TRUE);
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 )),
77 message, 0 ); 77 message, 0 );
78 } 78 }
79 79
80 QPoint p = mapToGlobal ( QPoint ( 0, 0 )); 80 QPoint p = mapToGlobal ( QPoint ( 0, 0 ));
81 QSize s = popupMenu->sizeHint ( ); 81 QSize s = popupMenu->sizeHint ( );
82 popupMenu->popup( QPoint ( 82 popupMenu->popup( QPoint (
83 p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ), 83 p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ),
84 p. y ( ) - s. height ( ) ), 0); 84 p. y ( ) - s. height ( ) ), 0);