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
@@ -64,17 +64,17 @@
 
 /*! creates a `TEScreen' of `lines' lines and `columns' columns.
 */
 
 TEScreen::TEScreen(int lines, int columns)
 {
   this->lines   = lines;
   this->columns = columns;
-//  qDebug("Columns %d", columns);
+//  odebug << "Columns " << columns << "" << oendl; 
   
   image      = (ca*) malloc(lines*columns*sizeof(ca));
   tabstops   = NULL; initTabStops();
 
   histCursor = 0;
   horzCursor = 0;
 
   clearSelection();
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
@@ -936,17 +936,17 @@ void TEWidget::setMouseMarks(bool on)
 
 #undef KeyPress
 
 void TEWidget::emitSelection()
 // Paste Clipboard by simulating keypress events
 {
 #ifndef QT_NO_CLIPBOARD
   QString text = QApplication::clipboard()->text();
-        //qDebug(text);
+        //odebug << text << oendl; 
   if ( ! text.isNull())
   {
     text.replace(QRegExp("\n"), "\r");
     QKeyEvent e(QEvent::KeyPress, 0, -1, 0, text);
     emit keyPressedSignal(&e); // expose as a big fat keypress event
     emit clearSelectionSignal();
   }
 #endif
@@ -1023,17 +1023,17 @@ bool TEWidget::eventFilter( QObject *obj, QEvent *e )
         return FALSE; // not us
     if ( e->type() == QEvent::Wheel)  {
         QApplication::sendEvent(scrollbar, e);
     }
 
 #ifdef FAKE_CTRL_AND_ALT
     static bool control = FALSE;
     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;
     if ( e->type() == QEvent::KeyPress || e->type() == QEvent::KeyRelease ) {
         QKeyEvent* ke = (QKeyEvent*)e;
         bool keydown = e->type() == QEvent::KeyPress || ke->isAutoRepeat();
         switch (ke->key()) {
           case Key_F9: // let this be "Control"
               control = keydown;
               e = new QKeyEvent(QEvent::KeyPress, Key_Control, 0, ke->state());
@@ -1062,17 +1062,17 @@ bool TEWidget::eventFilter( QObject *obj, QEvent *e )
     }
 #endif
 
     if ( e->type() == QEvent::KeyPress )  {
         QKeyEvent* ke = (QKeyEvent*)e;
         actSel=0; // Key stroke implies a screen update, so TEWidget won't
           // know where the current selection is.
 
-//     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; 
 
         bool special_function = true;
         switch(ke->key()) {
                   //case 0x201b:  // fn-5
                   //case Key_F1:
           // switch sessions (?)
           // emitText("\\"); // expose  (??)
                   //  break;
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
@@ -146,23 +146,23 @@ void CommandEditDialog::accept()
 int i = 0;
   Config *cfg = new Config("Konsole");
   cfg->setGroup("Commands");
   cfg->clearGroup();
 
     QListViewItemIterator it( m_PlayListSelection );
 
     for ( ; it.current(); ++it ) {
-//    qDebug(it.current()->text(0));
+//    odebug << it.current()->text(0) << oendl; 
     cfg->writeEntry(QString::number(i),it.current()->text(0));
     i++;
 
     }
     cfg->writeEntry("Commands Set","TRUE");
-//    qDebug("CommandEditDialog::accept() - written");
+//    odebug << "CommandEditDialog::accept() - written" << oendl; 
     delete cfg;
     emit commandsEdited();
     close();
 
 
 
 
 
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
@@ -24,16 +24,17 @@
 
 #include <stdlib.h>
 #include <sys/types.h>
 #include <pwd.h>
 #include <unistd.h>
 
 #ifdef  QT_QWS_OPIE
 #include <opie2/ocolorpopupmenu.h>
+#include <opie2/odebug.h>
 using namespace Opie;
 #endif
 
 #include <qpe/resource.h>
 
 #include <qmenubar.h>
 #include <qtabbar.h>
 #include <qpe/config.h>
@@ -199,30 +200,30 @@ static const char *commonCmds[] =
         */
 
         "exit",
         NULL
     };
 
 
 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
 
 
 //  QPEApplication::grabKeyboard(); // for CTRL and ALT
 
-    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
 #endif
 
     *shell = getenv("SHELL");
-    qWarning("SHell initially is %s", *shell );
+    owarn << "SHell initially is " << *shell << "" << oendl;
 
     if (shell == NULL || *shell == '\0') {
         struct passwd *ent = 0;
         uid_t me = getuid();
         *shell = "/bin/sh";
 
         while ( (ent = getpwent()) != 0 ) {
             if (ent->pw_uid == me) {
@@ -230,17 +231,17 @@ static void konsoleInit(const char** shell) {
                     *shell = ent->pw_shell;
                 break;
             }
         }
         endpwent();
     }
 
     if( putenv((char*)"COLORTERM=") !=0)
-        qDebug("putenv failed"); // to trigger mc's color detection
+        odebug << "putenv failed" << oendl;  // to trigger mc's color detection
 }
 
 
 Konsole::Konsole(QWidget* parent, const char* name, WFlags fl) :
         QMainWindow(parent, name, fl)
 {
     QStrList tmp; const char* shell;
 
@@ -276,17 +277,17 @@ class HistoryList : public QList<HistoryItem>
         if (c1 < c2)
             return(-1);
         return(0);
     }
 };
 
 void Konsole::initCommandList()
 {
-    //    qDebug("Konsole::initCommandList");
+    //    odebug << "Konsole::initCommandList" << oendl;
     Config cfg( "Konsole" );
     cfg.setGroup("Commands");
     //    commonCombo->setInsertionPolicy(QComboBox::AtCurrent);
     commonCombo->clear();
 
     if (cfg.readEntry("ShellHistory","TRUE") == "TRUE")
     {
         QString histfilename = QString(getenv("HOME")) + "/.bash_history";
@@ -508,17 +509,17 @@ void Konsole::init(const char* _pgm, QStrList & _args)
     menuToolBar = new QToolBar( this );
     menuToolBar->setHorizontalStretchable( TRUE );
 
     QMenuBar *menuBar = new QMenuBar( menuToolBar );
 
     setFont(cfont);
 
     configMenu = new QPopupMenu( this);
-    colorMenu = new QPopupMenu( this); 
+    colorMenu = new QPopupMenu( this);
    scrollMenu = new QPopupMenu( this);
     editCommandListMenu = new QPopupMenu( this);
 
     configMenu->insertItem(tr("Command List"), editCommandListMenu);
 
     bool listHidden;
     cfg.setGroup("Menubar");
     if( cfg.readEntry("Hidden","FALSE") == "TRUE")
@@ -1062,17 +1063,17 @@ QSize Konsole::calcSize(int columns, int lines)
 
 /**
     sets application window to a size based on columns X lines of the te
     guest widget. Call with (0,0) for setting default size.
 */
 
 void Konsole::setColLin(int columns, int lines)
 {
-    qDebug("konsole::setColLin:: Columns %d", columns);
+    odebug << "konsole::setColLin:: Columns " << columns << "" << oendl;
 
     if ((columns==0) || (lines==0))
     {
         if (defaultSize.isEmpty()) // not in config file : set default value
         {
             defaultSize = calcSize(80,24);
             // notifySize(24,80); // set menu items (strange arg order !)
         }
@@ -1110,17 +1111,17 @@ void Konsole::setFont(int fontno)
   n_font = fontno;
 }
 */
 
 // --| color selection |-------------------------------------------------------
 
 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();
     //   if (te != 0) {
     //   setColLin(columns,te->Lines());
     //   te->update();
     //   }
 }
 
 //FIXME: If a child dies during session swap,
@@ -1408,17 +1409,17 @@ void Konsole::colorMenuIsSelected(int iD)
 
 /// -------------------------------   some new stuff by L.J. Potter
 
 
 void Konsole::colorMenuSelected(int iD)
 {
     // this is NOT pretty, elegant or anything else besides functional
     //       QString temp;
-    //      qDebug( temp.sprintf("colormenu %d", iD));
+    //      odebug << temp.sprintf("colormenu " << iD) << "" << oendl;
 
     TEWidget* te = getTe();
     Config cfg( "Konsole" );
     cfg.setGroup("Colors");
 
     ColorEntry m_table[TABLE_COLORS];
     const ColorEntry * defaultCt=te->getdefaultColorTable();
 
@@ -1524,17 +1525,17 @@ void Konsole::colorMenuSelected(int iD)
         background.setRgb(0x00,0x00,0x00);
         foreground.setRgb(255,215,105);
         colorMenu->setItemChecked(cm_ab,TRUE);
     }
 #ifdef QT_QWS_OPIE
     if(iD==-19)
     {
         // Custom
-        qDebug("do custom");
+        odebug << "do custom" << oendl;
         if(fromMenu)
         {
             Opie::OColorPopupMenu* penColorPopupMenu = new Opie::OColorPopupMenu(Qt::black, this, "foreground color");
             connect(penColorPopupMenu, SIGNAL(colorSelected(const QColor&)), this,
                     SLOT(changeForegroundColor(const QColor&)));
             penColorPopupMenu->exec();
         }
         if(!fromMenu)
@@ -1629,17 +1630,17 @@ void Konsole::tabMenuSelected(int id)
     tabMenu->setItemChecked(id, true);
     tabPos = id;
 }
 
 
 void Konsole::configMenuSelected(int iD)
 {
     //      QString temp;
-    //      qDebug( temp.sprintf("configmenu %d",iD));
+    //      odebug << temp.sprintf("configmenu " << iD) << "" << oendl;
 
     TEWidget* te = getTe();
     Config cfg( "Konsole" );
     cfg.setGroup("Menubar");
     if(iD == cm_wrap)
     {
         cfg.setGroup("ScrollBar");
         bool b=cfg.readBoolEntry("HorzScroll",0);
@@ -1699,17 +1700,17 @@ void Konsole::setColor(int sess)
                                        cfg.readNumEntry("backgroundGreen",0)),
                       cfg.readNumEntry("backgroundBlue"+ss,
                                        cfg.readNumEntry("backgroundBlue",0)));
     setColors(foreground, background);
 }
 
 void Konsole::scrollMenuSelected(int index)
 {
-    //    qDebug( "scrollbar menu %d",index);
+    //    odebug << "scrollbar menu " << index << "" << oendl;
 
     TEWidget* te = getTe();
     Config cfg( "Konsole" );
     cfg.setGroup("ScrollBar");
 
     if(index == sm_none)
     {
         te->setScrollbarLocation(0);
@@ -1743,17 +1744,17 @@ void Konsole::scrollMenuSelected(int index)
 //           }
 //           te->setScrollbarLocation( cfg.readNumEntry("Position",2));
 //       }
 //         break;
 
 void Konsole::editCommandListMenuSelected(int iD)
 {
     //      QString temp;
-    //      qDebug( temp.sprintf("edit command list %d",iD));
+    //      odebug << temp.sprintf("edit command list " << iD) << "" << oendl;
 
     // FIXME: more cleanup needed here
 
 
     TEWidget* te = getTe();
     Config cfg( "Konsole" );
     cfg.setGroup("Menubar");
     if( iD  == ec_cmdlist)
@@ -1784,17 +1785,17 @@ void Konsole::editCommandListMenuSelected(int iD)
                 configMenu->setItemChecked(ec_edit,FALSE);
                 commonCombo->setEditable( FALSE );
             }
         }
     }
     if( iD  == ec_quick)
     {
         cfg.setGroup("Commands");
-        //        qDebug("enableCommandEdit");
+        //        odebug << "enableCommandEdit" << oendl;
         if( !configMenu->isItemChecked(iD) )
         {
             commonCombo->setEditable( TRUE );
             configMenu->setItemChecked(iD,TRUE);
             commonCombo->setCurrentItem(0);
             cfg.writeEntry("EditEnabled","TRUE");
         }
         else
@@ -1872,40 +1873,40 @@ void Konsole::changeForegroundColor(const QColor &color)
 {
     Config cfg( "Konsole" );
     cfg.setGroup("Colors");
     int r, g, b;
     color.rgb(&r,&g,&b);
     foreground.setRgb(r,g,b);
 
     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
 
     Opie::OColorPopupMenu* penColorPopupMenu2 = new Opie::OColorPopupMenu(Qt::black, this,"background color");
     connect(penColorPopupMenu2, SIGNAL(colorSelected(const QColor&)), this,
             SLOT(changeBackgroundColor(const QColor&)));
     penColorPopupMenu2->exec();
 #endif
 }
 
 void Konsole::changeBackgroundColor(const QColor &color)
 {
 
-    qDebug("Change background");
+    odebug << "Change background" << oendl;
     Config cfg( "Konsole" );
     cfg.setGroup("Colors");
     int r, g, b;
     color.rgb(&r,&g,&b);
     background.setRgb(r,g,b);
     cfg.writeEntry("background",color.name());
-    qDebug("background "+color.name());
+    odebug << "background "+color.name() << oendl;
     cfg.write();
 }
 
 void Konsole::doWrap()
 {
     Config cfg( "Konsole" );
     cfg.setGroup("ScrollBar");
     TEWidget* te = getTe();
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
@@ -40,22 +40,22 @@ OPIE_EXPORT_APP( OApplicationFactory<Konsole> )
 #include <stdlib.h>
 
 #include <pwd.h>
 #include <sys/types.h>
 
 
 /* --| main |------------------------------------------------------ */
                 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
 
                 QPEApplication a( argc, argv );
 #ifdef FAKE_CTRL_AND_ALT
-    qDebug("Fake Ctrl and Alt defined");
+    odebug << "Fake Ctrl and Alt defined" << oendl; 
                 QPEApplication::grabKeyboard(); // for CTRL and ALT
 #endif
 
                 QStrList tmp;
                 const char* shell = getenv("SHELL");
 
                 if (shell == NULL || *shell == '\0') {
                                 struct passwd *ent = 0;
@@ -68,17 +68,17 @@ OPIE_EXPORT_APP( OApplicationFactory<Konsole> )
                                                                                 shell = ent->pw_shell;
                                                                 break;
                                                 }
                                 }
                                 endpwent();
                 }
 
                 if( putenv((char*)"COLORTERM=") !=0)
-                                qDebug("putenv failed"); // to trigger mc's color detection
+                                odebug << "putenv failed" << oendl;  // to trigger mc's color detection
 
                 Konsole m( "test", shell, tmp, TRUE  );
                 m.setCaption( Konsole::tr("Terminal") );
                 a.showMainWidget( &m );
 
                 return a.exec();
 }
 
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
@@ -12,24 +12,27 @@
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** 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 <qheader.h>
 
 #include "playlistselection.h"
 
-#include <stdlib.h>
-
+/* OPIE */
+#include <opie2/odebug.h>
 
+/* Qt */
+#include <qheader.h>
 
+/* STD */
+#include <stdlib.h>
 
 
 PlayListSelection::PlayListSelection( QWidget *parent, const char *name )
     : QListView( parent, name )
 {
     setAllColumnsShowFocus( TRUE );
     addColumn( tr( "Command Selection" ) );
     header()->hide();
@@ -76,17 +79,17 @@ void PlayListSelection::addStringToSelection (const QString & lnk) {
     QListViewItem *current = selectedItem();
     if ( current )
         item->moveItem( current );
     setSelected( item, TRUE );
     ensureItemVisible( selectedItem() );
 
 }
 void PlayListSelection::removeSelected() {
-    qDebug("removeSelected()");
+    odebug << "removeSelected()" << oendl;
     QListViewItem *item = selectedItem();
     if ( item )
   delete item;
     setSelected( currentItem(), TRUE );
     ensureItemVisible( selectedItem() );
 }