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
@@ -62,53 +62,53 @@ AdvancedFm::~AdvancedFm() {
 void AdvancedFm::cleanUp() {
    QString sfile=QDir::homeDirPath();
    if(sfile.right(1) != "/")
       sfile+="/._temp";
    else
       sfile+="._temp";
    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);
    } else {
       viewMenu->setItemChecked(viewMenu->idAt(0), false);
       viewMenu->setItemChecked(viewMenu->idAt(1), true);
    }
 
    QString fs= getFileSystemType( (const QString &)  path);
 
    setCaption(tr("AdvancedFm :: ")+fs+" :: "
               +checkDiskSpace( (const QString &) path )+ tr(" kB free") );
    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);
         setCaption(tr("AdvancedFm :: ")+fs+" :: "
                              +checkDiskSpace((const QString &) path)+ tr(" kB free") );
         bool isDir=FALSE;
         const QFileInfoList *list = thisDir->entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/);
         QFileInfoListIterator it(*list);
         QFileInfo *fi;
@@ -151,87 +151,87 @@ void AdvancedFm::populateView() {
                         }
                         else if( !fi->isReadable() )  {
                                 pm = Resource::loadPixmap( "locked" );
                         }
                         else { //everything else goes by mimetype
                                 MimeType mt(fi->filePath());
                                 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 ) );
                         }
                         item->setPixmap( 0,pm);
 
                 }
                 isDir=FALSE;
                 ++it;
         }
 
         if( path.find("dev",0,TRUE) != -1) {
                 struct stat buf;
                 dev_t devT;
                 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);
                                         pm = unknownXpm;
                                         item->setPixmap( 0,pm);
                                 }
                         }
 
                 closedir(dir);
         }
 
         thisView->setSorting( 3,FALSE);
         fillCombo( (const QString &) path );
 }
 
 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
          strItem2 = dealWithSymName((const QString&)strItem);
          if(QDir(strItem2).exists() )
             strItem = strItem2;
       }
 
       if( strItem.find(". .",0,TRUE) && strItem.find("/",0,TRUE)!=-1 ) {
@@ -258,31 +258,31 @@ void AdvancedFm::ListPressed( int mouse, QListViewItem *item, const QPoint& , in
          cancelRename();
       }
    }
    break;
    case 2:
       menuTimer.start( 500, TRUE );
       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");
 }
 
 void AdvancedFm::writeConfig() {
    Config cfg("AdvancedFm");
 }
 
@@ -320,25 +320,25 @@ void AdvancedFm::currentPathComboActivated(const QString & currentPath) {
    populateView();
    update();
 }
 
 QStringList AdvancedFm::getPath() {
    QStringList strList;
    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() {
    QString current = QDir::homeDirPath();
    chdir( current.latin1() );
    CurrentDir()->cd(  current, TRUE);
    populateView();
    update();
 }
@@ -371,25 +371,25 @@ void AdvancedFm::CFButtonPushed() {
    update();
 }
 
 
 void AdvancedFm::doAbout() {
    QMessageBox::message("AdvancedFm",tr("Advanced FileManager\n"
                                         "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;
       case Key_Next:
          break;
       case Key_Return:
       case Key_Enter:
          navigateToSelected();
          break;
@@ -629,25 +629,25 @@ QString AdvancedFm::checkDiskSpace(const QString &path) {
    }
    return "";
 }
 
 void AdvancedFm::addToDocs() {
    QStringList strListPaths = getPath();
    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();
       }
    }
 }
 
 
 void AdvancedFm::customDirsToMenu() {
@@ -702,25 +702,25 @@ void AdvancedFm::addCustomDir() {
    }
    if(addIt) {
       menuButton->insertItem(dir);
 //          customDirMenu->insertItem(dir);
       list <<  dir;
    }
 
    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();
    int ramble=2;
 //  int ramble=-24;
 //first remove list
    if(list.grep(dir,true).isEmpty()) {
       QMessageBox::message(tr( "AdvancedFm" ),
                            tr("Cannot remove current directory\nfrom bookmarks.\nIt is not bookmarked!"));
@@ -737,25 +737,25 @@ void AdvancedFm::removeCustomDir() {
          ramble++;
 //        ramble--;
       }
 
       cfg.writeEntry("CustomDir", list2, ',');
       cfg.write();
    }
 //    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();
    }
    if( dir == s_removeBookmark) {
       removeCustomDir( );
    } else {
       gotoDirectory( dir);
 //       if(QDir( curDir).exists() )
@@ -778,68 +778,68 @@ QDir *AdvancedFm::CurrentDir() {
 }
 
 QDir *AdvancedFm::OtherDir() {
    if ( whichTab == 1) {
       return &currentRemoteDir;
    } else {
       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);
       populateView();
    }
    else if(QFileInfo(curDir).exists()) {
       QFileInfo fileInfo(curDir);
       curDir=fileInfo.dirPath();
       if(QDir( curDir).exists() )  {
@@ -857,25 +857,25 @@ void AdvancedFm::findFile(const QString &fileName) {
    QFileInfo fi(fileName);
    QListView *thisView = CurrentView();
    QListViewItemIterator it( thisView );
    for ( ; it.current(); ++it ) {
       if(it.current()->text(0) == fi.fileName()) {
          it.current()->setSelected(true);
          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) {
       Remote_View->clearFocus();
    } else {
       Local_View->clearFocus();
    }
 }
 
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
@@ -2,41 +2,45 @@
    advancedfmData.cpp
                              -------------------
 ** Created: Mon 09-23-2002 13:24:11
     copyright            : (C) 2002 by ljp
     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"
 
+/* 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);
          layout->setMargin( 0); // squeeze
 
          QMenuBar *menuBar = new QMenuBar(this);
          menuBar->setMargin( 0 ); // squeeze
          fileMenu = new QPopupMenu( this );
          viewMenu  = new QPopupMenu( this );
@@ -210,29 +214,29 @@ void AdvancedFm::init() {
                                         TabWidget->insertTab( tab_3, tr( "Remote" ) );
          */
 
          ///////////////
 
          if ( QFile::exists ( "/dev/sharp_buz" ) || QFile::exists ( "/dev/sharp_led" ))
                         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);
          currentRemoteDir.setPath( QDir::currentDirPath());
 
          //  b = TRUE;
 
          filterStr="*";
          showMenuHidden();
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
@@ -1,56 +1,59 @@
 /***************************************************************************

    AdvancedFm.cpp

   -------------------

   ** Created: Sat Mar 9 23:33:09 2002

     copyright            : (C) 2002 by ljp

     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) {

       CurrentDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);

       OtherDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);

       fileMenu->setItemChecked( fileMenu->idAt(0),TRUE);

     } else {

       CurrentDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);

       OtherDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);

@@ -83,37 +86,37 @@ void AdvancedFm::runThis() {
 

   QString curFile = CurrentView()->currentItem()->text(0);

   QString path = thisDir->canonicalPath();

 

   if( curFile.find("@",0,TRUE) !=-1 || curFile.find("->",0,TRUE) !=-1 )  //if symlink

 

     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();

             }

         }

     }

 }

 

 void AdvancedFm::runText() {

    if( !CurrentView()->currentItem()) return;

   QString curFile = CurrentView()->currentItem()->text(0);

   if(curFile != "../") {

@@ -193,30 +196,30 @@ void AdvancedFm::doDelete() {
                                              tr("Really delete\n%1?").arg( myFile ),

                                              tr("Yes"), tr("No"), 0, 0, 1) ) {

                case 1:

                   return;

                   break;

                };

             }

 

             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();

             }

          }

       }

    }

     populateView();

 }

 

 void AdvancedFm::filePerms() {

@@ -234,28 +237,28 @@ void AdvancedFm::filePerms() {
    }

     populateView();

 }

 

 void AdvancedFm::doProperties() {

 #if defined(QT_QWS_OPIE)

 

    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

 

 }

 

 void AdvancedFm::upDir() {

   QDir *thisDir = CurrentDir();

   QString current = thisDir->canonicalPath();

   QDir dir(current);

@@ -293,26 +296,26 @@ void AdvancedFm::copy() {
          };

       }

 

       QString curFile, item, destFile;

       for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {

          item=(*it);

          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);

-//          qDebug("CurrentFile file is " + curFile);

+//          odebug << "Destination file is "+destFile << oendl; 
+//          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 ),

                                              tr("Yes"),tr("No"),0,0,1) ) {

                case 1:

                   return;

                   break;

                };

             }

@@ -411,54 +414,54 @@ void AdvancedFm::copySameDir() {
                 break;

               case 1:

                 return;

                 break;

               };

             }

           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();

 }

 

 void AdvancedFm::move() {

   qApp->processEvents();

 

   QStringList curFileList = getPath();

   if( curFileList.count() > 0) {

       QString curFile, destFile, item;

 

       QDir *thisDir = CurrentDir();

       QDir *thatDir = OtherDir();

       for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {

           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;

           }

 

                     QFile f( curFile);

           if( f.exists()) {

                             if( !copyFile(  curFile, destFile) )  {

                                     QMessageBox::message(tr("Note"),tr("Could not move\n")+curFile);

                                     return;

@@ -480,25 +483,25 @@ bool AdvancedFm::moveDirectory( const QString & src, const QString & dest ) {
                 err = -1;

 

         if(err!=0) {

                 QMessageBox::message(tr("Note"),tr("Could not move\n") + src);

                 return false;

         }

         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;

         }

 

         return true;

 }

 

 

 bool AdvancedFm::copyFile( const QString & src, const QString & dest ) {

@@ -516,47 +519,47 @@ bool AdvancedFm::copyFile( const QString & src, const QString & dest ) {
 

 

         bool success = true;

         struct stat status;

         QFile srcFile(src);

         QFile destFile(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) {

               QString msg;

               switch(err) {

               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;

    }

    srcFile.close();

    destFile.close();

     // Set file permissions

   if( stat( (const char *) src, &status ) == 0 )  {

       chmod( (const char *) dest, status.st_mode );

@@ -570,25 +573,25 @@ void AdvancedFm::runCommand() {
    QDir *thisDir = CurrentDir();

 

    QString curFile;

    curFile = thisDir->canonicalPath() +"/"+ CurrentView()->currentItem()->text(0);

 

    InputDialog *fileDlg;

    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;

       outDlg = new Output( command, this, tr("AdvancedFm Output"), true);

       QPEApplication::execDialog( outDlg );

       qApp->processEvents();

 

    }

 }

@@ -653,25 +656,25 @@ void AdvancedFm::mkSym() {
           QString destName = thatDir->canonicalPath()+"/"+(*it);

           if(destName.right(1) == "/") {

               destName = destName.left( destName.length() -1);

             }

 

           QString curFile =  thisDir->canonicalPath()+"/"+(*it);

 

           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();

     }

 }

 

 void AdvancedFm::doBeam() {

    Ir ir;

    if(!ir.supported())  {

    } else {

       QStringList curFileList = getPath();

@@ -706,33 +709,33 @@ void AdvancedFm::startProcess(const QString & cmd) {
   process = new OProcess();

   connect(process, SIGNAL(processExited(Opie::Core::OProcess*)),

           this, SLOT( processEnded(Opie::Core::OProcess*)));

 

   connect(process, SIGNAL( receivedStderr(Opie::Core::OProcess*,char*,int)),

           this, SLOT( oprocessStderr(Opie::Core::OProcess*,char*,int)));

 

   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 ) {

   if ( o->inherits( "QLineEdit" ) )  {

       if ( e->type() == QEvent::KeyPress ) {

           QKeyEvent *ke = (QKeyEvent*)e;

           if ( ke->key() == Key_Return ||

                ke->key() == Key_Enter )  {

               okRename();

@@ -756,25 +759,25 @@ bool AdvancedFm::eventFilter( QObject * o, QEvent * e ) {
           else {

              whichTab=2;

           }

        }

        OtherView()->setSelected( OtherView()->currentItem(), FALSE );//make sure there's correct selection

      }

 

   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;

   if ( resetFocus ) {

       view->viewport()->setFocusProxy( view);

       view->setFocus();

     }

 }

 

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
@@ -23,25 +23,25 @@
 #include <unistd.h>
 #include <sys/stat.h>
 #include <stdlib.h>
 #include <sys/types.h>
 #include <pwd.h>
 #include <grp.h>
 
 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 ) );
     TextLabel1->setText( tr( "Set file permissions for:" ) );
 
     LineEdit1 = new QLineEdit( this, "LineEdit1" );
     LineEdit1->setGeometry( QRect( 10, 25, 218, 22 ) );
     LineEdit1->setReadOnly(true);
 
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
@@ -1,32 +1,35 @@
 /****************************************************************************
 ** 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",
 "#  c #9E9E9E",
 "$  c #525252",
 "%  c #929292",
 "&  c #676767",
 "*  c #848484",
 "=  c #666666",
@@ -112,25 +115,25 @@ static char * filesave_xpm[] = {
 "CzDEvEv;;DssF$  ",
 "G.H{E{E{IxsJ$+  ",
 "  +...vEKxzLM   ",
 "     +...z]n$   ",
 "        +...    "};
 
 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 );
     OutputLayout->setSpacing( 2);
     OutputLayout->setMargin( 2);
 
     QPushButton *docButton;
      docButton = new QPushButton(  QPixmap(( const char** ) filesave_xpm  ) ,"",this,"saveButton");
      docButton->setFixedSize( QSize( 20, 20 ) );
@@ -148,25 +151,25 @@ Output::Output( const QStringList commands, QWidget* parent,  const char* name,
 
     connect(proc, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)),
             this, SLOT(commandStdout(Opie::Core::OProcess*,char*,int)));
 
     connect(proc, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)),
             this, SLOT(commandStderr(Opie::Core::OProcess*,char*,int)));
 
 //     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") );
          OutputEdit->setCursorPosition( OutputEdit->numLines() + 1,0,FALSE);
          perror("Error: ");
          QString errorMsg=tr("Error\n")+(QString)strerror(errno);
          OutputEdit->append( errorMsg);
          OutputEdit->setCursorPosition( OutputEdit->numLines() + 1,0,FALSE);
      }
@@ -177,67 +180,67 @@ Output::~Output() {
 
 void Output::saveOutput() {
 
     InputDialog *fileDlg;
     fileDlg = new InputDialog(this,tr("Save output to file (name only)"),TRUE, 0);
     fileDlg->exec();
     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] );
 //     }
 //     printf("\n");
 
     QString lineStr = buffer;
     lineStr=lineStr.left(lineStr.length()-1);
     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);
 }
 
 void Output::processFinished() {
 
     delete proc;
     OutputEdit->append( tr("\nFinished\n") );
     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
@@ -18,32 +18,37 @@
 ..}^=.=       =       ;      Public License for more details.
 ++=   -.     .`     .:
  :     =  ...= . :.=-        You should have received a copy of the GNU
  -.   .:....=;==+<;          General Public License along with this file;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include "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
     int fh = fontMetrics().height();
 
     // create layout
     QGridLayout *layout=new QGridLayout(this);
     layout->setSpacing( 2 );
         layout->setMargin( 4 );
@@ -293,25 +298,25 @@ void ListEdit::slotClick(QListViewItem *itm, const QPoint &pnt, int col)
                 _box->setCurrentItem(i);
                 i=-1;
                 break;
             }
             i++;
         }
         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);
     }
 }
 
 
 // --- addColumnDef -----------------------------------------------------------
 void ListEdit::addColumnDef(ColumnDef *pDef)
 {
     _typeTable->addColumn( pDef->getName() );
     _vColumns.append(pDef);
 }
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
@@ -19,46 +19,48 @@
 ++=   -.     .`     .:
  :     =  ...= . :.=-        You should have received a copy of the GNU
  -.   .:....=;==+<;          General Public License along with this file;
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include "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;
     _sNewValue=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)
 {
     _sName=sName;
     _vColumns.setAutoDelete(TRUE);
 }
 
 
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
@@ -22,26 +22,30 @@
   -_. . .   )=.  =           see the file COPYING. If not, write to the
     --        :-=`           Free Software Foundation, Inc.,
                              59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #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>
 #include <qradiobutton.h>
 #include <qwhatsthis.h>
 
 Transaction::Transaction( QWidget *parent, bool bNew, const QString &acctname,
                                                          TranInfo *info, Cfg *pCfg )
         : QDialog( parent, 0, TRUE, WStyle_ContextHelp )
@@ -323,15 +327,15 @@ void Transaction::slotActivated(const QString &arg )
         if( pTi ) {
             initFromInfo( pTi, true );
             amtEdit->setFocus();
             amtEdit->setSelection(0, amtEdit->text().length() );
             amtEdit->setCursorPosition(0);
         }
     }
 }
 
 // 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            += -lopiecore2
+LIBS          += -lqpe -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
@@ -1,27 +1,31 @@
 /***************************************************************************
  *                                                                         *
  *   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.                                   *
  *                                                                         *
  ***************************************************************************/
   // (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 );
         addColumn(tr("Files"));
 
         if (!confDir.isReadable())
                 QMessageBox::critical(this,tr("Could not open"),tr("The directory ")+settingsPath+tr(" could not be opened."),1,0);
         readConfFiles();
 
@@ -38,24 +42,24 @@ void ListViewConfDir::readConfFiles()
 
         confDir.setFilter( QDir::Files | QDir::NoSymLinks );
   confDir.setSorting( QDir::Name );
   confDir.setNameFilter("*.conf");
   const QFileInfoList *list = confDir.entryInfoList();
   QFileInfoListIterator it( *list );
   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;
   }
 }
 
 void ListViewConfDir::expand(QListViewItem *item)
 {
          ((ListViewItemConf*)item)->expand();
 }
 
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
@@ -1,26 +1,32 @@
 /***************************************************************************
  *                                                                         *
  *   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.                                   *
  *                                                                         *
  ***************************************************************************/
 // (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)
 {
   confFileInfo = file;
 //  parseFile();
   displayText();
 }
 
 ListViewItemConfFile::~ListViewItemConfFile()
@@ -31,61 +37,61 @@ ListViewItemConfFile::~ListViewItemConfFile()
 void ListViewItemConfFile::displayText()
 {
           setText(0,(_changed?"*":"")+confFileInfo->fileName());
 }
 
 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);
-             if (!groupItem) qDebug("PANIK NO GROUP! >%s<",group.latin1());
+//      odebug << "got key"+s << oendl; 
+             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());
   QFile::remove(backupFileName());
   delete this;
 }
 
 void ListViewItemConfFile::revert()
 {
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
@@ -2,52 +2,55 @@
  *                                                                         *
  *   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.                                   *
  *                                                                         *
  ***************************************************************************/
 
 // (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() );
   setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));//, sizePolicy().hasHeightForWidth() ) );
 
   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();
 
   connect(settingList, SIGNAL( pressed(QListViewItem*) ),
                                                 this, SLOT(setCurrent(QListViewItem*)));
         connect( settingList, SIGNAL( clicked(QListViewItem*) ),
                                            this, SLOT( stopTimer(QListViewItem*) ) );
 
@@ -89,25 +92,25 @@ void MainWindow::makeMenu()
   connect( popupTimer, SIGNAL(timeout()),
                                         this, SLOT(showPopup()) );
 }
 
 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)
   {
           editor->layoutType(EditWidget::File);
     _currentItem=0;
     _fileItem = (ListViewItemConfFile*)item;
            return;
   }
   _fileItem = 0;
@@ -165,25 +168,25 @@ void MainWindow::revertConfFile()
         if (!_item) return;
          _item->revert();
 }
 
 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());
     popupMenuFile->popup( QCursor::pos() );
   }else if(_currentItem)
   {
     popupMenuEntry->popup( QCursor::pos() );
   }
 }
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,15 +1,21 @@
-#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) {
 }
 
 const QString& CfgEntry::getFile() const {
         return file;
 }
 
@@ -86,36 +92,36 @@ bool CfgParser::load(QString file, CfgFile& cfg) {
         QXmlSimpleReader reader;
         CfgHandler p(*this);
         
         reader.setErrorHandler(this);
         reader.setContentHandler(&p);
 
         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);
         }
 
         if (ardelay != -1) {
                 cfg.setAutorepeatDelay(ardelay);
         }
 
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
@@ -9,16 +9,16 @@ HEADERS		= zkb.h \
                                 cfgfile.h
 
         SOURCES         = main.cpp \
                   cfgdlg.cpp \
                   cfgfile.cpp \
                   zkb.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
@@ -355,25 +355,25 @@ State* Keymap::getStateByLabel(const QString& label) {
         QString name = lit.data();
 
         int n = name.find(":*");
         if (n>=0 && n==(int)(name.length()-2)) {
                 name=name.left(name.length() - 1);
 
                 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;
 }
 
 bool Keymap::addState(const QString& name, State* state) {
         if (states.find(name) != states.end()) {
                 return false;
         }
@@ -407,25 +407,25 @@ bool Keymap::setCurrentState(State* state) {
                         qDebug("state changed: %s\n", (const char*) 
                                 currentStateName.utf8());
 
                         if (!lsmapInSync) {
                                 generateLabelStateMaps();
                         }
 
                         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;
                 }
         }
 
         return false;
 }
 
 bool Keymap::removeState(const QString& name, bool force) {
         QMap<QString, State*>::Iterator it = states.find(name);
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,46 +1,49 @@
-#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() {
 }
 
 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);
         QXmlSimpleReader reader;
         ZkbHandler h(*this, keymap, 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(),
-                (const char*) err.utf8());
+        odebug << "end loading file=" << file.utf8() << ": status=" << err.utf8() << oendl;
         return ret;
 }
 
 bool ZkbConfig::warning(const QXmlParseException& e) {
         QString tmp;
 
         tmp.sprintf("%d: warning: %s\n", e.lineNumber(), 
                 (const char*) e.message().utf8());
 
         err += tmp;
 
         return true;
@@ -113,25 +116,25 @@ bool ZkbHandler::startLabelElement(const QString& label,
                 return false;
         }
 
         return true;
 }
 
 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) {
                         err = currentStateName + 
                                 ": undefined parent state: " + pn;
                         return false;
                 }
         }
 
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
@@ -7,49 +7,52 @@
     *   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 "bartender.h"
 #include "showdrinks.h"
 #include "inputDialog.h"
 #include "searchresults.h"
 #include "bac.h"
 
-#include <qtoolbar.h>
-#include <qmenubar.h>
-//#include <opie2/colorpopupmenu.h>
+/* OPIE */
+#include <opie2/odebug.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);
     layout->setMargin( 2);
     connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
 
     setCaption( tr( "Bartender" ) );
 
     ToolBar1 = new QToolBar( this, "ToolBar1" );
@@ -135,52 +138,52 @@ void Bartender::initDrinkDb() {
 }
 
 void Bartender::fillList() {
     dbFile.at(1);
     DrinkView->clear();
     int i=0;
     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);
     QString newName, newIng;
     QPEApplication::execDialog( newDrinks );
     newName = newDrinks->LineEdit1->text();
     newIng= newDrinks->MultiLineEdit1->text();
 
     if(dbFile.isOpen())
         dbFile.close();
     if ( !dbFile.open( IO_WriteOnly| IO_Append)) {
         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();
     }
     delete newDrinks;
 }
 
 void Bartender::showDrink(int mouse, QListViewItem * item, const QPoint&, int) {
     switch (mouse) {
       case 1:
@@ -198,25 +201,25 @@ void Bartender::showDrink( QListViewItem *item) {
     Show_Drink *showDrinks;
     QString myDrink=item->text(0);
     showDrinks = new Show_Drink(this, myDrink, TRUE);
     QTextStream t( &dbFile);
 
     QString s, s2;
     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;
             }
         }
     }
     QPEApplication::execDialog( showDrinks );
 
     if(showDrinks ->result() ==0) {
        doEdit();
     }
     delete showDrinks;
@@ -239,25 +242,25 @@ void Bartender::askSearch() {
 void Bartender::doSearchByName() {
 //    if( DrinkView->currentItem() == NULL) return;
     QStringList searchList;
     QString searchForDrinkName;
     InputDialog *fileDlg;
     fileDlg = new InputDialog(this,tr("Find by Drink Name"),TRUE, 0);
     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
             QMessageBox::message(tr("Search"),tr("Sorry no results for\n")+searchForDrinkName);
     }//end Inputdialog
     delete fileDlg;
 }
 
 void Bartender::doSearchByDrink() {
@@ -270,28 +273,28 @@ void Bartender::doSearchByDrink() {
     fileDlg->exec();
     if( fileDlg->result() == 1 ) {
         searchForDrinkName = fileDlg->LineEdit1->text();
 
         dbFile.at(0);
         QTextStream t( &dbFile);
 
         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
         if(searchList.count() >0)
             showSearchResult(searchList);
         else
             QMessageBox::message(tr("Search"),tr("Sorry no results for\n")+ searchForDrinkName);
     }
     delete fileDlg;
@@ -304,25 +307,25 @@ void Bartender::showSearchResult(QStringList &searchList) {
     searchList.sort();
 
     searchDlg = new Search_Results(this, "Search Results", TRUE);
     searchDlg->ListBox1->insertStringList( searchList,-1);
     QPEApplication::execDialog( searchDlg );
 
     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;
 }
 
 void Bartender::doEdit() {
    if(DrinkView->currentItem() == NULL) {
     fileNew();
    }
 
    QString myDrink;
@@ -334,25 +337,25 @@ void Bartender::doEdit() {
     QString newName, newIng;
     QPEApplication::showDialog( newDrinks );
     QTextStream t( &dbFile);
 
     QString s, s2;
     while ( !t.eof()) {
         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;
             }
         }
     }
     newDrinks->exec();
     newName = newDrinks->LineEdit1->text();
     newIng= newDrinks->MultiLineEdit1->text();
 
     if( newDrinks ->result() == 1 ) {
@@ -361,25 +364,25 @@ void Bartender::doEdit() {
         if ( !dbFile.open( IO_ReadWrite )) {
             QMessageBox::message( (tr("Note")), (tr("Drink database not opened sucessfully.\n")) );
             return;
         }
         int fd = dbFile.handle();
         lseek( fd, foundAt, SEEK_SET);
 
 //        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();
     }
 }
 
 void Bartender::clearList() {
     DrinkView->clear();
 }
@@ -388,45 +391,45 @@ void Bartender::doBac() {
     BacDialog *bacDlg;
     bacDlg = new BacDialog(this,"BAC",TRUE);
     QPEApplication::execDialog( bacDlg );
     delete bacDlg;
 }
 
 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();
           break;
       case -5://        drink -5
           doSearchByName();
 
           break;
       case -6://        alcohol -6
           doSearchByDrink();
 
           break;
 
     }
 }
 
 void Bartender::editMenuActivated(int item) {
-    qDebug("Item %d", item);
+    odebug << "Item " << item << "" << oendl; 
       /*
         edit -8
       */
     switch(item) {
       case -8:
           doEdit() ;
           break;
 
     }
 }
 
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
@@ -54,59 +54,63 @@
     other by the operating system. One may think of them as two serial devices
     linked by a null-modem cable. Being based on devices the number of
     simultanous instances of this class is (globally) limited by the number of
     those device pairs, which is 256.
 
     Another technic are UNIX 98 PTY's. These are supported also, and prefered
     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>
 #include <sys/types.h>
 #include <sys/ioctl.h>
 #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);
 }
 
 
 void MyPty::donePty()
 {
     // This is code from the Qt DumbTerminal example
 
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
@@ -1020,25 +1020,25 @@ bool TEWidget::eventFilter( QObject *obj, QEvent *e )
         static_cast<QKeyEvent *>( e )->ignore();
         return true;
     }
     if ( obj != this /* when embedded */ && obj != parent() /* when standalone */ )
         return FALSE; // not us
     if ( e->type() == QEvent::Wheel)  {
         QApplication::sendEvent(scrollbar, e);
     }
 
 #ifdef FAKE_CTRL_AND_ALT
     static bool control = FALSE;
     static bool alt = FALSE;
-//    qDebug(" Has a keyboard with no CTRL and ALT keys, but we fake it:");
+//    odebug << " Has a keyboard with no CTRL and ALT keys, but we fake it:" << oendl; 
     bool dele=FALSE;
     if ( e->type() == QEvent::KeyPress || e->type() == QEvent::KeyRelease ) {
         QKeyEvent* ke = (QKeyEvent*)e;
         bool keydown = e->type() == QEvent::KeyPress || ke->isAutoRepeat();
         switch (ke->key()) {
           case Key_F9: // let this be "Control"
               control = keydown;
               e = new QKeyEvent(QEvent::KeyPress, Key_Control, 0, ke->state());
               dele=TRUE;
               break;
           case Key_F13: // let this be "Alt"
               alt = keydown;
@@ -1059,29 +1059,29 @@ bool TEWidget::eventFilter( QObject *obj, QEvent *e )
                                     ke->ascii(), ke->state()|AltButton, ke->text());
                   dele=TRUE;
               }
         }
     }
 #endif
 
     if ( e->type() == QEvent::KeyPress )  {
         QKeyEvent* ke = (QKeyEvent*)e;
         actSel=0; // Key stroke implies a screen update, so TEWidget won't
           // know where the current selection is.
 
-//     qDebug("key pressed is 0x%x",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;
 #endif
         return true;               // stop the event
     }
     if ( e->type() == QEvent::Enter )  {
         QObject::disconnect( (QObject*)cb, SIGNAL(dataChanged()),
                              this, SLOT(onClearSelection()) );
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
@@ -61,24 +61,30 @@
    producing the illusion of a permanent and immediate display operation.
 
    As a sort of catch-all needed for cases where none of the above
    conditions catch, the screen refresh is also triggered by a count
    of incoming bulks (`bulk_incnt').
 */
 
 /* 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>
 
 
 /* ------------------------------------------------------------------------- */
 /*                                                                           */
 /*                               TEmulation                                  */
 /*                                                                           */
 /* ------------------------------------------------------------------------- */
 
 #define CNTL(c) ((c)-'@')
@@ -195,25 +201,25 @@ void TEmulation::onRcvChar(int c)
 
 /* ------------------------------------------------------------------------- */
 /*                                                                           */
 /*                             Keyboard Handling                             */
 /*                                                                           */
 /* ------------------------------------------------------------------------- */
 
 /*!
 */
 
 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.
     // We should do a conversion here, but since this
     // routine will never be used, we simply emit plain ascii.
     emit sndBlock(ev->text().ascii(),ev->text().length());
   }
   else if (ev->ascii()>0)
   { unsigned char c[1];
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,25 +1,28 @@
+#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" ) );
 
     QVBoxLayout *layout = new QVBoxLayout( this );
     QTabWidget *tabWidget = new QTabWidget( this );
 
     tabWidget->addTab( tab0( this ), tr("Settings1") );
     tabWidget->addTab( tab1( this ), tr("Settings2") );
 
@@ -143,25 +146,25 @@ QWidget* ATConfigDialog::tab1( QWidget* parent ) {
     multiLineUntagBox = new QComboBox( returnWidget );
     layout->addWidget( multiLineUntagLabel, 6, 0 );
     layout->addWidget( multiLineUntagBox, 6, 1 );
     multiLineUntagBox->insertItem( tr("No") );
     multiLineUntagBox->insertItem( tr("Yes") );
 
     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 ) );
     dialSuf2Line->setText( config.readEntry("DialSuffix2", MODEM_DEFAULT_DIAL_SUFFIX1 ) );
     dialPref3Line->setText( config.readEntry("DialPrefix3", MODEM_DEFAULT_DIAL_PREFIX1 ) );
     dialSuf3Line->setText( config.readEntry("DialSuffix3", MODEM_DEFAULT_DIAL_SUFFIX1 ) );
     connectLine->setText( config.readEntry("DefaultConnect", MODEM_DEFAULT_CONNECT_STRING ) );
     hangupLine->setText( config.readEntry("HangupString", MODEM_DEFAULT_HANGUP_STRING ) );
     dialTimeSpin->setValue( config.readNumEntry("DialTime", MODEM_DEFAULT_DIAL_TIME ) );
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,29 +1,34 @@
 #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
 //   |       \             | to get determinable results.
 //   v        ^            |
 // (dial) ----+            |
 //   |        ^            |
 //   v        |            |
 // (online) --+            |
@@ -95,25 +100,25 @@ void Dialer::slotCancel()
         if(state != state_online)
         {
                 usercancel = 1;
                 reset();
         }
         else {
             accept();
         }
 }
 
 void Dialer::reset()
 {
-    qWarning("reset");
+    owarn << "reset" << oendl; 
         switchState(state_cancel);
 }
 
 void Dialer::slotAutostart()
 {
         //state = state_preinit;
         dial(m_profile.readEntry("Number"));
 }
 
 void Dialer::dial(const QString& number)
 {
         while(state != state_online)
@@ -127,67 +132,67 @@ void Dialer::dial(const QString& number)
         }
 
         if(usercancel)
         {
                 // modem hangup
                 trydial(QString::null);
                 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();
         }
 */
 
         if(state != state_cancel)
         {
                 switchState(state_dialtone);
 
                 send("ATX1\r");
                 QString response4 = receive();
                 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));
 
                 QString response5 = receive();
                 if(!response5.contains("CONNECT") )
                 {
                         if(response5.contains("BUSY"))
                                 switchState(state_dialing);
                         else
@@ -205,25 +210,25 @@ void Dialer::trydial(const QString& number)
         {
             state = state_online;
             slotCancel();
         }
 }
 
 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";
 */
         m = m.replace(QRegExp("\n"), "\r");
 
         bytes = ::write(m_fd, m.local8Bit(), strlen(m.local8Bit()));
         if(bytes < 0)
         {
@@ -238,29 +243,29 @@ QString Dialer::receive()
         int ret;
         int counter = 0;
 
         while(1)
         {
                 ret = ::read(m_fd, buffer, sizeof(buffer));
 
                 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;
                         }
                 }
                 else if(ret < 0)
                 {
                         if(errno != EAGAIN) reset();
                         else if(!(counter++ % 100)) qApp->processEvents();
                 }
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,19 +1,21 @@
-
 #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
         setWrap(prof.readNumEntry("Wrap", 0) ? 0 : 80);
     m_teWid->setMinimumSize(150, 70 );
     m_script = 0;
     parent->resize( m_teWid->calcSize(80, 24 ) );
     m_teEmu = new TEmuVt102(m_teWid );
 
@@ -119,53 +121,53 @@ QColor EmulationHandler::foreColor(int col) {
     QColor co;
     /* we need to switch it */
     switch( col ) {
     default:
     case Profile::White:
         /* color is black */
         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;
 }
 QColor EmulationHandler::backColor(int col ) {
   QColor co;
     /* we need to switch it */
     switch( col ) {
     default:
     case Profile::White:
         /* color is white */
         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;
 }
 
 QPushButton*  EmulationHandler::cornerButton() {
     return m_teWid->cornerButton();
 }
 
 
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
@@ -215,27 +215,27 @@ void EmulationWidget::paintEvent( QPaintEvent* pe )
         drawAttrString( unistr, painter, QRect( m_blX+tLx+f_width*x,m_bY+tLy+f_height*y,f_width*len,f_height ), m_image[loc(x ,y )], pm != 0l, false );
         x +=len -1;
     }
     delete [] disstrU;
     drawFrame( &painter );
     painter.end();
 }
 
 void EmulationWidget::calcGeometry()
 {
         m_scrollbar->resize(QApplication::style().scrollBarExtent().width(), contentsRect().height() );
 
-        qDebug( QString(" TEST").arg( contentsRect().width() ) );
-        qDebug( QString(" TEST").arg( contentsRect().height() ) );
-        qDebug("NEUER TESTT!!!!!!!!");
+        odebug << QString(" TEST").arg( contentsRect().width() ) << oendl; 
+        odebug << QString(" TEST").arg( contentsRect().height() ) << oendl; 
+        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;
                 m_brX = m_blX;
                 m_scrollbar->hide();
                 break;
         case SCRLEFT :
                 m_columns = ( contentsRect().width() - 2 * rimX - m_scrollbar->width() ) / f_width;
                 m_brX = ( contentsRect().width() - ( m_columns*f_width ) - m_scrollbar->width() ) / 2;
@@ -249,39 +249,39 @@ void EmulationWidget::calcGeometry()
                 m_brX = m_blX;
                 m_scrollbar->move( contentsRect().topRight() - QPoint (m_scrollbar->width()-1,0 ) );
                 m_scrollbar->show();
                 break;
         }
 
         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 );
     }
     else
     {
         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
         painter.setPen( color_table[attr.f].color );
     painter.drawText( rect.x(), rect.y() + f_ascent, string );
 
 }
 
 
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,14 +1,19 @@
 #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
 #define DEFAULT_COLS 12
 
 /* FunctionKeyboard {{{1 */
 
 FunctionKeyboard::FunctionKeyboard(QWidget *parent) :
     QFrame(parent), numRows(DEFAULT_ROWS), numCols(DEFAULT_COLS),
@@ -28,25 +33,25 @@ FunctionKeyboard::FunctionKeyboard(QWidget *parent) :
 
             QString handle = "r" + QString::number(r) + "c" + QString::number(c);
             QStringList value_list = conf.readListEntry( handle, '|');
 
             if (value_list.isEmpty()) continue;
 
             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();
 
 
 
 }
 
 FunctionKeyboard::~FunctionKeyboard() {}
 
 void FunctionKeyboard::changeRows(int r) {
 
     numRows = r;
@@ -247,25 +252,25 @@ void FunctionKeyboard::loadDefaults() {
     keys.insert( "r1c10", FKey ("F11", 0, 4154, 0));
     keys.insert( "r1c11", FKey ("F12", 0, 4155, 0));
 
 
 }
 
 /* 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)));
 
     QGroupBox *dimentions = new QGroupBox(2, Qt::Horizontal, tr("Dimensions"), this);
     QLabel *l = new QLabel("Rows", dimentions);
     m_rowBox = new QSpinBox(1, 15, 1, dimentions);
     connect (m_rowBox, SIGNAL(valueChanged(int)), this, SLOT(slotChangeRows(int)));
     l = new QLabel("Columns", dimentions);
     m_colBox = new QSpinBox(1, 15, 1, dimentions);
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,16 +1,19 @@
 
 #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() {
     if ( m_attach ) {
         delete m_attach;
     }
 }
 
 
@@ -34,25 +37,25 @@ bool IOBt::open() {
         // hciattach here
         m_attach = new OProcess();
         *m_attach << "hciattach /dev/ttyS2 any 57600";
 
         // then start hcid, then rcfomm handling (m_mac)
 
         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 )
 
         ret =IOSerial::open();
     }
     return ret;
 }
 
@@ -80,14 +83,14 @@ void IOBt::slotExited( OProcess* proc ){
     delete proc;
 }
 
 QBitArray IOBt::supports() const {
     return QBitArray( 3 );
 }
 
 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,16 +1,18 @@
-
 #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() {
     if ( m_attach ) {
         delete m_attach;
     }
 }
 
 
@@ -26,25 +28,25 @@ bool IOIrda::open() {
 
     // irdaattach here
     m_attach = new OProcess();
     *m_attach << "irattach /dev/ttyS2 -s";
 
     connect( m_attach, SIGNAL( processExited(Opie::Core::OProcess*) ),
              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;
 }
 
 void IOIrda::reload( const Profile &config ) {
     m_device = config.readEntry("Device", IRDA_DEFAULT_DEVICE);
     m_baud = config.readNumEntry("Baud", IRDA_DEFAULT_BAUD);
     m_parity = config.readNumEntry("Parity", IRDA_DEFAULT_PARITY);
     m_dbits = config.readNumEntry("DataBits", IRDA_DEFAULT_DBITS);
     m_sbits = config.readNumEntry("StopBits", IRDA_DEFAULT_SBITS);
@@ -65,14 +67,14 @@ void IOIrda::slotExited(OProcess* proc ){
     delete proc;
 }
 
 QBitArray IOIrda::supports()const {
     return QBitArray( 3 );
 }
 
 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,27 +1,27 @@
 
 #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();
         internDetach();
         Dialer d(m_profile, m_fd);
         d.setHangupOnly();
         //d.exec();
         internAttach();
         //closeRawIO(fd);
@@ -95,14 +95,14 @@ void IOModem::slotExited(OProcess* proc ){
     delete proc;
 }
 
 QBitArray IOModem::supports()const {
     return QBitArray( 3 );
 }
 
 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
@@ -82,25 +82,25 @@ void FixIt::fixIt() {
         file.writeBlock(m_file,strlen(m_file) );
     }
     file.close();
     ::kill( SIGHUP, 1 );
 }
 #endif
 
 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") );
     app.showMainWidget( &mw );
 
     int ap = app.exec();
 
 #ifdef FSCKED_DISTRIBUTION
     /* should add a signal  handler too */
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,39 +1,42 @@
-#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 );
     }
     m_factory = new MetaFactory();
     Default def(m_factory);
     m_sessions.setAutoDelete( TRUE );
     m_curSession = 0;
     m_manager = new ProfileManager( m_factory );
     m_manager->load();
@@ -437,31 +440,31 @@ void MainWindow::slotConfigure() {
 /*
  * we will remove
  * this window from the tabwidget
  * remove it from the list
  * delete it
  * and set the currentSession()
  */
 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 );
         m_recordScript->setEnabled( false );
         m_saveScript->setEnabled( false );
         m_scripts->setItemEnabled(m_runScript_id, false);
         m_fullscreen->setEnabled( false );
         m_wrap->setEnabled( false );
         m_closewindow->setEnabled( false );
@@ -561,34 +564,34 @@ void MainWindow::slotOpenKeb(bool state) {
 void MainWindow::slotOpenButtons( bool state ) {
 
     if ( state ) {
         m_buttonBar->show();
     } else {
         m_buttonBar->hide();
     }
 }
 
 
 
 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);
         } else {
             m_connect->setEnabled( true );
             m_disconnect->setEnabled( false );
             m_recordScript->setEnabled( false );
             m_saveScript->setEnabled( false );
             m_scripts->setItemEnabled(m_runScript_id, false);
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,24 +1,27 @@
+#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 );
                 return;
             }
         }
         bo->insertItem( str );
         bo->setCurrentItem( b );
     }
@@ -126,25 +129,25 @@ void ModemConfigWidget::load( const Profile& prof ) {
 
     if ( sbits == 2) {
         m_base->setStop( IOLayerBase::Stop_Two );
     } else if ( sbits == 15 ) {
         m_base->setStop( IOLayerBase::Stop_OnePointFive );
     } else {
         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 );
 
 
 }
 
 /*
  * save speed,
  * flow,
  * parity
  */
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,16 +1,14 @@
 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 \
            profile.h \
            profileconfig.h \
            profilemanager.h  \
            tabwidget.h \
            configdialog.h \
            keytrans.h \
@@ -61,16 +59,16 @@ SOURCES      = io_layer.cpp io_serial.cpp io_irda.cpp io_bt.cpp io_modem.cpp \
         emulation_handler.cpp TEHistory.cpp \
         TEScreen.cpp TEWidget.cpp \
         TEmuVt102.cpp TEmulation.cpp MyPty.cpp \
         consoleconfigwidget.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
@@ -32,55 +32,55 @@ void SzTransfer::sendFile(const QString& file) {
     connect(proc, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)),
             this, SLOT(SzReceivedStdout(Opie::Core::OProcess*,char*,int)));
     connect(proc, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)),
             this, SLOT(SzReceivedStderr(Opie::Core::OProcess*,char*,int)));
     connect(layer(), SIGNAL(received(const QByteArray&)),
             this, SLOT(receivedStdin(const QByteArray&)));
     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] );
     }
     printf("\n");
 
     // send out through the io layer
     layer()->send(data);
 }
 
 void SzTransfer::SzReceivedStderr(OProcess *, char *buffer, int length) {
 
     // parse and show data in a progress dialog/widget
     printf("stderr:\n");
     //for (int i = 0; i < length; i++)
     //    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&)),
             this, SLOT(receivedStdin(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,27 +1,30 @@
-
 #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 );
 }
 
 void TabWidget::remove( Session* ses ) {
     m_map.remove( ses->widgetStack() );
     removePage( ses->widgetStack() );
 }
 
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,22 +1,27 @@
+#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
     };
 
     enum ColourIds {
         id_term_black,
         id_term_white,
         id_term_green,
@@ -60,25 +65,25 @@ TerminalWidget::TerminalWidget( const QString& name, QWidget* parent,
     m_typeBox->add( m_terminal );
     m_typeBox->add( m_terminalBox );
     m_lroot->add( m_groupSize );
 
     m_colorBox->add( m_colorLabel );
     m_colorBox->add( m_colorCmb );
 
     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 );
 
     m_colorCmb->insertItem( tr("black on white"), id_term_black );
     m_colorCmb->insertItem( tr("white on black"), id_term_white );
     m_colorCmb->insertItem( tr("green on black"), id_term_green );
     m_colorCmb->insertItem( tr("orange on black"), id_term_orange );
 
     // signals + slots
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
@@ -17,63 +17,63 @@
 
 using namespace Opie::Core;
 using namespace Opie::Core;
 SenderUI::SenderUI()
     : Sender() {
 
     /* 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() {
 
 }
 void SenderUI::slotSendFile() {
 
     sz = new FileTransfer(FileTransfer::SY, ser);
     sz->sendFile("/home/ich/bootopie-v06-13.jffs2");
 
     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
@@ -986,25 +986,25 @@ bool Widget::eventFilter( QObject *obj, QEvent *e )
         static_cast<QKeyEvent *>( e )->ignore();
         return true;
     }
     if ( obj != this /* when embedded */ && obj != parent() /* when standalone */ )
         return FALSE; // not us
     if ( e->type() == QEvent::Wheel)  {
         QApplication::sendEvent(scrollbar, e);
     }
 
 #ifdef FAKE_CTRL_AND_ALT
     static bool control = FALSE;
     static bool alt = FALSE;
-//    qDebug(" Has a keyboard with no CTRL and ALT keys, but we fake it:");
+//    odebug << " Has a keyboard with no CTRL and ALT keys, but we fake it:" << oendl; 
     bool dele=FALSE;
     if ( e->type() == QEvent::KeyPress || e->type() == QEvent::KeyRelease ) {
         QKeyEvent* ke = (QKeyEvent*)e;
         bool keydown = e->type() == QEvent::KeyPress || ke->isAutoRepeat();
         switch (ke->key()) {
           case Key_F9: // let this be "Control"
               control = keydown;
               e = new QKeyEvent(QEvent::KeyPress, Key_Control, 0, ke->state());
               dele=TRUE;
               break;
           case Key_F13: // let this be "Alt"
               alt = keydown;
@@ -1025,29 +1025,29 @@ bool Widget::eventFilter( QObject *obj, QEvent *e )
                                     ke->ascii(), ke->state()|AltButton, ke->text());
                   dele=TRUE;
               }
         }
     }
 #endif
 
     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;
 #endif
         return true;               // stop the event
     }
     if ( e->type() == QEvent::Enter )  {
         QObject::disconnect( (QObject*)cb, SIGNAL(dataChanged()),
                              this, SLOT(onClearSelection()) );
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
@@ -66,25 +66,25 @@ bool WidgetLayer::eventFilter( QObject *obj, QEvent *e )
 {
     if ( (e->type() == QEvent::Accel ||
           e->type() == QEvent::AccelAvailable ) && qApp->focusWidget() == this )  {
         static_cast<QKeyEvent *>( e )->ignore();
         return true;
     }
     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"
               control = keydown;
               e = new QKeyEvent(QEvent::KeyPress, Key_Control, 0, ke->state());
               dele=TRUE;
               break;
           case Key_F13: // let this be "Alt"
               alt = keydown;
@@ -106,25 +106,25 @@ QChar(a,0));
                                     ke->ascii(), ke->state()|AltButton, ke->text());
                   dele=TRUE;
               }
         }
     }
 #endif
 
     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();
 #ifdef FAKE_CTRL_AND_ALT
         if ( dele ) delete e;
 #endif
         return true;               // stop the event
     }
     return QFrame::eventFilter( obj, e );
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
@@ -11,30 +11,34 @@
 ** THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 ** PURPOSE.
 **
 ** email sales@trolltech.com for information about Qtopia License
 ** Agreements.
 **
 ** 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>
 #include <qfontdatabase.h>
 #include <qcombobox.h>
 #include <qlineedit.h>
 #include <qfileinfo.h>
 #include <qfile.h>
 #include <qfiledialog.h>
@@ -435,56 +439,56 @@ void MainWindow::fileOpen()
 {
     save();
     editorStack->raiseWidget( fileSelector );
     fileSelector->reread();
     hideEditTools();
     fileSelector->setNewVisible( TRUE );
     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" );
     clear();
     editorStack->raiseWidget( editor );
     editor->viewport()->setFocus();
     doc = new DocLnk( nf );
     updateCaption();
 }
 
 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 );
     updateCaption();
 }
 
 void MainWindow::showEditTools( void )
 {
     tbMenu->show();
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,16 +1,15 @@
 
 CONFIG        += qt warn on  quick-app
 
-
 HEADERS    =    qcleanuphandler.h \
         qcomplextext_p.h \
         qrichtext_p.h \
         qstylesheet.h \
         qtextedit.h \
         mainwindow.h
 
 SOURCES    =    qcomplextext.cpp \
         qstylesheet.cpp \
         qrichtext_p.cpp \
         qrichtext.cpp \
         qtextedit.cpp \
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
@@ -97,43 +97,43 @@ QBidiContext::~QBidiContext()
    previous and left with next in the above rules ;-)
 */
 
 /*
   Two small helper functions for arabic shaping. They get the next shape causing character on either
   side of the char in question. Implements rule R1.
 
   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--;
         ch--;
     }
     return &QChar::replacement;
 }
 
 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++;
     }
     return &QChar::replacement;
 }
 
 static inline bool prevVisualCharJoins( const QString &str, int pos)
 {
     return (     prevChar( str, pos )->joining() != QChar::OtherJoining );
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
@@ -28,29 +28,35 @@
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
 **   information about Qt Commercial License Agreements.
 ** See http://www.trolltech.com/qpl/ for QPL licensing information.
 ** 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 "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;
 
 static QTextFormatCollection *qFormatCollection = 0;
 
 const int border_tolerance = 2;
 
 #ifdef Q_WS_WIN
@@ -175,25 +181,25 @@ QTextDeleteCommand::~QTextDeleteCommand()
 {
     for ( int i = 0; i < (int)text.size(); ++i ) {
         if ( text[ i ].format() )
             text[ i ].format()->removeRef();
     }
     text.resize( 0 );
 }
 
 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();
     if ( c )
         *c = cursor;
     if ( doc ) {
         doc->setSelectionStart( QTextDocument::Temp, cursor );
         for ( int i = 0; i < len; ++i )
             cursor.gotoNextLetter();
@@ -203,25 +209,25 @@ QTextCursor *QTextDeleteCommand::execute( QTextCursor *c )
             *c = cursor;
     } else {
         s->remove( index, len );
     }
 
     return 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 );
     cursor.insert( str, TRUE, &text );
     cursor.setParagraph( s );
     cursor.setIndex( index );
     if ( c ) {
         c->setParagraph( s );
         c->setIndex( index );
@@ -1535,28 +1541,28 @@ void QTextDocument::setRichTextInternal( const QString &text, QTextCursor* curso
                         curpar->setAlignment( curtag.alignment );
                         custom = parseTable( attr, format, doc, length, pos, curpar );
                     } else if ( tagname == "qt" || tagname == "body" ) {
                         if ( attr.contains( "bgcolor" ) ) {
                             QBrush *b = new QBrush( QColor( attr["bgcolor"] ) );
                             setPaper( b );
                         }
                         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 );
                                 setPaper( b );
                             }
                         }
                         if ( attr.contains( "text" ) ) {
                             QColor c( attr["text"] );
                             if ( formatCollection()->defaultFormat()->color() != c ) {
@@ -2143,25 +2149,25 @@ QString QTextDocument::richText() const
         s += QString::number( formatCollection()->defaultFormat()->font().pointSize() );
         s += "pt;font-family:";
         s += formatCollection()->defaultFormat()->font().family();
         s +="\">";
     }
     QTextParagraph* p = fParag;
 
     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);
 
     while ( p ) {
         listDepth = p->listDepth();
         if ( listDepth < pastListDepth )  {
             for ( int i = listDepth+1; i <= pastListDepth; i++ )
                 s += list_is_ordered( listStyles[i] ) ? "</ol>" : "</ul>";
@@ -4087,25 +4093,25 @@ int QTextParagraph::lineHeightOfChar( int i, int *bl, int *y ) const
         if ( i >= it.key() ) {
             if ( bl )
                 *bl = ( *it )->baseLine;
             if ( y )
                 *y = ( *it )->y;
             return ( *it )->h;
         }
         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() )
         ( (QTextParagraph*)this )->format();
 
     int l = (int)lineStarts.count() - 1;
     QMap<int, QTextLineStart*>::ConstIterator it = lineStarts.end();
     --it;
     for ( ;; ) {
@@ -4113,25 +4119,25 @@ QTextStringChar *QTextParagraph::lineStartOfChar( int i, int *index, int *line )
             if ( index )
                 *index = it.key();
             if ( line )
                 *line = l;
             return &str->at( it.key() );
         }
         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() )
         ( (QTextParagraph*)this )->format();
 
     return (int)lineStarts.count();
 }
 
 QTextStringChar *QTextParagraph::lineStartOfLine( int line, int *index ) const
@@ -4140,25 +4146,25 @@ QTextStringChar *QTextParagraph::lineStartOfLine( int line, int *index ) const
         ( (QTextParagraph*)this )->format();
 
     if ( line >= 0 && line < (int)lineStarts.count() ) {
         QMap<int, QTextLineStart*>::ConstIterator it = lineStarts.begin();
         while ( line-- > 0 )
             ++it;
         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() )
         ( (QTextParagraph*)this )->format();
 
     int line = 0;
     int x = str->at(0).x;  /* set x to x of first char */
     if ( str->isBidi() ) {
         for ( int i = 1; i < str->length()-1; ++i )
@@ -5688,25 +5694,25 @@ QTextFormat *QTextFormatCollection::format( const QFont &f, const QColor &c )
     if ( cachedFormat ) {
         cachedFormat->addRef();
         return cachedFormat;
     }
 
     if ( key == defFormat->key() )
         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 )
         lastFormat = 0;
     if ( cres == f )
         cres = 0;
     if ( cachedFormat == f )
         cachedFormat = 0;
     cKey.remove( f->key() );
@@ -6074,29 +6080,29 @@ QTextImage::QTextImage( QTextDocument *p, const QMap<QString, QString> &attr, co
             pixmap_map = new QMap<QString, QPixmapInt>;
         if ( pixmap_map->contains( imgId ) ) {
             QPixmapInt& pmi = pixmap_map->operator[](imgId);
             pm = pmi.pm;
             pmi.ref++;
             width = pm.width();
             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();
                     if ( height != 0 ) {
                         width = img.width() * height / img.height();
                     }
                 }
                 if ( height == 0 ) {
                     height = img.height();
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
@@ -26,24 +26,27 @@
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
 **   information about Qt Commercial License Agreements.
 ** See http://www.trolltech.com/qpl/ for QPL licensing information.
 ** 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 <opie2/odebug.h>
+using namespace Opie::Core;
+
 #include "qrichtext_p.h"
 
 using namespace Qt3;
 
 QTextCommand::~QTextCommand() {}
 QTextCommand::Commands QTextCommand::type() const { return Invalid; }
 
 
 QTextCustomItem::~QTextCustomItem() {}
 void QTextCustomItem::adjustToPainter( QPainter* p){ if ( p ) width = 0; }
 QTextCustomItem::Placement QTextCustomItem::placement() const { return PlaceInline; }
 
@@ -128,25 +131,25 @@ QTextDocument *QTextCursor::document() const
 }
 
 void QTextCursor::gotoPosition( QTextParagraph* p, int index )
 {
     if ( para && p != para ) {
         while ( para->document() != p->document() && !indices.isEmpty() )
             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;
 }
 
 bool QTextDocument::hasSelection( int id, bool visible ) const
 {
     return ( selections.find( id ) != selections.end() &&
              ( !visible ||
@@ -468,74 +471,74 @@ bool QTextParagraph::fullSelected( int id ) const
 {
     if ( !mSelections )
         return FALSE;
     QMap<int, QTextParagraphSelection>::ConstIterator it = mSelections->find( id );
     if ( it == mSelections->end() )
         return FALSE;
     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();
 
     QMap<int, QTextLineStart*>::ConstIterator it = lineStarts.begin();
     while ( l-- > 0 )
         ++it;
     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();
 
     QMap<int, QTextLineStart*>::ConstIterator it = lineStarts.begin();
     while ( l-- > 0 )
         ++it;
     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();
 
     QMap<int, QTextLineStart*>::ConstIterator it = lineStarts.begin();
     while ( l-- > 0 )
         ++it;
     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 );
-        qDebug( "%d %d", (int)lineStarts.count() - 1, l );
+        owarn << "QTextParagraph::lineInfo: line " << l << " out of range!" << oendl; 
+        odebug << "" << (int)lineStarts.count() - 1 << " " << l << "" << oendl; 
         y = 0;
         h = 15;
         bl = 10;
         return;
     }
 
     if ( !isValid() )
         ( (QTextParagraph*)this )->format();
 
     QMap<int, QTextLineStart*>::ConstIterator it = lineStarts.begin();
     while ( l-- > 0 )
         ++it;
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,21 +1,26 @@
-#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 )
   {
     cleared = 0;
 
     firstline = new QHBox ( this );
     firstline->setSpacing ( 2 );
 
@@ -258,25 +263,25 @@ void AccountDisplay::getTransferAccounts ( QListViewItem * item )
         // enter today's date in the date box as default
         QDate today = QDate::currentDate ();
         int defaultday = today.day();
         int defaultmonth = today.month();
         int defaultyear  = today.year();
         td->date->setText ( preferences->getDate ( defaultyear, defaultmonth, defaultday ) );
 
         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 );
 
             // update account balances of both accounts and parents if necessary
             account->updateAccountBalance ( firstaccountid );
              if ( account->getParentAccountID ( firstaccountid ) != -1 )
                account->changeParentAccountBalance ( account->getParentAccountID ( firstaccountid ) );
             account->updateAccountBalance ( secondaccountid );
             if ( account->getParentAccountID ( secondaccountid ) != -1 )
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
@@ -34,16 +34,16 @@ SOURCES =	qashmoney.cpp \
                         calculator.cpp \
                         datepicker.cpp \
                         main.cpp \
                         budget.cpp \
                         budgetdisplay.cpp \
                         currency.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
@@ -8,33 +8,41 @@
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/ 
-#include <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"
-#include "datacache.h"
+
+/* STD */
 #include <assert.h>
+#include <stdlib.h>
 
 static const int del_flag = 0x1;
 static const int new_flag = 0x2;
 
 /* Helper function */
 
 int parseNextNumber(QString *q) {
     QChar c;
     uint i;
     int result = 0;
 
     bool found_digits = FALSE;
@@ -303,25 +311,25 @@ void TVVariant::load(QDataStream &s )
                 s >> *x;
                 d->value.ptr = x;
             }
             break;
         case Int:
             {
                 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();
 
     switch( d->typ ) {
         case String:
             s << *((QString *)d->value.ptr);
             break;
         case Date:
@@ -1069,25 +1077,25 @@ QDataStream &operator<<( QDataStream &s, const DataElem &d)
     return s;
 }
 
 QDataStream &operator>>( QDataStream &s, DataElem &d)
 {
     int i;
     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;
         d.setField(index, t);
     }
     return s;
 }
 
 /*! Returns the number of possible (not valid) fields in the data element */
@@ -1368,25 +1376,25 @@ bool DataElem::contains(int i, TVVariant v) const
             QString qs2 = v.toString().lower();
             if (qs1.contains(qs2) > 0) return TRUE;
             break;
         }
             /* meaningless for ints */
             /* meaningless for time */
             /* 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
 {
     if (!hasValidValue(i)) return FALSE;
 
     if (getField(i).type() != v.type())
         return FALSE;
 
     switch(getField(i).type()) {
@@ -1394,25 +1402,25 @@ bool DataElem::startsWith(int i, TVVariant v) const
             QString qs1 = getField(i).toString().lower();
             QString qs2 = v.toString().lower();
             return qs1.startsWith(qs2);
         }
             /* meaningless for ints */
             /* meaningless for time */
             /* 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
 {
     if (!hasValidValue(i)) return FALSE;
 
     if (getField(i).type() != v.type())
         return FALSE;
 
     switch(getField(i).type()) {
@@ -1420,25 +1428,25 @@ bool DataElem::endsWith(int i, TVVariant v) const
             QString qs1 = getField(i).toString().lower();
             QString qs2 = v.toString().lower();
             return qs1.startsWith(qs2);
         }
             /* meaningless for ints */
             /* meaningless for time */
             /* 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
     parameter.
 
     \return 
     <UL>
     <LI>TRUE if the first element is a closer match to the target than the 
     second element</LI>
@@ -1452,19 +1460,19 @@ bool DataElem::closer(DataElem*d1, DataElem *d2, TVVariant target, int column)
 
     if(!d1) return FALSE;
 
     if (!d1->hasValidValue(column)) return FALSE;
 
     if(!target.isValid()) return FALSE;
 
     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
@@ -17,27 +17,35 @@
 ** not clear to you.
 **
 **********************************************************************/ 
 /*
  * This file is used to load the xml files that represent the database.
  * The main requirment for said file is each data entry must contain a key,
  * 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
     searching the data loaded by the application
 
 */
 
 /*!
     Constructs a DBStore item
@@ -141,25 +149,25 @@ bool DBStore::saveSource(QIODevice *outDev, const QString &source)
 
     \param delm An already allocated and initialized data element to be added
 */
 void DBStore::addItem(DataElem *delem)
 {
     addItemInternal(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;
     number_elems++;
 
     if(number_elems >= table_size) {
         /* filled current table, double if we can */
         table_size = table_size << 1;
 
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
@@ -9,30 +9,36 @@
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/ 
 #include "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;
 } 
 
 QString DBXml::type()
 {
     return "xml";
 }
 
 bool DBXml::openSource(QIODevice *inDev)
@@ -131,25 +137,25 @@ DBXmlHandler::DBXmlHandler(DBStore *ds)
     current_keyrep = 0;
 }
 
 /*!
     Destroys the DBXmlHandler
 */
 DBXmlHandler::~DBXmlHandler()
 {
 }
 
 QString DBXmlHandler::errorProtocol()
 {
-    qWarning("Error reading file");
+    owarn << "Error reading file" << oendl; 
         return errorProt;
 }
 
 bool DBXmlHandler::startDocument()
 {
         errorProt = "";
         state = StateInit;
         return TRUE;
 }
 
 bool DBXmlHandler::startElement(const QString&, const QString&, 
                                                 const QString& qName, const QXmlAttributes& atts)
@@ -163,49 +169,49 @@ bool DBXmlHandler::startElement(const QString&, const QString&,
     if (state == StateDocument && qName == "header") {
         state = StateHeader;
         if (current_keyrep) delete current_keyrep;
         current_keyrep = new KeyList();
         return TRUE;
     }
     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;
     }
         if (state == StateDocument && qName == "record") {
                 state = StateRecord;
         current_data = new DataElem(data_store);
                 // Now expecting a <record> tag
                 return TRUE;
         }
         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)
 {
         switch(state) {
         case StateField:
                 // TODO checks 'could' be done of the popped value
         state = StateRecord;
                 break;
         case StateKey:
@@ -216,25 +222,25 @@ bool DBXmlHandler::endElement(const QString&, const QString&,
         data_store->setKeys(current_keyrep);
         state = StateDocument;
         break;
         case StateRecord:
         data_store->addItem(current_data);
                 state = StateDocument;
                 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;
 }
 
 bool DBXmlHandler::characters(const QString& ch)
 {
         // this is where the 'between tag' stuff happens.
         // e.g. the stuff between tags.
         QString ch_simplified = ch.simplifyWhiteSpace();
 
@@ -245,53 +251,53 @@ bool DBXmlHandler::characters(const QString& ch)
         int *tmp_val = new int;
         /* We just grabbed the display name of a key */
         *tmp_val = current_keyrep->addKey(ch_simplified, last_key_type);
         keyIndexList.insert(key, tmp_val);
                 return TRUE;
         }
         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";
 }
 
 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
@@ -9,45 +9,47 @@
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/ 
 
-/* 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.
 */
 
 /*!
     Constructs a new TableViewerWindow
 */
 TableViewerWindow::TableViewerWindow(QWidget *parent, const char *name, WFlags f)
@@ -192,25 +194,25 @@ void TableViewerWindow::selectDocument()
     fileSelector->reread();
 }
 
 void TableViewerWindow::saveDocument()
 {
     if(!dirty)
   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;
 }
 
 void TableViewerWindow::newDocument()
 {
     DocLnk nf;
     nf.setType("text/x-xml-tableviewer");
     nf.setName("table");
    
@@ -279,25 +281,25 @@ void TableViewerWindow::openDocument(const DocLnk &f)
         listView->first();
         ts.current_elem = listView->getCurrentData();
         browseView->rebuildData();
         listView->rebuildData();
 
         QString scratch = "Table Viewer";/* later take from constant */
         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 
 */
 void TableViewerWindow::firstItem()
 {
     listView->first();
     ts.current_elem = listView->getCurrentData();
     browseView->rebuildData();
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
@@ -8,26 +8,33 @@
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/ 
+
 #include "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)
 {
     if(width > 70) width = 70;
     QListView::setColumnWidth(column, width);
 }
 
 void TVListViewPrivate::setSorting(int column, bool increasing)
 {
@@ -154,25 +161,25 @@ void TVListView::clearItems()
     delete it;
     it = new QListViewItemIterator(listViewDisplay);
 }
 
 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)++;
     if (!it->current()) {
         *it = tmp;
     }
 }
 
 void TVListView::previous()
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
@@ -17,25 +17,24 @@ HEADERS        = microkde/kapplication.h \
                   microkde/kstandarddirs.h \
                   microkde/ktempfile.h \
                   microkde/kunload.h \
                   microkde/kurlrequester.h \
                   microkde/kfontdialog.h \
                   microkde/krun.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 \
           document/katecmds.h    document/katedocument.h  \
           document/katesyntaxdocument.h \
           view/kateundohistory.h  \
           view/kateview.h  \
           view/kateviewdialog.h \
           interfaces/view.h \
@@ -49,37 +48,35 @@ SOURCES        = microkde/kapplication.cpp \
                   microkde/kmessagebox.cpp \
                   microkde/kprocess.cpp \
                   microkde/kstandarddirs.cpp \
                   microkde/ktempfile.cpp \
                   microkde/kurlrequester.cpp \
                   microkde/kfontdialog.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 \
             $(OPIEDIR)/noncore/apps/tinykate/libkate/interfaces \
             $(OPIEDIR)/noncore/apps/tinykate/libkate/ktexteditor \
             $(OPIEDIR)/noncore/apps/tinykate/libkate/qt3back
 DEPENDPATH    += $(OPIEDIR)/include
 LIBS            += -lqpe -lqtaux2 -lopiecore2 -lopieui2
 TARGET        = tinykate
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,22 +1,20 @@
 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
 
 
 
 include ( $(OPIEDIR)/include.pro )
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,22 +1,19 @@
-/****************************************************************************
-** 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>
 #include <qwhatsthis.h>
 
 static const char* const image0_data[] = { 
 "24 16 3 1",
 ". c None",
 "# c #000040",
@@ -207,50 +204,50 @@ ScQtFileDlg::ScQtFileDlg( QWidget* parent,  const char* name, bool modal, WFlags
 }
 
 /*  
  *  Destroys the object and frees any allocated resources
  */
 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
@@ -20,35 +20,34 @@
 #include "zsafe.h"
 #include "newdialog.h"
 #include "searchdialog.h"
 #include "categorydialog.h"
 #include "passworddialog.h"
 #include "infoform.h"
 #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>
 #endif
 #include <string.h>
 #include <errno.h>
 
 #include <qmenubar.h>
 #include <qpopupmenu.h>
@@ -2060,45 +2059,43 @@ int ZSafe::loadInit(const char* _filename, const char *password)
         return PWERR_OPEN;
 
     buffer = (char *)malloc(load_buffer_length);
     for (j = 0; password[j] != '\0'; j++) {
         key[j] = password[j];
     }
     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;
 
     for (count = 0; count < 4; count++) {
         count2 = count << 1;
         iv[count] = charbuf[count2] << 8;
         iv[count] += charbuf[count2 + 1];
     }
 
     size = 0;
     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;
             }
             count += count2;
         } /* while (count < 8) */
 
         size += 8;
         for (count2 = 0; count2 < 8; count2 += 2) {
@@ -2250,25 +2247,25 @@ bool ZSafe::saveDocument(const char* _filename,
        strcpy(entry[i++], "password");
        entry[i] = (char*)malloc(strlen("comment")+1);
        strcpy(entry[i++], "comment");
 
        entry[i] = (char*)malloc(strlen("field5")+1);
        strcpy(entry[i++], "field5");
        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
            saveConf();
         }
 
         QListViewItem *i;
         // step through all categories
         for (i = ListView->firstChild();
@@ -2294,34 +2291,34 @@ bool ZSafe::saveDocument(const char* _filename,
          strcpy(entry[j++], si->text(3).utf8());
          entry[j] = (char*)malloc(strlen(si->text(4).utf8())+1);
          strcpy(entry[j++], si->text(4).utf8());
          entry[j] = (char*)malloc(strlen(si->text(5).utf8())+1);
          strcpy(entry[j++], si->text(5).utf8());
 
           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;
         return true;
     }
 }
 
 PasswordForm *newPwdDialog;
 bool newPwdDialogResult = false;
@@ -3181,25 +3178,25 @@ void ZSafe::editCategory()
               categories.remove (category);
 // #ifndef WIN32
               conf->removeEntry(category);
 // #endif
               saveConf();
            }
 
            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;
                   pix = new QPixmap (fullIconPath);
                   if (pix)
                   {
                      // save the full pixmap name into the config file
 // #ifndef WIN32
                      conf->writeEntry(APP_KEY+category, 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
@@ -1,17 +1,17 @@
 TEMPLATE        = app
 CONFIG         = qt warn_on 
 DESTDIR      = $(OPIEDIR)/bin
 HEADERS      = zsafe.h krc2.h category.h categorylist.h zlistview.h \
                scqtfiledlg.h
 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 )