convert to Opie Debugging Framework

1 files changed, 28 insertions, 26 deletions

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
@@ -16,8 +16,6 @@
 #include "notes.h"
 
-#include <qapplication.h>
-#include <stdlib.h>
-#include <qstringlist.h>
-
+/* OPIE */
+#include <opie2/odebug.h>
 #include <opie2/otaskbarapplet.h>
 #include <qpe/filemanager.h>
@@ -27,12 +25,13 @@
 #include <qpe/ir.h>
 #include <qpe/config.h>
+using namespace Opie::Core;
+using namespace Opie::Ui;
 
-// #include <qsocket.h>
-// #include <qclipboard.h>
+/* QT */
 #include <qmultilineedit.h>
 #include <qlistbox.h>
 #include <qpopupmenu.h>
 #include <qmessagebox.h>
-
+#include <qapplication.h>
 #include <qdir.h>
 #include <qfile.h>
@@ -44,8 +43,11 @@
 #include <qpixmap.h>
 #include <qstring.h>
+#include <qstringlist.h>
 #include <qtimer.h>
 
+/* STD */
+#include <stdlib.h>
+
 /* XPM */
-using namespace Opie::Ui;
 static char * notes_xpm[] = {
 "16 16 11 1",
@@ -85,7 +87,7 @@ NotesControl::NotesControl( QWidget *, const char * )
     QDir d( QDir::homeDirPath()+"/notes");
     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; 
     }
     Config cfg("Notes");
@@ -166,5 +168,5 @@ void NotesControl::slotDeleteButton() {
 
     QString selectedText = box->currentText();
-    qDebug("deleting "+selectedText);
+    odebug << "deleting "+selectedText << oendl; 
 
     if( !selectedText.isEmpty()) {
@@ -177,10 +179,10 @@ void NotesControl::slotDeleteButton() {
             entryName.sprintf( "File%i", i + 1 );
             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++ ) {
                     entryName.sprintf( "File%i", i + 1  );
                     entryName2.sprintf( "File%i", i + 2 );
                     QString temp = cfg.readEntry(entryName2);
-                    qDebug("move "+temp);
+                    odebug << "move "+temp << oendl; 
                     cfg.writeEntry(entryName, temp);
                     i++;
@@ -193,8 +195,8 @@ void NotesControl::slotDeleteButton() {
                 nf.removeFiles();
                 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; 
 
             }
@@ -284,5 +286,5 @@ void NotesControl::save() {
     cfg.setGroup("Docs");
     if( edited) {
-//        qDebug("is edited");
+//        odebug << "is edited" << oendl; 
         QString rt = view->text();
         if( rt.length()>1) {
@@ -302,5 +304,5 @@ void NotesControl::save() {
             if ( docname.isEmpty() )
                 docname = "Empty Text";
-//            qDebug(docname);
+//            odebug << docname << oendl; 
 
             if( oldDocName != docname) {
@@ -313,9 +315,9 @@ void NotesControl::save() {
             }
 //             else
-//                 qDebug("oldname equals docname");
+//                 odebug << "oldname equals docname" << oendl; 
 
             doc = new DocLnk(docname);
             if(QFile(doc->linkFile()).exists())
-               qDebug("puppie");
+               odebug << "puppie" << oendl; 
             doc->setType("text/plain");
             doc->setName(docname);
@@ -328,5 +330,5 @@ void NotesControl::save() {
             oldDocName=docname;
             edited=false;
-//            qDebug("save");
+//            odebug << "save" << oendl; 
             if (doPopulate)
                 populateBox();
@@ -340,5 +342,5 @@ void NotesControl::save() {
 void NotesControl::populateBox() {
     box->clear();
-//    qDebug("populate");
+//    odebug << "populate" << oendl; 
     Config cfg("Notes");
     cfg.setGroup("Docs");
@@ -375,5 +377,5 @@ void NotesControl::load() {
 
 void NotesControl::load(const QString & file) {
-    qDebug("loading "+file);
+    odebug << "loading "+file << oendl; 
     QString name = file;
     QString temp;
@@ -402,5 +404,5 @@ void NotesControl::loadDoc( const DocLnk &f) {
     QString txt;
     if ( !fm.loadFile( f, txt ) ) {
-        qDebug("could not load file "+f.file());
+        odebug << "could not load file "+f.file() << oendl; 
         return;
     }
@@ -436,5 +438,5 @@ void NotesControl::slotSearch() {
 //           case ControlButton:
 //               if(e->key() == Key_C) { //copy
-//                   qDebug("copy");
+//                   odebug << "copy" << oendl; 
 //     QClipboard *cb = QApplication::clipboard();
 //     QString text;
@@ -483,8 +485,8 @@ void NotesApplet::mousePressEvent( QMouseEvent *) {
 //    QPoint curPos = mapToGlobal( rect().topLeft() );
          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();
             QRect rect = QApplication::desktop()->geometry();