summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/applets/cardmon/cardmon.cpp178
-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, 129 insertions, 117 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
@@ -18,11 +18,12 @@
-
#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>
@@ -32,5 +33,6 @@
#include <qtextstream.h>
+#include <qsound.h>
#include <qtimer.h>
-#include <qapplication.h>
+/* STD */
#include <stdio.h>
@@ -40,3 +42,2 @@
#include <fcntl.h>
-#include <qsound.h>
@@ -80,3 +81,4 @@ CardMonitor::~CardMonitor()
{
- if (popupMenu) {
+ if ( popupMenu )
+ {
delete popupMenu;
@@ -87,3 +89,4 @@ void CardMonitor::popUp(QString message, QString icon)
{
- if (!popupMenu) {
+ if ( !popupMenu )
+ {
popupMenu = new QPopupMenu(this);
@@ -92,5 +95,8 @@ void CardMonitor::popUp(QString message, QString icon)
popupMenu->clear();
- if (icon.isEmpty()) {
+ if ( icon.isEmpty() )
+ {
popupMenu->insertItem(message, 0);
- } else {
+ }
+ else
+ {
popupMenu->insertItem(QIconSet(Resource::loadPixmap(icon)),
@@ -118,3 +124,4 @@ void CardMonitor::mousePressEvent(QMouseEvent *)
- if (cardInSd) {
+ if ( cardInSd )
+ {
menu->insertItem(QIconSet(Resource::loadPixmap("cardmon/ide")),
@@ -123,3 +130,4 @@ void CardMonitor::mousePressEvent(QMouseEvent *)
- if (cardInPcmcia0) {
+ if ( cardInPcmcia0 )
+ {
menu->
@@ -130,3 +138,4 @@ void CardMonitor::mousePressEvent(QMouseEvent *)
- if (cardInPcmcia1) {
+ if ( cardInPcmcia1 )
+ {
menu->
@@ -142,6 +151,8 @@ void CardMonitor::mousePressEvent(QMouseEvent *)
- if (opt == 1) {
+ if ( opt == 1 )
+ {
cmd = "/sbin/cardctl eject 0";
err = system((const char *) cmd);
- if (err != 0) {
+ if ( err != 0 )
+ {
qDebug("Could not execute `/sbin/cardctl eject 0'! err=%d",
@@ -150,6 +161,11 @@ void CardMonitor::mousePressEvent(QMouseEvent *)
}
- } else if (opt == 0) {
- if (ODevice::inst()->system() == System_Familiar) {
+ }
+ else if ( opt == 0 )
+ {
+ if ( ODevice::inst() ->system() == System_Familiar )
+ {
cmd = "umount /dev/mmc/part1";
- } else {
+ }
+ else
+ {
cmd = "umount /dev/mmcda1";
@@ -157,9 +173,13 @@ void CardMonitor::mousePressEvent(QMouseEvent *)
err = system((const char *) cmd);
- if (err != 0) {
+ if ( err != 0 )
+ {
popUp(tr("SD/MMC card eject failed!"));
}
- } else if (opt == 2) {
+ }
+ else if ( opt == 2 )
+ {
cmd = "/sbin/cardctl eject 1";
err = system((const char *) cmd);
- if (err != 0) {
+ if ( err != 0 )
+ {
qDebug("Could not execute `/sbin/cardctl eject 1'! err=%d",
@@ -175,6 +195,9 @@ void CardMonitor::cardMessage(const QCString & msg, const QByteArray &)
{
- if (msg == "stabChanged()") {
+ if ( msg == "stabChanged()" )
+ {
// qDebug("Pcmcia: stabchanged");
getStatusPcmcia();
- } else if (msg == "mtabChanged()") {
+ }
+ else if ( msg == "mtabChanged()" )
+ {
// qDebug("CARDMONAPPLET: mtabchanged");
@@ -193,7 +216,12 @@ bool CardMonitor::getStatusPcmcia(int showPopUp)
// one of these 3 files should exist
- if (QFile::exists("/var/run/stab")) {
+ if ( QFile::exists( "/var/run/stab" ) )
+ {
fileName = "/var/run/stab";
- } else if (QFile::exists("/var/state/pcmcia/stab")) {
+ }
+ else if ( QFile::exists( "/var/state/pcmcia/stab" ) )
+ {
fileName = "/var/state/pcmcia/stab";
- } else {
+ }
+ else
+ {
fileName = "/var/lib/pcmcia/stab";
@@ -203,3 +231,4 @@ bool CardMonitor::getStatusPcmcia(int showPopUp)
- if (f.open(IO_ReadOnly)) {
+ if ( f.open( IO_ReadOnly ) )
+ {
QStringList list;
@@ -210,8 +239,13 @@ bool CardMonitor::getStatusPcmcia(int showPopUp)
for (QStringList::Iterator line = list.begin(); line != list.end();
- line++) {
- if ((*line).startsWith("Socket 0:")) {
- if ((*line).startsWith("Socket 0: empty") && cardInPcmcia0) {
+ line++ )
+ {
+ if ( ( *line ).startsWith( "Socket 0:" ) )
+ {
+ if ( ( *line ).startsWith( "Socket 0: empty" ) && cardInPcmcia0 )
+ {
cardInPcmcia0 = FALSE;
- } else if (!(*line).startsWith("Socket 0: empty")
- && !cardInPcmcia0) {
+ }
+ else if ( !( *line ).startsWith( "Socket 0: empty" )
+ && !cardInPcmcia0 )
+ {
cardInPcmcia0Name =
@@ -227,7 +261,12 @@ bool CardMonitor::getStatusPcmcia(int showPopUp)
}
- } else if ((*line).startsWith("Socket 1:")) {
- if ((*line).startsWith("Socket 1: empty") && cardInPcmcia1) {
+ }
+ else if ( ( *line ).startsWith( "Socket 1:" ) )
+ {
+ if ( ( *line ).startsWith( "Socket 1: empty" ) && cardInPcmcia1 )
+ {
cardInPcmcia1 = FALSE;
- } else if (!(*line).startsWith("Socket 1: empty")
- && !cardInPcmcia1) {
+ }
+ else if ( !( *line ).startsWith( "Socket 1: empty" )
+ && !cardInPcmcia1 )
+ {
cardInPcmcia1Name =
@@ -248,10 +287,15 @@ bool CardMonitor::getStatusPcmcia(int showPopUp)
if (!showPopUp
- && (cardWas0 != cardInPcmcia0 || cardWas1 != cardInPcmcia1)) {
+ && ( cardWas0 != cardInPcmcia0 || cardWas1 != cardInPcmcia1 ) )
+ {
QString text = QString::null;
QString what = QString::null;
- if (cardWas0 != cardInPcmcia0) {
- if (cardInPcmcia0) {
+ if ( cardWas0 != cardInPcmcia0 )
+ {
+ if ( cardInPcmcia0 )
+ {
text += tr("New card: ");
what = "on";
- } else {
+ }
+ else
+ {
text += tr("Ejected: ");
@@ -263,7 +307,11 @@ bool CardMonitor::getStatusPcmcia(int showPopUp)
- if (cardWas1 != cardInPcmcia1) {
- if (cardInPcmcia1) {
+ if ( cardWas1 != cardInPcmcia1 )
+ {
+ if ( cardInPcmcia1 )
+ {
text += tr("New card: ");
what = "on";
- } else {
+ }
+ else
+ {
text += tr("Ejected: ");
@@ -277,4 +325,7 @@ bool CardMonitor::getStatusPcmcia(int showPopUp)
#endif
+
}
- } else {
+ }
+ else
+ {
// no file found
@@ -301,4 +352,6 @@ bool CardMonitor::getStatusSd(int showPopUp)
- if (mntfp) {
- while ((me = getmntent(mntfp)) != 0) {
+ if ( mntfp )
+ {
+ while ( ( me = getmntent( mntfp ) ) != 0 )
+ {
QString fs = me->mnt_fsname;
@@ -306,3 +359,4 @@ bool CardMonitor::getStatusSd(int showPopUp)
if (fs.left(14) == "/dev/mmc/part1" || fs.left(7) == "/dev/sd"
- || fs.left(9) == "/dev/mmcd") {
+ || fs.left( 9 ) == "/dev/mmcd" )
+ {
cardInSd = TRUE;
@@ -317,9 +371,13 @@ bool CardMonitor::getStatusSd(int showPopUp)
- if (!showPopUp && cardWas != cardInSd) {
+ if ( !showPopUp && cardWas != cardInSd )
+ {
QString text = QString::null;
QString what = QString::null;
- if (cardInSd) {
+ if ( cardInSd )
+ {
text += "New card: SD/MMC";
what = "on";
- } else {
+ }
+ else
+ {
text += "Ejected: SD/MMC";
@@ -345,6 +403,9 @@ void CardMonitor::paintEvent(QPaintEvent *)
- if ( cardInPcmcia0 || cardInPcmcia1 || cardInSd ) {
+ if ( cardInPcmcia0 || cardInPcmcia1 || cardInSd )
+ {
p.drawPixmap(0, 0, pm );
show();
- } else {
+ }
+ else
+ {
//p.eraseRect(rect());
@@ -353 +414,12 @@ void CardMonitor::paintEvent(QPaintEvent *)
}
+
+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
@@ -32,3 +32,3 @@ public:
bool getStatusSd( int showPopUp = FALSE );
-
+ static int position();
private slots:
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
@@ -2,4 +2,4 @@ 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
@@ -8,3 +8,3 @@ INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include ../launcher
-LIBS += -lqpe -lopie
+LIBS += -lqpe -lopiecore2
VERSION = 1.0.0
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;
-};