summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/applets/cardmon/cardmon.cpp520
-rw-r--r--core/applets/cardmon/cardmon.h2
-rw-r--r--core/applets/cardmon/cardmon.pro6
-rw-r--r--core/applets/cardmon/cardmonimpl.cpp42
-rw-r--r--core/applets/cardmon/cardmonimpl.h18
5 files changed, 300 insertions, 288 deletions
diff --git a/core/applets/cardmon/cardmon.cpp b/core/applets/cardmon/cardmon.cpp
index 4ed09b8..8ffaada 100644
--- a/core/applets/cardmon/cardmon.cpp
+++ b/core/applets/cardmon/cardmon.cpp
@@ -1,353 +1,425 @@
/*
- * cardmon.cpp
- *
- * ---------------------
- *
- * copyright : (c) 2002 by Maximilian Reiss
- * email : max.reiss@gmx.de
- * based on two apps by Devin Butterfield
- */
+* cardmon.cpp
+*
+* ---------------------
+*
+* copyright : (c) 2002 by Maximilian Reiss
+* email : max.reiss@gmx.de
+* based on two apps by Devin Butterfield
+*/
/***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/
-
#include "cardmon.h"
-#include <qpe/resource.h>
-
-#include <opie/odevice.h>
-
+/* OPIE */
+#include <opie2/odevice.h>
+#include <opie2/otaskbarapplet.h>
#include <qpe/applnk.h>
+#include <qpe/resource.h>
+/* QT */
+#include <qapplication.h>
#include <qcopchannel_qws.h>
#include <qpainter.h>
#include <qmessagebox.h>
#include <qfile.h>
#include <qtextstream.h>
+#include <qsound.h>
#include <qtimer.h>
-#include <qapplication.h>
+/* STD */
#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
using namespace Opie;
-CardMonitor::CardMonitor(QWidget * parent):QWidget(parent),
- pm( Resource::loadPixmap("cardmon/pcmcia") )
+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 * 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 &)));
+ 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;
cardInSd = FALSE;
setFocusPolicy( NoFocus );
- setFixedWidth ( AppLnk::smallIconSize() );
- setFixedHeight ( AppLnk::smallIconSize() );
+ setFixedWidth ( AppLnk::smallIconSize() );
+ setFixedHeight ( AppLnk::smallIconSize() );
- getStatusPcmcia(TRUE);
- getStatusSd(TRUE);
- repaint(FALSE);
+ getStatusPcmcia( TRUE );
+ getStatusSd( TRUE );
+ repaint( FALSE );
popupMenu = 0;
}
CardMonitor::~CardMonitor()
{
- if (popupMenu) {
- delete popupMenu;
+ if ( popupMenu )
+ {
+ delete popupMenu;
}
}
-void CardMonitor::popUp(QString message, QString icon)
+void CardMonitor::popUp( QString message, QString icon )
{
- if (!popupMenu) {
- popupMenu = new QPopupMenu(this);
+ if ( !popupMenu )
+ {
+ popupMenu = new QPopupMenu( this );
}
popupMenu->clear();
- if (icon.isEmpty()) {
- popupMenu->insertItem(message, 0);
- } else {
- popupMenu->insertItem(QIconSet(Resource::loadPixmap(icon)),
- message, 0);
+ if ( icon.isEmpty() )
+ {
+ popupMenu->insertItem( message, 0 );
+ }
+ else
+ {
+ popupMenu->insertItem( QIconSet( Resource::loadPixmap( icon ) ),
+ message, 0 );
}
- QPoint p = mapToGlobal(QPoint(0, 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);
+ popupMenu->popup( QPoint( p.x() + ( width() / 2 ) - ( s.width() / 2 ),
+ p.y() - s.height() ), 0 );
- QTimer::singleShot(2000, this, SLOT(popupTimeout()));
+ QTimer::singleShot( 2000, this, SLOT( popupTimeout() ) );
}
void CardMonitor::popupTimeout()
{
popupMenu->hide();
}
-void CardMonitor::mousePressEvent(QMouseEvent *)
+void CardMonitor::mousePressEvent( QMouseEvent * )
{
- QPopupMenu *menu = new QPopupMenu(this);
+ QPopupMenu * menu = new QPopupMenu( this );
QString cmd;
int err = 0;
- if (cardInSd) {
- menu->insertItem(QIconSet(Resource::loadPixmap("cardmon/ide")),
- tr("Eject SD/MMC card"), 0);
+ if ( cardInSd )
+ {
+ menu->insertItem( QIconSet( Resource::loadPixmap( "cardmon/ide" ) ),
+ tr( "Eject SD/MMC card" ), 0 );
}
- if (cardInPcmcia0) {
- menu->
- insertItem(QIconSet
- (Resource::loadPixmap("cardmon/" + cardInPcmcia0Type)),
- tr("Eject card 0: %1").arg(cardInPcmcia0Name), 1);
+ 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);
+ if ( cardInPcmcia1 )
+ {
+ menu->
+ insertItem( QIconSet
+ ( Resource::loadPixmap( "cardmon/" + cardInPcmcia1Type ) ),
+ tr( "Eject card 1: %1" ).arg( cardInPcmcia1Name ), 2 );
}
- QPoint p = mapToGlobal(QPoint(0, 0));
+ 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 != 0) {
- qDebug("Could not execute `/sbin/cardctl eject 0'! err=%d",
- err);
- popUp(tr("CF/PCMCIA card eject failed!"));
- }
- } else if (opt == 0) {
- if (ODevice::inst()->system() == System_Familiar) {
- cmd = "umount /dev/mmc/part1";
- } else {
- cmd = "umount /dev/mmcda1";
- }
- err = system((const char *) cmd);
- if (err != 0) {
- popUp(tr("SD/MMC card eject failed!"));
- }
- } else if (opt == 2) {
- cmd = "/sbin/cardctl eject 1";
- err = system((const char *) cmd);
- if (err != 0) {
- qDebug("Could not execute `/sbin/cardctl eject 1'! err=%d",
- err);
- popUp(tr("CF/PCMCIA card eject failed!"));
- }
+ 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 != 0 )
+ {
+ qDebug( "Could not execute `/sbin/cardctl eject 0'! err=%d",
+ err );
+ popUp( tr( "CF/PCMCIA card eject failed!" ) );
+ }
+ }
+ else if ( opt == 0 )
+ {
+ if ( ODevice::inst() ->system() == System_Familiar )
+ {
+ cmd = "umount /dev/mmc/part1";
+ }
+ else
+ {
+ cmd = "umount /dev/mmcda1";
+ }
+ err = system( ( const char * ) cmd );
+ if ( err != 0 )
+ {
+ popUp( tr( "SD/MMC card eject failed!" ) );
+ }
+ }
+ else if ( opt == 2 )
+ {
+ cmd = "/sbin/cardctl eject 1";
+ err = system( ( const char * ) cmd );
+ if ( 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 &)
+void CardMonitor::cardMessage( const QCString & msg, const QByteArray & )
{
- if (msg == "stabChanged()") {
- // qDebug("Pcmcia: stabchanged");
- getStatusPcmcia();
- } else if (msg == "mtabChanged()") {
- // qDebug("CARDMONAPPLET: mtabchanged");
- getStatusSd();
+ if ( msg == "stabChanged()" )
+ {
+ // qDebug("Pcmcia: stabchanged");
+ getStatusPcmcia();
+ }
+ else if ( msg == "mtabChanged()" )
+ {
+ // qDebug("CARDMONAPPLET: mtabchanged");
+ getStatusSd();
}
}
-bool CardMonitor::getStatusPcmcia(int showPopUp)
+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";
- } else {
- fileName = "/var/lib/pcmcia/stab";
+ if ( QFile::exists( "/var/run/stab" ) )
+ {
+ fileName = "/var/run/stab";
+ }
+ else if ( QFile::exists( "/var/state/pcmcia/stab" ) )
+ {
+ fileName = "/var/state/pcmcia/stab";
+ }
+ else
+ {
+ fileName = "/var/lib/pcmcia/stab";
}
- QFile f(fileName);
-
- if (f.open(IO_ReadOnly)) {
- QStringList list;
- QTextStream stream(&f);
- QString streamIn;
- 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::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);
- }
+ QFile f( fileName );
+
+ if ( f.open( IO_ReadOnly ) )
+ {
+ QStringList list;
+ QTextStream stream( &f );
+ QString streamIn;
+ 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::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 );
+ }
#ifndef QT_NO_SOUND
- QSound::play(Resource::findSound("cardmon/card" + what));
+ QSound::play( Resource::findSound( "cardmon/card" + what ) );
#endif
- }
- } else {
- // no file found
- qDebug("no file found");
- cardInPcmcia0 = FALSE;
- cardInPcmcia1 = FALSE;
+
+ }
+ }
+ else
+ {
+ // no file found
+ qDebug( "no file found" );
+ cardInPcmcia0 = FALSE;
+ cardInPcmcia1 = FALSE;
}
repaint( FALSE );
- return ((cardWas0 == cardInPcmcia0
- && cardWas1 == cardInPcmcia1) ? FALSE : TRUE);
+ return ( ( cardWas0 == cardInPcmcia0
+ && cardWas1 == cardInPcmcia1 ) ? FALSE : TRUE );
}
-bool CardMonitor::getStatusSd(int showPopUp)
+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;
- //qDebug( fs );
- if (fs.left(14) == "/dev/mmc/part1" || fs.left(7) == "/dev/sd"
- || fs.left(9) == "/dev/mmcd") {
- cardInSd = TRUE;
- show();
- }
-// else {
-// cardInSd = FALSE;
-// }
- }
- endmntent(mntfp);
+ FILE *mntfp = setmntent( "/etc/mtab", "r" );
+
+ if ( mntfp )
+ {
+ while ( ( me = getmntent( mntfp ) ) != 0 )
+ {
+ QString fs = me->mnt_fsname;
+ //qDebug( fs );
+ if ( fs.left( 14 ) == "/dev/mmc/part1" || fs.left( 7 ) == "/dev/sd"
+ || fs.left( 9 ) == "/dev/mmcd" )
+ {
+ cardInSd = TRUE;
+ show();
+ }
+ // else {
+ // cardInSd = FALSE;
+ // }
+ }
+ endmntent( mntfp );
}
- if (!showPopUp && cardWas != cardInSd) {
- QString text = QString::null;
- QString what = QString::null;
- if (cardInSd) {
- text += "New card: SD/MMC";
- what = "on";
- } else {
- text += "Ejected: SD/MMC";
- what = "off";
- }
- //qDebug("TEXT: " + text );
+ if ( !showPopUp && cardWas != cardInSd )
+ {
+ QString text = QString::null;
+ QString what = QString::null;
+ if ( cardInSd )
+ {
+ text += "New card: SD/MMC";
+ what = "on";
+ }
+ else
+ {
+ text += "Ejected: SD/MMC";
+ what = "off";
+ }
+ //qDebug("TEXT: " + text );
#ifndef QT_NO_SOUND
- QSound::play(Resource::findSound("cardmon/card" + what));
+ QSound::play( Resource::findSound( "cardmon/card" + what ) );
#endif
- popUp(text, "cardmon/ide"); // XX add SD pic
+ popUp( text, "cardmon/ide" ); // XX add SD pic
}
#else
#error "Not on Linux"
#endif
repaint( FALSE );
- return ((cardWas == cardInSd) ? FALSE : TRUE);
+ return ( ( cardWas == cardInSd ) ? FALSE : TRUE );
}
-void CardMonitor::paintEvent(QPaintEvent *)
+void CardMonitor::paintEvent( QPaintEvent * )
{
- QPainter p(this);
+ QPainter p( this );
- if ( cardInPcmcia0 || cardInPcmcia1 || cardInSd ) {
- p.drawPixmap(0, 0, pm );
- show();
- } else {
- //p.eraseRect(rect());
- hide();
+ if ( cardInPcmcia0 || cardInPcmcia1 || cardInSd )
+ {
+ p.drawPixmap( 0, 0, pm );
+ show();
+ }
+ else
+ {
+ //p.eraseRect(rect());
+ hide();
}
}
+
+int CardMonitor::position()
+{
+ return 7;
+}
+
+Q_EXPORT_INTERFACE()
+{
+ Q_CREATE_INSTANCE( OTaskbarAppletWrapper<CardMonitor> );
+}
+
diff --git a/core/applets/cardmon/cardmon.h b/core/applets/cardmon/cardmon.h
index 4f00920..37de366 100644
--- a/core/applets/cardmon/cardmon.h
+++ b/core/applets/cardmon/cardmon.h
@@ -1,58 +1,58 @@
/*
* cardmon.h
*
* ---------------------
*
* copyright : (c) 2003 by Maximilian Reiss
* email : max.reiss@gmx.de
* based on two apps by Devin Butterfield
*/
/***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
***************************************************************************/
#ifndef CARDMON_H
#define CARDMON_H
#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 );
-
+ static int position();
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 = QString::null );
};
#endif
diff --git a/core/applets/cardmon/cardmon.pro b/core/applets/cardmon/cardmon.pro
index 1e8f86f..7c0c739 100644
--- a/core/applets/cardmon/cardmon.pro
+++ b/core/applets/cardmon/cardmon.pro
@@ -1,13 +1,13 @@
TEMPLATE = lib
CONFIG += qt plugin warn_on release
-HEADERS = cardmon.h cardmonimpl.h
-SOURCES = cardmon.cpp cardmonimpl.cpp
+HEADERS = cardmon.h
+SOURCES = cardmon.cpp
TARGET = cardmonapplet
DESTDIR = $(OPIEDIR)/plugins/applets
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include ../launcher
-LIBS += -lqpe -lopie
+LIBS += -lqpe -lopiecore2
VERSION = 1.0.0
include ( $(OPIEDIR)/include.pro )
target.path = $$prefix/plugins/applets
diff --git a/core/applets/cardmon/cardmonimpl.cpp b/core/applets/cardmon/cardmonimpl.cpp
deleted file mode 100644
index 7b144d4..0000000
--- a/core/applets/cardmon/cardmonimpl.cpp
+++ b/dev/null
@@ -1,42 +0,0 @@
-#include "cardmon.h"
-#include "cardmonimpl.h"
-
-
-CardMonitorImpl::CardMonitorImpl()
- : cardMonitor(0) {
-}
-
-CardMonitorImpl::~CardMonitorImpl() {
- delete cardMonitor;
-}
-
-QWidget *CardMonitorImpl::applet( QWidget *parent ) {
- if ( !cardMonitor ) {
- cardMonitor = new CardMonitor( parent );
- }
- return cardMonitor;
-}
-
-int CardMonitorImpl::position() const {
- return 7;
-}
-
-QRESULT CardMonitorImpl::queryInterface( const QUuid &uuid, QUnknownInterface **iface ) {
- *iface = 0;
- if ( uuid == IID_QUnknown ) {
- *iface = this;
- } else if ( uuid == IID_TaskbarApplet ) {
- *iface = this;
- } else {
- return QS_FALSE;
- }
-
- if ( *iface ) {
- (*iface)->addRef();
- }
- return QS_OK;
-}
-
-Q_EXPORT_INTERFACE() {
- Q_CREATE_INSTANCE( CardMonitorImpl )
-}
diff --git a/core/applets/cardmon/cardmonimpl.h b/core/applets/cardmon/cardmonimpl.h
deleted file mode 100644
index 26b7fe5..0000000
--- a/core/applets/cardmon/cardmonimpl.h
+++ b/dev/null
@@ -1,18 +0,0 @@
-#include <qpe/taskbarappletinterface.h>
-
-class CardMonitor;
-
-class CardMonitorImpl : public TaskbarAppletInterface {
-public:
- CardMonitorImpl();
- virtual ~CardMonitorImpl();
-
- QRESULT queryInterface( const QUuid&, QUnknownInterface** );
- Q_REFCOUNT
-
- virtual QWidget *applet( QWidget *parent );
- virtual int position() const;
-
-private:
- CardMonitor *cardMonitor;
-};