5 files changed, 98 insertions, 82 deletions

diff --git a/noncore/apps/tinykate/libkate/document/katebuffer.cpp b/noncore/apps/tinykate/libkate/document/katebuffer.cpp
index 22a4917..4c15fd0 100644
--- a/noncore/apps/tinykate/libkate/document/katebuffer.cpp
+++ b/noncore/apps/tinykate/libkate/document/katebuffer.cpp
@@ -24,13 +24,10 @@
 #include "katebuffer.h"
+#include "kdebug.h"
 
-// Includes for reading file
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <unistd.h>
+/* OPIE */
+#include <opie2/odebug.h>
 
+/* QT */
 #include <qfile.h>
 #include <qtextstream.h>
-
 #include <qtimer.h>
@@ -38,6 +35,10 @@
 
-//
-
+/* STD */
+// Includes for reading file
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <unistd.h>
 #include <assert.h>
-#include <kdebug.h>
 
@@ -68,3 +69,3 @@ KWBuffer::insertFile(int line, const QString &file, QTextCodec *codec)
         if (line) {
-                qDebug("insert File only supports insertion at line 0 == file opening");
+        odebug << "insert File only supports insertion at line 0 == file opening" << oendl;
                 return;
@@ -123,3 +124,3 @@ KWBuffer::count()
 {
-  qDebug("m_stringList.count %d",m_stringList.count());
+  odebug << "m_stringList.count " << m_stringList.count() << "" << oendl;
   return m_lineCount;
diff --git a/noncore/apps/tinykate/libkate/document/katedocument.cpp b/noncore/apps/tinykate/libkate/document/katedocument.cpp
index 0c742d7..6dc4fd2 100644
--- a/noncore/apps/tinykate/libkate/document/katedocument.cpp
+++ b/noncore/apps/tinykate/libkate/document/katedocument.cpp
@@ -41,16 +41,27 @@
 #include "katedocument.h"
+#include "kmessagebox.h"
+#include "kglobal.h"
 
+//#include "kcharsets.h"
+#include "kdebug.h"
+//#include "kinstance.h"
 
-#include <qfileinfo.h>
-#include <qdatetime.h>
+#include "kglobalsettings.h"
+//#include "kaction.h"
+//#include "kstdaction.h"
 
-#include <kmessagebox.h>
-#include <qpe/config.h>
-#include <qstring.h>
+#include "../view/kateview.h"
+#include "katebuffer.h"
+#include "katetextline.h"
 
-#include <sys/time.h>
-#include <unistd.h>
+#include "katecmd.h"
 
-#include <stdio.h>
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/config.h>
 
+/* QT */
+#include <qfileinfo.h>
+#include <qdatetime.h>
+#include <qstring.h>
 #include <qtimer.h>
@@ -64,17 +75,7 @@
 #include <qtextcodec.h>
-#include <kglobal.h>
-
-//#include <kcharsets.h>
-#include <kdebug.h>
-//#include <kinstance.h>
-
-#include <kglobalsettings.h>
-//#include <kaction.h>
-//#include <kstdaction.h>
-
-#include "../view/kateview.h"
-#include "katebuffer.h"
-#include "katetextline.h"
 
-#include "katecmd.h"
+/* STD */
+#include <sys/time.h>
+#include <unistd.h>
+#include <stdio.h>
 
@@ -300,3 +301,3 @@ void KateDocument::openURL(const QString &filename)
   {
-    qDebug("File doesn't exit or couldn't be read");
+    odebug << "File doesn't exit or couldn't be read" << oendl;
     return ;
@@ -307,3 +308,3 @@ void KateDocument::openURL(const QString &filename)
 //  buffer->insertFile(0, m_file, KGlobal::charsets()->codecForName(myEncoding));
-  qDebug("Telling buffer to open file");
+  odebug << "Telling buffer to open file" << oendl;
   buffer->insertFile(0, m_file, QTextCodec::codecForLocale());
@@ -685,3 +686,3 @@ void KateDocument::setHighlight(int n) {
 void KateDocument::makeAttribs() {
-  qDebug("KateDocument::makeAttribs()");
+  odebug << "KateDocument::makeAttribs()" << oendl;
   m_numAttribs = hlManager->makeAttribs(m_highlight, m_attribs, maxAttribs);
@@ -1925,3 +1926,3 @@ void KateDocument::updateLines(int startLine, int endLine, int flags, int cursor
     endCtx = textLine->getContext();
-//    qDebug("DOHIGHLIGHT");
+//    odebug << "DOHIGHLIGHT" << oendl;
     
diff --git a/noncore/apps/tinykate/libkate/document/katehighlight.cpp b/noncore/apps/tinykate/libkate/document/katehighlight.cpp
index 0d2c283..539d356 100644
--- a/noncore/apps/tinykate/libkate/document/katehighlight.cpp
+++ b/noncore/apps/tinykate/libkate/document/katehighlight.cpp
@@ -21,18 +21,3 @@
 
-#include <string.h>
-
-#include <qtextstream.h>
-#include <qpe/config.h>
-#include <kglobal.h>
-//#include <kinstance.h>
-//#include <kmimemagic.h>
-#include <klocale.h>
-//#include <kregexp.h>
-#include <kglobalsettings.h>
-#include <kdebug.h>
-#include <kstddirs.h>
-
 #include "katehighlight.h"
-
-
 #include "katetextline.h"
@@ -41,2 +26,21 @@
 
+#include "kglobal.h"
+//#include "kinstance.h"
+//#include "kmimemagic.h"
+#include "klocale.h"
+//#include "kregexp.h"
+#include "kglobalsettings.h"
+#include "kdebug.h"
+#include "kstddirs.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/config.h>
+
+/* QT */
+#include <qtextstream.h>
+
+/* STD */
+#include <string.h>
+
 
@@ -623,3 +627,3 @@ int Highlight::doHighlight(int ctxNum, TextLine *textLine)
         {
-            qDebug("An item has been detected");
+        odebug << "An item has been detected" << oendl;
             textLine->setAttribs(item->attr,s1 - str,s2 - str);
@@ -855,3 +859,3 @@ void Highlight::createItemData(ItemDataList &list)
 {
-    qDebug("Highlight::createItemData");
+    odebug << "Highlight::createItemData" << oendl;
 
@@ -876,3 +880,3 @@ void Highlight::createItemData(ItemDataList &list)
 
-    qDebug("Trying to read itemData section");
+    odebug << "Trying to read itemData section" << oendl;
 
@@ -884,3 +888,3 @@ void Highlight::createItemData(ItemDataList &list)
       {
-        qDebug("Setting up one itemData element");
+    odebug << "Setting up one itemData element" << oendl;
         // read all attributes
@@ -1314,3 +1318,3 @@ int HlManager::makeAttribs(Highlight *highlight, Attribute *a, int maxAttribs) {
 
-  qDebug("HlManager::makeAttribs");
+  odebug << "HlManager::makeAttribs" << oendl;
 
@@ -1323,3 +1327,3 @@ int HlManager::makeAttribs(Highlight *highlight, Attribute *a, int maxAttribs) {
   for (z = 0; z < nAttribs; z++) {
-    qDebug("HlManager::makeAttribs: createing one attribute definition");
+    odebug << "HlManager::makeAttribs: createing one attribute definition" << oendl;
     itemData = itemDataList.at(z);
diff --git a/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp b/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp
index 6059e9b..9fa4452 100644
--- a/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp
+++ b/noncore/apps/tinykate/libkate/document/katesyntaxdocument.cpp
@@ -18,11 +18,16 @@
 #include "katesyntaxdocument.h"
-#include <kateconfig.h>
+#include "kateconfig.h"
+#include "kdebug.h"
+#include "kstddirs.h"
+#include "klocale.h"
+#include "kmessagebox.h"
+#include "kglobal.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/qpeapplication.h>
+
+/* QT */
 #include <qfile.h>
-#include <kdebug.h>
-#include <kstddirs.h>
-#include <klocale.h>
-#include <kmessagebox.h>
 #include <qstringlist.h>
-#include <kglobal.h>
-#include <qpe/qpeapplication.h>
 #include <qdir.h>
@@ -78,3 +83,3 @@ void SyntaxDocument::setupModeList(bool force)
     {
-        qDebug("Found a description file:"+path+(*it));
+    odebug << "Found a description file:"+path+(*it) << oendl;
         setIdentifier(path+(*it));
@@ -84,3 +89,3 @@ void SyntaxDocument::setupModeList(bool force)
           e=e->firstChild();
-          qDebug(e->tagName());
+      odebug << e->tagName() << oendl;
           if (e->tagName()=="language")
@@ -92,3 +97,3 @@ void SyntaxDocument::setupModeList(bool force)
             mli->extension = e->attribute("extensions");
-            qDebug(QString("valid description for: %1/%2").arg(mli->section).arg(mli->name));
+        odebug << QString("valid description for: %1/%2").arg(mli->section).arg(mli->name) << oendl;
             if (mli->section.isEmpty())
@@ -294,3 +299,3 @@ QStringList& SyntaxDocument::finddata(const QString& mainGroup,const QString& ty
                         {
-                                qDebug("FOUND A LIST ENTRY("+e2->tagName()+"):"+e2->firstChild()->value());
+                odebug << "FOUND A LIST ENTRY("+e2->tagName()+"):"+e2->firstChild()->value() << oendl;
                                 m_data+=e2->firstChild()->value().stripWhiteSpace();
diff --git a/noncore/apps/tinykate/libkate/kateconfig.cpp b/noncore/apps/tinykate/libkate/kateconfig.cpp
index 96f91fb..782b629 100644
--- a/noncore/apps/tinykate/libkate/kateconfig.cpp
+++ b/noncore/apps/tinykate/libkate/kateconfig.cpp
@@ -20,2 +20,10 @@
 
+#define QTOPIA_INTERNAL_LANGLIST
+#include "kateconfig.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/global.h>
+
+/* QT */
 #include <qdir.h>
@@ -27,2 +35,3 @@
 
+/* STD */
 #include <sys/stat.h>
@@ -33,6 +42,2 @@
 
-#define QTOPIA_INTERNAL_LANGLIST
-#include "kateconfig.h"
-#include <qpe/global.h>
-
 
@@ -95,3 +100,3 @@ KateConfig::KateConfig( const QString &name, Domain domain )
 {
-    qWarning("KateConfig constructor\n");
+    owarn << "KateConfig constructor\n" << oendl;
     git = groups.end();
@@ -120,3 +125,3 @@ KateConfig::~KateConfig()
 {
-    qWarning("KateConfig destructor\n");
+    owarn << "KateConfig destructor\n" << oendl;
     if ( changed )
@@ -174,3 +179,3 @@ void KateConfig::writeEntry( const QString &key, const QString &value )
     if ( git == groups.end() ) {
-        qWarning( "no group set" );
+    owarn << "no group set" << oendl;
         return;
@@ -234,3 +239,3 @@ void KateConfig::writeEntryCrypt( const QString &key, const QString &value )
     if ( git == groups.end() ) {
-        qWarning( "no group set" );
+    owarn << "no group set" << oendl;
         return;
@@ -323,3 +328,3 @@ void KateConfig::removeEntry( const QString &key )
     if ( git == groups.end() ) {
-        qWarning( "no group set" );
+    owarn << "no group set" << oendl;
         return;
@@ -399,3 +404,3 @@ QString KateConfig::readEntryDirect( const QString &key, const QString &deflt )
     if ( git == groups.end() ) {
-        //qWarning( "no group set" );
+    //owarn << "no group set" << oendl;
         return deflt;
@@ -502,3 +507,3 @@ void KateConfig::clearGroup()
     if ( git == groups.end() ) {
-        qWarning( "no group set" );
+    owarn << "no group set" << oendl;
         return;
@@ -523,3 +528,3 @@ void KateConfig::write( const QString &fn )
     if ( !f.open( IO_WriteOnly|IO_Raw ) ) {
-        qWarning( "could not open for writing `%s'", strNewFile.latin1() );
+    owarn << "could not open for writing `" << strNewFile << "'" << oendl;
         git = groups.end();