4 files changed, 33 insertions, 19 deletions

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 ( ))