64 files changed, 432 insertions, 339 deletions
diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index a60d6ce..a47edd8 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -68,13 +68,13 @@ void AdvancedFm::cleanUp() {
   QFile file( sfile);
   if(file.exists())
      file.remove();
 }
 void AdvancedFm::tabChanged(QWidget *) {
-//   qWarning("tab changed");
+//   owarn << "tab changed" << oendl; 
   QString path = CurrentDir()->canonicalPath();
   currentPathCombo->lineEdit()->setText( path );
   if(whichTab == 1) {
      viewMenu->setItemChecked(viewMenu->idAt(0), true);
      viewMenu->setItemChecked(viewMenu->idAt(1), false);
@@ -90,19 +90,19 @@ void AdvancedFm::tabChanged(QWidget *) {
   chdir( path.latin1());
 }
 void AdvancedFm::populateView() {
-// qWarning("PopulateView");
+// owarn << "PopulateView" << oendl; 
        QPixmap pm;
        QListView *thisView = CurrentView();
        QDir *thisDir = CurrentDir();
        QString path = thisDir->canonicalPath();
-//qWarning("path is "+path);
+//owarn << "path is "+path << oendl; 
        thisView->clear();
        thisDir->setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
        thisDir->setMatchAllDirs(TRUE);
        thisDir->setNameFilter(filterStr);
        QString fileL, fileS, fileDate;
        QString fs= getFileSystemType((const QString &) path);
@@ -157,13 +157,13 @@ void AdvancedFm::populateView() {
                                pm=mt.pixmap(); //sets the correct pixmap for mimetype
                                if(pm.isNull()) {
                                        pm = unknownXpm;
                                }
                        }
                        if(  fi->isSymLink() || fileL.find("->",0,TRUE) != -1) {
-                                    //  qDebug(" overlay link image");
+                                    //  odebug << " overlay link image" << oendl; 
                                pm= Resource::loadPixmap( "advancedfm/symlink" );
                                    //              pm= Resource::loadPixmap( "folder" );
 //                QPixmap lnk = Resource::loadPixmap( "opie/symlink" );
 //                QPainter painter( &pm );
 //                painter.drawPixmap( pm.width()-lnk.width(), pm.height()-lnk.height(), lnk );
 //                pm.setMask( pm.createHeuristicMask( FALSE ) );
@@ -181,13 +181,13 @@ void AdvancedFm::populateView() {
                DIR *dir;
                struct dirent *mydirent;
                if((dir = opendir( path.latin1())) != NULL)
                        while ((mydirent = readdir(dir)) != NULL) {
                                lstat( mydirent->d_name, &buf);
-//        qDebug(mydirent->d_name);
+//        odebug << mydirent->d_name << oendl; 
                                fileL.sprintf("%s", mydirent->d_name);
                                devT = buf.st_dev;
                                fileS.sprintf("%d, %d", (int) ( devT >>8) &0xFF, (int)devT &0xFF);
                                fileDate.sprintf("%s", ctime( &buf.st_mtime));
                                if( fileL.find(".") == -1 ) {
                                        item= new QListViewItem( thisView, fileL, fileS, fileDate);
@@ -206,26 +206,26 @@ void AdvancedFm::populateView() {
 void AdvancedFm::rePopulate() {
     populateView();
     setOtherTabCurrent();
     populateView();
 //      int tmpTab = whichTab;
-// //  qDebug("%d", tmpTab);
+// //  odebug << "" << tmpTab << "" << oendl; 
 //    for(int i =1; i < 3; i++) {
 //       TabWidget->setCurrentWidget(i - 1);
 //       populateView();
 //    }
 //    TabWidget->setCurrentWidget( tmpTab - 1);
 }
 void AdvancedFm::ListClicked(QListViewItem *selectedItem) {
-//qWarning("listclicked");
+//owarn << "listclicked" << oendl; 
   if(selectedItem) {
      QString strItem=selectedItem->text(0);
-//      qWarning(strItem);
+//      owarn << strItem << oendl; 
      QString strSize=selectedItem->text(1);
      strSize=strSize.stripWhiteSpace();
      bool isDirectory = false;
      QString strItem2;
      if(strItem.find("@",0,TRUE) !=-1 || strItem.find("->",0,TRUE) !=-1 ) {//if symlink
@@ -264,19 +264,19 @@ void AdvancedFm::ListPressed( int mouse, QListViewItem *item, const QPoint& , in
      break;
   };
 }
 void AdvancedFm::switchToLocalTab() {
-//qWarning("switch to local view");
+//owarn << "switch to local view" << oendl; 
   TabWidget->setCurrentWidget(0);
   Local_View->setFocus();
 }
 void AdvancedFm::switchToRemoteTab() {
-//qWarning("switch to local view");
+//owarn << "switch to local view" << oendl; 
   TabWidget->setCurrentWidget(1);
   Remote_View->setFocus();
 }
 void AdvancedFm::readConfig() {
   Config cfg("AdvancedFm");
@@ -326,13 +326,13 @@ QStringList AdvancedFm::getPath() {
   QListView *thisView=CurrentView();
   QList<QListViewItem> * getSelectedItems( QListView * thisView );
   QListViewItemIterator it( thisView );
   for ( ; it.current(); ++it ) {
      if ( it.current()->isSelected() ) {
         strList <<  it.current()->text(0);
-//        qDebug(it.current()->text(0));
+//        odebug << it.current()->text(0) << oendl; 
      }
   }
   return strList;
 }
 void AdvancedFm::homeButtonPushed() {
@@ -377,13 +377,13 @@ void AdvancedFm::doAbout() {
                                        "is copyright 2002-2003 by\n"
                                        "L.J.Potter<llornkcor@handhelds.org>\n"
                                        "and is licensed by the GPL"));
 }
 void AdvancedFm::keyPressEvent( QKeyEvent *e) {
-//   qWarning("key %d", e->key());
+//   owarn << "key " << e->key() << "" << oendl; 
 //   if( CurrentView()->hasFocus()  )
   {
      switch ( e->key() ) {
      case Key_Left:
         upDir();
         break;
@@ -635,13 +635,13 @@ void AdvancedFm::addToDocs() {
   QDir *thisDir = CurrentDir();
   if( strListPaths.count() > 0) {
      QString curFile;
      for ( QStringList::Iterator it = strListPaths.begin(); it != strListPaths.end(); ++it ) {
         curFile = thisDir->canonicalPath()+"/"+(*it);
-//                qDebug(curFile);
+//                odebug << curFile << oendl; 
         QFileInfo fi(curFile);
         DocLnk f;
 //                curFile.replace(QRegExp("\\..*"),"");
         f.setName(fi.baseName() );
         f.setFile( curFile);
         f.writeLink();
@@ -708,13 +708,13 @@ void AdvancedFm::addCustomDir() {
   cfg.writeEntry("CustomDir", list, ',');
   cfg.write();
 }
 void AdvancedFm::removeCustomDir() {
-//  qDebug("remove custom dir");
+//  odebug << "remove custom dir" << oendl; 
   Config cfg("AdvancedFm");
   cfg.setGroup("Menu");
   QString dir;
   QStringList list = cfg.readListEntry( (const QString &)"CustomDir", (const QChar)',');
   QStringList list2;
   dir =  CurrentDir()->canonicalPath();
@@ -743,13 +743,13 @@ void AdvancedFm::removeCustomDir() {
   }
 //    customDirsToMenu();
 }
 void AdvancedFm::gotoCustomDir(const QString &dir) {
-//     qDebug("gotoCustomDir(const QString &dir) " +dir );
+//     odebug << "gotoCustomDir(const QString &dir) " +dir << oendl; 
 //  QString curDir = dir;
 //  QDir *thisDir = CurrentDir();
 //     if( curDir.isEmpty()) {
 //     }
   if( dir == s_addBookmark) {
      addCustomDir();
@@ -784,56 +784,56 @@ QDir *AdvancedFm::OtherDir() {
      return &currentDir;
   }
 }
 QListView * AdvancedFm::CurrentView() {
   if ( whichTab == 1) {
-//      qWarning("CurrentView Tab 1");
+//      owarn << "CurrentView Tab 1" << oendl; 
      return Local_View;
   } else {
-//      qWarning("CurrentView Tab 2");
+//      owarn << "CurrentView Tab 2" << oendl; 
      return Remote_View;
   }
 }
 QListView * AdvancedFm::OtherView() {
   if ( whichTab == 1)
      return Remote_View;
   else
      return Local_View;
 }
 void AdvancedFm::setOtherTabCurrent() {
-//   qWarning("setOtherTabCurrent() %d", whichTab);
+//   owarn << "setOtherTabCurrent() " << whichTab << "" << oendl; 
   if ( whichTab == 1) {
      TabWidget->setCurrentWidget(1);
   } else {
      TabWidget->setCurrentWidget(0);
   }
   OtherView()->setFocus();
   OtherView()->setSelected( CurrentView()->firstChild(), true);
 }
 void AdvancedFm::qcopReceive(const QCString &msg, const QByteArray &data) {
-//   qDebug("qcop message "+msg );
+//   odebug << "qcop message "+msg << oendl; 
   QDataStream stream ( data, IO_ReadOnly );
   if ( msg == "openDirectory(QString)" ) {
-//      qDebug("received");
+//      odebug << "received" << oendl; 
      QString file;
      stream >> file;
      gotoDirectory( (const QString &) file);
   }
 }
 void AdvancedFm::setDocument(const QString &file) {
   gotoDirectory( file);
 }
 void AdvancedFm::gotoDirectory(const QString &file) {
-//   qWarning("goto dir "+file);
+//   owarn << "goto dir "+file << oendl; 
   QString curDir = file;
   QDir *thisDir = CurrentDir();
   if(QDir( curDir).exists() )  {
      thisDir->setPath( curDir );
      chdir( curDir.latin1() );
      thisDir->cd( curDir, TRUE);
@@ -863,13 +863,13 @@ void AdvancedFm::findFile(const QString &fileName) {
         thisView->ensureItemVisible(it.current());
      }
   }
 }
 void AdvancedFm::slotSwitchMenu(int ) {
-//   qDebug("Switch %d", item);
+//   odebug << "Switch " << item << "" << oendl; 
   //   viewMenu->setItemChecked(item, true);
 }
 void AdvancedFm::dealWithSchmooSchmaa(QWidget *w) {
   tabChanged( w);
   if( w == Local_View) {
diff --git a/noncore/apps/advancedfm/advancedfm.pro b/noncore/apps/advancedfm/advancedfm.pro
index 716343d..f1c518e 100644
--- a/noncore/apps/advancedfm/advancedfm.pro
+++ b/noncore/apps/advancedfm/advancedfm.pro
@@ -1,35 +1,15 @@
 TEMPLATE  = app
 CONFIG    += qt warn_on  quick-app
-# CONFIG    += qt warn_on 
 HEADERS   = advancedfm.h filePermissions.h output.h
 SOURCES   = advancedfm.cpp advancedfmData.cpp advancedfmMenu.cpp filePermissions.cpp output.cpp main.cpp
 TARGET    = advancedfm
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS            += -lqpe -lopiecore2 -lopieui2
-TRANSLATIONS = ../../../i18n/de/advancedfm.ts \
-     ../../../i18n/nl/advancedfm.ts \
-     ../../../i18n/da/advancedfm.ts \
-     ../../../i18n/xx/advancedfm.ts \
-   ../../../i18n/en/advancedfm.ts \
-   ../../../i18n/es/advancedfm.ts \
-   ../../../i18n/fr/advancedfm.ts \
-   ../../../i18n/hu/advancedfm.ts \
-   ../../../i18n/ja/advancedfm.ts \
-   ../../../i18n/ko/advancedfm.ts \
-   ../../../i18n/no/advancedfm.ts \
-   ../../../i18n/pl/advancedfm.ts \
-   ../../../i18n/pt/advancedfm.ts \
-   ../../../i18n/pt_BR/advancedfm.ts \
-   ../../../i18n/sl/advancedfm.ts \
-   ../../../i18n/zh_CN/advancedfm.ts \
-   ../../../i18n/zh_TW/advancedfm.ts
 !contains(CONFIG,quick-app) {
 DESTDIR = $(OPIEDIR)/bin
 DEFINES += NOQUICKLAUNCH
 }
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/advancedfm/advancedfmData.cpp b/noncore/apps/advancedfm/advancedfmData.cpp
index 2997c55..29335f8 100644
--- a/noncore/apps/advancedfm/advancedfmData.cpp
+++ b/noncore/apps/advancedfm/advancedfmData.cpp
@@ -8,29 +8,33 @@
 *   it under the terms of the GNU General Public License as published by  *
 *   the Free Software Foundation; either version 2 of the License, or     *
 *   (at your option) any later version.                                   *
 ***************************************************************************/
 #include "advancedfm.h"
+/* OPIE */
+#include <opie2/odebug.h>
 #include <qpe/storage.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <qpe/menubutton.h>
+using namespace Opie::Core;
+using namespace Opie::Ui;
+/* QT */
 #include <qlayout.h>
 #include <qhbox.h>
 #include <qmenubar.h>
 #include <qcombobox.h>
 #include <qtoolbutton.h>
 #include <qlineedit.h>
 #include <qlistview.h>
+/* STD */
 #include <sys/utsname.h>
-using namespace Opie::Ui;
 void AdvancedFm::init() {
         b = false;
         setCaption( tr( "AdvancedFm" ) );
         QVBoxLayout *layout = new QVBoxLayout( this );
         layout->setSpacing( 2);
@@ -216,17 +220,17 @@ void AdvancedFm::init() {
                        zaurusDevice=TRUE;
         else
                        zaurusDevice=FALSE;
         if( !StorageInfo::hasSd() || !StorageInfo::hasMmc()) {
-                        qDebug("not have sd");
+                        odebug << "not have sd" << oendl; 
                        sdButton->hide();
         }
         if( !StorageInfo::hasCf() ) {
-                        qDebug("not have cf");
+                        odebug << "not have cf" << oendl; 
                        cfButton->hide();
         }
         currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
         currentDir.setPath( QDir::currentDirPath());
         currentRemoteDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp
index 81a4318..d34f330 100644
--- a/noncore/apps/advancedfm/advancedfmMenu.cpp
+++ b/noncore/apps/advancedfm/advancedfmMenu.cpp
@@ -6,45 +6,48 @@
    email               : ljp@llornkcor.com
    *   This program is free software; you can redistribute it and/or modify  *
    *   it under the terms of the GNU General Public License as published by  *
    *   the Free Software Foundation; either version 2 of the License, or     *
    *   (at your option) any later version.                                   *
    ***************************************************************************/
 #include "advancedfm.h"
 #include "output.h"
 #include "filePermissions.h"
+/* OPIE */
+#include <opie2/odebug.h>
 #include <qpe/lnkproperties.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/applnk.h>
+using namespace Opie::Core;
-#include <qmessagebox.h>
+/* QT*/
+#include <qmessagebox.h>
 #include <qpopupmenu.h>
 #include <qlistview.h>
+/* STD */
 #include <errno.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <dirent.h>
 #include <sys/sendfile.h>
 #include <fcntl.h>
-using namespace Opie::Core;
-using namespace Opie::Core;
 void AdvancedFm::doDirChange() {
   QString pathItem = CurrentView()->currentItem()->text(0);
   if( pathItem == "../") {
      ListClicked( CurrentView()->currentItem());
   } else {
      if( pathItem.find(" -> ",0,TRUE) != -1)
         pathItem = dealWithSymName((const QString&)pathItem)+"/";
-//      qWarning(pathItem);
+//      owarn << pathItem << oendl; 
      gotoDirectory( CurrentDir()->path()+"/"+pathItem.left( pathItem.length() - 1) );
   }
 }
 void AdvancedFm::showMenuHidden() {
  if (b) {
@@ -89,25 +92,25 @@ void AdvancedFm::runThis() {
    curFile = dealWithSymName((const QString&)curFile);
  if(curFile != "../") {
      fs = getFileSystemType((const QString &) path);
      QFileInfo fileInfo( path  + "/" + curFile);
-//      qDebug( fileInfo.owner());
+//      odebug << fileInfo.owner() << oendl; 
      if( (fileInfo.permission( QFileInfo::ExeUser)
           | fileInfo.permission( QFileInfo::ExeGroup)
           | fileInfo.permission( QFileInfo::ExeOther)) // & fs.find("vfat",0,TRUE) == -1) {
          | fs == "vfat" && fileInfo.filePath().contains("/bin") ) {
        QCopEnvelope e("QPE/System", "execute(QString)" );
        e << curFile;
      } else {
          curFile =  path + "/" + curFile;
          DocLnk nf(curFile);
          QString execStr = nf.exec();
-//          qDebug( execStr);
+//          odebug << execStr << oendl; 
          if( execStr.isEmpty() ) {
            } else {
              nf.execute();
            }
        }
    }
@@ -199,18 +202,18 @@ void AdvancedFm::doDelete() {
            }
            QString cmd="rm "+f;
            QFile file(f);
            QFileInfo fi(myFile);
            if( fi.fileName().find("../",0,TRUE)==-1) {
-//               qDebug("remove link files "+myFile);
+//               odebug << "remove link files "+myFile << oendl; 
 //               DocLnk lnk(f);
                 DocLnk *lnk;
                 lnk = new DocLnk(f);
-//                 qDebug("Deleting doclnk " + lnk->linkFile());
+//                 odebug << "Deleting doclnk " + lnk->linkFile() << oendl; 
                 if(lnk->isValid())
                    lnk->removeLinkFile();
               // delete lnk;
               file.remove();
            }
         }
@@ -240,16 +243,16 @@ void AdvancedFm::doProperties() {
   QStringList curFileList = getPath();
   QString filePath;
   filePath = CurrentDir()->canonicalPath()+"/";
-//   qDebug("%d",curFileList.count());
+//   odebug << "" << curFileList.count() << "" << oendl; 
   for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
-//      qDebug((filePath+*it));
+//      odebug << (filePath+*it) << oendl; 
      DocLnk lnk( (filePath+*it));
      LnkProperties prop( &lnk );
      QPEApplication::execDialog( &prop );
   }
 #endif
@@ -299,14 +302,14 @@ void AdvancedFm::copy() {
         if(item.find("->",0,TRUE)) //symlink
            item = item.left(item.find("->",0,TRUE));
         curFile = thisDir->canonicalPath()+"/"+ item;
         destFile = thatDir->canonicalPath()+"/"+ item;
-//          qDebug("Destination file is "+destFile);
+//          odebug << "Destination file is "+destFile << oendl; 
-//          qDebug("CurrentFile file is " + curFile);
+//          odebug << "CurrentFile file is " + curFile << oendl; 
         QFile f(destFile);
         if( f.exists()) {
            if(doMsg) {
               switch ( QMessageBox::warning(this,tr("File Exists!"),
                                             tr("%1 exists. Ok to overwrite?").arg( item ),
@@ -417,13 +420,13 @@ void AdvancedFm::copySameDir() {
          if(!copyFile( curFile,destFile) )  {
              QMessageBox::message("AdvancedFm",tr("Could not copy\n")
                                   +curFile +tr("to\n")+destFile);
              return;
            }
-//          qDebug("copy "+curFile+" as "+destFile);
+//          odebug << "copy "+curFile+" as "+destFile << oendl; 
        }
      delete fileDlg;
    }
            rePopulate();
 }
@@ -440,19 +443,19 @@ void AdvancedFm::move() {
          item=(*it);
          QString destFile =  thatDir->canonicalPath();
          if(destFile.right(1).find("/",0,TRUE) == -1)
            destFile+="/";
          destFile += item;
-//          qDebug("Destination file is "+destFile);
+//          odebug << "Destination file is "+destFile << oendl; 
          curFile = thisDir->canonicalPath();
          if(curFile.right(1).find("/",0,TRUE) == -1)
                            curFile +="/";
          curFile+= item;
-//          qDebug("CurrentFile file is " + curFile);
+//          odebug << "CurrentFile file is " + curFile << oendl; 
          if(QFileInfo(curFile).isDir()) {
                            moveDirectory( curFile, destFile );
                            rePopulate();
                            return;
          }
@@ -486,13 +489,13 @@ bool AdvancedFm::moveDirectory( const QString & src, const QString & dest ) {
        return true;
 }
 bool AdvancedFm::copyDirectory( const QString & src, const QString & dest ) {
        QString    cmd = "/bin/cp -fpR " + src + " " + dest;
-    qWarning(cmd);
+    owarn << cmd << oendl; 
        int    err = system( (const char *) cmd );
        if ( err != 0 ) {
                QMessageBox::message("AdvancedFm",
                                                         tr( "Could not copy \n%1 \nto \n%2").arg( src ).arg( dest ) );
                return false;
        }
@@ -522,20 +525,20 @@ bool AdvancedFm::copyFile( const QString & src, const QString & dest ) {
        int err=0;
        int read_fd=0;
   int write_fd=0;
   struct stat stat_buf;
   off_t offset = 0;
      if(!srcFile.open( IO_ReadOnly|IO_Raw)) {
-//         qWarning("open failed");
+//         owarn << "open failed" << oendl; 
         return success = false;
   }
   read_fd = srcFile.handle();
   if(read_fd != -1) {
      fstat (read_fd, &stat_buf);
      if( !destFile.open( IO_WriteOnly|IO_Raw ) ) {
-//       qWarning("destfile open failed");
+//       owarn << "destfile open failed" << oendl; 
       return success = false;
      }
      write_fd = destFile.handle();
      if(write_fd != -1) {
         err = sendfile(write_fd, read_fd, &offset, stat_buf.st_size);
           if( err == -1) {
@@ -544,13 +547,13 @@ bool AdvancedFm::copyFile( const QString & src, const QString & dest ) {
              case EBADF : msg = "The input file was not opened for reading or the output file was not opened for writing. ";
              case EINVAL: msg = "Descriptor is not valid or locked. ";
              case ENOMEM: msg = "Insufficient memory to read from in_fd.";
              case EIO: msg = "Unspecified error while reading from in_fd.";
              };
              success = false;
-//              qWarning(msg);
+//              owarn << msg << oendl; 
         }
      } else {
         success = false;
      }
   } else {
      success = false;
@@ -576,13 +579,13 @@ void AdvancedFm::runCommand() {
   fileDlg = new InputDialog(this,tr("Run Command"),TRUE, 0);
   fileDlg->setInputText(curFile);
   fileDlg->exec();
   //QString command;
   if( fileDlg->result() == 1 ) {
-//      qDebug(fileDlg->LineEdit1->text());
+//      odebug << fileDlg->LineEdit1->text() << oendl; 
      QStringList command;
      command << "/bin/sh";
      command << "-c";
      command <<  fileDlg->LineEdit1->text();
      Output *outDlg;
@@ -659,13 +662,13 @@ void AdvancedFm::mkSym() {
          if( curFile.right(1) == "/") {
              curFile = curFile.left( curFile.length() -1);
            }
          cmd = "ln -s "+curFile+" "+destName;
-//          qDebug(cmd);
+//          odebug << cmd << oendl; 
          startProcess( (const QString)cmd );
        }
            rePopulate();
            setOtherTabCurrent();
    }
 }
@@ -712,21 +715,21 @@ void AdvancedFm::startProcess(const QString & cmd) {
  command << "/bin/sh";
  command << "-c";
  command << cmd.latin1();
  *process << command;
  if(!process->start(OProcess::NotifyOnExit, OProcess::All) )
-    qDebug("could not start process");
+    odebug << "could not start process" << oendl; 
 }
 void AdvancedFm::processEnded(OProcess *) {
            rePopulate();
 }
 void AdvancedFm::oprocessStderr(OProcess*, char *buffer, int ) {
-//    qWarning("received stderrt %d bytes", buflen);
+//    owarn << "received stderrt " << buflen << " bytes" << oendl; 
    QString lineStr = buffer;
    QMessageBox::warning( this, tr("Error"), lineStr ,tr("Ok") );
 }
 bool AdvancedFm::eventFilter( QObject * o, QEvent * e ) {
@@ -762,13 +765,13 @@ bool AdvancedFm::eventFilter( QObject * o, QEvent * e ) {
  return QWidget::eventFilter( o, e );
 }
 void AdvancedFm::cancelRename() {
-//  qDebug("cancel rename");
+//  odebug << "cancel rename" << oendl; 
  QListView * view;
  view = CurrentView();
  bool resetFocus = view->viewport()->focusProxy() == renameBox;
  delete renameBox;
  renameBox = 0;
diff --git a/noncore/apps/advancedfm/filePermissions.cpp b/noncore/apps/advancedfm/filePermissions.cpp
index 9698de7..b7d48e8 100644
--- a/noncore/apps/advancedfm/filePermissions.cpp
+++ b/noncore/apps/advancedfm/filePermissions.cpp
@@ -29,13 +29,13 @@
 filePermissions::filePermissions( QWidget* parent,  const char* name, bool modal, WFlags fl, const QString &fileName )
    : QDialog( parent, name, modal, fl )
 {
    if ( !name )
  setName( tr("filePermissions") );
-//    qDebug("FilePermissions "+fileName);
+//    odebug << "FilePermissions "+fileName << oendl; 
 /*    resize( 236, 210 );
    setMaximumSize( QSize( 236, 210 ) );
 */    setCaption( tr( "Set File Permissions" ) );
    TextLabel1 = new QLabel( this, "TextLabel1" );
    TextLabel1->setGeometry( QRect( 25, 5, 175, 20 ) );
diff --git a/noncore/apps/advancedfm/output.cpp b/noncore/apps/advancedfm/output.cpp
index 6906298..8c585f4 100644
--- a/noncore/apps/advancedfm/output.cpp
+++ b/noncore/apps/advancedfm/output.cpp
@@ -2,25 +2,28 @@
 ** outputEdit.cpp
 **
 ** Copyright: Fri Apr 12 15:12:58 2002 L.J. Potter <ljp@llornkcor.com>
 ****************************************************************************/
 #include "output.h"
+/* OPIE */
+#include <opie2/odebug.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/applnk.h>
+using namespace Opie::Core;
+/* QT */
 #include <qfile.h>
 #include <qmultilineedit.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
+/* STD */
 #include <errno.h>
 /* XPM */
-using namespace Opie::Core;
-using namespace Opie::Core;
 static char * filesave_xpm[] = {
 "16 16 78 1",
 "   c None",
 ".  c #343434",
 "+  c #A0A0A0",
 "@  c #565656",
@@ -118,13 +121,13 @@ static char * filesave_xpm[] = {
 Output::Output( const QStringList commands, QWidget* parent,  const char* name, bool modal, WFlags fl)
    : QDialog( parent, name, modal, fl )
 {
   QStringList cmmds;
 //   cmmds=QStringList::split( " ", commands, false);
   cmmds=commands;
-//   qDebug("count %d", cmmds.count());
+//   odebug << "count " << cmmds.count() << "" << oendl; 
   if ( !name )
       setName( tr("Output"));
    resize( 196, 269 );
    setCaption( name );
    OutputLayout = new QGridLayout( this );
@@ -154,13 +157,13 @@ Output::Output( const QStringList commands, QWidget* parent,  const char* name,
 //     connect( , SIGNAL(received(const QByteArray&)),
 //             this, SLOT(commandStdin(const QByteArray&)));
 //    * proc << commands.latin1();
      for ( QStringList::Iterator it = cmmds.begin(); it != cmmds.end(); ++it ) {
-         qDebug( "%s", (*it).latin1() );
+         odebug << "" << (*it).latin1() << "" << oendl; 
         * proc << (*it).latin1();
      }
     if(!proc->start(OProcess::NotifyOnExit, OProcess::All)) {
         OutputEdit->append(tr("Process could not start") );
@@ -183,32 +186,32 @@ void Output::saveOutput() {
    if( fileDlg->result() == 1 ) {
      QString  filename = QPEApplication::documentDir();
      if(filename.right(1).find('/') == -1)
          filename+="/";
      QString name = fileDlg->LineEdit1->text();
      filename+="text/plain/"+name;
-      qDebug(filename);
+      odebug << filename << oendl; 
      QFile f(filename);
      f.open( IO_WriteOnly);
      if( f.writeBlock( OutputEdit->text(), qstrlen( OutputEdit->text()) ) != -1) {
          DocLnk lnk;
          lnk.setName(name); //sets file name
          lnk.setFile(filename); //sets File property
          lnk.setType("text/plain");
          if(!lnk.writeLink()) {
-              qDebug("Writing doclink did not work");
+              odebug << "Writing doclink did not work" << oendl; 
          }
      } else
-          qWarning("Could not write file");
+          owarn << "Could not write file" << oendl; 
      f.close();
    }
 }
 void Output::commandStdout(OProcess*, char *buffer, int buflen) {
-    qWarning("received stdout %d bytes", buflen);
+    owarn << "received stdout " << buflen << " bytes" << oendl; 
 //     QByteArray data(buflen);
 //     data.fill(*buffer, buflen);
 //     for (uint i = 0; i < data.count(); i++ ) {
 //         printf("%c", buffer[i] );
 //     }
@@ -219,19 +222,19 @@ void Output::commandStdout(OProcess*, char *buffer, int buflen) {
    OutputEdit->append(lineStr);
    OutputEdit->setCursorPosition( OutputEdit->numLines() + 1,0,FALSE);
 }
 void Output::commandStdin( const QByteArray &data) {
-    qWarning("received stdin  %d bytes", data.size());
+    owarn << "received stdin  " << data.size() << " bytes" << oendl; 
    // recieved data from the io layer goes to sz
    proc->writeStdin(data.data(), data.size());
 }
 void Output::commandStderr(OProcess*, char *buffer, int buflen) {
-    qWarning("received stderrt %d bytes", buflen);
+    owarn << "received stderrt " << buflen << " bytes" << oendl; 
    QString lineStr = buffer;
 //    lineStr=lineStr.left(lineStr.length()-1);
    OutputEdit->append(lineStr);
    OutputEdit->setCursorPosition( OutputEdit->numLines() + 1,0,FALSE);
 }
diff --git a/noncore/apps/checkbook/checkbook.pro b/noncore/apps/checkbook/checkbook.pro
index 34641f4..1472df6 100644
--- a/noncore/apps/checkbook/checkbook.pro
+++ b/noncore/apps/checkbook/checkbook.pro
diff --git a/noncore/apps/checkbook/listedit.cpp b/noncore/apps/checkbook/listedit.cpp
index d00e305..5026c9d 100644
--- a/noncore/apps/checkbook/listedit.cpp
+++ b/noncore/apps/checkbook/listedit.cpp
@@ -24,20 +24,25 @@
                             59 Temple Place - Suite 330,
                             Boston, MA 02111-1307, USA.
 */
 #include "listedit.h"
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/resource.h>
+using namespace Opie::Core;
+/* QT */
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qlistview.h>
 #include <qwidgetstack.h>
 #include <qcombobox.h>
 #include <qpushbutton.h>
-#include <qpe/resource.h>
 // --- ListEdit ---------------------------------------------------------------
 ListEdit::ListEdit( QWidget *parent, const char *sName )
    : QWidget(parent, sName), TableDef(sName)
 {
    // get font height
@@ -299,13 +304,13 @@ void ListEdit::slotClick(QListViewItem *itm, const QPoint &pnt, int col)
        if( i>=0 ) {
            _box->insertItem( _currentItem->text(_currentColumn) );
            _box->setCurrentItem(i);
        }
        _stack->raiseWidget(_box);
    } else {
-        qDebug( "Unsupported column type for column %s", (const char *)pDef->getName() );
+        odebug << "Unsupported column type for column " << (const char *)pDef->getName() << "" << oendl; 
        _typeEdit->setText("");
        _stack->raiseWidget(_typeEdit);
    }
 }
diff --git a/noncore/apps/checkbook/tabledef.cpp b/noncore/apps/checkbook/tabledef.cpp
index 9a42308..745cd80 100644
--- a/noncore/apps/checkbook/tabledef.cpp
+++ b/noncore/apps/checkbook/tabledef.cpp
@@ -25,12 +25,14 @@
                             Boston, MA 02111-1307, USA.
 */
 #include "tabledef.h"
+#include <opie2/odebug.h>
+using namespace Opie::Core;
 // --- ColumnDef --------------------------------------------------------------
 ColumnDef::ColumnDef(const char *sName, ColumnType type, const char *sNewValue)
 {
    _sName=sName;
    _type=type;
@@ -39,20 +41,20 @@ ColumnDef::ColumnDef(const char *sName, ColumnType type, const char *sNewValue)
 // --- addColumnValue ---------------------------------------------------------
 void ColumnDef::addColumnValue(const QString &sValue)
 {
    if( (_type & 0x00ffffff) !=typeList )
-        qDebug("Column %s is not a list", (const char *)_sName);
+        odebug << "Column " << (const char *)_sName << " is not a list" << oendl; 
    else
        _valueList.append(sValue);
 }
 void ColumnDef::addColumnValue(const char *sValue)
 {
    if( (_type & 0x00ffffff)!=typeList )
-        qDebug("Column %s is not a list", (const char *)_sName);
+        odebug << "Column " << (const char *)_sName << " is not a list" << oendl; 
    else
        _valueList.append(sValue);
 }
 // --- TableDef ---------------------------------------------------------------
 TableDef::TableDef(const char *sName)
diff --git a/noncore/apps/checkbook/transaction.cpp b/noncore/apps/checkbook/transaction.cpp
index 1b08b24..aafb588 100644
--- a/noncore/apps/checkbook/transaction.cpp
+++ b/noncore/apps/checkbook/transaction.cpp
@@ -28,14 +28,18 @@
 #include "transaction.h"
 #include "traninfo.h"
 #include "cfg.h"
 #include "checkbook.h"
+/* OPIE */
+#include <opie2/odebug.h>
 #include <qpe/datebookmonth.h>
+using namespace Opie::Core;
+/* QT */
 #include <qbuttongroup.h>
 #include <qcombobox.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qmultilineedit.h>
@@ -329,9 +333,9 @@ void Transaction::slotActivated(const QString &arg )
    }
 }
 // slotNotNew -----------------------------------------------------------------
 void Transaction::slotNotNew()
 {
-    qDebug("Not new");
+    odebug << "Not new" << oendl; 
    _bNew=false;
 }
diff --git a/noncore/apps/confedit/confedit.pro b/noncore/apps/confedit/confedit.pro
index 5a71680..785c588 100644
--- a/noncore/apps/confedit/confedit.pro
+++ b/noncore/apps/confedit/confedit.pro
@@ -1,21 +1,9 @@
 CONFIG        = qt warn_on  quick-app
 HEADERS        = mainwindow.h listviewconfdir.h listviewitemconffile.h listviewitemconfigentry.h editwidget.h listviewitemconf.h
 SOURCES        = main.cpp mainwindow.cpp listviewconfdir.cpp listviewitemconffile.cpp listviewitemconfigentry.cpp editwidget.cpp listviewitemconf.cpp
 INCLUDEPATH     += $(OPIEDIR)/include
 DEPENDPATH    += $(OPIEDIR)/include
-INTERFACES    =
+LIBS          += -lqpe -lopiecore2
-LIBS            += -lopiecore2
 TARGET        = confedit
-!contains( platform, x11 ) {
  include ( $(OPIEDIR)/include.pro )
-  LIBS += -lqpe
-}
-contains( platform, x11 ) {
-  LIBS        += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib
-}
diff --git a/noncore/apps/confedit/config.in b/noncore/apps/confedit/config.in
index e377307..d7682dc 100644
--- a/noncore/apps/confedit/config.in
+++ b/noncore/apps/confedit/config.in
@@ -1,4 +1,4 @@
  config CONFEDIT
-    boolean "opie-confeditor (generic editor for all Opie settings)"
+    boolean "opie-confedit (generic editor for all Opie settings)"
    default "y"
    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
diff --git a/noncore/apps/confedit/listviewconfdir.cpp b/noncore/apps/confedit/listviewconfdir.cpp
index 0c2feeb..33bffe1 100644
--- a/noncore/apps/confedit/listviewconfdir.cpp
+++ b/noncore/apps/confedit/listviewconfdir.cpp
@@ -6,16 +6,20 @@
 *   (at your option) any later version.                                   *
 *                                                                         *
 ***************************************************************************/
  // (c) 2002 Patrick S. Vogtp <tille@handhelds.org>
 #include "listviewconfdir.h"
+#include "listviewitemconffile.h"
-#include <qmessagebox.h>
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
-#include "listviewitemconffile.h"
+/* QT */
+#include <qmessagebox.h>
 ListViewConfDir::ListViewConfDir(QString settingsPath, QWidget *parent, const char *name )
  : QListView(parent,name), confDir(settingsPath)
 {
        setRootIsDecorated( true );
@@ -44,13 +48,13 @@ void ListViewConfDir::readConfFiles()
  QFileInfo *fi;
  ListViewItemConfFile *fileEntry;
        while ( (fi=it.current()) )
         {
-    qDebug( "opening: >%s<", fi->fileName().data() );
+    odebug << "opening: >" << fi->fileName().data() << "<" << oendl; 
          fileEntry = new ListViewItemConfFile( fi, this );
    QListViewItem *dummy = new QListViewItem(fileEntry, "dummy");
          ++it;
  }
 }
diff --git a/noncore/apps/confedit/listviewitemconffile.cpp b/noncore/apps/confedit/listviewitemconffile.cpp
index 1ff2c44..2958cf5 100644
--- a/noncore/apps/confedit/listviewitemconffile.cpp
+++ b/noncore/apps/confedit/listviewitemconffile.cpp
@@ -6,15 +6,21 @@
 *   (at your option) any later version.                                   *
 *                                                                         *
 ***************************************************************************/
 // (c) 2002 Patrick S. Vogt <tille@handhelds.org>
 #include "listviewitemconffile.h"
+#include "listviewitemconfigentry.h"
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+/* QT */
 #include <qmessagebox.h>
 #include <qtextstream.h>
-#include "listviewitemconfigentry.h"
 #define tr QObject::tr
 ListViewItemConfFile::ListViewItemConfFile(QFileInfo *file, QListView *parent)
   : ListViewItemConf(parent), _valid(false)
 {
@@ -37,49 +43,49 @@ QString ListViewItemConfFile::fileName()
 {
        return confFileInfo->fileName();
 }
 void ListViewItemConfFile::parseFile()
 {
-        //qDebug("ListViewItemConfFile::parseFile BEGIN");
+        //odebug << "ListViewItemConfFile::parseFile BEGIN" << oendl; 
  QFile confFile(confFileInfo->absFilePath());
        if(! confFile.open(IO_ReadOnly))
                        QMessageBox::critical(0,tr("Could not open"),tr("The file ")+confFileInfo->fileName()+tr(" could not be opened."),1,0);
        QTextStream t( &confFile );
         QString s;
  QString group;
  ListViewItemConfigEntry *groupItem;
  ListViewItemConfigEntry *item;
  while ( !t.atEnd() )
  {
          s = t.readLine().stripWhiteSpace();
-                //qDebug( "line: >%s<\n", s.latin1() );
+                //odebug << "line: >" << s.latin1() << "<\n" << oendl; 
          if (s.contains("<?xml"))
           {
            _valid = false;
                        break;
    }else
    if ( s[0] == '[' && s[s.length()-1] == ']' )
           {
-  //    qDebug("got group"+s);
+  //    odebug << "got group"+s << oendl; 
      group = s.mid(1,s.length()-2);
      if (!groupItem) groupItem = new ListViewItemConfigEntry(this, tr("no group") );
      groupItem = new ListViewItemConfigEntry(this, group );
      insertItem( groupItem );
    } else
    if ( int pos = s.find('=') )
    {
-//      qDebug("got key"+s);
+//      odebug << "got key"+s << oendl; 
-             if (!groupItem) qDebug("PANIK NO GROUP! >%s<",group.latin1());
+             if (!groupItem) odebug << "PANIK NO GROUP! >" << group.latin1() << "<" << oendl; 
            item = new ListViewItemConfigEntry(this, group, s );
      groupItem->insertItem( item );
    }
          }
        confFile.close();
        setExpandable( _valid );
-        //qDebug("ListViewItemConfFile::parseFile END");
+        //odebug << "ListViewItemConfFile::parseFile END" << oendl; 
 }
 void ListViewItemConfFile::remove()
 {
  QFile::remove(confFileInfo->absFilePath());
diff --git a/noncore/apps/confedit/mainwindow.cpp b/noncore/apps/confedit/mainwindow.cpp
index 6ef1043..4b04c97 100644
--- a/noncore/apps/confedit/mainwindow.cpp
+++ b/noncore/apps/confedit/mainwindow.cpp
@@ -8,21 +8,24 @@
 ***************************************************************************/
 // (c) 2002 Patrick S. Vogt <tille@handhelds.org>
 #include "mainwindow.h"
+#include "listviewconfdir.h"
+#include "listviewitemconfigentry.h"
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+/* QT */
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qlineedit.h>
-#include "listviewconfdir.h"
-#include "listviewitemconfigentry.h"
 MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
  QMainWindow( parent, name, f ), _currentItem(0), _fileItem(0)
 {
  setCaption( tr("Conf File Editor") );
        //setBaseSize(  qApp->globalStrut() );
@@ -30,18 +33,18 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
  mainLayout = new QVBoxLayout( this );
        mainLayout->setSpacing( 0 );
  mainLayout->setMargin( 0 );
-  qDebug("creating settingList");
+  odebug << "creating settingList" << oendl; 
  settingList = new ListViewConfDir( QDir::homeDirPath() + "/Settings", this, "settingslist");
  settingList->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));//, sizePolicy().hasHeightForWidth() ) );
  mainLayout->addWidget( settingList, 0);
-  qDebug("creating editor");
+  odebug << "creating editor" << oendl; 
  editor = new EditWidget(this);
  editor->setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Maximum));//, sizePolicy().hasHeightForWidth() ) );
  mainLayout->addWidget( editor, 1 );
  editor->layoutType( ListViewItemConf::File );
  makeMenu();
@@ -95,13 +98,13 @@ MainWindow::~MainWindow()
 }
 void MainWindow::setCurrent(QListViewItem *item)
 {
-        //qDebug("MainWindow::setCurrent");
+        //odebug << "MainWindow::setCurrent" << oendl; 
        if (!item) return;
         _item = (ListViewItemConf*) item;
  if (!_item) return;
  popupTimer->start( 750, true );
  if (_item->getType() == ListViewItemConf::File)
  {
@@ -171,13 +174,13 @@ void MainWindow::removeConfFile()
        if (!_item) return;
         _item->remove();
 }
 void MainWindow::showPopup()
 {
-qDebug("showPopup");
+odebug << "showPopup" << oendl; 
         if (!_item) return;
         popupActionRevert->setEnabled(_item->revertable());
        popupActionSave->setEnabled(_item->isChanged());
         if (_fileItem)
  {
                popupActionSave->setEnabled(_fileItem->isChanged());
diff --git a/noncore/apps/keyz-cfg/cfgfile.cpp b/noncore/apps/keyz-cfg/cfgfile.cpp
index b0dc968..81d1ee1 100644
--- a/noncore/apps/keyz-cfg/cfgfile.cpp
+++ b/noncore/apps/keyz-cfg/cfgfile.cpp
@@ -1,9 +1,15 @@
-#include <qmessagebox.h>
 #include "cfgfile.h"
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+/* QT */
+#include <qmessagebox.h>
 // CfgEntry implementation
 CfgEntry::CfgEntry() {
 }
 CfgEntry::CfgEntry(const QString& f, const QString& l):
        file(f), label(l) {
@@ -92,24 +98,24 @@ bool CfgParser::load(QString file, CfgFile& cfg) {
        err = "";
        ardelay = -1;
        arperiod = -1;
        reader.parse(is);
        if (!err.isEmpty()) {
-                qDebug(err);
+                odebug << err << oendl; 
                return false;
        }
        QMap<QString, QString>::Iterator fit, lit;
        for(uint i = 0; i < includeList.count(); i++) {
                QString file = *includeList.at(i);
                fit = includes.find(file);
                QString prefix = fit.data();
                QString label = "";
-                qDebug("include: file=" + fit.key() + ", prefix=" + fit.data());
+                odebug << "include: file=" + fit.key() + ", prefix=" + fit.data() << oendl; 
                lit = labels.find(prefix+":*");
                if (lit != labels.end()) {
                        label = lit.data();
                }
                cfg.replaceEntry(file, label);
diff --git a/noncore/apps/keyz-cfg/config.in b/noncore/apps/keyz-cfg/config.in
index 29a10f5..8e1be2d 100644
--- a/noncore/apps/keyz-cfg/config.in
+++ b/noncore/apps/keyz-cfg/config.in
@@ -1,4 +1,4 @@
  config KEYZCFG
    boolean "keyz-cfg (configuration tool for keyz applet)"
    default "n"
-    depends ( LIBQPE || LIBQPE-X11 )
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
diff --git a/noncore/apps/keyz-cfg/keyz-cfg.pro b/noncore/apps/keyz-cfg/keyz-cfg.pro
index 44bbb5f..7ac604b 100644
--- a/noncore/apps/keyz-cfg/keyz-cfg.pro
+++ b/noncore/apps/keyz-cfg/keyz-cfg.pro
@@ -15,10 +15,10 @@ SOURCES		= main.cpp \
                  zkbcfg.cpp \
                        zkbnames.cpp \
                        zkbxml.cpp
 INCLUDEPATH     += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
-        LIBS    += -lqpe
+        LIBS    += -lqpe -lopiecore2
        TARGET          = keyz-cfg
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/keyz-cfg/zkb.cpp b/noncore/apps/keyz-cfg/zkb.cpp
index f315d4b..8382615 100644
--- a/noncore/apps/keyz-cfg/zkb.cpp
+++ b/noncore/apps/keyz-cfg/zkb.cpp
@@ -361,13 +361,13 @@ State* Keymap::getStateByLabel(const QString& label) {
                n = currentStateName.findRev(":");
                if (n >= 0) {
                        name += currentStateName.mid(n+1);
                }
        }
-        //qDebug("look for: %s\n", (const char*) name.utf8());
+        //odebug << "look for: " << (const char*) name.utf8() << "\n" << oendl; 
        QMap<QString, State*>::Iterator sit = states.find(name);
        if (sit != states.end()) {
                state = sit.data();
        }
        return state;
@@ -413,13 +413,13 @@ bool Keymap::setCurrentState(State* state) {
                        QMap<State*, QString>::Iterator tit;
                        tit = stateLabelMap.find(state);
                        if (tit != stateLabelMap.end()) {
                                currentLabel = tit.data();
                        } else {
-        //                      qDebug("no label for: " + currentStateName + "\n");
+        //                      odebug << "no label for: " + currentStateName + "\n" << oendl; 
                                currentLabel = "";
                        }
                        return true;
                }
        }
diff --git a/noncore/apps/keyz-cfg/zkbcfg.cpp b/noncore/apps/keyz-cfg/zkbcfg.cpp
index 0992b9a..f1d53ba 100644
--- a/noncore/apps/keyz-cfg/zkbcfg.cpp
+++ b/noncore/apps/keyz-cfg/zkbcfg.cpp
@@ -1,10 +1,14 @@
-#include <qfileinfo.h>
 #include "zkbcfg.h"
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+/* QT */
+#include <qfileinfo.h>
 // Implementation of XkbConfig class
 ZkbConfig::ZkbConfig(const QString& dir):path(dir) {
 }
 ZkbConfig::~ZkbConfig() {
@@ -12,13 +16,13 @@ ZkbConfig::~ZkbConfig() {
 bool ZkbConfig::load(const QString& file, Keymap& keymap, const QString& prefix) {
        bool ret;
        QFile f(path+"/"+file);
        QFileInfo fi(f);
-        qDebug("start loading file=%s\n", (const char*) file.utf8());
+        odebug << "start loading file=" << (const char*) file.utf8() << "\n" << oendl; 
        if (includedFiles.find(fi.absFilePath()) != includedFiles.end()) {
                return false;
        }
        includedFiles.insert(fi.absFilePath(), 1);
        QXmlInputSource is(f);
@@ -27,14 +31,13 @@ bool ZkbConfig::load(const QString& file, Keymap& keymap, const QString& prefix)
        reader.setContentHandler(&h);
        reader.setErrorHandler(this);
        ret = reader.parse(is);
        includedFiles.remove(fi.absFilePath());
-        qDebug("end loading file=%s : status=%s\n", (const char*) file.utf8(),
+        odebug << "end loading file=" << file.utf8() << ": status=" << err.utf8() << oendl;
-                (const char*) err.utf8());
        return ret;
 }
 bool ZkbConfig::warning(const QXmlParseException& e) {
        QString tmp;
@@ -119,13 +122,13 @@ bool ZkbHandler::startLabelElement(const QString& label,
 bool ZkbHandler::startStateElement(const QString& name, 
        const QString& parentName, bool dflt) {
        currentStateName = prefix + name;
        currentState = keymap.getStateByName(currentStateName);
-        //qDebug("state name=%s\n", (const char*) currentStateName.utf8());
+        //odebug << "state name=" << (const char*) currentStateName.utf8() << "\n" << oendl; 
        State* parent = 0;
        if (!parentName.isEmpty()) {
                QString pn = prefix + parentName;
                parent = keymap.getStateByName(pn);
                if (parent == 0) {
diff --git a/noncore/apps/opie-bartender/bartender.cpp b/noncore/apps/opie-bartender/bartender.cpp
index e6cb515..59fc242 100644
--- a/noncore/apps/opie-bartender/bartender.cpp
+++ b/noncore/apps/opie-bartender/bartender.cpp
@@ -13,37 +13,40 @@
 #include "bartender.h"
 #include "showdrinks.h"
 #include "inputDialog.h"
 #include "searchresults.h"
 #include "bac.h"
-#include <qtoolbar.h>
+/* OPIE */
-#include <qmenubar.h>
+#include <opie2/odebug.h>
-//#include <opie2/colorpopupmenu.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
+using namespace Opie::Core;
+/* QT */
 #include <qlineedit.h>
 #include <qdir.h>
 #include <qpushbutton.h>
 #include <qlistbox.h>
 #include <qmultilineedit.h>
 #include <qmessagebox.h>
 #include <qtextstream.h>
 #include <qaction.h>
 #include <qheader.h>
 #include <qlistview.h>
 #include <qlayout.h>
+#include <qtoolbar.h>
+#include <qmenubar.h>
+/* STD */
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
 Bartender::Bartender( QWidget* parent,  const char* name, WFlags fl )
    : QMainWindow( parent, name, fl ) {
    if ( !name )
  setName( "Bartender" );
    QGridLayout *layout = new QGridLayout( this );
    layout->setSpacing( 2);
@@ -141,19 +144,19 @@ void Bartender::fillList() {
    QListViewItem * item ;
    QTextStream t( &dbFile);
    QString s;
    while ( !t.eof()) {
        s = t.readLine();
        if(s.find("#",0,TRUE) != -1) {
-//            qDebug(s.right(s.length()-2));
+//            odebug << s.right(s.length()-2) << oendl; 
            item= new QListViewItem( DrinkView, 0 );
            item->setText( 0, s.right(s.length()-2));
            i++;
        }
    }
-    qDebug("there are currently %d of drinks", i);
+    odebug << "there are currently " << i << " of drinks" << oendl; 
 }
 void Bartender::fileNew() {
    New_Drink *newDrinks;
    newDrinks = new New_Drink(this,"New Drink....", TRUE);
@@ -168,13 +171,13 @@ void Bartender::fileNew() {
        QMessageBox::message( (tr("Note")), (tr("Drink database not opened sucessfully.\n")) );
        return;
    }
    if(newDrinks ->result() == 1 ) {
        QString newDrink="\n# "+newName+"\n";
        newDrink.append(newIng+"\n");
-        qDebug("writing "+newDrink);
+        odebug << "writing "+newDrink << oendl; 
        dbFile.writeBlock( newDrink.latin1(), newDrink.length());
        clearList();
        dbFile.close();
        initDrinkDb();
    }
@@ -204,13 +207,13 @@ void Bartender::showDrink( QListViewItem *item) {
    while ( !t.eof()) {
        s = t.readLine();
        if(s.find( myDrink, 0, TRUE) != -1) {
            for(int i=0;s2.find( "#", 0, TRUE) == -1;i++) {
                s2 = t.readLine();
                if(s2.find("#",0,TRUE) == -1 || dbFile.atEnd() ) {
-//                    qDebug(s2);
+//                    odebug << s2 << oendl; 
                    showDrinks->MultiLineEdit1->append(s2);
                }
                if( dbFile.atEnd() ) break;
            }
        }
    }
@@ -245,13 +248,13 @@ void Bartender::doSearchByName() {
    fileDlg->exec();
    if( fileDlg->result() == 1 ) {
        searchForDrinkName = fileDlg->LineEdit1->text();
        QListViewItemIterator it( DrinkView );
        for ( ; it.current(); ++it ) {
            if ( it.current()->text(0).find( searchForDrinkName, 0, TRUE) != -1 ) {
-//                 qDebug( it.current()->text(0));
+//                 odebug << it.current()->text(0) << oendl; 
                searchList.append(it.current()->text(0));
            }
        }
        if(searchList.count() >0)
            showSearchResult(searchList);
        else
@@ -276,16 +279,16 @@ void Bartender::doSearchByDrink() {
        QString s, s2;
        while ( !t.eof()) {
            s = t.readLine();
            if(s.find("#",0,TRUE) != -1) {
                lastDrinkName=s.right(s.length()-2);
-//                qDebug("last drink name "+lastDrinkName);
+//                odebug << "last drink name "+lastDrinkName << oendl; 
            }
            else if( s.find( searchForDrinkName ,0, FALSE) != -1 && lastDrinkName != tempName ) {
-//                qDebug("appending "+lastDrinkName);
+//                odebug << "appending "+lastDrinkName << oendl; 
                searchList.append( lastDrinkName);
                tempName=lastDrinkName;
            }
 //            if( dbFile.atEnd() ) break;
        } //oef
@@ -310,13 +313,13 @@ void Bartender::showSearchResult(QStringList &searchList) {
    if( searchDlg->result() == 1 ) {
        result= searchDlg->ListBox1->currentText();
    }
    QListViewItemIterator it2( DrinkView );
    for ( ; it2.current(); ++it2 ) {
        if ( it2.current()->text(0)== result ) {
-//                qDebug( it2.current()->text(0));
+//                odebug << it2.current()->text(0) << oendl; 
            showDrink(it2.current());
        }
    }
 delete  searchDlg;
 }
@@ -340,13 +343,13 @@ void Bartender::doEdit() {
        s = t.readLine();
        if(s.find( myDrink, 0, TRUE) != -1) {
            foundAt = dbFile.at() - (s.length()+1);
            for(int i=0;s2.find( "#", 0, TRUE) == -1;i++) {
                s2 = t.readLine();
                if(s2.find("#",0,TRUE) == -1 || dbFile.atEnd() ) {
-//                    qDebug(s2);
+//                    odebug << s2 << oendl; 
                    newDrinks->MultiLineEdit1->append(s2);
                    newDrinks->LineEdit1->setText(myDrink);
                }
                if( dbFile.atEnd() ) break;
            }
        }
@@ -367,13 +370,13 @@ void Bartender::doEdit() {
 //        dbFile.at( foundAt);
 #warning FIXME problems with editing drinks db
        ////////// FIXME write to user file
        QString newDrink="# "+newName+"\n";
        newDrink.append(newIng+"\n");
-        qDebug("writing "+newDrink);
+        odebug << "writing "+newDrink << oendl; 
        dbFile.writeBlock( newDrink.latin1(), newDrink.length());
        clearList();
        dbFile.flush();
        initDrinkDb();
@@ -394,13 +397,13 @@ void Bartender::doBac() {
 void Bartender::openCurrentDrink() {
    if(DrinkView->currentItem() == NULL) return;
    showDrink(DrinkView->currentItem());
 }
 void Bartender::fileMenuActivated( int item) {
-    qDebug("Item %d", item);
+    odebug << "Item " << item << "" << oendl; 
    switch(item) {
      case -3: //        new -3
          fileNew();
          break;
      case -4://        open -4
          openCurrentDrink();
@@ -415,13 +418,13 @@ void Bartender::fileMenuActivated( int item) {
          break;
    }
 }
 void Bartender::editMenuActivated(int item) {
-    qDebug("Item %d", item);
+    odebug << "Item " << item << "" << oendl; 
      /*
        edit -8
      */
    switch(item) {
      case -8:
          doEdit() ;
diff --git a/noncore/apps/opie-bartender/bartender.pro b/noncore/apps/opie-bartender/bartender.pro
index 4ad3c31..41fc0e5 100644
--- a/noncore/apps/opie-bartender/bartender.pro
+++ b/noncore/apps/opie-bartender/bartender.pro
@@ -1,12 +1,11 @@
 TEMPLATE  = app
-#CONFIG   = qt warn_on 
 CONFIG    = qt warn_on 
 HEADERS   = bartender.h newdrinks.h showdrinks.h inputDialog.h searchresults.h bac.h
 SOURCES   = main.cpp bartender.cpp newdrinks.cpp showdrinks.cpp inputDialog.cpp searchresults.cpp bac.cpp
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
-LIBS            += -lqpe
+LIBS        += -lqpe -lopiecore2
 DESTDIR = $(OPIEDIR)/bin
 TARGET    = bartender
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/opie-bartender/config.in b/noncore/apps/opie-bartender/config.in
index c6ca2e6..c39a7d6 100644
--- a/noncore/apps/opie-bartender/config.in
+++ b/noncore/apps/opie-bartender/config.in
@@ -1,4 +1,5 @@
  config BARTENDER
    boolean "bartender - bar receipe and blood alcohol estimator"
    default "n"
-    depends ( LIBQPE || LIBQPE-X11 )
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
diff --git a/noncore/apps/opie-console/MyPty.cpp b/noncore/apps/opie-console/MyPty.cpp
index a37f980..6d57703 100644
--- a/noncore/apps/opie-console/MyPty.cpp
+++ b/noncore/apps/opie-console/MyPty.cpp
@@ -60,16 +60,24 @@
    over the (obsolete) predecessor.
    There's a sinister ioctl(2), signal(2) and job control stuff
    nessesary to make everything work as it should.
 */
+#include "procctl.h"
+#include "MyPty.h"
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+/* QT */
 #include <qsocketnotifier.h>
 #include <qfile.h>
+/* STD */
 #include <stdlib.h>
 #include <stdio.h>
 #include <signal.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <termios.h>
@@ -78,29 +86,25 @@
 #include <sys/wait.h>
 #ifdef HAVE_OPENPTY
 #include <pty.h>
 #endif
-#include "procctl.h"
-#include "MyPty.h"
 #undef VERBOSE_DEBUG
 /* -------------------------------------------------------------------------- */
 /*!
   Informs the client program about the
   actual size of the window.
 */
 void MyPty::setSize(int lines, int columns)
 {
-    qWarning("setting size");
+    owarn << "setting size" << oendl; 
  struct winsize wsize;
  wsize.ws_row = (unsigned short)lines;
  wsize.ws_col = (unsigned short)columns;
  if(m_fd < 0) return;
  ioctl(m_fd,TIOCSWINSZ,(char *)&wsize);
 }
diff --git a/noncore/apps/opie-console/TEWidget.cpp b/noncore/apps/opie-console/TEWidget.cpp
index e535296..d168a5e 100644
--- a/noncore/apps/opie-console/TEWidget.cpp
+++ b/noncore/apps/opie-console/TEWidget.cpp
@@ -1026,13 +1026,13 @@ bool TEWidget::eventFilter( QObject *obj, QEvent *e )
        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"
@@ -1065,17 +1065,17 @@ bool TEWidget::eventFilter( QObject *obj, QEvent *e )
    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",ke->key());
+//     odebug << "key pressed is 0x" << ke->key() << "" << oendl; 
        if( ke->state() == ShiftButton && ke->key() == Key_Tab) { //lets hardcode this sucker
-//     qDebug("key pressed 2 is 0x%x",ke->key());
+//     odebug << "key pressed 2 is 0x" << ke->key() << "" << oendl; 
            emitText("\\"); // expose
        } else
            emit keyPressedSignal(ke); // expose
        ke->accept();
 #ifdef FAKE_CTRL_AND_ALT
        if ( dele ) delete e;
diff --git a/noncore/apps/opie-console/TEmulation.cpp b/noncore/apps/opie-console/TEmulation.cpp
index d0169d7..6ff73af 100644
--- a/noncore/apps/opie-console/TEmulation.cpp
+++ b/noncore/apps/opie-console/TEmulation.cpp
@@ -67,12 +67,18 @@
 /* FIXME
   - evtl. the bulk operations could be made more transparent.
 */
 #include "TEmulation.h"
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+/* STD */
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
 /* ------------------------------------------------------------------------- */
@@ -201,13 +207,13 @@ void TEmulation::onRcvChar(int c)
 /*!
 */
 void TEmulation::onKeyPress( QKeyEvent* ev )
 {
-    qWarning("onKeyPress,....");
+    owarn << "onKeyPress,...." << oendl; 
  if (!connected) return; // someone else gets the keys
  if (scr->getHistCursor() != scr->getHistLines());
    scr->setHistCursor(scr->getHistLines());
  if (!ev->text().isEmpty())
  { // A block of text
    // Note that the text is proper unicode.
diff --git a/noncore/apps/opie-console/atconfigdialog.cpp b/noncore/apps/opie-console/atconfigdialog.cpp
index 8e91b9e..c998f96 100644
--- a/noncore/apps/opie-console/atconfigdialog.cpp
+++ b/noncore/apps/opie-console/atconfigdialog.cpp
@@ -1,19 +1,22 @@
+#include "atconfigdialog.h"
+#include "io_modem.h"
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+/* QT */
 #include <qlineedit.h>
 #include <qspinbox.h>
 #include <qlayout.h>
 #include <qcombobox.h>
 #include <qtabwidget.h>
 #include <qlabel.h>
 #include <qscrollview.h>
-#include "atconfigdialog.h"
-#include "io_modem.h"
 ATConfigDialog::ATConfigDialog(  QWidget* parent, const char* name, bool modal, WFlags fl )
    : QDialog( parent, name, modal, fl ) {
    setCaption( tr( "Dialing parameter setup" ) );
@@ -149,13 +152,13 @@ QWidget* ATConfigDialog::tab1( QWidget* parent ) {
    return returnWidget;
 }
 void ATConfigDialog::readConfig( const Profile& config ) {
-    qWarning("config in atconfigdialog");
+    owarn << "config in atconfigdialog" << oendl; 
    initStringLine->setText( config.readEntry("InitString", MODEM_DEFAULT_INIT_STRING ) );
    resetStringLine->setText( config.readEntry("ResetString", MODEM_DEFAULT_RESET_STRING ) );
    dialPref1Line->setText( config.readEntry("DialPrefix1", MODEM_DEFAULT_DIAL_PREFIX1 ) );
    dialSuf1Line->setText( config.readEntry("DialSuffix1", MODEM_DEFAULT_DIAL_SUFFIX1 ) );
    dialPref2Line->setText( config.readEntry("DialPrefix2", MODEM_DEFAULT_DIAL_PREFIX1 ) );
diff --git a/noncore/apps/opie-console/dialer.cpp b/noncore/apps/opie-console/dialer.cpp
index 67ad10e..7010594 100644
--- a/noncore/apps/opie-console/dialer.cpp
+++ b/noncore/apps/opie-console/dialer.cpp
@@ -1,23 +1,28 @@
 #include "dialer.h"
+#include "io_modem.h"
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+/* QT */
 #include <qlayout.h>
 #include <qprogressbar.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qapp.h>
 #include <qtimer.h>
 #include <qmessagebox.h>
+/* STD */
 #include <unistd.h>
 #include <string.h>
 #include <fcntl.h>
 #include <errno.h>
-#include "io_modem.h"
 // State machine:          | When an error occurs, we don't have to
 //                         | reset everything.
 // (init) <------+         | But if the user wants to reset,
 //   |           |         | we stop dialing immediately.
 //   v           |         |
 // (options) ----+         | Following the state machine is necessary
@@ -101,13 +106,13 @@ void Dialer::slotCancel()
            accept();
        }
 }
 void Dialer::reset()
 {
-    qWarning("reset");
+    owarn << "reset" << oendl; 
        switchState(state_cancel);
 }
 void Dialer::slotAutostart()
 {
        //state = state_preinit;
@@ -133,35 +138,35 @@ void Dialer::dial(const QString& number)
                reject();
        }
 }
 void Dialer::trydial(const QString& number)
 {
-    qWarning("TryDial:%s", number.latin1() );
+    owarn << "TryDial:" << number.latin1() << "" << oendl; 
        if(state != state_cancel) switchState(state_preinit);
        if(cleanshutdown)
        {
-            qWarning("HangupString " + m_profile.readEntry("HangupString",  MODEM_DEFAULT_HANGUP_STRING));
+            owarn << "HangupString " << m_profile.readEntry("HangupString") << oendl; 
            send(m_profile.readEntry("HangupString", MODEM_DEFAULT_HANGUP_STRING ) + "\r");
        }
        if(state != state_cancel)
        {
                switchState(state_init);
-//                qWarning("Init String " + m_profile.readEntry("InitString") );
+//                owarn << "Init String " + m_profile.readEntry("InitString") << oendl; 
                send(m_profile.readEntry("InitString",MODEM_DEFAULT_INIT_STRING ) + "\r");
                QString response2 = receive();
                if(!response2.contains("\nOK\r"))
                        reset();
        }
        /*if(state != state_cancel)
        {
                switchState(state_options);
-                qWarning("ATM3l3");
+                owarn << "ATM3l3" << oendl; 
                send("ATM3L3\r");
                QString response3 = receive();
                if(!response3.contains("\nOK\r"))
                        reset();
        }
 */
@@ -175,13 +180,13 @@ void Dialer::trydial(const QString& number)
                if(!response4.contains("\nOK\r"))
                        reset();
        }
        if(state != state_cancel)
        {
-            qWarning("progress");
+            owarn << "progress" << oendl; 
                switchState(state_dialing);
        //      send(QString("ATDT %1\r").arg(number));
                send(QString("%1 %2\r").arg(m_profile.readEntry("DialPrefix1", MODEM_DEFAULT_DIAL_PREFIX1 ))
                     .arg(number));
@@ -211,13 +216,13 @@ void Dialer::trydial(const QString& number)
 void Dialer::send(const QString& msg)
 {
        QString m = msg;
        int bytes;
        QString termination;
-        qWarning("Sending: %s", m.latin1());
+        owarn << "Sending: " << m.latin1() << "" << oendl; 
        /*termination = "\r";
        //termination = m_profile.readEntry("Termination");
        if(termination == "\n") m = m + "\n";
        else if(termination == "\r") m = m + "\r";
        else m = m + "\r\n";
@@ -244,17 +249,17 @@ QString Dialer::receive()
                if(ret > 0)
                {
                        for(int i = 0; i < ret; i++)
                                buffer[i] = buffer[i] & 0x7F;
                        buffer[ret] = 0;
-                        qWarning("Got: %s", buffer);
+                        owarn << "Got: " << buffer << "" << oendl; 
                        buf.append(QString(buffer));
                        if(buf.contains("OK") || buf.contains("ERROR") || buf.contains("CONNECT") || (buf.contains("BUSY")))
                        {
-                                //qWarning("Receiving: '%s'", buf.latin1());
+                                //owarn << "Receiving: '" << buf.latin1() << "'" << oendl; 
                                cleanshutdown = 1;
                                return buf;
                        }else if (buf.contains("NO CARRIER") || buf.contains("NO DIALTONE")  ) {
                            cleanshutdown = 1;
                            return QString::null;
                        }
diff --git a/noncore/apps/opie-console/emulation_handler.cpp b/noncore/apps/opie-console/emulation_handler.cpp
index 99d069f..89b70c6 100644
--- a/noncore/apps/opie-console/emulation_handler.cpp
+++ b/noncore/apps/opie-console/emulation_handler.cpp
@@ -1,13 +1,15 @@
 #include "TEmuVt102.h"
 #include "profile.h"
 #include "emulation_handler.h"
 #include "script.h"
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
 EmulationHandler::EmulationHandler( const Profile& prof, QWidget* parent,const char* name )
    : QObject(0, name )
 {
    m_teWid = new TEWidget( parent, "TerminalMain");
        // use setWrapAt(0) for classic behaviour (wrap at screen width, no scrollbar)
        // use setWrapAt(80) for normal console with scrollbar
@@ -125,17 +127,17 @@ QColor EmulationHandler::foreColor(int col) {
        co = Qt::white;
        break;
    case Profile::Black:
        co = Qt::black;
        break;
    case Profile::Green:
-        qWarning("Foreground green");
+        owarn << "Foreground green" << oendl; 
        co = Qt::green;
        break;
    case Profile::Orange:
-        qWarning("Foreground orange");
+        owarn << "Foreground orange" << oendl; 
        co.setRgb( 231, 184, 98 );
        break;
    }
    return co;
 }
@@ -149,17 +151,17 @@ QColor EmulationHandler::backColor(int col ) {
        co = Qt::black;
        break;
    case Profile::Black:
        co = Qt::white;
        break;
    case Profile::Green:
-        qWarning("Background black");
+        owarn << "Background black" << oendl; 
        co = Qt::black;
        break;
    case Profile::Orange:
-        qWarning("Background black");
+        owarn << "Background black" << oendl; 
        co = Qt::black;
        break;
    }
    return co;
 }
diff --git a/noncore/apps/opie-console/emulation_widget.cpp b/noncore/apps/opie-console/emulation_widget.cpp
index ad8ecba..4688551 100644
--- a/noncore/apps/opie-console/emulation_widget.cpp
+++ b/noncore/apps/opie-console/emulation_widget.cpp
@@ -221,15 +221,15 @@ void EmulationWidget::paintEvent( QPaintEvent* pe )
 }
 void EmulationWidget::calcGeometry()
 {
        m_scrollbar->resize(QApplication::style().scrollBarExtent().width(), contentsRect().height() );
-        qDebug( QString(" TEST").arg( contentsRect().width() ) );
+        odebug << QString(" TEST").arg( contentsRect().width() ) << oendl; 
-        qDebug( QString(" TEST").arg( contentsRect().height() ) );
+        odebug << QString(" TEST").arg( contentsRect().height() ) << oendl; 
-        qDebug("NEUER TESTT!!!!!!!!");
+        odebug << "NEUER TESTT!!!!!!!!" << oendl; 
               switch( scrollLoc )
        {
        case SCRNONE :
                m_columns = ( contentsRect().width() -2 * rimX ) / f_width;
                m_blX = ( contentsRect().width() - ( m_columns*f_width ) ) / 2;
@@ -255,13 +255,13 @@ void EmulationWidget::calcGeometry()
        m_lines = ( contentsRect().height() - 2 * rimY ) / f_height;
        m_bY = ( contentsRect().height() - (m_lines * f_height ) ) / 2;
 }
 void EmulationWidget::drawAttrString( QString& string, QPainter &painter, QRect rect, Character attr, bool usePixmap, bool clear )
 {
-    qWarning("Color1 %s", color_table[attr.b].color.name().latin1() );
+    owarn << "Color1 " << color_table[attr.b].color.name().latin1() << "" << oendl; 
    if ( usePixmap && color_table[attr.b].transparent )
    {
        painter.setBackgroundMode( TransparentMode );
        if ( clear )
            erase( rect );
    }
@@ -269,13 +269,13 @@ void EmulationWidget::drawAttrString( QString& string, QPainter &painter, QRect
    {
        if ( blinking )
            painter.fillRect( rect, color_table[attr.b].color );
        else
        {
            painter.setBackgroundMode( OpaqueMode );
-            qWarning("Color %s", color_table[attr.b].color.name().latin1() );
+            owarn << "Color " << color_table[attr.b].color.name().latin1() << "" << oendl; 
            painter.setBackgroundColor( color_table[attr.b].color );
        }
    }
    if ( color_table[attr.f].bold )
        painter.setPen( QColor( 0x8F, 0x00, 0x00 ) );
    else
diff --git a/noncore/apps/opie-console/function_keyboard.cpp b/noncore/apps/opie-console/function_keyboard.cpp
index eb32551..6613183 100644
--- a/noncore/apps/opie-console/function_keyboard.cpp
+++ b/noncore/apps/opie-console/function_keyboard.cpp
@@ -1,8 +1,13 @@
 #include "function_keyboard.h"
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+/* QT */
 #include <qlayout.h>
 #include <qlistbox.h>
 #include <qlabel.h>
 #include <qdir.h>
 #define DEFAULT_ROWS 2
@@ -34,13 +39,13 @@ FunctionKeyboard::FunctionKeyboard(QWidget *parent) :
            keys.insert(
                 handle,
                 FKey (value_list[0], value_list[1], value_list[2].toUShort(), value_list[3].toUShort())
            );
        }
-    //qWarning("loaded %d keys", keys.count());
+    //owarn << "loaded " << keys.count() << " keys" << oendl; 
    */
    if (keys.isEmpty()) loadDefaults();
 }
@@ -253,13 +258,13 @@ void FunctionKeyboard::loadDefaults() {
 /* FunctionKeyboardConfig {{{1 */
 FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* parent, const char* na )
    : ProfileDialogKeyWidget(name, parent, na),
      selectedRow(0), selectedCol(0)
 {
-    qWarning("FunctionKeyboardConfig");
+    owarn << "FunctionKeyboardConfig" << oendl; 
    kb = new FunctionKeyboard(this);
    connect (kb, SIGNAL(keyPressed(FKey,ushort,ushort,bool)),
             this, SLOT(slotKeyPressed(FKey,ushort,ushort,bool)));
diff --git a/noncore/apps/opie-console/io_bt.cpp b/noncore/apps/opie-console/io_bt.cpp
index a29fa8e..c102427 100644
--- a/noncore/apps/opie-console/io_bt.cpp
+++ b/noncore/apps/opie-console/io_bt.cpp
@@ -1,10 +1,13 @@
 #include "io_bt.h"
+/* OPIE */
+#include <opie2/odebug.h>
 using namespace Opie::Core;
 IOBt::IOBt( const Profile &config ) : IOSerial( config ) {
    m_attach = 0;
 }
 IOBt::~IOBt() {
@@ -40,13 +43,13 @@ bool IOBt::open() {
        connect( m_attach, SIGNAL( processExited(Opie::Core::OProcess*) ),
                 this, SLOT( slotExited(Opie::Core::OProcess*) ) );
        if ( m_attach->start() ) {
            ret = IOSerial::open();
        } else {
-            qWarning("could not attach to device");
+            owarn << "could not attach to device" << oendl; 
            delete m_attach;
            m_attach = 0;
        }
    } else {
        // directly to the normal serial
        // TODO: look first if the connection really exists. ( is set up )
@@ -86,8 +89,8 @@ QBitArray IOBt::supports() const {
 bool IOBt::isConnected() {
    return false;
 }
 void IOBt::send(const QByteArray &data) {
-    qDebug( "Please overload me..." );
+    odebug << "Please overload me..." << oendl; 
 }
diff --git a/noncore/apps/opie-console/io_irda.cpp b/noncore/apps/opie-console/io_irda.cpp
index 07c2b62..38542f5 100644
--- a/noncore/apps/opie-console/io_irda.cpp
+++ b/noncore/apps/opie-console/io_irda.cpp
@@ -1,10 +1,12 @@
 #include "io_irda.h"
+/* OPIE */
+#include <opie2/odebug.h>
 using namespace Opie::Core;
 IOIrda::IOIrda( const Profile &config ) : IOSerial( config ) {
    m_attach = 0;
 }
 IOIrda::~IOIrda() {
@@ -32,13 +34,13 @@ bool IOIrda::open() {
             this, SLOT( slotExited(Opie::Core::OProcess*) ) );
    if ( m_attach->start() ) {
        ret= IOSerial::open();
    } else {
    // emit error!!!
-        qWarning("could not attach to device");
+        owarn << "could not attach to device" << oendl; 
        delete m_attach;
        m_attach = 0l;
    }
    return ret;
 }
@@ -71,8 +73,8 @@ QBitArray IOIrda::supports()const {
 bool IOIrda::isConnected() {
    return false;
 }
 void IOIrda::send(const QByteArray &data) {
-    qDebug( "Please overload me..." );
+    odebug << "Please overload me..." << oendl; 
 }
diff --git a/noncore/apps/opie-console/io_modem.cpp b/noncore/apps/opie-console/io_modem.cpp
index b74d076..c499dfe 100644
--- a/noncore/apps/opie-console/io_modem.cpp
+++ b/noncore/apps/opie-console/io_modem.cpp
@@ -1,21 +1,21 @@
 #include "io_modem.h"
 #include "dialer.h"
+/* OPIE */
+#include <opie2/odebug.h>
 using namespace Opie::Core;
-using namespace Opie::Core;
 IOModem::IOModem( const Profile &profile )
        : IOSerial( profile ) {
        m_profile = profile;
 }
 IOModem::~IOModem() {
 }
 void IOModem::close() {
        // Hangup, discarding result
        //int fd = rawIO();
@@ -101,8 +101,8 @@ QBitArray IOModem::supports()const {
 bool IOModem::isConnected() {
    return false;
 }
 void IOModem::send(const QByteArray &data) {
-    qDebug( "Please overload me..." );
+    odebug << "Please overload me..." << oendl; 
 }
diff --git a/noncore/apps/opie-console/main.cpp b/noncore/apps/opie-console/main.cpp
index dfb2f83..1bd4338 100644
--- a/noncore/apps/opie-console/main.cpp
+++ b/noncore/apps/opie-console/main.cpp
@@ -88,13 +88,13 @@ void FixIt::fixIt() {
 int main(int argc, char **argv) {
 // too bad this gives us trouble the taskbar...    argv[0]="embeddedkonsole";
    QPEApplication app( argc, argv );
 #ifdef   FSCKED_DISTRIBUTION
-    qWarning("fscked");
+    owarn << "fscked" << oendl; 
    FixIt it;
    it.fixIt();
 #endif
    MainWindow mw;
    mw.setCaption(QObject::tr("Opie Console") );
diff --git a/noncore/apps/opie-console/mainwindow.cpp b/noncore/apps/opie-console/mainwindow.cpp
index 06a8f7d..b403b4d 100644
--- a/noncore/apps/opie-console/mainwindow.cpp
+++ b/noncore/apps/opie-console/mainwindow.cpp
@@ -1,33 +1,36 @@
-#include <assert.h>
-#include <qaction.h>
-#include <qmenubar.h>
-#include <qtoolbar.h>
-#include <qmessagebox.h>
-#include <qwhatsthis.h>
-#include <qfileinfo.h>
-#include <qpe/filemanager.h>
-#include <opie2/ofiledialog.h>
 #include "TEmulation.h"
 #include "profileeditordialog.h"
 #include "configdialog.h"
 #include "default.h"
 #include "profilemanager.h"
 #include "mainwindow.h"
 #include "tabwidget.h"
 #include "transferdialog.h"
 #include "function_keyboard.h"
 #include "emulation_handler.h"
 #include "script.h"
+/* OPIE */
+#include <opie2/odebug.h>
+#include <opie2/ofiledialog.h>
+#include <qpe/filemanager.h>
+using namespace Opie::Core;
 using namespace Opie::Ui;
+/* QT */
+#include <qaction.h>
+#include <qmenubar.h>
+#include <qtoolbar.h>
+#include <qmessagebox.h>
+#include <qwhatsthis.h>
+#include <qfileinfo.h>
+/* STD */
+#include <assert.h>
 MainWindow::MainWindow(QWidget *parent, const char *name, WFlags) : QMainWindow(parent, name, WStyle_ContextHelp)  {
    KeyTrans::loadAll();
    for (int i = 0; i < KeyTrans::count(); i++ ) {
        KeyTrans* s = KeyTrans::find(i );
        assert( s );
    }
@@ -443,19 +446,19 @@ void MainWindow::slotConfigure() {
 */
 void MainWindow::slotClose() {
    if (!currentSession() )
        return;
    Session* ses = currentSession();
-    qWarning("removing! currentSession %s", currentSession()->name().latin1() );
+    owarn << "removing! currentSession " << currentSession()->name().latin1() << "" << oendl; 
    /* set to NULL to be safe, if its needed slotSessionChanged resets it automatically */
    m_curSession = NULL;
    tabWidget()->remove( /*currentSession()*/ses );
    /*it's autodelete */
    m_sessions.remove( ses );
-    qWarning("after remove!!");
+    owarn << "after remove!!" << oendl; 
    if (!currentSession() ) {
        m_connect->setEnabled( false );
        m_disconnect->setEnabled( false );
        m_terminate->setEnabled( false );
        m_transfer->setEnabled( false );
@@ -567,22 +570,22 @@ void MainWindow::slotOpenButtons( bool state ) {
    }
 }
 void MainWindow::slotSessionChanged( Session* ses ) {
-    qWarning("changed!");
+    owarn << "changed!" << oendl; 
    if(m_curSession)
        if(m_curSession->transferDialog()) m_curSession->transferDialog()->hide();
    if(ses)
        if(ses->transferDialog()) ses->transferDialog()->show();
    if ( ses ) {
        m_curSession = ses;
-        qDebug(QString("is connected : %1").arg(  m_curSession->layer()->isConnected() ) );
+        odebug << QString("is connected : %1").arg(  m_curSession->layer()->isConnected() ) << oendl; 
        if ( m_curSession->layer()->isConnected() ) {
            m_connect->setEnabled( false );
            m_disconnect->setEnabled( true );
            m_recordScript->setEnabled(!m_curSession->emulationHandler()->isRecording());
            m_saveScript->setEnabled(m_curSession->emulationHandler()->isRecording());
            m_scripts->setItemEnabled(m_runScript_id, true);
diff --git a/noncore/apps/opie-console/modemconfigwidget.cpp b/noncore/apps/opie-console/modemconfigwidget.cpp
index 3466e3a..9fdaf73 100644
--- a/noncore/apps/opie-console/modemconfigwidget.cpp
+++ b/noncore/apps/opie-console/modemconfigwidget.cpp
@@ -1,18 +1,21 @@
+#include "modemconfigwidget.h"
+#include "dialdialog.h"
+/* OPIE */
+#include <opie2/odebug.h>
 #include <qpe/qpeapplication.h>
+using namespace Opie::Core;
+/* QT */
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qcombobox.h>
 #include <qpushbutton.h>
 #include <qhbox.h>
-#include "modemconfigwidget.h"
-#include "dialdialog.h"
 namespace {
    void setCurrent( const QString& str, QComboBox* bo ) {
        uint b = bo->count();
        for (int i = 0; i < bo->count(); i++ ) {
            if ( bo->text(i) == str ) {
                bo->setCurrentItem( i );
@@ -132,13 +135,13 @@ void ModemConfigWidget::load( const Profile& prof ) {
        m_base->setStop( IOLayerBase::Stop_One );
    }
    atConf->readConfig( prof );
    if ( prof.readEntry( "Device" ).isEmpty() ) {
-        qWarning("device empty!");
+        owarn << "device empty!" << oendl; 
        return;
    }
    setCurrent( prof.readEntry( "Device" ), m_deviceCmb );
 }
diff --git a/noncore/apps/opie-console/opie-console.pro b/noncore/apps/opie-console/opie-console.pro
index 7a15828..f7e33e9 100644
--- a/noncore/apps/opie-console/opie-console.pro
+++ b/noncore/apps/opie-console/opie-console.pro
@@ -1,10 +1,8 @@
 TEMPLATE     = app
-TMAKE_CXXFLAGS    += -DHAVE_OPENPTY
 CONFIG       += qt warn_on 
-#CONFIG          = qt 
 DESTDIR      = $(OPIEDIR)/bin
 HEADERS      = io_layer.h io_serial.h io_irda.h io_bt.h io_modem.h \
           file_layer.h filetransfer.h \
           metafactory.h \
           session.h \
           mainwindow.h \
@@ -67,10 +65,10 @@ SOURCES      = io_layer.cpp io_serial.cpp io_irda.cpp io_bt.cpp io_modem.cpp \
 INTERFACES   = configurebase.ui editbase.ui
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lqpe -lopiecore2 -lopieui2 -lutil
 TARGET       = opie-console
+DEFINES += HAVE_OPENPTY
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/opie-console/sz_transfer.cpp b/noncore/apps/opie-console/sz_transfer.cpp
index fbc5306..f505998 100644
--- a/noncore/apps/opie-console/sz_transfer.cpp
+++ b/noncore/apps/opie-console/sz_transfer.cpp
@@ -38,13 +38,13 @@ void SzTransfer::sendFile(const QString& file) {
    proc->start(OProcess::NotifyOnExit, OProcess::All);
 }
 void SzTransfer::SzReceivedStdout(OProcess *, char *buffer, int buflen) {
-    qWarning("recieved from sz on stdout %d bytes", buflen);
+    owarn << "recieved from sz on stdout " << buflen << " bytes" << oendl; 
    QByteArray data(buflen);
    data.fill(*buffer, buflen);
    for (uint i = 0; i < data.count(); i++ ) {
        printf("%c", buffer[i] );
    }
@@ -62,22 +62,22 @@ void SzTransfer::SzReceivedStderr(OProcess *, char *buffer, int length) {
    //    printf("%c", buffer[i]);
    //printf("\n");
 }
 void SzTransfer::receivedStdin(const QByteArray &data) {
-    qWarning("recieved from io_serial %d bytes", data.size());
+    owarn << "recieved from io_serial " << data.size() << " bytes" << oendl; 
    // recieved data from the io layer goes to sz
    proc->writeStdin(data.data(), data.size());
 }
 void SzTransfer::sent() {
-    qWarning("sent file");
+    owarn << "sent file" << oendl; 
    //setcbreak(0); /* default */
    delete proc;
    disconnect(layer(), SIGNAL(received(const QByteArray&)),
diff --git a/noncore/apps/opie-console/tabwidget.cpp b/noncore/apps/opie-console/tabwidget.cpp
index 6429e3c..41a91ed 100644
--- a/noncore/apps/opie-console/tabwidget.cpp
+++ b/noncore/apps/opie-console/tabwidget.cpp
@@ -1,21 +1,24 @@
 #include "tabwidget.h"
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
 using namespace Opie::Ui;
 TabWidget::TabWidget( QWidget* parent, const char* name )
    : OTabWidget( parent, name ) {
    connect(this, SIGNAL( currentChanged(QWidget*) ),
            this, SLOT( slotCurChanged(QWidget*) ) );
 }
 TabWidget::~TabWidget() {
 }
 void TabWidget::add( Session* ses ) {
-    qWarning("session ses " + ses->name() );
+    owarn << "session ses " + ses->name() << oendl; 
    if ( !ses->widgetStack() ) return;
    //reparent( ses->widgetStack(), QPoint() );
    addTab( ses->widgetStack(), "console/konsole", ses->name() );
    //addTab( ses->widgetStack(), ses->name() );
    m_map.insert( ses->widgetStack(), ses );
 }
diff --git a/noncore/apps/opie-console/terminalwidget.cpp b/noncore/apps/opie-console/terminalwidget.cpp
index 6870487..087476b 100644
--- a/noncore/apps/opie-console/terminalwidget.cpp
+++ b/noncore/apps/opie-console/terminalwidget.cpp
@@ -1,16 +1,21 @@
+#include "terminalwidget.h"
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+/* QT */
 #include <qlabel.h>
 #include <qcheckbox.h>
 #include <qcombobox.h>
 #include <qradiobutton.h>
 #include <qhgroupbox.h>
 #include <qhbuttongroup.h>
 #include <qlayout.h>
-#include "terminalwidget.h"
 namespace {
    enum TermIds {
        id_term_vt100 = 0,
        id_term_vt102,
        id_term_linux,
        id_term_xterm
@@ -66,13 +71,13 @@ TerminalWidget::TerminalWidget( const QString& name, QWidget* parent,
    m_lroot->add( m_groupConv );
    m_lroot->add( m_groupOptions );
    m_lroot->addStretch( 0 );
    // Fill in some options
-    qWarning("Options for terminal box");
+    owarn << "Options for terminal box" << oendl; 
    m_terminalBox->insertItem( tr("VT 100"), 0 ); // /*, id_term_vt100*/ );
    m_terminalBox->insertItem( tr("VT 102"), 1 );  // /* , id_term_vt102 */);
    m_terminalBox->insertItem( tr("Linux Console"), 2 ); //, id_term_linux );
    m_terminalBox->insertItem( tr("X-Terminal"), 3 ); //, id_term_xterm );
    //m_terminalBox->insertItem( tr("ANSI"), id_term_ansi );
diff --git a/noncore/apps/opie-console/test/senderui.cpp b/noncore/apps/opie-console/test/senderui.cpp
index df27055..45fd11d 100644
--- a/noncore/apps/opie-console/test/senderui.cpp
+++ b/noncore/apps/opie-console/test/senderui.cpp
@@ -23,21 +23,21 @@ SenderUI::SenderUI()
    /* we do that manually */
    Profile prof;
    QString str = "/dev/bty0";
    prof.writeEntry("Device",str );
    prof.writeEntry("Baud", 19200 );
-    qWarning("prof " + prof.readEntry("Device")  + " " + str);
+    owarn << "prof " + prof.readEntry("Device")  + " " + str << oendl; 
    ser = new IOSerial(prof);
    connect(ser, SIGNAL(received(const QByteArray&) ),
            this, SLOT(got(const QByteArray&) ) );
    if ( ser->open() )
-        qWarning("opened!!!");
+        owarn << "opened!!!" << oendl; 
    else
-        qWarning("could not open");
+        owarn << "could not open" << oendl; 
 }
 SenderUI::~SenderUI() {
 }
@@ -49,31 +49,31 @@ void SenderUI::slotSendFile() {
    connect (sz, SIGNAL(sent()),
             this, SLOT(fileTransComplete()));
 }
 void SenderUI::slotSend() {
    QCString str = MultiLineEdit1->text().utf8();
-    qWarning("sending: %s", str.data() );
+    owarn << "sending: " << str.data() << "" << oendl; 
    str = str.replace( QRegExp("\n"), "\r");
    ser->send( str );
 }
 void SenderUI::got(const QByteArray& ar) {
-    qWarning("got:");
+    owarn << "got:" << oendl; 
    for ( uint i = 0; i < ar.count(); i++ ) {
        printf("%c", ar[i] );
    }
    printf("\n");
 }
 void SenderUI::fileTransComplete() {
-    qWarning("file transfer complete");
+    owarn << "file transfer complete" << oendl; 
 }
 void SenderUI::send() {
 }
 void SenderUI::slotRev(){
-qWarning("Going to receive!");
+owarn << "Going to receive!" << oendl; 
 FileReceive *rev = new FileReceive( FileReceive::SZ, ser );
 rev->receive();
 }
diff --git a/noncore/apps/opie-console/widget.cpp b/noncore/apps/opie-console/widget.cpp
index e17dfd4..c51983f 100644
--- a/noncore/apps/opie-console/widget.cpp
+++ b/noncore/apps/opie-console/widget.cpp
@@ -992,13 +992,13 @@ bool Widget::eventFilter( QObject *obj, QEvent *e )
        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"
@@ -1031,17 +1031,17 @@ bool Widget::eventFilter( QObject *obj, QEvent *e )
    if ( e->type() == QEvent::KeyPress )  {
        QKeyEvent* ke = (QKeyEvent*)e;
        actSel=0; // Key stroke implies a screen update, so Widget won't
          // know where the current selection is.
-//     qDebug("key pressed is 0x%x",ke->key());
+//     odebug << "key pressed is 0x" << ke->key() << "" << oendl; 
        if( ke->state() == ShiftButton && ke->key() == Key_Tab) { //lets hardcode this sucker
-//     qDebug("key pressed 2 is 0x%x",ke->key());
+//     odebug << "key pressed 2 is 0x" << ke->key() << "" << oendl; 
            emitText("\\"); // expose
        } else
            emit keyPressedSignal(ke); // expose
        ke->accept();
 #ifdef FAKE_CTRL_AND_ALT
        if ( dele ) delete e;
diff --git a/noncore/apps/opie-console/widget_layer.cpp b/noncore/apps/opie-console/widget_layer.cpp
index 96dda1c..ab25919 100644
--- a/noncore/apps/opie-console/widget_layer.cpp
+++ b/noncore/apps/opie-console/widget_layer.cpp
@@ -72,13 +72,13 @@ bool WidgetLayer::eventFilter( QObject *obj, QEvent *e )
    if ( obj != this /* when embedded */ && obj != parent() /* when standalone */ )
        return false; // not us
 #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"
@@ -112,13 +112,13 @@ QChar(a,0));
    if ( e->type() == QEvent::KeyPress )  {
        QKeyEvent* ke = (QKeyEvent*)e;
        //actSel=0; // Key stroke implies a screen update, so Widget won't
          // know where the current selection is.
-//     qDebug("key pressed is 0x%x",ke->key());
+//     odebug << "key pressed is 0x" << ke->key() << "" << oendl; 
        if( ke->state() == ShiftButton && ke->key() == Key_Tab) { //lets hardcode this sucker
            insertText("\\"); // expose
        } else
            emit keyPressed( ke ); // expose
        ke->accept();
diff --git a/noncore/apps/opie-write/mainwindow.cpp b/noncore/apps/opie-write/mainwindow.cpp
index 90e1a70..aa03060 100644
--- a/noncore/apps/opie-write/mainwindow.cpp
+++ b/noncore/apps/opie-write/mainwindow.cpp
@@ -17,18 +17,22 @@
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #include "mainwindow.h"
+/* OPIE */
+#include <opie2/odebug.h>
 #include <qpe/fileselector.h>
 #include <qpe/applnk.h>
 #include <qpe/resource.h>
 #include <qpe/fontdatabase.h>
+using namespace Opie::Core;
-//#include "qspellchecker.h"
+/* QT */
 #include "qtextedit.h"
 #include <qaction.h>
 #include <qtoolbar.h>
 #include <qtoolbutton.h>
 #include <qtabwidget.h>
 #include <qapplication.h>
@@ -441,25 +445,25 @@ void MainWindow::fileOpen()
    clear();
    updateCaption();
 }
 void MainWindow::fileRevert()
 {
-    qDebug( "QMainWindow::fileRevert needs to be done" );
+    odebug << "QMainWindow::fileRevert needs to be done" << oendl; 
 }
 void MainWindow::fileNew()
 {
    editor->setTextFormat( Qt::RichText );
    save();
    newFile(DocLnk());
 }
 void MainWindow::insertTable()
 {
-    qDebug( "MainWindow::insertTable() needs to be done" );
+    odebug << "MainWindow::insertTable() needs to be done" << oendl; 
 }
 void MainWindow::newFile( const DocLnk &dl )
 {
    DocLnk nf = dl;
    nf.setType( "text/html" );
@@ -472,13 +476,13 @@ void MainWindow::newFile( const DocLnk &dl )
 void MainWindow::openFile( const DocLnk &dl )
 {
    FileManager fm;
    QString txt;
    if ( !fm.loadFile( dl, txt ) )
-  qDebug( "couldn't open file" );
+  odebug << "couldn't open file" << oendl; 
    clear();
    editorStack->raiseWidget( editor );
    editor->viewport()->setFocus();
    doc = new DocLnk( dl );
    editor->setText( txt );
    editor->setModified( FALSE );
diff --git a/noncore/apps/opie-write/opie-write.pro b/noncore/apps/opie-write/opie-write.pro
index 044ce7e..8e514d4 100644
--- a/noncore/apps/opie-write/opie-write.pro
+++ b/noncore/apps/opie-write/opie-write.pro
@@ -1,10 +1,9 @@
 CONFIG        += qt warn on  quick-app
 HEADERS    =    qcleanuphandler.h \
        qcomplextext_p.h \
        qrichtext_p.h \
        qstylesheet.h \
        qtextedit.h \
        mainwindow.h
diff --git a/noncore/apps/opie-write/qcomplextext.cpp b/noncore/apps/opie-write/qcomplextext.cpp
index 473f184..00a91c5 100644
--- a/noncore/apps/opie-write/qcomplextext.cpp
+++ b/noncore/apps/opie-write/qcomplextext.cpp
@@ -103,13 +103,13 @@ QBidiContext::~QBidiContext()
  leftChar() returns true if the char to the left is a left join-causing char
  rightChar() returns true if the char to the right is a right join-causing char
 */
 static inline const QChar *prevChar( const QString &str, int pos )
 {
-    //qDebug("leftChar: pos=%d", pos);
+    //odebug << "leftChar: pos=" << pos << "" << oendl; 
    pos--;
    const QChar *ch = str.unicode() + pos;
    while( pos > -1 ) {
        if( !ch->isMark() )
            return ch;
        pos--;
@@ -121,13 +121,13 @@ static inline const QChar *prevChar( const QString &str, int pos )
 static inline const QChar *nextChar( const QString &str, int pos)
 {
    pos++;
    int len = str.length();
    const QChar *ch = str.unicode() + pos;
    while( pos < len ) {
-        //qDebug("rightChar: %d isLetter=%d, joining=%d", pos, ch.isLetter(), ch.joining());
+        //odebug << "rightChar: " << pos << " isLetter=" << ch.isLetter() << ", joining=" << ch.joining() << "" << oendl; 
        if( !ch->isMark() )
            return ch;
        // assume it's a transparent char, this might not be 100% correct
        pos++;
        ch++;
    }
diff --git a/noncore/apps/opie-write/qrichtext.cpp b/noncore/apps/opie-write/qrichtext.cpp
index b77a0fc..c27eb1e 100644
--- a/noncore/apps/opie-write/qrichtext.cpp
+++ b/noncore/apps/opie-write/qrichtext.cpp
@@ -34,17 +34,23 @@
 ** not clear to you.
 **
 **********************************************************************/
 #include "qrichtext_p.h"
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+/* QT */
 #include "qdragobject.h"
 #include "qpaintdevicemetrics.h"
 #include "qdrawutil.h"
 #include "qcleanuphandler.h"
+/* STD */
 #include <stdlib.h>
 using namespace Qt3;
 static QTextCursor* richTextExportStart = 0;
 static QTextCursor* richTextExportEnd = 0;
@@ -181,13 +187,13 @@ QTextDeleteCommand::~QTextDeleteCommand()
 }
 QTextCursor *QTextDeleteCommand::execute( QTextCursor *c )
 {
    QTextParagraph *s = doc ? doc->paragAt( id ) : parag;
    if ( !s ) {
-        qWarning( "can't locate parag at %d, last parag: %d", id, doc->lastParagraph()->paragId() );
+        owarn << "can't locate parag at " << id << ", last parag: " << doc->lastParagraph()->paragId() << "" << oendl; 
        return 0;
    }
    cursor.setParagraph( s );
    cursor.setIndex( index );
    int len = text.size();
@@ -209,13 +215,13 @@ QTextCursor *QTextDeleteCommand::execute( QTextCursor *c )
 }
 QTextCursor *QTextDeleteCommand::unexecute( QTextCursor *c )
 {
    QTextParagraph *s = doc ? doc->paragAt( id ) : parag;
    if ( !s ) {
-        qWarning( "can't locate parag at %d, last parag: %d", id, doc->lastParagraph()->paragId() );
+        owarn << "can't locate parag at " << id << ", last parag: " << doc->lastParagraph()->paragId() << "" << oendl; 
        return 0;
    }
    cursor.setParagraph( s );
    cursor.setIndex( index );
    QString str = QTextString::toString( text );
@@ -1541,16 +1547,16 @@ void QTextDocument::setRichTextInternal( const QString &text, QTextCursor* curso
                        }
                        if ( attr.contains( "background" ) ) {
                            QImage img;
                            QString bg = attr["background"];
                            const QMimeSource* m = factory_->data( bg, contxt );
                            if ( !m ) {
-                                qWarning("QRichText: no mimesource for %s", bg.latin1() );
+                                owarn << "QRichText: no mimesource for " << bg.latin1() << "" << oendl; 
                            } else {
                                if ( !QImageDrag::decode( m, img ) ) {
-                                    qWarning("QTextImage: cannot decode %s", bg.latin1() );
+                                    owarn << "QTextImage: cannot decode " << bg.latin1() << "" << oendl; 
                                }
                            }
                            if ( !img.isNull() ) {
                                QPixmap pm;
                                pm.convertFromImage( img );
                                QBrush *b = new QBrush( QColor(), pm );
@@ -2149,13 +2155,13 @@ QString QTextDocument::richText() const
    QStyleSheetItem* item_p = styleSheet()->item("p");
    QStyleSheetItem* item_ul = styleSheet()->item("ul");
    QStyleSheetItem* item_ol = styleSheet()->item("ol");
    QStyleSheetItem* item_li = styleSheet()->item("li");
    if ( !item_p || !item_ul || !item_ol || !item_li ) {
-        qWarning( "QTextEdit: cannot export HTML due to insufficient stylesheet (lack of p, ul, ol, or li)" );
+        owarn << "QTextEdit: cannot export HTML due to insufficient stylesheet (lack of p, ul, ol, or li)" << oendl; 
        return QString::null;
    }
    int pastListDepth = 0;
    int listDepth = 0;
    int futureListDepth = 0;
    QMemArray<int> listStyles(10);
@@ -4093,13 +4099,13 @@ int QTextParagraph::lineHeightOfChar( int i, int *bl, int *y ) const
        }
        if ( it == lineStarts.begin() )
            break;
        --it;
    }
-    qWarning( "QTextParagraph::lineHeightOfChar: couldn't find lh for %d", i );
+    owarn << "QTextParagraph::lineHeightOfChar: couldn't find lh for " << i << "" << oendl; 
    return 15;
 }
 QTextStringChar *QTextParagraph::lineStartOfChar( int i, int *index, int *line ) const
 {
    if ( !isValid() )
@@ -4119,13 +4125,13 @@ QTextStringChar *QTextParagraph::lineStartOfChar( int i, int *index, int *line )
        if ( it == lineStarts.begin() )
            break;
        --it;
        --l;
    }
-    qWarning( "QTextParagraph::lineStartOfChar: couldn't find %d", i );
+    owarn << "QTextParagraph::lineStartOfChar: couldn't find " << i << "" << oendl; 
    return 0;
 }
 int QTextParagraph::lines() const
 {
    if ( !isValid() )
@@ -4146,13 +4152,13 @@ QTextStringChar *QTextParagraph::lineStartOfLine( int line, int *index ) const
        int i = it.key();
        if ( index )
            *index = i;
        return &str->at( i );
    }
-    qWarning( "QTextParagraph::lineStartOfLine: couldn't find %d", line );
+    owarn << "QTextParagraph::lineStartOfLine: couldn't find " << line << "" << oendl; 
    return 0;
 }
 int QTextParagraph::leftGap() const
 {
    if ( !isValid() )
@@ -5694,13 +5700,13 @@ QTextFormat *QTextFormatCollection::format( const QFont &f, const QColor &c )
        return defFormat;
    cachedFormat = createFormat( f, c );
    cachedFormat->collection = this;
    cKey.insert( cachedFormat->key(), cachedFormat );
    if ( cachedFormat->key() != key )
-        qWarning("ASSERT: keys for format not identical: '%s '%s'", cachedFormat->key().latin1(), key.latin1() );
+        owarn << "ASSERT: keys for format not identical: '" << cachedFormat->key().latin1() << " '" << key.latin1() << "'" << oendl; 
    return cachedFormat;
 }
 void QTextFormatCollection::remove( QTextFormat *f )
 {
    if ( lastFormat == f )
@@ -6080,17 +6086,17 @@ QTextImage::QTextImage( QTextDocument *p, const QMap<QString, QString> &attr, co
            height = pm.height();
        } else {
            QImage img;
            const QMimeSource* m =
                factory.data( imageName, context );
            if ( !m ) {
-                qWarning("QTextImage: no mimesource for %s", imageName.latin1() );
+                owarn << "QTextImage: no mimesource for " << imageName.latin1() << "" << oendl; 
            }
            else {
                if ( !QImageDrag::decode( m, img ) ) {
-                    qWarning("QTextImage: cannot decode %s", imageName.latin1() );
+                    owarn << "QTextImage: cannot decode " << imageName.latin1() << "" << oendl; 
                }
            }
            if ( !img.isNull() ) {
                if ( width == 0 ) {
                    width = img.width();
diff --git a/noncore/apps/opie-write/qrichtext_p.cpp b/noncore/apps/opie-write/qrichtext_p.cpp
index 6783e0b..2e8b09c 100644
--- a/noncore/apps/opie-write/qrichtext_p.cpp
+++ b/noncore/apps/opie-write/qrichtext_p.cpp
@@ -32,12 +32,15 @@
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
+#include <opie2/odebug.h>
+using namespace Opie::Core;
 #include "qrichtext_p.h"
 using namespace Qt3;
 QTextCommand::~QTextCommand() {}
 QTextCommand::Commands QTextCommand::type() const { return Invalid; }
@@ -134,13 +137,13 @@ void QTextCursor::gotoPosition( QTextParagraph* p, int index )
            pop();
        Q_ASSERT( indices.isEmpty() || para->document() == p->document() );
    }
    para = p;
    if ( index < 0 || index >= para->length() ) {
 #if defined(QT_CHECK_RANGE)
-        qWarning( "QTextCursor::gotoParagraph Index: %d out of range", index );
+        owarn << "QTextCursor::gotoParagraph Index: " << index << " out of range" << oendl; 
 #endif
        index = index < 0 ? 0 : para->length() - 1;
    }
    tmpIndex = -1;
    idx = index;
@@ -474,13 +477,13 @@ bool QTextParagraph::fullSelected( int id ) const
    return ( *it ).start == 0 && ( *it ).end == str->length() - 1;
 }
 int QTextParagraph::lineY( int l ) const
 {
    if ( l > (int)lineStarts.count() - 1 ) {
-        qWarning( "QTextParagraph::lineY: line %d out of range!", l );
+        owarn << "QTextParagraph::lineY: line " << l << " out of range!" << oendl; 
        return 0;
    }
    if ( !isValid() )
        ( (QTextParagraph*)this )->format();
@@ -490,13 +493,13 @@ int QTextParagraph::lineY( int l ) const
    return ( *it )->y;
 }
 int QTextParagraph::lineBaseLine( int l ) const
 {
    if ( l > (int)lineStarts.count() - 1 ) {
-        qWarning( "QTextParagraph::lineBaseLine: line %d out of range!", l );
+        owarn << "QTextParagraph::lineBaseLine: line " << l << " out of range!" << oendl; 
        return 10;
    }
    if ( !isValid() )
        ( (QTextParagraph*)this )->format();
@@ -506,13 +509,13 @@ int QTextParagraph::lineBaseLine( int l ) const
    return ( *it )->baseLine;
 }
 int QTextParagraph::lineHeight( int l ) const
 {
    if ( l > (int)lineStarts.count() - 1 ) {
-        qWarning( "QTextParagraph::lineHeight: line %d out of range!", l );
+        owarn << "QTextParagraph::lineHeight: line " << l << " out of range!" << oendl; 
        return 15;
    }
    if ( !isValid() )
        ( (QTextParagraph*)this )->format();
@@ -522,14 +525,14 @@ int QTextParagraph::lineHeight( int l ) const
    return ( *it )->h;
 }
 void QTextParagraph::lineInfo( int l, int &y, int &h, int &bl ) const
 {
    if ( l > (int)lineStarts.count() - 1 ) {
-        qWarning( "QTextParagraph::lineInfo: line %d out of range!", l );
+        owarn << "QTextParagraph::lineInfo: line " << l << " out of range!" << oendl; 
-        qDebug( "%d %d", (int)lineStarts.count() - 1, l );
+        odebug << "" << (int)lineStarts.count() - 1 << " " << l << "" << oendl; 
        y = 0;
        h = 15;
        bl = 10;
        return;
    }
diff --git a/noncore/apps/qashmoney/accountdisplay.cpp b/noncore/apps/qashmoney/accountdisplay.cpp
index 0fe5b09..046d997 100755
--- a/noncore/apps/qashmoney/accountdisplay.cpp
+++ b/noncore/apps/qashmoney/accountdisplay.cpp
@@ -1,15 +1,20 @@
-#include <qmessagebox.h>
-#include <qheader.h>
 #include "accountdisplay.h"
 #include "newaccount.h"
 #include "transaction.h"
 #include "transferdialog.h"
 #include "transfer.h"
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+/* QT */
+#include <qmessagebox.h>
+#include <qheader.h>
 extern Account *account;
 extern Transaction *transaction;
 extern Transfer *transfer;
 extern Preferences *preferences;
 AccountDisplay::AccountDisplay ( QWidget *parent ) : QWidget ( parent )
@@ -264,13 +269,13 @@ void AccountDisplay::getTransferAccounts ( QListViewItem * item )
        if ( td->exec() == QDialog::Accepted )
          {
            // set the cleared integer if the checkbox is checked
            if ( td->clearedcheckbox->isChecked() == TRUE )
              cleared = 1;
-            qDebug("Year from transferdialog = %i",td->getYear());
+            odebug << "Year from transferdialog = " << td->getYear() << "" << oendl; 
            // add the transfer with a new date if its been edited or use the default date
            if ( td->getDateEdited () == TRUE )
              transfer->addTransfer ( firstaccountid, account->getParentAccountID ( firstaccountid ), secondaccountid, account->getParentAccountID ( secondaccountid ), td->getDay(), td->getMonth(), td->getYear(), td->amount->text().toFloat(), cleared );
            else
              transfer->addTransfer ( firstaccountid, account->getParentAccountID ( firstaccountid ), secondaccountid, account->getParentAccountID ( secondaccountid ), defaultday, defaultmonth, defaultyear, td->amount->text().toFloat(), cleared );
diff --git a/noncore/apps/qashmoney/config.in b/noncore/apps/qashmoney/config.in
index 91739fe..aeed298 100644
--- a/noncore/apps/qashmoney/config.in
+++ b/noncore/apps/qashmoney/config.in
@@ -1,4 +1,4 @@
  config QASHMONEY
    boolean "opie-qashmoney (money manager)" 
    default "n"
-    depends ( LIBQPE || LIBQPE-X11 ) 
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
diff --git a/noncore/apps/qashmoney/qashmoney.pro b/noncore/apps/qashmoney/qashmoney.pro
index 6ad3db3..8a4302f 100755
--- a/noncore/apps/qashmoney/qashmoney.pro
+++ b/noncore/apps/qashmoney/qashmoney.pro
@@ -40,10 +40,10 @@ SOURCES =	qashmoney.cpp \
 INCLUDEPATH = $(OPIEDIR)/include
 DEPENDPATH = $(OPIEDIR)/include
 DESTDIR = $(OPIEDIR)/bin
 unix:LIBS += -lm
-LIBS += -lqpe -lqte -lsqlite
+LIBS += -lqpe -lopiecore2 -lsqlite
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/tableviewer/db/common.cpp b/noncore/apps/tableviewer/db/common.cpp
index dbf9370..6e544ba 100644
--- a/noncore/apps/tableviewer/db/common.cpp
+++ b/noncore/apps/tableviewer/db/common.cpp
@@ -14,21 +14,29 @@
 ** 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 <stdlib.h>
+#include "common.h"   
+#include "datacache.h"
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/timestring.h>
+using namespace Opie::Core;
+/* QT */
 #include <qstring.h>
 #include <qheader.h>
 #include <qvector.h>
 #include <qdatetime.h>
-#include <qpe/timestring.h>
-#include "common.h"
+/* STD */
-#include "datacache.h"
 #include <assert.h>
+#include <stdlib.h>
 static const int del_flag = 0x1;
 static const int new_flag = 0x2;
 /* Helper function */
@@ -309,13 +317,13 @@ void TVVariant::load(QDataStream &s )
                int x;
                s >> x;
                d->value.i = x;
            }
      break;
        default:
-      qFatal("Unrecognized data type");
+      ofatal << "Unrecognized data type" << oendl; 
    }
 }
 void TVVariant::save( QDataStream &s ) const
 {
    s << type();
@@ -1075,13 +1083,13 @@ QDataStream &operator>>( QDataStream &s, DataElem &d)
    int size;
    TVVariant t;
    int index = 0;
    s >> size; /* redundent data but makes streaming easier */
    if (size != d.getNumFields()) {
-        qWarning("DataSize mis-match");
+        owarn << "DataSize mis-match" << oendl; 
        return s; /* sanity check failed.. don't load */
    }
    for(i = 0; i < size; i++) {
        s >> (Q_UINT16)index;
        s >> t;
@@ -1374,13 +1382,13 @@ bool DataElem::contains(int i, TVVariant v) const
            /* meaningless for dates */
        case TVVariant::Int: 
        case TVVariant::Time:
        case TVVariant::Date:
            break;
        default:
-            qWarning("Tried to compare unknown data type");
+            owarn << "Tried to compare unknown data type" << oendl; 
    }
    return FALSE;
 }
 bool DataElem::startsWith(int i, TVVariant v) const
 {
@@ -1400,13 +1408,13 @@ bool DataElem::startsWith(int i, TVVariant v) const
            /* meaningless for dates */
        case TVVariant::Int: 
        case TVVariant::Time:
        case TVVariant::Date:
            return FALSE;
        default:
-            qWarning("Tried to compare unknown data type");
+            owarn << "Tried to compare unknown data type" << oendl; 
    }
    return FALSE;
 }
 bool DataElem::endsWith(int i, TVVariant v) const
 {
@@ -1426,13 +1434,13 @@ bool DataElem::endsWith(int i, TVVariant v) const
            /* meaningless for dates */
        case TVVariant::Int: 
        case TVVariant::Time:
        case TVVariant::Date:
            return FALSE;
        default:
-            qWarning("Tried to compare unknown data type");
+            owarn << "Tried to compare unknown data type" << oendl; 
    }
    return FALSE;
 }
 /*!
    Determins which of the first to parameters are closer to the third, target
@@ -1458,13 +1466,13 @@ bool DataElem::closer(DataElem*d1, DataElem *d2, TVVariant target, int column)
    type = d1->getField(column).type();
    if(d2) {
        if (type != d2->getField(column).type()) {
                /* can't do compare */
-                qWarning("Tried to compare two incompatable types");
+                owarn << "Tried to compare two incompatable types" << oendl; 
                return FALSE;
        }
        return target.closer(d1->getField(column), d2->getField(column));
    } 
    return target.close(d1->getField(column));
 }
diff --git a/noncore/apps/tableviewer/db/datacache.cpp b/noncore/apps/tableviewer/db/datacache.cpp
index 7c14eef..6380e1b 100644
--- a/noncore/apps/tableviewer/db/datacache.cpp
+++ b/noncore/apps/tableviewer/db/datacache.cpp
@@ -23,15 +23,23 @@
 * otherwise any other data headings are allowed.
 */
 #include "datacache.h"
 #include "xmlsource.h"
 #include "csvsource.h"
-#include <stdlib.h>
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+/* QT */
 #include <qheader.h>
+/* STD */
+#include <stdlib.h>
 #define INIT_TABLE_SIZE 128
 /*!
    \class DBStore datastore.h
    \brief The DBStore class is the class responsible for storing, sorting and
@@ -147,13 +155,13 @@ void DBStore::addItem(DataElem *delem)
 }
 void DBStore::addItemInternal(DataElem *delem)
 {
    /* if already full, don't over fill, do a qWarning though */
    if (full) {
-        qWarning("Attempted to add items to already full table");
+        owarn << "Attempted to add items to already full table" << oendl; 
        return;
    }
    master_table.insert(number_elems, delem);
    current_elem = number_elems;
diff --git a/noncore/apps/tableviewer/db/xmlsource.cpp b/noncore/apps/tableviewer/db/xmlsource.cpp
index 94fec36..4ca6aee 100644
--- a/noncore/apps/tableviewer/db/xmlsource.cpp
+++ b/noncore/apps/tableviewer/db/xmlsource.cpp
@@ -15,18 +15,24 @@
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/ 
 #include "xmlsource.h"
-#include <qdict.h>
-#include <stdlib.h>
-#include <qtextstream.h>
 #include "../xmlencodeattr.h"
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+/* QT */
+#include <qdict.h>
+#include <qtextstream.h>
+/* STD */
+#include <stdlib.h>
 DBXml::DBXml(DBStore *d) 
 {
    dstore = d;
 } 
@@ -137,13 +143,13 @@ DBXmlHandler::DBXmlHandler(DBStore *ds)
 DBXmlHandler::~DBXmlHandler()
 {
 }
 QString DBXmlHandler::errorProtocol()
 {
-    qWarning("Error reading file");
+    owarn << "Error reading file" << oendl; 
        return errorProt;
 }
 bool DBXmlHandler::startDocument()
 {
        errorProt = "";
@@ -169,13 +175,13 @@ bool DBXmlHandler::startElement(const QString&, const QString&,
    if (state == StateHeader && qName == "key") {
        /* Ok, adding a new key to our KeyList TODO */
        state = StateKey;
        last_key_type = TVVariant::String;
        key = atts.value("name");
        if (key.isEmpty()) {
-            qWarning("empty key name");
+            owarn << "empty key name" << oendl; 
            return FALSE;
        }
        if(!atts.value("type").isEmpty())
            last_key_type = TVVariant::nameToType(atts.value("type"));
        return TRUE;
    }
@@ -187,19 +193,19 @@ bool DBXmlHandler::startElement(const QString&, const QString&,
        }
        if (state == StateRecord) {
        state = StateField;
        /* the qName is the name of a key */
        if (!keyIndexList[qName]) {
            /* invalid key, we failed */
-            qWarning("Invalid key in record");
+            owarn << "Invalid key in record" << oendl; 
            return FALSE;
        }
        keyIndex = *keyIndexList[qName];
                return TRUE;
        }
-    qWarning("Unable to determine tag type");
+    owarn << "Unable to determine tag type" << oendl; 
        return FALSE;
 }
 bool DBXmlHandler::endElement(const QString&, const QString&, 
                                                                const QString& qName)
 {
@@ -222,13 +228,13 @@ bool DBXmlHandler::endElement(const QString&, const QString&,
                break;
        case StateDocument:
                // we are done... 
                break;
        default:
                // should only get a 'endElement' from one of the above states.
-        qWarning("Invalid end tag");
+        owarn << "Invalid end tag" << oendl; 
                return FALSE;
                break;
        }
        return TRUE;
 }
@@ -251,13 +257,13 @@ bool DBXmlHandler::characters(const QString& ch)
        if (state == StateField) {
        /* Ok, need to add data here */
        current_data->setField(keyIndex, ch_simplified);
                return TRUE;
        }
        
-    qWarning("Junk characters found... ignored");
+    owarn << "Junk characters found... ignored" << oendl; 
    return TRUE;
 }
 QString DBXmlHandler::errorString()
 {
        return "the document is not in the expected file format";
@@ -267,31 +273,31 @@ bool DBXmlHandler::warning(const QXmlParseException& exception)
 {
    errorProt += QString("warning parsing error: %1 in line %2, column %3\n" )
        .arg(exception.message())
        .arg(exception.lineNumber())
        .arg(exception.columnNumber());
-    qWarning(errorProt);
+    owarn << errorProt << oendl; 
    return QXmlDefaultHandler::fatalError(exception);
 }
 bool DBXmlHandler::error(const QXmlParseException& exception)
 {
    errorProt += QString("error parsing error: %1 in line %2, column %3\n" )
        .arg(exception.message())
        .arg(exception.lineNumber())
        .arg(exception.columnNumber());
-    qWarning(errorProt);
+    owarn << errorProt << oendl; 
    return QXmlDefaultHandler::fatalError(exception);
 }
 bool DBXmlHandler::fatalError(const QXmlParseException& exception)
 {
    errorProt += QString("fatal parsing error: %1 in line %2, column %3\n" )
        .arg(exception.message())
        .arg(exception.lineNumber())
        .arg(exception.columnNumber());
-    qWarning(errorProt);
+    owarn << errorProt << oendl; 
    return QXmlDefaultHandler::fatalError(exception);
 }
diff --git a/noncore/apps/tableviewer/tableviewer.cpp b/noncore/apps/tableviewer/tableviewer.cpp
index 102b94c..9538cb3 100644
--- a/noncore/apps/tableviewer/tableviewer.cpp
+++ b/noncore/apps/tableviewer/tableviewer.cpp
@@ -15,33 +15,35 @@
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/ 
-/* local includes */
 #include "tableviewer.h"
 #include "ui/tvbrowseview.h"
 #include "ui/tvfilterview.h"
 #include "ui/tvlistview.h"
 #include "ui/tveditview.h"
 #include "ui/tvkeyedit.h"
 #include "db/datacache.h"
-/* QPE includes */
+/* OPIE */
+#include <opie2/odebug.h>
 #include <qpe/fileselector.h>
 #include <qpe/resource.h>
-#include <qtoolbar.h>
+using namespace Opie::Core;
-/* QTE includes */
+/* QT */
 #include <qmenubar.h>
+#include <qtoolbar.h>
 #include <qpopupmenu.h>
 #include <qapplication.h>
 #include <qwidgetstack.h>
 #include <qlayout.h>
 #include <qbuffer.h>
 /*!
    \class TableViewerWindow
    \brief The main window widget of the application
    This is the main widget of the table viewer application.  
    It is the co-ordination point.
@@ -198,13 +200,13 @@ void TableViewerWindow::saveDocument()
  return;
    FileManager fm;
    QIODevice *dev = fm.saveFile(doc);
    if(!ds->saveSource(dev, doc.type())){
-  qWarning("Save unsuccessful");
+  owarn << "Save unsuccessful" << oendl; 
  return;
    }
    dev->close();
    dirty = FALSE;
 }
@@ -285,13 +287,13 @@ void TableViewerWindow::openDocument(const DocLnk &f)
        scratch += " - ";
        scratch += ds->getName();
        setCaption(tr(scratch));
  dirty = FALSE;
    } else {
-        qWarning(tr("could not load Document"));
+        owarn << tr("could not load Document") << oendl; 
    }
    dev->close();
 }
 /*! 
    Moves to the first item of the current table 
diff --git a/noncore/apps/tableviewer/tableviewer.pro b/noncore/apps/tableviewer/tableviewer.pro
index 1de23bb..564f50f 100644
--- a/noncore/apps/tableviewer/tableviewer.pro
+++ b/noncore/apps/tableviewer/tableviewer.pro
diff --git a/noncore/apps/tableviewer/ui/tvlistview.cpp b/noncore/apps/tableviewer/ui/tvlistview.cpp
index b10ff1d..c3e6432 100644
--- a/noncore/apps/tableviewer/ui/tvlistview.cpp
+++ b/noncore/apps/tableviewer/ui/tvlistview.cpp
@@ -14,14 +14,21 @@
 ** 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 "tvlistview.h"
 #include "../db/common.h"
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+/* QT */
 #include <qtoolbutton.h>
 #include <qlistview.h>
 #include <qlayout.h>
 void TVListViewPrivate::setColumnWidth(int column, int width)
 {
@@ -160,13 +167,13 @@ void TVListView::first()
    delete it;
    it = new QListViewItemIterator(listViewDisplay);
 }
 void TVListView::last()
 {
-    qWarning("TVListView::last not yet implemented");
+    owarn << "TVListView::last not yet implemented" << oendl; 
 }
 void TVListView::next()
 {
    QListViewItemIterator tmp = *it;
    (*it)++;
diff --git a/noncore/apps/tinykate/libkate/libkate.pro b/noncore/apps/tinykate/libkate/libkate.pro
index 11ee275..1552dff 100644
--- a/noncore/apps/tinykate/libkate/libkate.pro
+++ b/noncore/apps/tinykate/libkate/libkate.pro
@@ -23,13 +23,12 @@ HEADERS        = microkde/kapplication.h \
                  microkde/knumvalidator.h \
                  microkde/kstaticdeleter.h \
                  microkde/klistview.h \
                  microkde/kglobalsettings.h \
          microkde/kcolorbtn.h \
          \
-              \
          qt3back/qregexp3.h \
          microkde/ksharedptr.h \
          document/katebuffer.h  document/katedialogs.h \
          document/katetextline.h \
          document/katecmd.h \
          document/katehighlight.h \
@@ -55,25 +54,23 @@ SOURCES        = microkde/kapplication.cpp \
                  microkde/krun.cpp \
                  microkde/knumvalidator.cpp \
                  microkde/kglobal.cpp \
                  microkde/kglobalsettings.cpp \
          microkde/kcolorbtn.cpp \
          \
-          \
          qt3back/qregexp3.cpp \
          ktexteditor/ktexteditor.cpp \
          document/katebuffer.cpp  document/katedialogs.cpp \
          document/katehighlight.cpp  \
          document/katecmd.cpp   \
          document/katesyntaxdocument.cpp document/katecmds.cpp \
          document/katedocument.cpp    document/katetextline.cpp \
          view/kateundohistory.cpp \
          view/kateview.cpp \
          view/kateviewdialog.cpp \
          interfaces/interfaces.cpp
 INTERFACES    =
 INCLUDEPATH    += $(OPIEDIR)/include \
            $(OPIEDIR)/noncore/apps/tinykate/libkate \
            $(OPIEDIR)/noncore/apps/tinykate/libkate/microkde \
            $(OPIEDIR)/noncore/apps/tinykate/libkate/document \
            $(OPIEDIR)/noncore/apps/tinykate/libkate/view \
diff --git a/noncore/apps/tinykate/tinykate.pro b/noncore/apps/tinykate/tinykate.pro
index 6f4baa8..d34e519 100644
--- a/noncore/apps/tinykate/tinykate.pro
+++ b/noncore/apps/tinykate/tinykate.pro
@@ -1,21 +1,19 @@
 TEMPLATE    = app
 CONFIG        = qt warn_on  quick-app
 DESTDIR        = $(OPIEDIR)/bin
 HEADERS        = tinykate.h
 SOURCES        = tinykate.cpp main.cpp
-INTERFACES    =
 INCLUDEPATH    += $(OPIEDIR)/include \
            $(OPIEDIR)/noncore/apps/tinykate/libkate \
            $(OPIEDIR)/noncore/apps/tinykate/libkate/microkde \
                        $(OPIEDIR)/noncore/apps/tinykate/libkate/document \
                        $(OPIEDIR)/noncore/apps/tinykate/libkate/view \
                        $(OPIEDIR)/noncore/apps/tinykate/libkate/interfaces \
                        $(OPIEDIR)/noncore/apps/tinykate/libkate/ktexteditor \
                        $(OPIEDIR)/noncore/apps/tinykate/libkate/qt3back
 DEPENDPATH    += $(OPIEDIR)/include
 LIBS            += -lqpe -ltinykate -lopiecore2 -lopieui2
 TARGET        = kate
diff --git a/noncore/apps/zsafe/config.in b/noncore/apps/zsafe/config.in
index 6e321f3..b6d3ffe 100644
--- a/noncore/apps/zsafe/config.in
+++ b/noncore/apps/zsafe/config.in
@@ -1,5 +1,5 @@
 config ZSAFE
    boolean "zsafe (Zaurus Password Manager)"
    default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI
diff --git a/noncore/apps/zsafe/scqtfiledlg.cpp b/noncore/apps/zsafe/scqtfiledlg.cpp
index 52b8d0d..c67bbd5 100644
--- a/noncore/apps/zsafe/scqtfiledlg.cpp
+++ b/noncore/apps/zsafe/scqtfiledlg.cpp
@@ -1,16 +1,13 @@
-/****************************************************************************
-** Form implementation generated from reading ui file 'scqtfiledlg.ui'
-**
-** Created: Sun Jun 8 15:51:12 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
 #include "scqtfiledlg.h"
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+/* QT */
 #include <qcombobox.h>
 #include <qlineedit.h>
 #include <qlistview.h>
 #include <qtoolbutton.h>
 #include <qlayout.h>
 #include <qtooltip.h>
@@ -213,44 +210,44 @@ ScQtFileDlg::~ScQtFileDlg()
 {
    // no need to delete child widgets, Qt does it all for us
 }
 void ScQtFileDlg::slotCancel()
 {
-    qWarning( "ScQtFileDlg::slotCancel(): Not implemented yet!" );
+    owarn << "ScQtFileDlg::slotCancel(): Not implemented yet!" << oendl; 
 }
 void ScQtFileDlg::slotDirComboBoxChanged( int )
 {
-    qWarning( "ScQtFileDlg::slotDirComboBoxChanged( int ): Not implemented yet!" );
+    owarn << "ScQtFileDlg::slotDirComboBoxChanged( int ): Not implemented yet!" << oendl; 
 }
 void ScQtFileDlg::slotDoubleClicked(QListViewItem *)
 {
-    qWarning( "ScQtFileDlg::slotDoubleClicked(QListViewItem *): Not implemented yet!" );
+    owarn << "ScQtFileDlg::slotDoubleClicked(QListViewItem *): Not implemented yet!" << oendl; 
 }
 void ScQtFileDlg::slotFileTextChanged( const QString & )
 {
-    qWarning( "ScQtFileDlg::slotFileTextChanged( const QString & ): Not implemented yet!" );
+    owarn << "ScQtFileDlg::slotFileTextChanged( const QString & ): Not implemented yet!" << oendl; 
 }
 void ScQtFileDlg::slotMkDir()
 {
-    qWarning( "ScQtFileDlg::slotMkDir(): Not implemented yet!" );
+    owarn << "ScQtFileDlg::slotMkDir(): Not implemented yet!" << oendl; 
 }
 void ScQtFileDlg::slotOK()
 {
-    qWarning( "ScQtFileDlg::slotOK(): Not implemented yet!" );
+    owarn << "ScQtFileDlg::slotOK(): Not implemented yet!" << oendl; 
 }
 void ScQtFileDlg::slotSelectionChanged(QListViewItem *)
 {
-    qWarning( "ScQtFileDlg::slotSelectionChanged(QListViewItem *): Not implemented yet!" );
+    owarn << "ScQtFileDlg::slotSelectionChanged(QListViewItem *): Not implemented yet!" << oendl; 
 }
 void ScQtFileDlg::slotTypeComboBoxChanged( int )
 {
-    qWarning( "ScQtFileDlg::slotTypeComboBoxChanged( int ): Not implemented yet!" );
+    owarn << "ScQtFileDlg::slotTypeComboBoxChanged( int ): Not implemented yet!" << oendl; 
 }
diff --git a/noncore/apps/zsafe/zsafe.cpp b/noncore/apps/zsafe/zsafe.cpp
index 3df55eb..bf8f7f4 100644
--- a/noncore/apps/zsafe/zsafe.cpp
+++ b/noncore/apps/zsafe/zsafe.cpp
@@ -26,23 +26,22 @@
 #include "zlistview.h"
 #include "shadedlistitem.h"
 #ifndef DESKTOP
 #ifndef NO_OPIE
 #include <opie2/ofiledialog.h>
+#include <opie2/odebug.h>
+using namespace Opie::Core;
 using namespace Opie::Ui;
 #else
 #include "scqtfileedit.h"
 #endif
 #endif
 #include <qclipboard.h>
-#include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #ifndef WIN32
 #include <unistd.h>
@@ -2066,13 +2065,12 @@ int ZSafe::loadInit(const char* _filename, const char *password)
    keylength = j;
    krc2->rc2_expandkey (key, keylength, 128);
 #ifndef WIN32
    size = read(fileno (fd), (unsigned char *) (charbuf + count), 8);
 #else
-    printf ("LoadInit() read1");
    size = fread ((unsigned char *) (charbuf + count), sizeof(unsigned char), 8, fd);
 #endif
    if (size < 8)
        return PWERR_DATA;
@@ -2086,13 +2084,12 @@ int ZSafe::loadInit(const char* _filename, const char *password)
    bufferIndex = 0;
 #ifndef WIN32
    while ((count = read (fileno (fd), (unsigned char *) charbuf, 8)) > 0) {
        while (count < 8) {
            count2 = read (fileno (fd), (unsigned char *) (charbuf + count), 8);
 #else
-    printf ("LoadInit() read2");
    while ((count = fread ((unsigned char *) (charbuf), sizeof(unsigned char), 8, fd)) > 0) {
        while (count < 8) {
            count2 = fread ((unsigned char *) (charbuf + count), sizeof(unsigned char), 8, fd);
 #endif
            if (count2 == 0) {
                return PWERR_DATA;
@@ -2256,13 +2253,13 @@ bool ZSafe::saveDocument(const char* _filename,
       entry[i] = (char*)malloc(strlen("field6")+1);
       strcpy(entry[i++], "field6");
       retval = saveEntry(entry);
           for (int z=0; z<i; z++) free(entry[z]);
           if (retval == PWERR_DATA) {
-              qWarning("1: Error writing file, contents not saved");
+              owarn << "1: Error writing file, contents not saved" << oendl; 
              saveFinalize();
              return false;
           }
 // #ifndef WIN32
           conf->writeEntry(APP_KEY+"valzsafe", 1);
 // #endif
@@ -2300,22 +2297,22 @@ bool ZSafe::saveDocument(const char* _filename,
          retval = saveEntry(entry);
              for (int z=0; z<j; z++)
              {
                  free(entry[z]);
              }
              if (retval == PWERR_DATA) {
-                        qWarning("1: Error writing file, contents not saved");
+                        owarn << "1: Error writing file, contents not saved" << oendl; 
                        saveFinalize();
                        return false;
              }
           }
        }
    if (saveFinalize() == PWERR_DATA) {
-                qWarning("2: Error writing file, contents not saved");
+                owarn << "2: Error writing file, contents not saved" << oendl; 
        return false;
    } else {
 #ifndef DESKTOP
                Global::statusMessage (tr("Password file saved."));
 #endif
                modified = false;
@@ -3187,13 +3184,13 @@ void ZSafe::editCategory()
           category = dialog->CategoryField->currentText();
           icon = dialog->IconField->currentText()+".png";
           if (cat)
           {
-              qWarning("Category found");
+              owarn << "Category found" << oendl; 
              // if (!icon.isEmpty() && !icon.isNull())
              if (icon != "predefined.png")
              {
                  // build the full path
                  fullIconPath = iconPath + icon;
diff --git a/noncore/apps/zsafe/zsafe.pro b/noncore/apps/zsafe/zsafe.pro
index 72c8fe9..3cae706 100644
--- a/noncore/apps/zsafe/zsafe.pro
+++ b/noncore/apps/zsafe/zsafe.pro
@@ -7,11 +7,11 @@ SOURCES      = main.cpp zsafe.cpp krc2.cpp category.cpp \
               categorylist.cpp zlistview.cpp shadedlistitem.cpp\
               scqtfileedit.cpp scqtfileedit.moc.cpp \
               scqtfiledlg.cpp
 INTERFACES     = newdialog.ui searchdialog.ui passworddialog.ui categorydialog.ui infoform.ui wait.ui
 INCLUDEPATH    += $(OPIEDIR)/include
 DEPENDPATH    += $(OPIEDIR)/include
-LIBS        += -Wl,-rpath,$(OPIEDIR)/lib -L$(OPIEDIR)/lib -lqpe -lopiecore2 -lopieui2
+LIBS         += -lqpe -lopiecore2 -lopieui2
 TARGET         = zsafe
 include ( $(OPIEDIR)/include.pro )