6 files changed, 38 insertions, 34 deletions

diff --git a/core/apps/embeddedkonsole/TEScreen.cpp b/core/apps/embeddedkonsole/TEScreen.cpp
index 3dbcec2..8e69a88 100644
--- a/core/apps/embeddedkonsole/TEScreen.cpp
+++ b/core/apps/embeddedkonsole/TEScreen.cpp
@@ -71,3 +71,3 @@ TEScreen::TEScreen(int lines, int columns)
   this->columns = columns;
-//  qDebug("Columns %d", columns);
+//  odebug << "Columns " << columns << "" << oendl; 
   
diff --git a/core/apps/embeddedkonsole/TEWidget.cpp b/core/apps/embeddedkonsole/TEWidget.cpp
index 93348f4..3cb1c0a 100644
--- a/core/apps/embeddedkonsole/TEWidget.cpp
+++ b/core/apps/embeddedkonsole/TEWidget.cpp
@@ -943,3 +943,3 @@ void TEWidget::emitSelection()
   QString text = QApplication::clipboard()->text();
-        //qDebug(text);
+        //odebug << text << oendl; 
   if ( ! text.isNull())
@@ -1030,3 +1030,3 @@ bool TEWidget::eventFilter( QObject *obj, QEvent *e )
     static bool alt = FALSE;
-//    qDebug(" Has a keyboard with no CTRL and ALT keys, but we fake it:");
+//    odebug << " Has a keyboard with no CTRL and ALT keys, but we fake it:" << oendl; 
     bool dele=FALSE;
@@ -1069,3 +1069,3 @@ bool TEWidget::eventFilter( QObject *obj, QEvent *e )
 
-//     qDebug("key pressed is 0x%x, ascii is 0x%x, state %d", ke->key(), ke->ascii(), ke->state());
+//     odebug << "key pressed is 0x" << ke->key() << ", ascii is 0x" << ke->ascii() << ", state " << ke->state() << "" << oendl; 
 
diff --git a/core/apps/embeddedkonsole/commandeditdialog.cpp b/core/apps/embeddedkonsole/commandeditdialog.cpp
index 6587b26..697bf72 100644
--- a/core/apps/embeddedkonsole/commandeditdialog.cpp
+++ b/core/apps/embeddedkonsole/commandeditdialog.cpp
@@ -153,3 +153,3 @@ int i = 0;
     for ( ; it.current(); ++it ) {
-//    qDebug(it.current()->text(0));
+//    odebug << it.current()->text(0) << oendl; 
     cfg->writeEntry(QString::number(i),it.current()->text(0));
@@ -159,3 +159,3 @@ int i = 0;
     cfg->writeEntry("Commands Set","TRUE");
-//    qDebug("CommandEditDialog::accept() - written");
+//    odebug << "CommandEditDialog::accept() - written" << oendl; 
     delete cfg;
diff --git a/core/apps/embeddedkonsole/konsole.cpp b/core/apps/embeddedkonsole/konsole.cpp
index 8207f23..80c8223 100644
--- a/core/apps/embeddedkonsole/konsole.cpp
+++ b/core/apps/embeddedkonsole/konsole.cpp
@@ -31,2 +31,3 @@
 #include <opie2/ocolorpopupmenu.h>
+#include <opie2/odebug.h>
 using namespace Opie;
@@ -206,4 +207,4 @@ static const char *commonCmds[] =
 static void konsoleInit(const char** shell) {
-    if(setuid(getuid()) !=0) qDebug("setuid failed");
-    if(setgid(getgid()) != 0) qDebug("setgid failed"); // drop privileges
+    if(setuid(getuid()) !=0) odebug << "setuid failed" << oendl;
+    if(setgid(getgid()) != 0) odebug << "setgid failed" << oendl;  // drop privileges
 
@@ -212,5 +213,5 @@ static void konsoleInit(const char** shell) {
 
-    qDebug("keyboard grabbed");
+    odebug << "keyboard grabbed" << oendl;
 #ifdef FAKE_CTRL_AND_ALT
-    qDebug("Fake Ctrl and Alt defined");
+    odebug << "Fake Ctrl and Alt defined" << oendl;
     QPEApplication::grabKeyboard(); // for CTRL and ALT
@@ -219,3 +220,3 @@ static void konsoleInit(const char** shell) {
     *shell = getenv("SHELL");
-    qWarning("SHell initially is %s", *shell );
+    owarn << "SHell initially is " << *shell << "" << oendl;
 
@@ -237,3 +238,3 @@ static void konsoleInit(const char** shell) {
     if( putenv((char*)"COLORTERM=") !=0)
-        qDebug("putenv failed"); // to trigger mc's color detection
+        odebug << "putenv failed" << oendl;  // to trigger mc's color detection
 }
@@ -283,3 +284,3 @@ void Konsole::initCommandList()
 {
-    //    qDebug("Konsole::initCommandList");
+    //    odebug << "Konsole::initCommandList" << oendl;
     Config cfg( "Konsole" );
@@ -515,3 +516,3 @@ void Konsole::init(const char* _pgm, QStrList & _args)
     configMenu = new QPopupMenu( this);
-    colorMenu = new QPopupMenu( this); 
+    colorMenu = new QPopupMenu( this);
    scrollMenu = new QPopupMenu( this);
@@ -1069,3 +1070,3 @@ void Konsole::setColLin(int columns, int lines)
 {
-    qDebug("konsole::setColLin:: Columns %d", columns);
+    odebug << "konsole::setColLin:: Columns " << columns << "" << oendl;
 
@@ -1117,3 +1118,3 @@ void Konsole::changeColumns(int /*columns*/)
 { //FIXME this seems to cause silliness when reset command is executed
-    //     qDebug("change columns");
+    //     odebug << "change columns" << oendl;
     //   TEWidget* te = getTe();
@@ -1415,3 +1416,3 @@ void Konsole::colorMenuSelected(int iD)
     //       QString temp;
-    //      qDebug( temp.sprintf("colormenu %d", iD));
+    //      odebug << temp.sprintf("colormenu " << iD) << "" << oendl;
 
@@ -1531,3 +1532,3 @@ void Konsole::colorMenuSelected(int iD)
         // Custom
-        qDebug("do custom");
+        odebug << "do custom" << oendl;
         if(fromMenu)
@@ -1636,3 +1637,3 @@ void Konsole::configMenuSelected(int iD)
     //      QString temp;
-    //      qDebug( temp.sprintf("configmenu %d",iD));
+    //      odebug << temp.sprintf("configmenu " << iD) << "" << oendl;
 
@@ -1706,3 +1707,3 @@ void Konsole::scrollMenuSelected(int index)
 {
-    //    qDebug( "scrollbar menu %d",index);
+    //    odebug << "scrollbar menu " << index << "" << oendl;
 
@@ -1750,3 +1751,3 @@ void Konsole::editCommandListMenuSelected(int iD)
     //      QString temp;
-    //      qDebug( temp.sprintf("edit command list %d",iD));
+    //      odebug << temp.sprintf("edit command list " << iD) << "" << oendl;
 
@@ -1791,3 +1792,3 @@ void Konsole::editCommandListMenuSelected(int iD)
         cfg.setGroup("Commands");
-        //        qDebug("enableCommandEdit");
+        //        odebug << "enableCommandEdit" << oendl;
         if( !configMenu->isItemChecked(iD) )
@@ -1879,6 +1880,6 @@ void Konsole::changeForegroundColor(const QColor &color)
     cfg.writeEntry("foreground",color.name());
-    qDebug("foreground "+color.name());
+    odebug << "foreground "+color.name() << oendl;
     cfg.write();
 
-    qDebug("do other dialog");
+    odebug << "do other dialog" << oendl;
 #ifdef QT_QWS_OPIE
@@ -1895,3 +1896,3 @@ void Konsole::changeBackgroundColor(const QColor &color)
 
-    qDebug("Change background");
+    odebug << "Change background" << oendl;
     Config cfg( "Konsole" );
@@ -1902,3 +1903,3 @@ void Konsole::changeBackgroundColor(const QColor &color)
     cfg.writeEntry("background",color.name());
-    qDebug("background "+color.name());
+    odebug << "background "+color.name() << oendl;
     cfg.write();
diff --git a/core/apps/embeddedkonsole/main.cpp b/core/apps/embeddedkonsole/main.cpp
index b851d3e..131e782 100644
--- a/core/apps/embeddedkonsole/main.cpp
+++ b/core/apps/embeddedkonsole/main.cpp
@@ -47,4 +47,4 @@ OPIE_EXPORT_APP( OApplicationFactory<Konsole> )
                 int main(int argc, char* argv[]) {
-                if(setuid(getuid()) !=0) qDebug("setuid failed");
-                if(setgid(getgid()) != 0) qDebug("setgid failed"); // drop privileges
+                if(setuid(getuid()) !=0) odebug << "setuid failed" << oendl; 
+                if(setgid(getgid()) != 0) odebug << "setgid failed" << oendl;  // drop privileges
 
@@ -52,3 +52,3 @@ OPIE_EXPORT_APP( OApplicationFactory<Konsole> )
 #ifdef FAKE_CTRL_AND_ALT
-    qDebug("Fake Ctrl and Alt defined");
+    odebug << "Fake Ctrl and Alt defined" << oendl; 
                 QPEApplication::grabKeyboard(); // for CTRL and ALT
@@ -75,3 +75,3 @@ OPIE_EXPORT_APP( OApplicationFactory<Konsole> )
                 if( putenv((char*)"COLORTERM=") !=0)
-                                qDebug("putenv failed"); // to trigger mc's color detection
+                                odebug << "putenv failed" << oendl;  // to trigger mc's color detection
 
diff --git a/core/apps/embeddedkonsole/playlistselection.cpp b/core/apps/embeddedkonsole/playlistselection.cpp
index fc5330f..096d36a 100644
--- a/core/apps/embeddedkonsole/playlistselection.cpp
+++ b/core/apps/embeddedkonsole/playlistselection.cpp
@@ -19,3 +19,2 @@
 **********************************************************************/
-#include <qheader.h>
 
@@ -23,6 +22,10 @@
 
-#include <stdlib.h>
-
+/* OPIE */
+#include <opie2/odebug.h>
 
+/* Qt */
+#include <qheader.h>
 
+/* STD */
+#include <stdlib.h>
 
@@ -83,3 +86,3 @@ void PlayListSelection::addStringToSelection (const QString & lnk) {
 void PlayListSelection::removeSelected() {
-    qDebug("removeSelected()");
+    odebug << "removeSelected()" << oendl;
     QListViewItem *item = selectedItem();