- convert qDebug to odebug

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,14 +1,20 @@
+
+#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;
 class NoSortItem : public QListViewItem {
 public:
   NoSortItem ( QListView *lv, uint pos, const QString &str, const QCString &s1 = 0, const QCString &s2 = 0 )
     : QListViewItem ( lv, str, s1, s2 )
   {
@@ -103,26 +109,26 @@ void RemapDlg::itemChanged ( QListViewItem *it )
   bool enabled = false;
   OQCopMessage m;
   
   m_current = 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 ( ));
   }
   
   w_channel-> setEnabled ( enabled );
   w_message-> setEnabled ( enabled );
   
   w_channel-> setEditText ( m. channel ( ));
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
@@ -18,40 +18,44 @@
 **
 **********************************************************************/
 
 // changes by Maximilian Reiss <harlekin@handhelds.org>
 
 #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,
                             WFlags fl )
     : CityTimeBase( parent, name, fl ),
       strRealTz(0),
       bAdded(false)
 {
     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;
     pEnv = NULL;
     pEnv = getenv("TZ");
     if ( pEnv )
         strRealTz = pEnv;
     pEnv = NULL;
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
@@ -1,17 +1,21 @@
 
 
 // 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>
 
 
 /*
  *  Constructs a CityTimeBase which is a child of 'parent', with the
  *  name 'name' and widget flags set to 'f'
  */
@@ -396,16 +400,16 @@ bool CityTimeBase::event( QEvent* ev )
 	cmdCity9_font.setBold( TRUE );
 	cmdCity9->setFont( cmdCity9_font );
     }
     return ret;
 }
 
 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
@@ -18,30 +18,34 @@
 **
 **********************************************************************/
 
 // changes by Maximilian Reiss <harlekin@handhelds.org>
 
 #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>
 #include <qtextstream.h>
 #include <qtimer.h>
 #include <qtoolbutton.h>
 #include <qlayout.h>
 #include <qhbox.h>
 #include <qlistview.h>
 #include <qwhatsthis.h>
 
+/* STD */
 #include <limits.h>
 
 // the map file...
 static const char strZONEINFO[] = "/usr/share/zoneinfo/zone.tab";
 static const char strMAP[] = "citytime/simple_grid_400";
 
 // the maximum distance we'll allow the pointer to be away from a city
 // and still show the city's time
@@ -125,20 +129,20 @@ ZoneField::ZoneField( const QString& strLine )
     iStart = regCity.match( strLine, iStart + iLen, &iLen );
     if ( iStart >= 0 ) {
 	strCity = strLine.mid( iStart, iLen );
     }
 }
 
 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 )
     : QScrollView( parent, name ),
       pLast( 0 ),
       pRepaint( 0 ),
       ox( 0 ),
       oy( 0 ),
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
@@ -23,23 +23,27 @@
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #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 );
 
     _enable = new QCheckBox( tr( "Enable the Documents Tab" ), this );
 
     Config cfg( "Launcher" );
     cfg.setGroup( "DocTab" );
@@ -54,15 +58,15 @@ DocTabSettings::DocTabSettings( QWidget *parent, const char *name ):QWidget( par
 }
 
 void DocTabSettings::appletChanged()
 {
 }
 
 void DocTabSettings::accept()
 {
-    qDebug( "DocTabSettings::accept()" );
+    odebug << "DocTabSettings::accept()" << oendl;
     Config cfg( "Launcher" );
     cfg.setGroup( "DocTab" );
     cfg.writeEntry( "Enable", _enable->isChecked() );
     cfg.write();
 }
 
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
@@ -23,24 +23,28 @@
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #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 );
 
     _resize = new QCheckBox( tr( "Resize application on Popup" ), this );
     _float = new QCheckBox( tr( "Enable floating and resizing" ), this );
 
     QHBoxLayout* hbox = new QHBoxLayout( lay, 4 );
@@ -68,17 +72,17 @@ InputMethodSettings::InputMethodSettings( QWidget *parent, const char *name ):QW
 }
 
 void InputMethodSettings::appletChanged()
 {
 }
 
 void InputMethodSettings::accept()
 {
-    qDebug( "InputMethodSettings::accept()" );
+    odebug << "InputMethodSettings::accept()" << oendl;
     Config cfg( "Launcher" );
     cfg.setGroup( "InputMethods" );
     cfg.writeEntry( "Resize", _resize->isChecked() );
     cfg.writeEntry( "Float", _float->isChecked() );
     cfg.writeEntry( "Width", _size->value() );
     cfg.write();
 }
 
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
@@ -20,36 +20,38 @@
  -.   .:....=;==+<;          General Public License along with this file;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
+#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>
 #include <qiconview.h>
 #include <qapplication.h>
 #include <qlabel.h>
 #include <qradiobutton.h>
 #include <qbuttongroup.h>
 #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 {
 public:
 	SampleItem ( QIconView *v, const QString &text, const QPixmap &pix ) : QIconViewItem ( v, text )
 	{
 		m_large = pix;
 		m_small. convertFromImage ( pix. convertToImage ( ). smoothScale ( pix. width ( ) / 2, pix. height ( ) / 2 ));
@@ -143,17 +145,17 @@ public:
 				if ( val. isEmpty ( ))
 					setBackgroundColor ( colorGroup ( ). base ( ));
 				else
 					setBackgroundColor ( val );
 				break;
 			}
 
 			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;
 					imgio. setFileName ( val );
 					QSize ds = qApp-> desktop ( )-> size ( );
 					QString param ( "Scale( %1, %2, ScaleMin )" ); // No tr
 					imgio. setParameters ( param. arg ( ds. width ( )). arg ( ds. height ( )). latin1 ( ));
 					imgio. read ( );
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
@@ -23,29 +23,33 @@
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              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 )
 {
 	m_applets_changed = false;
 
@@ -80,61 +84,61 @@ void TaskbarSettings::init ( )
 	QStringList list = QDir ( path, "lib*.so" ). entryList ( );
 #endif /* Q_OS_MACX */
 
 	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 )
 					name. truncate ( sep );
 				sep = name. find ( "applet" );
 				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;
 		}
 		lib-> unload ( );
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
@@ -24,24 +24,27 @@
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include "light.h"
 #include "sensor.h"
 
+/* OPIE */
 #include <opie2/odevice.h>
+#include <opie2/odebug.h>
 
 #include <qpe/config.h>
 #include <qpe/power.h>
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
 #include <qpe/qcopenvelope_qws.h>
 #endif
 
+/* QT */
 #include <qlabel.h>
 #include <qcheckbox.h>
 #include <qtabwidget.h>
 #include <qslider.h>
 #include <qspinbox.h>
 #include <qpushbutton.h>
 #include <qgroupbox.h>
 #include <qcombobox.h>
@@ -228,29 +231,29 @@ void LightSettings::setBacklight ( int bright )
 void LightSettings::setContrast ( int contr )
 {
 	if (contr == -1) contr = m_oldcontrast;
 	ODevice::inst ( )-> setDisplayContrast(contr);
 }
 
 void LightSettings::setFrequency ( int index )
 {
-	qWarning("LightSettings::setFrequency(%d)", index);
+    owarn << "LightSettings::setFrequency(" << index << ")" << oendl;
 	ODevice::inst ( )-> setCurrentCpuFrequency(index);
 }
 
 void LightSettings::resetBacklight ( )
 {
 	setBacklight ( -1 );
 	setContrast ( -1 );
 }
 
 void LightSettings::setCloseHingeAction ( int index )
 {
-    qWarning("LightSettings::setCloseHingeStatus(%d)", index);
+    owarn << "LightSettings::setCloseHingeStatus(" << index << ")" << oendl;
 }
 
 void LightSettings::accept ( )
 {
 	Config config ( "apm" );
 
 	// bat
 	config. setGroup ( "Battery" );
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
@@ -14,29 +14,35 @@
  ** See http://www.trolltech.com/gpl/ for GPL licensing information.
  **
  ** Contact info@trolltech.com if any conditions of this licensing are
  ** not clear to you.
  **
  **********************************************************************/
 #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>
 #include <qmessagebox.h>
 #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 )
 {
     valid=FALSE;
     Config cfg("Security");
     cfg.setGroup("Passcode");
     passcode = cfg.readEntry("passcode");
     passcode_poweron->setChecked(cfg.readBoolEntry("passcode_poweron",FALSE));
@@ -252,17 +258,17 @@ void Security::selectNet(int auth_peer,int auth_peer_bits, bool update)
     }
 
     for (int i=0; i<syncnet->count(); i++) {
         if ( syncnet->text(i).left(sn.length()) == sn ) {
             syncnet->setCurrentItem(i);
             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)
 {
     auth_peer=0;
     if ( sn == tr("Any") ) {
         auth_peer = 0;
         auth_peer_bits = 0;
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
@@ -1,10 +1,10 @@
 CONFIG		+= qt warn_on  quick-app
 HEADERS		= security.h
 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,15 +1,21 @@
+
+/* OPIE */
+#include <opie2/odebug.h>
+
+/* QT */
 #include <qapplication.h>
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qdir.h>
 #include <qtextstream.h>
 #include <qstringlist.h>
 
+/* STD */
 #include <stdlib.h>
 #include <unistd.h> //symlink() 
 #include <sys/stat.h> // mkdir()
 
 #include <sys/vfs.h>
 #include <mntent.h>
 #include <errno.h>
 
@@ -19,60 +25,60 @@ static void createSymlinks( const QString &location, const QString &package )
 {
 
     QFile inFile( location + "/usr/lib/ipkg/info/" + package + ".list" );
     mkdir( "/usr/lib/ipkg", 0777 );
     mkdir( listDir, 0777 );
 
     QFile outFile( listDir + package + ".list");
 
-//    qDebug( "createSymlinks %s -> %s", inFile.name().ascii(), outFile.name().ascii() );
+//    odebug << "createSymlinks " << inFile.name().ascii() << " -> " << outFile.name().ascii() << "" << oendl;
     
 
     
     if ( inFile.open(IO_ReadOnly) && outFile.open(IO_WriteOnly)) {   
 	QTextStream in(&inFile);
 	QTextStream out(&outFile);
 
 	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() ) {
 		    if (symlink( (location+s).ascii(), s.ascii() ) != 0){
 			if (errno == ENOENT){
 //			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;
 		}
 	    }
 	}
 	inFile.close();
 	outFile.close();
     }
 }
 
@@ -83,24 +89,24 @@ static void removeSymlinks( const QString &package )
     QFile inFile( listDir + package + ".list" );
 
     if ( inFile.open(IO_ReadOnly) ) {   
 	QTextStream in(&inFile);
 
 	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();
 	inFile.remove();
     }
 }
 
 
@@ -126,25 +132,25 @@ static void updateSymlinks()
     if ( mntfp ) {
 	while ( (me = getmntent( mntfp )) != 0 ) {
 	    QString root = me->mnt_dir;
 	    if ( root == "/" ) 
 		continue;
 
 	    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 );
 		QFileInfo *fi;
 		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
 			createSymlinks( root, fi->baseName() );
 		    }
 		    
 		}		
 		
@@ -170,10 +176,10 @@ int main( int argc, char *argv[] )
     
     if ( command == "update" ) // No tr
 	updateSymlinks();
     else if ( command == "create" && argc > 3 ) // No tr
 	createSymlinks( argv[2], argv[3] );
     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
@@ -4,12 +4,12 @@ DESTDIR		= $(OPIEDIR)/bin
 
 HEADERS		= 
 SOURCES		= main.cpp
 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
@@ -13,36 +13,43 @@
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
+#include "dropins.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+
+/* QT */
 #include <qpainter.h>
 #include <qstrlist.h>
 #include <qtimer.h>
 #include <qguardedptr.h>
 #include <qcopchannel_qws.h>
 #define QTOPIA_INTERNAL_INITAPP
 
 #ifdef private
 #       undef  private
 #endif
 #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;
 
 static QPEApplication *app = 0;
 static PluginLoader *loader = 0;
 static ApplicationInterface *appIface = 0;
 static QGuardedPtr<QWidget> mainWindow;
 
@@ -106,40 +113,40 @@ public:
 	}
 	if ( mainWindow ) {
 	    if ( mainWindow->metaObject()->slotNames().contains("setDocument(const QString&)") ) {
 		app->showMainDocumentWidget( mainWindow );
 	    } else {
 		app->showMainWidget( mainWindow );
 	    }
 	} else {
-	    qWarning( "Could not create application main window" );
+        owarn << "Could not create application main window" << oendl;
 	    exit(-1);
 	}
     }
 
 private slots:
     void message(const QCString &msg, const QByteArray & data)
     {
 	QStrList argList;
 
 	if ( msg == "execute(QStrList)" ) {
 	    delete qlChannel;
 	    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)" ) {
 	    delete qlChannel;
 	    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 );
 	    delete this;
 	}
     }
 
 private:
@@ -175,17 +182,17 @@ int main( int argc, char** argv )
 
     unsetenv( "LD_BIND_NOW" );
 
     QCString arg0 = argv[0];
     int sep = arg0.findRev( '/' );
     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_
 	// Setup to change proc title
 	int i;
 	char **envp = environ;
 	/* Move the environment so we can reuse the memory.
 	 * (Code borrowed from sendmail.) */
@@ -201,17 +208,17 @@ int main( int argc, char** argv )
 
 	argv0 = argv;
 	if (i > 0)
 	    argv_lth = envp[i-1] + strlen(envp[i-1]) - argv0[0];
 	else
 	    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.
 	QFont f( QApplication::font() );
 	f.setWeight( QFont::Bold );
 	QFontMetrics fmb( f );
 	fmb.ascent(); // causes font load.