author | harlekin <harlekin> | 2002-08-07 14:25:20 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-08-07 14:25:20 (UTC) |
commit | 7effde67fd121736ec658e690858c6c54bd6d125 (patch) (side-by-side diff) | |
tree | 3209a4af6ce12e1dbfeccb67b71ecdda1c029256 | |
parent | c829f4047a79947310b8ae759594c3fcf70a6df7 (diff) | |
download | opie-7effde67fd121736ec658e690858c6c54bd6d125.zip opie-7effde67fd121736ec658e690858c6c54bd6d125.tar.gz opie-7effde67fd121736ec658e690858c6c54bd6d125.tar.bz2 |
small gcc3.x fix
-rw-r--r-- | core/applets/cardmon/cardmon.cpp | 2 |
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 @@ -20,97 +20,97 @@ #include "cardmon.h" #include <qpe/resource.h> #include <qcopchannel_qws.h> #include <qpainter.h> #include <qmessagebox.h> #include <qfile.h> #include <qtextstream.h> #include <qtimer.h> #include <stdio.h> #include <unistd.h> #include <stdlib.h> #include <string.h> #include <fcntl.h> #include <qsound.h> #if defined(_OS_LINUX_) || defined(Q_OS_LINUX) #include <sys/vfs.h> #include <mntent.h> #endif CardMonitor::CardMonitor( QWidget *parent ) : QWidget( parent ), pm( Resource::loadPixmap( "cardmon/pcmcia" ) ) { QCopChannel* pcmciaChannel = new QCopChannel( "QPE/Card", this ); connect( pcmciaChannel, SIGNAL(received(const QCString &, const QByteArray &)), this, SLOT(cardMessage( const QCString &, const QByteArray &)) ); QCopChannel* sdChannel = new QCopChannel( "QPE/Card", this ); connect( sdChannel, SIGNAL(received(const QCString &, const QByteArray &)), this, SLOT(cardMessage( const QCString &, const QByteArray &)) ); cardInPcmcia0 = FALSE; cardInPcmcia1 = FALSE; setFixedSize( pm.size() ); getStatusPcmcia(TRUE); getStatusSd(TRUE); repaint(FALSE); popupMenu = 0; } CardMonitor::~CardMonitor() { if( popupMenu ) { delete popupMenu; } } -void CardMonitor::popUp( QString message, QString icon = QString::null ) { +void CardMonitor::popUp( QString message, QString icon ) { if ( ! popupMenu ) { 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(); } 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 ) { menu->insertItem( QIconSet ( Resource::loadPixmap ( "cardmon/" + cardInPcmcia0Type )), tr("Eject card 0: %1").arg(cardInPcmcia0Name), 1 ); } if ( cardInPcmcia1 ) { menu->insertItem( QIconSet ( Resource::loadPixmap ( "cardmon/" + cardInPcmcia1Type )), tr("Eject card 1: %1").arg(cardInPcmcia1Name), 2 ); } QPoint p = mapToGlobal ( QPoint ( 0, 0 )); QSize s = menu->sizeHint ( ); int opt = menu->exec( QPoint ( p. x ( ) + ( width ( ) / 2 ) - ( s. width ( ) / 2 ), p. y ( ) - s. height ( ) ), 0); |