1 files changed, 13 insertions, 9 deletions

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
@@ -25,25 +25,29 @@
                              Boston, MA 02111-1307, USA.
 
 */
 
 #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>
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qwhatsthis.h>
 
+/* STD */
 #include <stdlib.h>
 
 
 TaskbarSettings::TaskbarSettings ( QWidget *parent, const char *name )
 	: QWidget ( parent, name )
 {
@@ -82,39 +86,39 @@ void TaskbarSettings::init ( )
 
 	for ( QStringList::Iterator it = list. begin ( ); it != list. end ( ); ++it ) {
 		QString name;
 		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 ("."));
 			QString tfn = QPEApplication::qpeDir ( ) + "/i18n/" + lang + "/" + type + ".qm";
 			if ( trans-> load ( tfn ))
 				qApp-> installTranslator ( trans );
 			else
 				delete trans;
 			name = iface-> name ( );
 			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
 				int sep = name. find( ".so" );
 #endif /* Q_OS_MACX */
 				if ( sep > 0 )
@@ -123,16 +127,16 @@ void TaskbarSettings::init ( )
 				if ( sep == (int) name.length ( ) - 6 )
 					name. truncate ( sep );
 				name[0] = name[0]. upper ( );
 				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 ( ))
 				item-> setPixmap ( 0, icon );
 			item-> setOn ( exclude. find ( *it ) == exclude. end ( ));
 			m_applets [*it] = item;