1 files changed, 24 insertions, 22 deletions

diff --git a/core/launcher/documentlist.cpp b/core/launcher/documentlist.cpp
index 3e0a96c..92b8c25 100644
--- a/core/launcher/documentlist.cpp
+++ b/core/launcher/documentlist.cpp
@@ -23,4 +23,5 @@
 
+/* OPIE */
 #include <opie2/oglobal.h>
-
+#include <opie2/odebug.h>
 #include <qtopia/config.h>
@@ -35,3 +36,5 @@
 #endif
+using namespace Opie::Core;
 
+/* QT */
 #include <qtimer.h>
@@ -49,3 +52,2 @@
 
-using namespace Opie::Core;
 AppLnkSet *DocumentList::appLnkSet = 0;
@@ -110,3 +112,3 @@ DocumentList::DocumentList( ServerInterface *serverGui, bool /*scanDocs*/,
     d->scanDocs = cfg.readBoolEntry( "Enable", true );
-    qDebug( "DocumentList::DocumentList() : scanDocs = %d", d->scanDocs );
+    odebug << "DocumentList::DocumentList() : scanDocs = " << d->scanDocs << "" << oendl;
 
@@ -143,3 +145,3 @@ void DocumentList::pause()
 {
-    //qDebug("pause %i", d->tid);
+    //odebug << "pause " << d->tid << "" << oendl;
     killTimer( d->tid );
@@ -153,3 +155,3 @@ void DocumentList::resume()
         d->tid = startTimer( 20 );
-        //qDebug("resumed %i", d->tid);
+    //odebug << "resumed " << d->tid << "" << oendl;
     }
@@ -179,3 +181,3 @@ void DocumentList::rescan()
 {
-    //qDebug("rescan");
+    //odebug << "rescan" << oendl;
     pause();
@@ -234,3 +236,3 @@ void DocumentList::reloadAppLnks()
 
-                    //qDebug("adding type %s", (*ittypes).latin1());
+            //odebug << "adding type " << (*ittypes) << "" << oendl;
 
@@ -243,3 +245,3 @@ void DocumentList::reloadAppLnks()
         for ( QStringList::Iterator ittypes=prevTypeList.begin(); ittypes!=prevTypeList.end(); ++ittypes) {
-            //qDebug("removing type %s", (*ittypes).latin1());
+        //odebug << "removing type " << (*ittypes) << "" << oendl;
             d->serverGui->typeRemoved(*ittypes);
@@ -276,3 +278,3 @@ void DocumentList::linkChanged( QString arg )
 {
-    //qDebug( "linkchanged( %s )", arg.latin1() );
+    //odebug << "linkchanged( " << arg << " )" << oendl;
 
@@ -289,3 +291,3 @@ void DocumentList::linkChanged( QString arg )
                 || ( doc->fileKnown() && doc->file() == arg ) ) {
-                //qDebug( "found old link" );
+        //odebug << "found old link" << oendl;
                 DocLnk* dl = new DocLnk( arg );
@@ -295,3 +297,3 @@ void DocumentList::linkChanged( QString arg )
                     // to the new link
-                    //qDebug( "change case" );
+            //odebug << "change case" << oendl;
                     if ( d->serverGui )
@@ -302,3 +304,3 @@ void DocumentList::linkChanged( QString arg )
                     // so we aren't interested in it, so take it away from the list
-                    //qDebug( "removal case" );
+            //odebug << "removal case" << oendl;
                     if ( d->serverGui )
@@ -316,3 +318,3 @@ void DocumentList::linkChanged( QString arg )
             // Add if it's a link we are interested in
-            //qDebug( "add case" );
+        //odebug << "add case" << oendl;
             add( *dl );
@@ -380,3 +382,3 @@ void DocumentList::sendAllDocLinks()
 
-    //qDebug( "sending length %d", contents.length() );
+    //odebug << "sending length " << contents.length() << "" << oendl;
 #ifndef QT_NO_COP
@@ -385,3 +387,3 @@ void DocumentList::sendAllDocLinks()
 #endif
-    //qDebug( "================ \n\n%s\n\n===============", contents.latin1() );
+    //odebug << "================ \n\n" << contents << "\n\n===============" << oendl;
 
@@ -538,3 +540,3 @@ void DocumentListPrivate::estimatedPercentScanned()
 
-    // qDebug( "overallProgress: %f", overallProgress );
+    // odebug << "overallProgress: " << overallProgress << "" << oendl;
 
@@ -555,3 +557,3 @@ const QString DocumentListPrivate::nextFile()
                 QDir dir( docPaths[docPathsSearched] );
-                // qDebug("now using base path: %s", docPaths[docPathsSearched].latin1() );
+        // odebug << "now using base path: " << docPaths[docPathsSearched] << "" << oendl;
                 docPathsSearched++;
@@ -589,3 +591,3 @@ const QString DocumentListPrivate::nextFile()
                         QDir dir( fi->filePath() );
-                        // qDebug("now going in to path: %s", bn.latin1() );
+            // odebug << "now going in to path: " << bn << "" << oendl;
                         if ( !dir.exists( ".Qtopia-ignore" ) ) {
@@ -630,3 +632,3 @@ const DocLnk *DocumentListPrivate::iterate()
     if ( state == Find ) {
-        //qDebug("state Find");
+    //odebug << "state Find" << oendl;
         QString file = nextFile();
@@ -652,3 +654,3 @@ const DocLnk *DocumentListPrivate::iterate()
     if ( state == RemoveKnownFiles ) {
-        //qDebug("state RemoveKnownFiles");
+    //odebug << "state RemoveKnownFiles" << oendl;
         const QList<DocLnk> &list = dls.children();
@@ -666,3 +668,3 @@ const DocLnk *DocumentListPrivate::iterate()
     if ( state == MakeUnknownFiles ) {
-        //qDebug("state MakeUnknownFiles");
+    //odebug << "state MakeUnknownFiles" << oendl;
         for (void* c; (c=dit->current()); ++(*dit) ) {
@@ -689,3 +691,3 @@ const DocLnk *DocumentListPrivate::iterate()
 
-    //qDebug("state Done");
+    //odebug << "state Done" << oendl;
     return NULL;