libopie1->libopie2

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
@@ -16,29 +16,30 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #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>
@@ -78,21 +79,26 @@ CardMonitor::CardMonitor(QWidget * parent):QWidget(parent),
 
 CardMonitor::~CardMonitor()
 {
-    if (popupMenu) {
+    if ( popupMenu )
+    {
 	delete popupMenu;
     }
 }
 
 void CardMonitor::popUp(QString message, QString icon)
 {
-    if (!popupMenu) {
+    if ( !popupMenu )
+    {
 	popupMenu = new QPopupMenu(this);
     }
 
     popupMenu->clear();
-    if (icon.isEmpty()) {
+    if ( icon.isEmpty() )
+    {
 	popupMenu->insertItem(message, 0);
-    } else {
+    }
+    else
+    {
 	popupMenu->insertItem(QIconSet(Resource::loadPixmap(icon)),
 			      message, 0);
     }
@@ -116,19 +122,22 @@ void CardMonitor::mousePressEvent(QMouseEvent *)
     QString cmd;
     int err = 0;
 
-    if (cardInSd) {
+    if ( cardInSd )
+    {
 	menu->insertItem(QIconSet(Resource::loadPixmap("cardmon/ide")),
 			tr("Eject SD/MMC card"), 0);
     }
 
-    if (cardInPcmcia0) {
+    if ( cardInPcmcia0 )
+    {
 	menu->
 	    insertItem(QIconSet
 		       (Resource::loadPixmap("cardmon/" + cardInPcmcia0Type)),
 			tr("Eject card 0: %1").arg(cardInPcmcia0Name), 1);
     }
 
-    if (cardInPcmcia1) {
+    if ( cardInPcmcia1 )
+    {
 	menu->
 	    insertItem(QIconSet
 		       (Resource::loadPixmap("cardmon/" + cardInPcmcia1Type)),
@@ -140,28 +149,39 @@ void CardMonitor::mousePressEvent(QMouseEvent *)
     int opt = menu->exec(QPoint(p.x() + (width() / 2) - (s.width() / 2),
 				p.y() - s.height()), 0);
 
-    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",
 		   err);
 	    popUp(tr("CF/PCMCIA card eject failed!"));
 	}
-    } 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";
 	}
 	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",
 		   err);
 	    popUp(tr("CF/PCMCIA card eject failed!"));
@@ -173,10 +193,13 @@ void CardMonitor::mousePressEvent(QMouseEvent *)
 
 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");
 	getStatusSd();
     }
@@ -191,29 +214,40 @@ bool CardMonitor::getStatusPcmcia(int showPopUp)
     QString fileName;
 
     // 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";
     }
 
     QFile f(fileName);
 
-    if (f.open(IO_ReadOnly)) {
+    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) {
+                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 =
 			(*line).mid(((*line).find(':') + 1),
 				    (*line).length() - 9);
@@ -225,11 +259,16 @@ bool CardMonitor::getStatusPcmcia(int showPopUp)
 		    cardInPcmcia0Type =
 			(*line).mid(pos, (*line).find("\t", pos) - pos);
 		}
-	    } 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 =
 			(*line).mid(((*line).find(':') + 1),
 				    (*line).length() - 9);
@@ -246,14 +285,19 @@ bool CardMonitor::getStatusPcmcia(int showPopUp)
 	f.close();
 
 	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: ");
 		    what = "off";
 		}
@@ -261,11 +305,15 @@ bool CardMonitor::getStatusPcmcia(int showPopUp)
 		popUp(text, "cardmon/" + cardInPcmcia0Type);
 	    }
 
-	    if (cardWas1 != cardInPcmcia1) {
-		if (cardInPcmcia1) {
+            if ( cardWas1 != cardInPcmcia1 )
+            {
+                if ( cardInPcmcia1 )
+                {
 		    text += tr("New card: ");
 		    what = "on";
-		} else {
+                }
+                else
+                {
 		    text += tr("Ejected: ");
 		    what = "off";
 		}
@@ -275,8 +323,11 @@ bool CardMonitor::getStatusPcmcia(int showPopUp)
 #ifndef QT_NO_SOUND
 	    QSound::play(Resource::findSound("cardmon/card" + what));
 #endif
+
 	}
-    } else {
+    }
+    else
+    {
 	// no file found
 	qDebug("no file found");
 	cardInPcmcia0 = FALSE;
@@ -299,12 +350,15 @@ bool CardMonitor::getStatusSd(int showPopUp)
     struct mntent *me;
     FILE *mntfp = setmntent("/etc/mtab", "r");
 
-    if (mntfp) {
-	while ((me = getmntent(mntfp)) != 0) {
+    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") {
+                    || fs.left( 9 ) == "/dev/mmcd" )
+            {
 		cardInSd = TRUE;
 		show();
 	    }
@@ -315,13 +369,17 @@ bool CardMonitor::getStatusSd(int showPopUp)
 	endmntent(mntfp);
     }
 
-    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";
 	    what = "off";
 	}
@@ -343,11 +401,25 @@ void CardMonitor::paintEvent(QPaintEvent *)
 
     QPainter p(this);
 
-    if ( cardInPcmcia0 || cardInPcmcia1 || cardInSd ) {
+    if ( cardInPcmcia0 || cardInPcmcia1 || cardInSd )
+    {
 	p.drawPixmap(0, 0, pm  );
 	show();
-    } else {
+    }
+    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
@@ -30,7 +30,7 @@ public:
     ~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();
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,12 +1,12 @@
 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 )
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;
-};