14 files changed, 111 insertions, 57 deletions

diff --git a/core/settings/button/remapdlg.cpp b/core/settings/button/remapdlg.cpp
index 4effebc..cadb955 100644
--- a/core/settings/button/remapdlg.cpp
+++ b/core/settings/button/remapdlg.cpp
@@ -1,9 +1,15 @@
+
+#include "remapdlg.h"
+#include "buttonutils.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+
+/* QT */
 #include <qlistview.h>
 #include <qcombobox.h>
 #include <qtimer.h>
 
-#include "remapdlg.h"
-#include "buttonutils.h"
 
 
 using namespace Opie::Core;
@@ -108,16 +114,16 @@ void RemapDlg::itemChanged ( QListViewItem *it )
   if ( it == m_map_none )
   {
     m_msg = m = OQCopMessage ( "ignore", 0 );
-    qDebug ("***ignoring");
+    odebug << "***ignoring" << oendl;
   }
   else if ( it == m_map_preset )
   {
     m_msg = m = m_msg_preset;
-    qDebug ("***Preset");
+    odebug << "***Preset" << oendl;
   }
   else if ( it && !it-> childCount ( ) ) 
   {
-    qDebug ("***Custom: %s %s ",it-> text ( 1 ). latin1 ( ), it-> text ( 2 ). latin1 ( ));
+    odebug << "***Custom: " << it-> text ( 1 ). latin1 ( ) << " " << it-> text ( 2 ). latin1 ( ) << oendl;
     enabled = ( it == m_map_custom );
     m_msg = m = OQCopMessage ( it-> text ( 1 ). latin1 ( ), it-> text ( 2 ). latin1 ( ));
   }
diff --git a/core/settings/citytime/citytime.cpp b/core/settings/citytime/citytime.cpp
index 721285d..d73bda1 100644
--- a/core/settings/citytime/citytime.cpp
+++ b/core/settings/citytime/citytime.cpp
@@ -23,18 +23,22 @@
 #include "zonemap.h"
 #include "citytime.h"
 
+/* OPIE */
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 #include <qpe/tzselect.h>
 #if !defined(QT_NO_COP)
 #include <qpe/qcopenvelope_qws.h>
 #endif
+#include <opie2/odebug.h>
 
+/* QT */
 #include <qlabel.h>
 #include <qmessagebox.h>
 #include <qtoolbutton.h>
 #include <qlayout.h>
 
+/* STD */
 #include <stdlib.h>
 
 CityTime::CityTime( QWidget *parent, const char* name,
@@ -46,7 +50,7 @@ CityTime::CityTime( QWidget *parent, const char* name,
     Config config( "qpe" );
     config.setGroup( "Time" );
     bWhichClock = config.readBoolEntry( "AMPM", TRUE );
-    qDebug( QString("%1").arg(bWhichClock) );
+    odebug << QString("%1").arg(bWhichClock) << oendl;
     frmMap->changeClock( bWhichClock );
 
     char *pEnv;
diff --git a/core/settings/citytime/citytimebase.cpp b/core/settings/citytime/citytimebase.cpp
index 323929b..77cb91d 100644
--- a/core/settings/citytime/citytimebase.cpp
+++ b/core/settings/citytime/citytimebase.cpp
@@ -3,10 +3,14 @@
 // changes by Maximilian Reiss <harlekin@handhelds.org>
 
 #include "citytimebase.h"
+#include "zonemap.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
 
+/* QT */
 #include <qlabel.h>
 #include <qtoolbutton.h>
-#include "zonemap.h"
 #include <qlayout.h>
 #include <qwhatsthis.h>
 
@@ -401,11 +405,11 @@ bool CityTimeBase::event( QEvent* ev )
 
 void CityTimeBase::beginNewTz()
 {
-    qWarning( "CityTimeBase::beginNewTz(): Not implemented yet!" );
+    owarn << "CityTimeBase::beginNewTz(): Not implemented yet!" << oendl;
 }
 
 void CityTimeBase::slotNewTz(const QString &, const QString &)
 {
-    qWarning( "CityTimeBase::slotNewTz(const QString &, const QString &): Not implemented yet!" );
+    owarn << "CityTimeBase::slotNewTz(const QString &, const QString &): Not implemented yet!" << oendl;
 }
 
diff --git a/core/settings/citytime/zonemap.cpp b/core/settings/citytime/zonemap.cpp
index b6843d2..e4a25ef 100644
--- a/core/settings/citytime/zonemap.cpp
+++ b/core/settings/citytime/zonemap.cpp
@@ -23,9 +23,12 @@
 #include "sun.h"
 #include "zonemap.h"
 
+/* OPIE */
 #include <qpe/resource.h>
 #include <qpe/qpeapplication.h>
+#include <opie2/odebug.h>
 
+/* QT */
 #include <qfile.h>
 #include <qlabel.h>
 #include <qmessagebox.h>
@@ -37,6 +40,7 @@
 #include <qlistview.h>
 #include <qwhatsthis.h>
 
+/* STD */
 #include <limits.h>
 
 // the map file...
@@ -130,10 +134,10 @@ ZoneField::ZoneField( const QString& strLine )
 
 void ZoneField::showStructure( void ) const
 {
-    qDebug( "Country: %s", strCountry.latin1() );
-    qDebug( "City: %s", strCity.latin1() );
-    qDebug( "x: %d", _x );
-    qDebug( "y: %d\n", _y );
+    odebug << "Country: " << strCountry << "" << oendl;
+    odebug << "City: " << strCity << "" << oendl;
+    odebug << "x: " << _x << "" << oendl;
+    odebug << "y: " << _y << "\n" << oendl;
 }
 
 ZoneMap::ZoneMap( QWidget *parent, const char* name )
diff --git a/core/settings/launcher/doctabsettings.cpp b/core/settings/launcher/doctabsettings.cpp
index 179a7f9..dfdc9be 100644
--- a/core/settings/launcher/doctabsettings.cpp
+++ b/core/settings/launcher/doctabsettings.cpp
@@ -28,13 +28,17 @@
 
 #include "doctabsettings.h"
 
+/* OPIE */
 #include <qpe/config.h>
+#include <opie2/odebug.h>
 
+/* QT */
 #include <qcheckbox.h>
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qwhatsthis.h>
 
+
 DocTabSettings::DocTabSettings( QWidget *parent, const char *name ):QWidget( parent, name )
 {
     QBoxLayout *lay = new QVBoxLayout( this, 4, 4 );
@@ -59,7 +63,7 @@ void DocTabSettings::appletChanged()
 
 void DocTabSettings::accept()
 {
-    qDebug( "DocTabSettings::accept()" );
+    odebug << "DocTabSettings::accept()" << oendl;
     Config cfg( "Launcher" );
     cfg.setGroup( "DocTab" );
     cfg.writeEntry( "Enable", _enable->isChecked() );
diff --git a/core/settings/launcher/inputmethodsettings.cpp b/core/settings/launcher/inputmethodsettings.cpp
index e342c09..0422075 100644
--- a/core/settings/launcher/inputmethodsettings.cpp
+++ b/core/settings/launcher/inputmethodsettings.cpp
@@ -28,14 +28,18 @@
 
 #include "inputmethodsettings.h"
 
+/* OPIE */
 #include <qpe/config.h>
+#include <opie2/odebug.h>
 
+/* QT */
 #include <qspinbox.h>
 #include <qcheckbox.h>
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qwhatsthis.h>
 
+
 InputMethodSettings::InputMethodSettings( QWidget *parent, const char *name ):QWidget( parent, name )
 {
     QBoxLayout *lay = new QVBoxLayout( this, 4, 4 );
@@ -73,7 +77,7 @@ void InputMethodSettings::appletChanged()
 
 void InputMethodSettings::accept()
 {
-    qDebug( "InputMethodSettings::accept()" );
+    odebug << "InputMethodSettings::accept()" << oendl;
     Config cfg( "Launcher" );
     cfg.setGroup( "InputMethods" );
     cfg.writeEntry( "Resize", _resize->isChecked() );
diff --git a/core/settings/launcher/tabdialog.cpp b/core/settings/launcher/tabdialog.cpp
index 763b360..546e229 100644
--- a/core/settings/launcher/tabdialog.cpp
+++ b/core/settings/launcher/tabdialog.cpp
@@ -25,8 +25,17 @@
 
 */
 
+#include "tabdialog.h"
+
+/* OPIE */
 #include <qpe/resource.h>
+#include <opie2/ofontselector.h>
+#include <opie2/otabwidget.h>
+#include <opie2/ocolorbutton.h>
+#include <opie2/ofiledialog.h>
+#include <opie2/odebug.h>
 
+/* QT */
 #include <qlayout.h>
 #include <qvbox.h>
 #include <qtabbar.h>
@@ -38,13 +47,6 @@
 #include <qwhatsthis.h>
 #include <qcheckbox.h>
 
-#include <opie2/ofontselector.h>
-#include <opie2/otabwidget.h>
-#include <opie2/ocolorbutton.h>
-#include <opie2/ofiledialog.h>
-
-#include "tabdialog.h"
-
 
 using namespace Opie::Ui;
 class SampleItem : public QIconViewItem {
@@ -148,7 +150,7 @@ public:
                         }
 
                         case TabConfig::Image: {
-                                qDebug( "Loading image: %s", val.latin1() );
+                odebug << "Loading image: " << val << "" << oendl;
                                 QPixmap bg ( Resource::loadPixmap ( "wallpaper/" + val ));
                                 if ( bg. isNull ( )) {
                                         QImageIO imgio;
diff --git a/core/settings/launcher/taskbarsettings.cpp b/core/settings/launcher/taskbarsettings.cpp
index 43886c9..8dd9e97 100644
--- a/core/settings/launcher/taskbarsettings.cpp
+++ b/core/settings/launcher/taskbarsettings.cpp
@@ -28,12 +28,15 @@
 
 #include "taskbarsettings.h"
 
+/* OPIE */
 #include <qpe/config.h>
 #include <qpe/qlibrary.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/taskbarappletinterface.h>
 #include <qpe/qcopenvelope_qws.h>
+#include <opie2/odebug.h>
 
+/* QT */
 #include <qdir.h>
 #include <qlistview.h>
 #include <qheader.h>
@@ -41,6 +44,7 @@
 #include <qlabel.h>
 #include <qwhatsthis.h>
 
+/* STD */
 #include <stdlib.h>
 
 
@@ -85,12 +89,12 @@ void TaskbarSettings::init ( )
                 QPixmap icon;
                 TaskbarNamedAppletInterface *iface = 0;
 
-                qWarning("Load applet: %s", (*it).latin1() );
+        owarn << "Load applet: " << (*it) << "" << oendl;
                 QLibrary *lib = new QLibrary ( path + "/" + *it );
                 lib-> queryInterface ( IID_TaskbarNamedApplet, (QUnknownInterface**) &iface );
-                qWarning("<1>");
+        owarn << "<1>" << oendl;
                 if ( iface ) {
-                        qWarning("<2>");
+            owarn << "<2>" << oendl;
                         QString lang = getenv( "LANG" );
                         QTranslator *trans = new QTranslator ( qApp );
                         QString type = (*it). left ((*it). find ("."));
@@ -103,15 +107,15 @@ void TaskbarSettings::init ( )
                         icon = iface-> icon ( );
                         iface-> release ( );
                 }
-                qWarning("<3>");
+        owarn << "<3>" << oendl;
                 if ( !iface ) {
-                        qWarning("<4>");
+            owarn << "<4>" << oendl;
                         lib-> queryInterface ( IID_TaskbarApplet, (QUnknownInterface**) &iface );
                         
                         if ( iface ) {
-                                qWarning("<5>");
+                owarn << "<5>" << oendl;
                                 name = (*it). mid ( 3 );
-                                qWarning("Found applet: %s", name.latin1() );
+                owarn << "Found applet: " << name << "" << oendl;
 #ifdef Q_OS_MACX
                                 int sep = name. find( ".dylib" );
 #else
@@ -126,10 +130,10 @@ void TaskbarSettings::init ( )
                                         iface-> release ( );            
                                 }                               
                 }
-                qWarning("<6>");
+        owarn << "<6>" << oendl;
                 
                 if ( iface ) {
-                        qWarning("<7>");
+            owarn << "<7>" << oendl;
                         QCheckListItem *item;
                         item = new QCheckListItem ( m_list, name, QCheckListItem::CheckBox );
                         if ( !icon. isNull ( ))
diff --git a/core/settings/light-and-power/light.cpp b/core/settings/light-and-power/light.cpp
index d64a063..424a64c 100644
--- a/core/settings/light-and-power/light.cpp
+++ b/core/settings/light-and-power/light.cpp
@@ -29,7 +29,9 @@
 #include "light.h"
 #include "sensor.h"
 
+/* OPIE */
 #include <opie2/odevice.h>
+#include <opie2/odebug.h>
 
 #include <qpe/config.h>
 #include <qpe/power.h>
@@ -37,6 +39,7 @@
 #include <qpe/qcopenvelope_qws.h>
 #endif
 
+/* QT */
 #include <qlabel.h>
 #include <qcheckbox.h>
 #include <qtabwidget.h>
@@ -233,7 +236,7 @@ void LightSettings::setContrast ( int contr )
 
 void LightSettings::setFrequency ( int index )
 {
-        qWarning("LightSettings::setFrequency(%d)", index);
+    owarn << "LightSettings::setFrequency(" << index << ")" << oendl;
         ODevice::inst ( )-> setCurrentCpuFrequency(index);
 }
 
@@ -245,7 +248,7 @@ void LightSettings::resetBacklight ( )
 
 void LightSettings::setCloseHingeAction ( int index )
 {
-    qWarning("LightSettings::setCloseHingeStatus(%d)", index);
+    owarn << "LightSettings::setCloseHingeStatus(" << index << ")" << oendl;
 }
 
 void LightSettings::accept ( )
diff --git a/core/settings/security/security.cpp b/core/settings/security/security.cpp
index 4eddb55..b917aea 100644
--- a/core/settings/security/security.cpp
+++ b/core/settings/security/security.cpp
@@ -19,12 +19,15 @@
  **********************************************************************/
 #include "security.h"
 
+/* OPIE */
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 #include <qpe/password.h>
 #include <qpe/qpedialog.h>
 #include <qpe/qcopenvelope_qws.h>
+#include <opie2/odebug.h>
 
+/* QT */
 #include <qcheckbox.h>
 #include <qpushbutton.h>
 #include <qcombobox.h>
@@ -32,6 +35,9 @@
 #include <qfile.h>
 #include <qtextstream.h>
 
+
+using namespace Opie::Core;
+
     Security::Security( QWidget* parent,  const char* name, WFlags fl )
 : SecurityBase( parent, name, TRUE, WStyle_ContextHelp )
 {
@@ -257,7 +263,7 @@ void Security::selectNet(int auth_peer,int auth_peer_bits, bool update)
             return;
         }
     }
-    qDebug("No match for \"%s\"",sn.latin1());
+    odebug << "No match for \"" << sn << "\"" << oendl;
 }
 
 void Security::parseNet(const QString& sn,int& auth_peer,int& auth_peer_bits)
diff --git a/core/settings/security/security.pro b/core/settings/security/security.pro
index 4a29ee2..4c1e68b 100644
--- a/core/settings/security/security.pro
+++ b/core/settings/security/security.pro
@@ -4,7 +4,7 @@ SOURCES		= security.cpp main.cpp
         INTERFACES= securitybase.ui
 INCLUDEPATH += $(OPIEDIR)/include
         DEPENDPATH+= ../$(OPIEDIR)/include
-LIBS            += -lqpe
+LIBS            += -lqpe -lopiecore2
         TARGET  = security
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/core/symlinker/main.cpp b/core/symlinker/main.cpp
index 6a04980..96e7f3c 100644
--- a/core/symlinker/main.cpp
+++ b/core/symlinker/main.cpp
@@ -1,3 +1,8 @@
+
+/* OPIE */
+#include <opie2/odebug.h>
+
+/* QT */
 #include <qapplication.h>
 #include <qfile.h>
 #include <qfileinfo.h>
@@ -5,6 +10,7 @@
 #include <qtextstream.h>
 #include <qstringlist.h>
 
+/* STD */
 #include <stdlib.h>
 #include <unistd.h> //symlink() 
 #include <sys/stat.h> // mkdir()
@@ -24,7 +30,7 @@ static void createSymlinks( const QString &location, const QString &package )
 
     QFile outFile( listDir + package + ".list");
 
-//    qDebug( "createSymlinks %s -> %s", inFile.name().ascii(), outFile.name().ascii() );
+//    odebug << "createSymlinks " << inFile.name().ascii() << " -> " << outFile.name().ascii() << "" << oendl;
     
 
     
@@ -35,21 +41,21 @@ static void createSymlinks( const QString &location, const QString &package )
         QString s;
         while ( !in.eof() ) {        // until end of file...
             s = in.readLine();       // line of text excluding '\n'
-        //    qDebug( "Read: %s", s.ascii() );
+//      odebug << "Read: " << s.ascii() << "" << oendl;
             if (s.find(location,0,true) >= 0){
-        //          qDebug( "Found!" );
+//          odebug << "Found!" << oendl;
                     s = s.replace(location,"");
             }
-        //    qDebug( "Read after: %s", s.ascii() );
+//      odebug << "Read after: " << s.ascii() << "" << oendl;
             
             // for s, do link/mkdir.
             if ( s.right(1) == "/" ) {
-        //      qDebug("do mkdir for %s", s.ascii());
+//      odebug << "do mkdir for " << s.ascii() << "" << oendl;
                 mkdir( s.ascii(), 0777 );
                 //possible optimization: symlink directories
                 //that don't exist already. -- Risky.
             } else {
-        //      qDebug("do symlink for %s", s.ascii());
+//      odebug << "do symlink for " << s.ascii() << "" << oendl;
                 QFileInfo ffi( s ); 
                 //Don't try to symlink if a regular file exists already
                 if ( !ffi.exists() || ffi.isSymLink() ) {
@@ -58,16 +64,16 @@ static void createSymlinks( const QString &location, const QString &package )
         //              perror("Symlink Failed! ");
                         QString e=s.ascii();
                         e = e.replace(ffi.fileName(),"");
-        //              qDebug("DirName : %s",e.ascii() );
+//          odebug << "DirName : " << e.ascii() << "" << oendl;
                         system ( QString("mkdir -p ")+e.ascii() );
                         if (symlink( (location+s).ascii(), s.ascii() ) != 0)
-                                qDebug ("Big problem creating symlink and directory");
+                odebug << "Big problem creating symlink and directory" << oendl;
                         }
                     }
         //          qDebug ( "Created %s" ,s.ascii() );
                     out << s << "\n";
                 } else {
-                    qDebug( "%s  exists already, not symlinked", s.ascii() );
+            odebug << "" << s.ascii() << "  exists already, not symlinked" << oendl;
                 }
             }
         }
@@ -88,14 +94,14 @@ static void removeSymlinks( const QString &package )
         QString s;
         while ( !in.eof() ) {        // until end of file...
             s = in.readLine();       // line of text excluding '\n'
-        //    qDebug("remove symlink %s", s.ascii());
+//      odebug << "remove symlink " << s.ascii() << "" << oendl;
             QFileInfo ffi( s ); 
             //Confirm that it's still a symlink.
             if ( ffi.isSymLink() ){
                 unlink( s.ascii() );
         //          qDebug ( "Removed %s", s.ascii() );}
         //    else 
-        //      qDebug( "Not removed %s", s.ascii() );
+//      odebug << "Not removed " << s.ascii() << "" << oendl;
             }
         }
         inFile.close();
@@ -131,7 +137,7 @@ static void updateSymlinks()
 
             QString info = root + "/usr/lib/ipkg/info";
             QDir infoDir( info );
-        //    qDebug( "looking at %s", info.ascii() );
+//      odebug << "looking at " << info.ascii() << "" << oendl;
             if ( infoDir.isReadable() ) {
                 const QFileInfoList *packages = infoDir.entryInfoList( "*.list" ); // No tr
                 QFileInfoListIterator it( *packages );
@@ -139,7 +145,7 @@ static void updateSymlinks()
                 while (( fi = *it )) {
                     ++it;
                     if ( knownPackages.contains( fi->fileName() ) ) {
-        //              qDebug( "found %s and we've seen it before", fi->fileName().latin1() );
+//          odebug << "found " << fi->fileName() << " and we've seen it before" << oendl;
                         knownPackages.remove( fi->fileName() );
                     } else {
                         //it's a new one
@@ -175,5 +181,5 @@ int main( int argc, char *argv[] )
     else if ( command == "remove"  && argc > 2 ) // No tr
         removeSymlinks( argv[2] );
     else
-        qWarning( "Argument error" );
+    owarn << "Argument error" << oendl;
 }
diff --git a/core/symlinker/symlinker.pro b/core/symlinker/symlinker.pro
index f850d46..50ad785 100644
--- a/core/symlinker/symlinker.pro
+++ b/core/symlinker/symlinker.pro
@@ -9,7 +9,7 @@ INTERFACES	=
         TARGET  = opie-update-symlinks
 INCLUDEPATH     += $(OPIEDIR)/include 
 DEPENDPATH      += $(OPIEDIR)/include .
-LIBS            += -lqpe
+LIBS            += -lqpe -lopiecore2
 
 include ( $(OPIEDIR)/include.pro )
 
diff --git a/core/tools/quicklauncher/main.cpp b/core/tools/quicklauncher/main.cpp
index d467d6e..c2467fb 100644
--- a/core/tools/quicklauncher/main.cpp
+++ b/core/tools/quicklauncher/main.cpp
@@ -18,6 +18,12 @@
 **
 **********************************************************************/
 
+#include "dropins.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+
+/* QT */
 #include <qpainter.h>
 #include <qstrlist.h>
 #include <qtimer.h>
@@ -31,13 +37,14 @@
 #define private public
 #include <qtopia/qpeapplication.h>
 #undef private
+
+/* STD */
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "dropins.h"
 
 using QuickPrivate::PluginLoader;
 
@@ -111,7 +118,7 @@ public:
                 app->showMainWidget( mainWindow );
             }
         } else {
-            qWarning( "Could not create application main window" );
+        owarn << "Could not create application main window" << oendl;
             exit(-1);
         }
     }
@@ -126,7 +133,7 @@ private slots:
             QDataStream stream( data, IO_ReadOnly );
             QStrList argList;
             stream >> argList;
-            qDebug( "QuickLauncher execute: %s", argList.at(0) );
+        odebug << "QuickLauncher execute: " << argList.at(0) << "" << oendl;
             doQuickLaunch( argList );
             delete this;
         } else if ( msg == "execute(QString)" ) {
@@ -134,7 +141,7 @@ private slots:
             QDataStream stream( data, IO_ReadOnly );
             QString arg;
             stream >> arg;
-            qDebug( "QuickLauncher execute: %s", arg.latin1() );
+        odebug << "QuickLauncher execute: " << arg << "" << oendl;
             QStrList argList;
             argList.append( arg.utf8() );
             doQuickLaunch( argList );
@@ -180,7 +187,7 @@ int main( int argc, char** argv )
     if ( sep > 0 )
         arg0 = arg0.mid( sep+1 );
     if ( arg0 != "quicklauncher" ) {
-        qDebug( "QuickLauncher invoked as: %s", arg0.data() );
+    odebug << "QuickLauncher invoked as: " << arg0.data() << "" << oendl;
         QuickLauncher::exec( argc, argv );
     } else {
 #ifdef _OS_LINUX_
@@ -206,7 +213,7 @@ int main( int argc, char** argv )
             argv_lth = argv0[argc-1] + strlen(argv0[argc-1]) - argv0[0];
 #endif
         (void)new QuickLauncher();
-        qDebug( "QuickLauncher running" );
+    odebug << "QuickLauncher running" << oendl;
         // Pre-load default fonts
         QFontMetrics fm( QApplication::font() );
         fm.ascent(); // causes font load.