author | harlekin <harlekin> | 2002-07-31 13:30:45 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-07-31 13:30:45 (UTC) |
commit | 3cd137ee5784ac9552650e4f8edb1696880ced28 (patch) (side-by-side diff) | |
tree | f1668f52a53583843c68c51a8e636b8967b19064 | |
parent | 012abe9b9c667d24052a9f078030bfa7874b404e (diff) | |
download | opie-3cd137ee5784ac9552650e4f8edb1696880ced28.zip opie-3cd137ee5784ac9552650e4f8edb1696880ced28.tar.gz opie-3cd137ee5784ac9552650e4f8edb1696880ced28.tar.bz2 |
try to make gcc3.x happy
-rw-r--r-- | core/applets/cardmon/cardmon.cpp | 22 | ||||
-rw-r--r-- | core/applets/cardmon/cardmon.h | 2 |
2 files changed, 12 insertions, 12 deletions
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp index 0bd1ed3..ffead4d 100644 --- a/core/applets/cardmon/cardmon.cpp +++ b/core/applets/cardmon/cardmon.cpp @@ -36,136 +36,136 @@ #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="") { +void CardMonitor::popUp( QString message, QString icon = QString::null ) { if ( ! popupMenu ) { popupMenu = new QPopupMenu(); } popupMenu->clear(); - if( icon == "" ) { + if( icon.isEmpty() ) { popupMenu->insertItem( message, 0 ); } else { - popupMenu->insertItem( QIconSet ( Resource::loadPixmap ( icon )), + 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 )), + menu->insertItem( QIconSet ( Resource::loadPixmap ( "cardmon/" + cardInPcmcia0Type )), tr("Eject card 0: %1").arg(cardInPcmcia0Name), 1 ); } if ( cardInPcmcia1 ) { - menu->insertItem( QIconSet ( Resource::loadPixmap ( "cardmon/" + cardInPcmcia1Type )), + 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); if ( opt == 1 ) { cmd = "/sbin/cardctl eject 0"; err = system( (const char *) cmd ); if ( ( err == 127 ) || ( err < 0 ) ) { qDebug("Could not execute `/sbin/cardctl eject 0'! err=%d", err); popUp( tr("CF/PCMCIA card eject failed!")); - } + } } else if ( opt == 0 ) { cmd = "/etc/sdcontrol compeject"; err = system( (const char *) cmd ); if ( ( err != 0 ) ) { qDebug("Could not execute `/etc/sdcontrol comeject'! err=%d", err); popUp( tr("SD/MMC card eject failed!")); - } + } } else if ( opt == 2 ) { cmd = "/sbin/cardctl eject 1"; err = system( (const char *) cmd ); if ( ( err == 127 ) || ( err < 0 ) ) { qDebug("Could not execute `/sbin/cardctl eject 1'! err=%d", err); popUp( tr("CF/PCMCIA card eject failed!")); - } + } } delete menu; } void CardMonitor::cardMessage( const QCString &msg, const QByteArray & ) { if ( msg == "stabChanged()" ) { // qDebug("Pcmcia: stabchanged"); if ( getStatusPcmcia() ) { repaint(FALSE); } } else if ( msg == "mtabChanged()" ) { // qDebug("Pcmcia: mtabchanged"); if ( getStatusSd() ) { repaint(FALSE); } } } bool CardMonitor::getStatusPcmcia( int showPopUp ) { bool cardWas0 = cardInPcmcia0; // remember last state bool cardWas1 = cardInPcmcia1; QString fileName; // one of these 3 files should exist if (QFile::exists("/var/run/stab")) { fileName = "/var/run/stab"; } else if (QFile::exists("/var/state/pcmcia/stab")) { fileName="/var/state/pcmcia/stab"; @@ -182,102 +182,102 @@ bool CardMonitor::getStatusPcmcia( int showPopUp ) { streamIn = stream.read(); list = QStringList::split("\n", streamIn); for(QStringList::Iterator line=list.begin(); line!=list.end(); line++) { if( (*line).startsWith("Socket 0:") ){ if( (*line).startsWith("Socket 0: empty") && cardInPcmcia0 ){ cardInPcmcia0 = FALSE; } else if ( !(*line).startsWith("Socket 0: empty") && !cardInPcmcia0 ){ cardInPcmcia0Name = (*line).mid(((*line).find(':')+1), (*line).length()-9 ); cardInPcmcia0Name.stripWhiteSpace(); cardInPcmcia0 = TRUE; show(); line++; int pos=(*line).find('\t')+1; cardInPcmcia0Type = (*line).mid( pos, (*line).find("\t", pos) - pos); } } else if( (*line).startsWith("Socket 1:") ){ if( (*line).startsWith("Socket 1: empty") && cardInPcmcia1 ){ cardInPcmcia1 = FALSE; } else if ( !(*line).startsWith("Socket 1: empty") && !cardInPcmcia1 ){ cardInPcmcia1Name = (*line).mid(((*line).find(':')+1), (*line).length()-9 ); cardInPcmcia1Name.stripWhiteSpace(); cardInPcmcia1 = TRUE; show(); line++; int pos=(*line).find('\t')+1; cardInPcmcia1Type = (*line).mid( pos, (*line).find("\t", pos) - pos); } } } f.close(); if( !showPopUp && (cardWas0 != cardInPcmcia0 || cardWas1 != cardInPcmcia1)) { - QString text = ""; - QString what = ""; + QString text = QString::null; + QString what = QString::null; if(cardWas0 != cardInPcmcia0) { if(cardInPcmcia0) { text += tr("New card: "); what="on";} else { text += tr("Ejected: "); what="off";} text += cardInPcmcia0Name; popUp( text, "cardmon/" + cardInPcmcia0Type ); } if(cardWas1 != cardInPcmcia1) { if(cardInPcmcia1) { text += tr("New card: "); what="on";} else { text += tr("Ejected: "); what="off";} text += cardInPcmcia1Name; popUp( text, "cardmon/" + cardInPcmcia1Type ); } QSound::play(Resource::findSound("cardmon/card" + what)); } } else { // no file found qDebug("no file found"); cardInPcmcia0 = FALSE; cardInPcmcia1 = FALSE; } return ((cardWas0 == cardInPcmcia0 && cardWas1 == cardInPcmcia1) ? FALSE : TRUE); } bool CardMonitor::getStatusSd( int showPopUp ) { bool cardWas=cardInSd; // remember last state cardInSd=false; #if defined(_OS_LINUX_) || defined(Q_OS_LINUX) struct mntent *me; FILE *mntfp = setmntent( "/etc/mtab", "r" ); if ( mntfp ) { while ( (me = getmntent( mntfp )) != 0 ) { QString fs = me->mnt_fsname; if ( fs.left(7)=="/dev/sd" || fs.left(9) == "/dev/mmcd" ) { cardInSd=true; } } endmntent( mntfp ); } if(!showPopUp && cardWas != cardInSd) { - QString text = ""; + QString text = QString::null; if(cardInSd) { text += "SD Inserted"; } else { text += "SD Removed"; } popUp( text); // XX add SD pic } #else #error "Not on Linux" #endif return ((cardWas == cardInSd) ? FALSE : TRUE); } void CardMonitor::paintEvent( QPaintEvent * ) { QPainter p( this ); if ( cardInPcmcia0 || cardInPcmcia1 || cardInSd ) { p.drawPixmap( 0, 0, pm ); show(); } else { p.eraseRect( rect() ); hide(); } } diff --git a/core/applets/cardmon/cardmon.h b/core/applets/cardmon/cardmon.h index 9651783..49bcae8 100644 --- a/core/applets/cardmon/cardmon.h +++ b/core/applets/cardmon/cardmon.h @@ -22,37 +22,37 @@ #include <qwidget.h> #include <qpixmap.h> #include <qpopupmenu.h> class CardMonitor : public QWidget { Q_OBJECT public: CardMonitor( QWidget *parent = 0 ); ~CardMonitor(); bool getStatusPcmcia( int showPopUp = FALSE ); bool getStatusSd( int showPopUp = FALSE ); private slots: void cardMessage( const QCString &msg, const QByteArray & ); void popupTimeout(); protected: void paintEvent( QPaintEvent* ); void mousePressEvent( QMouseEvent * ); private: QPixmap pm; // pcmcia socket 0 bool cardInPcmcia0; QString cardInPcmcia0Name; QString cardInPcmcia0Type; // pcmcia socket 1 bool cardInPcmcia1; QString cardInPcmcia1Name; QString cardInPcmcia1Type; bool cardInSd; void iconShow(); QPopupMenu *popupMenu; - void popUp(QString message, QString icon=""); + void popUp(QString message, QString icon = QString::null ); }; #endif |