1 files changed, 43 insertions, 40 deletions

diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp
index 5bb65a9..c9178a5 100644
--- a/core/apps/textedit/textedit.cpp
+++ b/core/apps/textedit/textedit.cpp
@@ -13,2 +13,3 @@
 // changes added by L. J. Potter Sun 02-17-2002 21:31:31
+
 #include "textedit.h"
@@ -16,3 +17,4 @@
 
-
+/* OPIE */
+#include <opie2/odebug.h>
 #include <opie2/ofileselector.h>
@@ -20,3 +22,2 @@
 #include <opie2/ofontselector.h>
-
 #include <qpe/resource.h>
@@ -24,5 +25,8 @@
 #include <qpe/qpeapplication.h>
+using namespace Opie::Core;
+using namespace Opie::Ui;
+
+/* QT */
 #include <qmenubar.h>
 #include <qtoolbar.h>
-
 #include <qtextstream.h>
@@ -35,2 +39,4 @@
 #include <qdir.h>
+
+/* STD */
 #include <unistd.h>
@@ -39,6 +45,3 @@
 
-using namespace Opie::Ui;
-
 #if QT_VERSION < 300
-
 class QpeEditor : public QMultiLineEdit
@@ -413,3 +416,3 @@ TextEdit::TextEdit( QWidget *parent, const char *name, WFlags f )
 TextEdit::~TextEdit() {
-    qWarning("textedit d'tor");
+    owarn << "textedit d'tor" << oendl;
     delete editor;
@@ -648,3 +651,3 @@ void TextEdit::newFile( const DocLnk &f ) {
     currentFileName = "Unnamed";
-    qDebug("newFile "+currentFileName);
+    odebug << "newFile "+currentFileName << oendl;
     updateCaption( currentFileName);
@@ -657,3 +660,3 @@ void TextEdit::openDotFile( const QString &f ) {
 
-    qDebug("openFile dotfile " + currentFileName);
+    odebug << "openFile dotfile " + currentFileName << oendl;
     QString txt;
@@ -676,3 +679,3 @@ void TextEdit::openDotFile( const QString &f ) {
 void TextEdit::openFile( const QString &f ) {
-  qDebug("filename is "+ f);
+  odebug << "filename is "+ f << oendl;
   QString filer;
@@ -695,3 +698,3 @@ void TextEdit::openFile( const QString &f ) {
     {
-      qDebug("opening dotfile");
+      odebug << "opening dotfile" << oendl;
       currentFileName=f;
@@ -723,3 +726,3 @@ void TextEdit::openFile( const QString &f ) {
 
-      qDebug("openFile string "+currentFileName);
+      odebug << "openFile string "+currentFileName << oendl;
 
@@ -740,6 +743,6 @@ void TextEdit::openFile( const DocLnk &f ) {
     currentFileName=f.file();
-    qDebug("openFile doclnk " + currentFileName);
+    odebug << "openFile doclnk " + currentFileName << oendl;
     if ( !fm.loadFile( f, txt ) ) {
           // ####### could be a new file
-        qDebug( "Cannot open file" );
+        odebug << "Cannot open file" << oendl;
     }
@@ -772,3 +775,3 @@ void TextEdit::showEditTools() {
 bool TextEdit::save() {
-    qDebug("saveAsFile " + currentFileName);
+    odebug << "saveAsFile " + currentFileName << oendl;
     if(currentFileName.isEmpty()) {
@@ -779,5 +782,5 @@ bool TextEdit::save() {
     QString file = doc->file();
-    qDebug("saver file "+file);
+    odebug << "saver file "+file << oendl;
     QString name= doc->name();
-    qDebug("File named "+name);
+    odebug << "File named "+name << oendl;
     QString rt = editor->text();
@@ -788,3 +791,3 @@ bool TextEdit::save() {
             currentFileName= name ;
-            qDebug("saveFile "+currentFileName);
+            odebug << "saveFile "+currentFileName << oendl;
 
@@ -799,3 +802,3 @@ bool TextEdit::save() {
                 if ( !fm.saveFile( *doc, rt ) ) {
-                                                                                QMessageBox::message(tr("Text Edit"),tr("Save Failed"));
+                                        QMessageBox::message(tr("Text Edit"),tr("Save Failed"));
                     return false;
@@ -803,3 +806,3 @@ bool TextEdit::save() {
             } else {
-                qDebug("regular save file");
+                odebug << "regular save file" << oendl;
                 QFile f(file);
@@ -810,3 +813,3 @@ bool TextEdit::save() {
                      QMessageBox::message(tr("Text Edit"),tr("Write Failed"));
-                                                                                 return false;
+                                         return false;
                  }
@@ -834,3 +837,3 @@ bool TextEdit::saveAs() {
         return false;
-    qDebug("saveAsFile " + currentFileName);
+    odebug << "saveAsFile " + currentFileName << oendl;
       // case of nothing to save...
@@ -838,3 +841,3 @@ bool TextEdit::saveAs() {
 // //|| !bFromDocView)
-//         qDebug("no doc");
+//         odebug << "no doc" << oendl;
 //         return true;
@@ -848,3 +851,3 @@ bool TextEdit::saveAs() {
     QString rt = editor->text();
-    qDebug(currentFileName);
+    odebug << currentFileName << oendl;
 
@@ -853,3 +856,3 @@ bool TextEdit::saveAs() {
         || currentFileName == tr("Text Editor")) {
-        qDebug("do silly TT filename thing");
+        odebug << "do silly TT filename thing" << oendl;
 //        if ( doc && doc->name().isEmpty() ) {
@@ -874,3 +877,3 @@ bool TextEdit::saveAs() {
 //         else
-//             qDebug("hmmmmmm");
+//             odebug << "hmmmmmm" << oendl;
     }
@@ -902,3 +905,3 @@ bool TextEdit::saveAs() {
 
-        qDebug("saving filename "+fileNm);
+        odebug << "saving filename "+fileNm << oendl;
         QFileInfo fi(fileNm);
@@ -914,3 +917,3 @@ bool TextEdit::saveAs() {
 //        editor->setText(rt);
-            qDebug("Saving file as "+currentFileName);
+            odebug << "Saving file as "+currentFileName << oendl;
             doc->setName( currentFileName);
@@ -920,3 +923,3 @@ bool TextEdit::saveAs() {
             if ( !fm.saveFile( *doc, rt ) ) {
-                                                                QMessageBox::message(tr("Text Edit"),tr("Save Failed"));
+                                QMessageBox::message(tr("Text Edit"),tr("Save Failed"));
                 return false;
@@ -943,3 +946,3 @@ bool TextEdit::saveAs() {
     }
-    qDebug("returning false");
+    odebug << "returning false" << oendl;
     return false;
@@ -974,5 +977,5 @@ void TextEdit::setDocument(const QString& fileref) {
         currentFileName=fileref;
-        qDebug("setDocument");
+        odebug << "setDocument" << oendl;
          QFileInfo fi(currentFileName);
-         qDebug("basename:"+fi.baseName()+": current filenmame "+currentFileName);
+         odebug << "basename:"+fi.baseName()+": current filenmame "+currentFileName << oendl;
          if( (fi.baseName().left(1)).isEmpty() ) {
@@ -981,3 +984,3 @@ void TextEdit::setDocument(const QString& fileref) {
          } else {
-             qDebug("setDoc open");
+             odebug << "setDoc open" << oendl;
              bFromDocView = true;
@@ -1036,3 +1039,3 @@ void TextEdit::changeStartConfig( bool b ) {
 void TextEdit::editorChanged() {
-//    qDebug("editor changed");
+//    odebug << "editor changed" << oendl;
     if( /*editor->edited() &&*/ /*edited && */!edited1) {
@@ -1045,5 +1048,5 @@ void TextEdit::editorChanged() {
 void TextEdit::receive(const QCString&msg, const QByteArray &) {
-    qDebug("QCop "+msg);
+    odebug << "QCop "+msg << oendl;
   if ( msg == "setDocument(QString)" ) {
-      qDebug("bugger all");
+      odebug << "bugger all" << oendl;
 
@@ -1131,3 +1134,3 @@ void TextEdit::timerCrank()
             {
-//                qDebug("autosave");
+//                odebug << "autosave" << oendl;
                 save();
@@ -1147,3 +1150,3 @@ void TextEdit::doTimer(bool b)
       {
-//          qDebug("doTimer true");
+//          odebug << "doTimer true" << oendl;
           setTimer();
@@ -1151,3 +1154,3 @@ void TextEdit::doTimer(bool b)
 //     else
-//         qDebug("doTimer false");
+//         odebug << "doTimer false" << oendl;
 }
@@ -1158,3 +1161,3 @@ if(featureAutoSave)
   {
-//      qDebug("setting autosave");
+//      odebug << "setting autosave" << oendl;
       QTimer *timer = new QTimer(this );