5 files changed, 17 insertions, 14 deletions

diff --git a/core/launcher/documentlist.cpp b/core/launcher/documentlist.cpp
index 19ceb0f..44ceb0c 100644
--- a/core/launcher/documentlist.cpp
+++ b/core/launcher/documentlist.cpp
@@ -387,7 +387,7 @@ void DocumentList::DiffAppLnks()
             ++it1;
         }
         if (!found) {
-            qDebug("Item %s needs to be added",j->name().ascii() );
+            odebug << "Item " << j->name().ascii() << " needs to be added" << oendl; 
             d->serverGui->applicationAdded( j->type(), *j );
                 }           
             ++it2; 
@@ -403,7 +403,7 @@ void DocumentList::DiffAppLnks()
             ++it2;
         }
         if (!found) {
-            qDebug("Item %s needs to be removed",i->name().ascii() );
+            odebug << "Item " << i->name().ascii() << " needs to be removed" << oendl; 
             d->serverGui->applicationRemoved( i->type(), *i );
         }
                     
@@ -422,10 +422,10 @@ void DocumentList::storageChanged()
     t.start();
     DiffAppLnks();
 //    reloadAppLnks();
-    qDebug("Reload App links took %i ms",t.elapsed() );
+    odebug << "Reload App links took " << t.elapsed() << " ms" << oendl; 
     reloadDocLnks();
 //    odebug << "Reload links took " << t.elapsed() << " ms " << oendl;
-    qDebug("Reload All links took %i ms",t.elapsed() );
+    odebug << "Reload All links took " << t.elapsed() << " ms" << oendl; 
 // ### Optimization opportunity
     // Could be a bit more intelligent and somehow work out which
     // mtab entry has changed and then only scan that and add and remove
diff --git a/core/launcher/qprocess_unix.cpp b/core/launcher/qprocess_unix.cpp
index 56e1b1d..97c0460 100644
--- a/core/launcher/qprocess_unix.cpp
+++ b/core/launcher/qprocess_unix.cpp
@@ -1032,14 +1032,14 @@ void QProcess::socketRead( int fd )
     d->socketReadCalled = TRUE;
     if ( fd == d->proc->socketStdout ) {
 #if defined(QT_QPROCESS_DEBUG)
-        qDebug( "QProcess::socketRead(): %d bytes read from stdout (%d)",
-                buffer->size()-oldSize, fd );
+    odebug << "QProcess::socketRead(): " << buffer->size()-oldSize << "bytes read from stdout ("
+           << fd << ")" << oendl;
 #endif
         emit readyReadStdout();
     } else if ( fd == d->proc->socketStderr ) {
 #if defined(QT_QPROCESS_DEBUG)
-        qDebug( "QProcess::socketRead(): %d bytes read from stderr (%d)",
-                buffer->size()-oldSize, fd );
+    odebug << "QProcess::socketRead(): " << buffer->size()-oldSize << " bytes read from stderr ("
+           << fd << ")" << oendl;
 #endif
         emit readyReadStderr();
     }
diff --git a/core/launcher/screensaver.cpp b/core/launcher/screensaver.cpp
index a7d23c4..f818d62 100644
--- a/core/launcher/screensaver.cpp
+++ b/core/launcher/screensaver.cpp
@@ -5,6 +5,7 @@
 #include <qpe/network.h>
 
 #include <opie2/odevice.h>
+#include <opie2/odebug.h>
 
 
 using namespace Opie::Core;
@@ -210,7 +211,8 @@ void OpieScreenSaver::setBacklight ( int bright )
         int contrast = config. readNumEntry ( "Contrast", 127);
         m_use_light_sensor = config. readBoolEntry ( "LightSensor", false );
 
-        //qDebug ( "setBacklight: %d (norm: %d) (ls: %d)", bright, m_backlight_normal, m_use_light_sensor ? 1 : 0 );
+    //odebug << "setBacklight: " << bright << " (norm: " << m_backlight_normal << ") (ls: "
+    //       << ( m_use_light_sensor ? 1 : 0 ) << ")" << oendl;
 
         killTimers ( );
         if (( bright < 0 ) && m_use_light_sensor ) {
@@ -293,7 +295,9 @@ void OpieScreenSaver::timerEvent ( QTimerEvent * )
                 m_backlight_sensor = m_sensordata [LS_LightMax] - dy * stepno / ( m_sensordata [LS_Steps] - 1 );
         }
 
-        //qDebug ( "f(%d) = %d [%d - %d] -> [%d - %d] / %d", s, m_backlight_sensor, m_sensordata [LS_SensorMin], m_sensordata [LS_SensorMax], m_sensordata [LS_LightMin], m_sensordata [LS_LightMax], m_sensordata [LS_Steps] );
+    odebug << "f(" << s << ") = " << m_backlight_sensor << " [" << m_sensordata [LS_SensorMin]
+           << " - " << m_sensordata [LS_SensorMax] << " ] -> [" << m_sensordata [LS_LightMin]
+           << " - " << m_sensordata [LS_LightMax] << "] / " << m_sensordata [LS_Steps] << oendl;
 
         if ( m_level <= 0 )
                 setBacklightInternal ( -1 );
diff --git a/core/launcher/server.cpp b/core/launcher/server.cpp
index b9fa1e5..950032d 100644
--- a/core/launcher/server.cpp
+++ b/core/launcher/server.cpp
@@ -426,8 +426,8 @@ void Server::systemMsg(const QCString &msg, const QByteArray &data)
         QCopEnvelope e( "QPE/Desktop", "syncDate(QString,QString)" );
         e  << app  << cfg.readEntry( app );
 #endif
-        //qDebug("QPE/System sendSyncDate for %s: response %s", app.latin1(),
-        //cfg.readEntry( app ).latin1() );
+    //odebug << "QPE/System sendSyncDate for " << app.latin1() << ": response "
+    //       << cfg.readEntry( app ).latin1() << oendl;
     } else if ( msg == "setSyncDate(QString,QString)" ) {
         QString app, date;
         stream >> app >> date;
diff --git a/core/launcher/transferserver.cpp b/core/launcher/transferserver.cpp
index 4b764e3..c3f936e 100644
--- a/core/launcher/transferserver.cpp
+++ b/core/launcher/transferserver.cpp
@@ -781,8 +781,7 @@ bool ServerPI::backupRestoreGzip( const QString &file, QStringList &targets )
        file.findRev( ".tgz" ) == (int)file.length()-4 ) {
       QFileInfo info( file );
       targets = info.dirPath( TRUE );
-      qDebug("ServerPI::backupRestoreGzip for %s = %s", file.latin1(),
-             targets.join(" ").latin1() );
+      odebug << "ServerPI::backupRestoreGzip for " << file.latin1() << " = " << targets.join(" ").latin1() << oendl;
       return true;
   }
   return false;