convert to Opie Debugging Framework

8 files changed, 89 insertions, 78 deletions

diff --git a/noncore/applets/autorotateapplet/autorotate.cpp b/noncore/applets/autorotateapplet/autorotate.cpp
index ae7fbd0..34802fb 100644
--- a/noncore/applets/autorotateapplet/autorotate.cpp
+++ b/noncore/applets/autorotateapplet/autorotate.cpp
@@ -15,3 +15,3 @@
 /* OPIE */
-#include <opie2/odevice.h>
+#include <opie2/odebug.h>
 #include <opie2/otaskbarapplet.h>
@@ -20,2 +20,3 @@
 #include <qpe/resource.h>
+using namespace Opie::Core;
 
@@ -24,3 +25,2 @@
 
-using namespace Opie::Ui;
 AutoRotate::AutoRotate(QWidget * parent):QWidget(parent)
@@ -89,5 +89,5 @@ bool AutoRotate::isRotateEnabled()
     if (res )
-        qDebug("Enabled");
+        odebug << "Enabled" << oendl; 
     else
-        qDebug("Disabled");
+        odebug << "Disabled" << oendl; 
     return res;
@@ -95,3 +95,3 @@ bool AutoRotate::isRotateEnabled()
 
-EXPORT_OPIE_APPLET_v1(  AutoRotate )
+EXPORT_OPIE_APPLET_v1( AutoRotate )
 
diff --git a/noncore/applets/memoryapplet/swapfile.cpp b/noncore/applets/memoryapplet/swapfile.cpp
index 9416db3..a71078f 100644
--- a/noncore/applets/memoryapplet/swapfile.cpp
+++ b/noncore/applets/memoryapplet/swapfile.cpp
@@ -22,2 +22,8 @@
 
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/resource.h>
+using namespace Opie::Core;
+
+/* QT */
 #include <qfile.h>
@@ -36,2 +42,5 @@
 #include <qmessagebox.h>
+#include <qcopchannel_qws.h>
+
+/* STD */
 #include <stdio.h>
@@ -39,6 +48,2 @@
 #include <string.h>
-
-#include <qcopchannel_qws.h>
-#include <qpe/resource.h>
-
 #include <unistd.h>
@@ -56,3 +61,3 @@ Swapfile::Swapfile( QWidget *parent, const char *name, WFlags f )
 
-    QVBoxLayout* vb = new QVBoxLayout(this, 5);
+	QVBoxLayout* vb = new QVBoxLayout(this, 5);
 
@@ -60,3 +65,3 @@ Swapfile::Swapfile( QWidget *parent, const char *name, WFlags f )
 	cfsdRBG->setRadioButtonExclusive(true);
-    vb->addWidget(cfsdRBG);
+	vb->addWidget(cfsdRBG);
 
@@ -77,3 +82,3 @@ Swapfile::Swapfile( QWidget *parent, const char *name, WFlags f )
 	QVGroupBox* box1 = new QVGroupBox(tr("Manage Swapfile"), this);
-    vb->addWidget(box1);
+	vb->addWidget(box1);
 
@@ -215,3 +220,3 @@ void Swapfile::getStatusPcmcia()
 	// no file found
-	qDebug("no file found");
+	odebug << "no file found" << oendl; 
 	cardInPcmcia0 = FALSE;
diff --git a/noncore/applets/networkapplet/networkapplet.cpp b/noncore/applets/networkapplet/networkapplet.cpp
index 5eb5ad2..534a8d0 100644
--- a/noncore/applets/networkapplet/networkapplet.cpp
+++ b/noncore/applets/networkapplet/networkapplet.cpp
@@ -38,5 +38,8 @@
 #include <qpe/resource.h>
-#include <qpainter.h>
+using namespace Opie::Core;
+using namespace Opie::Ui;
+using namespace Opie::Net;
 
 /* QT */
+#include <qpainter.h>
 #include <qlabel.h>
@@ -45,6 +48,5 @@
 
+/* STD */
 #include <assert.h>
 
-using namespace Opie::Ui;
-using namespace Opie::Net;
 IfaceUpDownButton::IfaceUpDownButton( QWidget* parent, const char* name )
@@ -169,3 +171,3 @@ void NetworkAppletControl::showEvent( QShowEvent* e )
 {
-    qDebug( "showEvent" );
+    odebug << "showEvent" << oendl; 
     build();
@@ -177,3 +179,3 @@ void NetworkAppletControl::hideEvent( QHideEvent* e )
 {
-    qDebug( "hideEvent" );
+    odebug << "hideEvent" << oendl; 
     QWidget::hideEvent( e );
@@ -194,3 +196,3 @@ void NetworkAppletControl::hideEvent( QHideEvent* e )
     if ( list )
-        qWarning( "D'oh! We still have %d children...", list->count() );
+        owarn << "D'oh! We still have " << list->count() << " children..." << oendl; 
 
@@ -205,3 +207,3 @@ QSize NetworkAppletControl::sizeHint() const
     ONetwork::instance()->synchronize(); // rebuild interface database
-    qDebug( "sizeHint (#ifaces=%d)", ONetwork::instance()->count() );
+    odebug << "sizeHint (#ifaces=" << ONetwork::instance()->count() << ")" << oendl; 
     return QSize( 14+35+105+14 + 8, ONetwork::instance()->count() * 26 );
diff --git a/noncore/applets/notesapplet/config.in b/noncore/applets/notesapplet/config.in
index 27a8187..c92c1d5 100644
--- a/noncore/applets/notesapplet/config.in
+++ b/noncore/applets/notesapplet/config.in
@@ -3,2 +3,2 @@
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) 
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
diff --git a/noncore/applets/notesapplet/notes.cpp b/noncore/applets/notesapplet/notes.cpp
index 13f7cf3..b3e72a7 100644
--- a/noncore/applets/notesapplet/notes.cpp
+++ b/noncore/applets/notesapplet/notes.cpp
@@ -17,6 +17,4 @@
 
-#include <qapplication.h>
-#include <stdlib.h>
-#include <qstringlist.h>
-
+/* OPIE */
+#include <opie2/odebug.h>
 #include <opie2/otaskbarapplet.h>
@@ -28,5 +26,6 @@
 #include <qpe/config.h>
+using namespace Opie::Core;
+using namespace Opie::Ui;
 
-// #include <qsocket.h>
-// #include <qclipboard.h>
+/* QT */
 #include <qmultilineedit.h>
@@ -35,3 +34,3 @@
 #include <qmessagebox.h>
-
+#include <qapplication.h>
 #include <qdir.h>
@@ -45,6 +44,9 @@
 #include <qstring.h>
+#include <qstringlist.h>
 #include <qtimer.h>
 
+/* STD */
+#include <stdlib.h>
+
 /* XPM */
-using namespace Opie::Ui;
 static char * notes_xpm[] = {
@@ -86,5 +88,5 @@ NotesControl::NotesControl( QWidget *, const char * )
     if( !d.exists()) {
-        qDebug("make dir");
+        odebug << "make dir" << oendl; 
         if(!d.mkdir( QDir::homeDirPath()+"/notes", true))
-            qDebug("<<<<<<<<<<<<<<<<<<<<<<<<<<<make dir failed");
+            odebug << "<<<<<<<<<<<<<<<<<<<<<<<<<<<make dir failed" << oendl; 
     }
@@ -167,3 +169,3 @@ void NotesControl::slotDeleteButton() {
     QString selectedText = box->currentText();
-    qDebug("deleting "+selectedText);
+    odebug << "deleting "+selectedText << oendl; 
 
@@ -178,3 +180,3 @@ void NotesControl::slotDeleteButton() {
             if(selectedText == cfg.readEntry( entryName )) {
-                qDebug("removing %s, %d", selectedText.latin1(), i);
+                odebug << "removing " << selectedText.latin1() << ", " << i << "" << oendl; 
                 for ( int j = i; j < noOfFiles; j++ ) {
@@ -183,3 +185,3 @@ void NotesControl::slotDeleteButton() {
                     QString temp = cfg.readEntry(entryName2);
-                    qDebug("move "+temp);
+                    odebug << "move "+temp << oendl; 
                     cfg.writeEntry(entryName, temp);
@@ -194,6 +196,6 @@ void NotesControl::slotDeleteButton() {
                 QString fi=QPEApplication::documentDir()+"/text/plain/"+selectedText+".desktop";
-                qDebug(fi);
+                odebug << fi << oendl; 
 
                 QFile f( fi);
-                if( !f.remove()) qDebug(".desktop file not removed");
+                if( !f.remove()) odebug << ".desktop file not removed" << oendl; 
 
@@ -285,3 +287,3 @@ void NotesControl::save() {
     if( edited) {
-//        qDebug("is edited");
+//        odebug << "is edited" << oendl; 
         QString rt = view->text();
@@ -303,3 +305,3 @@ void NotesControl::save() {
                 docname = "Empty Text";
-//            qDebug(docname);
+//            odebug << docname << oendl; 
 
@@ -314,3 +316,3 @@ void NotesControl::save() {
 //             else
-//                 qDebug("oldname equals docname");
+//                 odebug << "oldname equals docname" << oendl; 
 
@@ -318,3 +320,3 @@ void NotesControl::save() {
             if(QFile(doc->linkFile()).exists())
-               qDebug("puppie");
+               odebug << "puppie" << oendl; 
             doc->setType("text/plain");
@@ -329,3 +331,3 @@ void NotesControl::save() {
             edited=false;
-//            qDebug("save");
+//            odebug << "save" << oendl; 
             if (doPopulate)
@@ -341,3 +343,3 @@ void NotesControl::populateBox() {
     box->clear();
-//    qDebug("populate");
+//    odebug << "populate" << oendl; 
     Config cfg("Notes");
@@ -376,3 +378,3 @@ void NotesControl::load() {
 void NotesControl::load(const QString & file) {
-    qDebug("loading "+file);
+    odebug << "loading "+file << oendl; 
     QString name = file;
@@ -403,3 +405,3 @@ void NotesControl::loadDoc( const DocLnk &f) {
     if ( !fm.loadFile( f, txt ) ) {
-        qDebug("could not load file "+f.file());
+        odebug << "could not load file "+f.file() << oendl; 
         return;
@@ -437,3 +439,3 @@ void NotesControl::slotSearch() {
 //               if(e->key() == Key_C) { //copy
-//                   qDebug("copy");
+//                   odebug << "copy" << oendl; 
 //     QClipboard *cb = QApplication::clipboard();
@@ -484,6 +486,6 @@ void NotesApplet::mousePressEvent( QMouseEvent *) {
          if(vc->showMax) {
-             qDebug("show max");
+             odebug << "show max" << oendl; 
              vc->showMaximized();
          } else {
-             qDebug("no show max");
+             odebug << "no show max" << oendl; 
              QWidget *wid = QPEApplication::desktop();
diff --git a/noncore/applets/notesapplet/notesapplet.pro b/noncore/applets/notesapplet/notesapplet.pro
index 44e5b34..c3f9b1c 100644
--- a/noncore/applets/notesapplet/notesapplet.pro
+++ b/noncore/applets/notesapplet/notesapplet.pro
@@ -1,11 +1,11 @@
-TEMPLATE  = lib
-CONFIG    += qt plugin warn_on 
-HEADERS =   notes.h
-SOURCES =   notes.cpp
-TARGET    = notesapplet
-DESTDIR   = $(OPIEDIR)/plugins/applets
+TEMPLATE    = lib
+CONFIG      += qt plugin warn_on 
+HEADERS     = notes.h
+SOURCES     = notes.cpp
+TARGET      = notesapplet
+DESTDIR     = $(OPIEDIR)/plugins/applets
 INCLUDEPATH += $(OPIEDIR)/include
-DEPENDPATH      += $(OPIEDIR)/include
-LIBS            += -lqpe
-VERSION   = 1.0.0
+DEPENDPATH  += $(OPIEDIR)/include
+LIBS        += -lqpe -lopiecore2
+VERSION   = 1.0.1
 
diff --git a/noncore/applets/wirelessapplet/wireless.cpp b/noncore/applets/wirelessapplet/wireless.cpp
index 0491a86..364f3ad 100644
--- a/noncore/applets/wirelessapplet/wireless.cpp
+++ b/noncore/applets/wirelessapplet/wireless.cpp
@@ -18,2 +18,3 @@
 /* OPIE */
+#include <opie2/odebug.h>
 #include <opie2/onetwork.h>
@@ -22,2 +23,5 @@
 #include <qpe/qpeapplication.h>
+using namespace Opie::Core;
+using namespace Opie::Ui;
+using namespace Opie::Net;
 
@@ -45,4 +49,2 @@
 
-using namespace Opie::Ui;
-using namespace Opie::Net;
 WirelessControl::WirelessControl( WirelessApplet *applet, QWidget *parent, const char *name )
@@ -209,3 +211,3 @@ void WirelessApplet::checkInterface()
 #ifdef MDEBUG
-        qDebug( "WIFIAPPLET: using interface '%s'", ( const char* ) interface->name() );
+        odebug << "WIFIAPPLET: using interface '" << ( const char* ) interface->name() << "'" << oendl; 
 #endif
@@ -216,3 +218,3 @@ void WirelessApplet::checkInterface()
 #ifdef MDEBUG
-        qDebug( "WIFIAPPLET: D'oh! No Wireless interface present... :(" );
+        odebug << "WIFIAPPLET: D'oh! No Wireless interface present... :(" << oendl; 
 #endif
@@ -225,3 +227,3 @@ void WirelessApplet::renewDHCP()
 #ifdef MDEBUG
-    qDebug( "WIFIAPPLET: Going to request a DHCP configuration renew." );
+    odebug << "WIFIAPPLET: Going to request a DHCP configuration renew." << oendl; 
 #endif
@@ -237,3 +239,3 @@ void WirelessApplet::renewDHCP()
 #ifdef MDEBUG
-    qDebug( "WIFIAPPLET: dhcpcd pidfile is '%s'", ( const char* ) pidfile );
+    odebug << "WIFIAPPLET: dhcpcd pidfile is '" << ( const char* ) pidfile << "'" << oendl; 
 #endif
@@ -247,3 +249,3 @@ void WirelessApplet::renewDHCP()
 #ifdef MDEBUG
-        qDebug( "WIFIAPPLET: sent SIGALARM to pid %d", pid );
+        odebug << "WIFIAPPLET: sent SIGALARM to pid " << pid << "" << oendl; 
 #endif
@@ -255,3 +257,3 @@ void WirelessApplet::renewDHCP()
 #ifdef MDEBUG
-    qDebug( "WIFIAPPLET: dhcpcd not available." );
+    odebug << "WIFIAPPLET: dhcpcd not available." << oendl; 
 #endif
@@ -259,3 +261,3 @@ void WirelessApplet::renewDHCP()
 #ifdef MDEBUG
-    qDebug( "WIFIAPPLET: udhcpc pidfile is '%s'", ( const char* ) pidfile );
+    odebug << "WIFIAPPLET: udhcpc pidfile is '" << ( const char* ) pidfile << "'" << oendl; 
 #endif
@@ -268,3 +270,3 @@ void WirelessApplet::renewDHCP()
 #ifdef MDEBUG
-        qDebug( "WIFIAPPLET: sent SIGUSR1 to pid %d", pid );
+        odebug << "WIFIAPPLET: sent SIGUSR1 to pid " << pid << "" << oendl; 
 #endif
@@ -305,3 +307,3 @@ void WirelessApplet::timerEvent( QTimerEvent* )
 #ifdef MDEBUG
-    qDebug( "WirelessApplet::timerEvent" );
+    odebug << "WirelessApplet::timerEvent" << oendl; 
 #endif
@@ -312,3 +314,3 @@ void WirelessApplet::timerEvent( QTimerEvent* )
 #ifdef MDEBUG
-            qDebug( "WIFIAPPLET: Interface no longer present." );
+            odebug << "WIFIAPPLET: Interface no longer present." << oendl; 
 #endif
@@ -322,3 +324,3 @@ void WirelessApplet::timerEvent( QTimerEvent* )
 #ifdef MDEBUG
-            qDebug( "WIFIAPPLET: A value has changed -> repainting." );
+            odebug << "WIFIAPPLET: A value has changed -> repainting." << oendl; 
 #endif
@@ -358,3 +360,3 @@ bool WirelessApplet::mustRepaint()
 #ifdef MDEBUG
-            qDebug( "WIFIAPPLET: We had no interface but now we have one! :-)" );
+            odebug << "WIFIAPPLET: We had no interface but now we have one! :-)" << oendl; 
 #endif
@@ -365,3 +367,3 @@ bool WirelessApplet::mustRepaint()
 #ifdef MDEBUG
-            qDebug( "WIFIAPPLET: We had a interface but now we don't have one! ;-(" );
+            odebug << "WIFIAPPLET: We had a interface but now we don't have one! ;-(" << oendl; 
 #endif
@@ -397,3 +399,3 @@ bool WirelessApplet::mustRepaint()
 #ifdef MDEBUG
-        qDebug( "WIFIAPPLET: ESSID has changed." );
+        odebug << "WIFIAPPLET: ESSID has changed." << oendl; 
 #endif
@@ -404,3 +406,3 @@ bool WirelessApplet::mustRepaint()
 #ifdef MDEBUG
-        qDebug( "WIFIAPPLET: FREQ has changed." );
+        odebug << "WIFIAPPLET: FREQ has changed." << oendl; 
 #endif
@@ -411,3 +413,3 @@ bool WirelessApplet::mustRepaint()
 #ifdef MDEBUG
-        qDebug( "WIFIAPPLET: AP has changed." );
+        odebug << "WIFIAPPLET: AP has changed." << oendl; 
 #endif
@@ -418,3 +420,3 @@ bool WirelessApplet::mustRepaint()
 #ifdef MDEBUG
-        qDebug( "WIFIAPPLET: MODE has changed." );
+        odebug << "WIFIAPPLET: MODE has changed." << oendl; 
 #endif
@@ -452,3 +454,3 @@ int WirelessApplet::numberOfRings()
     int qualityH = interface->signalStrength();
-    qDebug( "quality = %d", qualityH );
+    odebug << "quality = " << qualityH << "" << oendl; 
     if ( qualityH < 1 ) return -1;
@@ -483,3 +485,3 @@ void WirelessApplet::paintEvent( QPaintEvent* )
 
-    qDebug( "WirelessApplet: painting %d rings", rings );
+    odebug << "WirelessApplet: painting " << rings << " rings" << oendl; 
     int radius = 2;
diff --git a/noncore/applets/zkbapplet/zkbwidget.cpp b/noncore/applets/zkbapplet/zkbwidget.cpp
index 3acff1e..13d554c 100644
--- a/noncore/applets/zkbapplet/zkbwidget.cpp
+++ b/noncore/applets/zkbapplet/zkbwidget.cpp
@@ -96,3 +96,3 @@ QSize ZkbWidget::sizeHint() const {
 void ZkbWidget::stateChanged(const QString& s) {
-//	qDebug("stateChanged: %s\n", (const char*) s.utf8());
+//	odebug << "stateChanged: " << (const char*) s.utf8() << "\n" << oendl; 
 	setText(s);