64 files changed, 1360 insertions, 1267 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
@@ -72,5 +72,5 @@ void AdvancedFm::cleanUp() {
 void AdvancedFm::tabChanged(QWidget *) {
-//   qWarning("tab changed");
+//   owarn << "tab changed" << oendl; 
   QString path = CurrentDir()->canonicalPath();
   currentPathCombo->lineEdit()->setText( path );
@@ -94,5 +94,5 @@ void AdvancedFm::tabChanged(QWidget *) {
 void AdvancedFm::populateView() {
-// qWarning("PopulateView");
+// owarn << "PopulateView" << oendl; 
        QPixmap pm;
        QListView *thisView = CurrentView();
@@ -100,5 +100,5 @@ void AdvancedFm::populateView() {
        QString path = thisDir->canonicalPath();
-//qWarning("path is "+path);
+//owarn << "path is "+path << oendl; 
        thisView->clear();
        thisDir->setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
@@ -161,5 +161,5 @@ void AdvancedFm::populateView() {
                        }
                        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" );
@@ -185,5 +185,5 @@ void AdvancedFm::populateView() {
                        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;
@@ -210,5 +210,5 @@ void AdvancedFm::rePopulate() {
 //      int tmpTab = whichTab;
-// //  qDebug("%d", tmpTab);
+// //  odebug << "" << tmpTab << "" << oendl; 
 //    for(int i =1; i < 3; i++) {
@@ -220,8 +220,8 @@ void AdvancedFm::rePopulate() {
 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();
@@ -268,5 +268,5 @@ void AdvancedFm::ListPressed( int mouse, QListViewItem *item, const QPoint& , in
 void AdvancedFm::switchToLocalTab() {
-//qWarning("switch to local view");
+//owarn << "switch to local view" << oendl; 
   TabWidget->setCurrentWidget(0);
   Local_View->setFocus();
@@ -274,5 +274,5 @@ void AdvancedFm::switchToLocalTab() {
 void AdvancedFm::switchToRemoteTab() {
-//qWarning("switch to local view");
+//owarn << "switch to local view" << oendl; 
   TabWidget->setCurrentWidget(1);
   Remote_View->setFocus();
@@ -330,5 +330,5 @@ QStringList AdvancedFm::getPath() {
      if ( it.current()->isSelected() ) {
         strList <<  it.current()->text(0);
-//        qDebug(it.current()->text(0));
+//        odebug << it.current()->text(0) << oendl; 
      }
   }
@@ -381,5 +381,5 @@ void AdvancedFm::doAbout() {
 void AdvancedFm::keyPressEvent( QKeyEvent *e) {
-//   qWarning("key %d", e->key());
+//   owarn << "key " << e->key() << "" << oendl; 
 //   if( CurrentView()->hasFocus()  )
   {
@@ -639,5 +639,5 @@ void AdvancedFm::addToDocs() {
      for ( QStringList::Iterator it = strListPaths.begin(); it != strListPaths.end(); ++it ) {
         curFile = thisDir->canonicalPath()+"/"+(*it);
-//                qDebug(curFile);
+//                odebug << curFile << oendl; 
         QFileInfo fi(curFile);
         DocLnk f;
@@ -712,5 +712,5 @@ void AdvancedFm::addCustomDir() {
 void AdvancedFm::removeCustomDir() {
-//  qDebug("remove custom dir");
+//  odebug << "remove custom dir" << oendl; 
   Config cfg("AdvancedFm");
   cfg.setGroup("Menu");
@@ -747,5 +747,5 @@ void AdvancedFm::removeCustomDir() {
 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();
@@ -788,8 +788,8 @@ QDir *AdvancedFm::OtherDir() {
 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;
   }
@@ -804,5 +804,5 @@ QListView * AdvancedFm::OtherView() {
 void AdvancedFm::setOtherTabCurrent() {
-//   qWarning("setOtherTabCurrent() %d", whichTab);
+//   owarn << "setOtherTabCurrent() " << whichTab << "" << oendl; 
   if ( whichTab == 1) {
      TabWidget->setCurrentWidget(1);
@@ -815,8 +815,8 @@ void AdvancedFm::setOtherTabCurrent() {
 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;
@@ -831,5 +831,5 @@ void AdvancedFm::setDocument(const QString &file) {
 void AdvancedFm::gotoDirectory(const QString &file) {
-//   qWarning("goto dir "+file);
+//   owarn << "goto dir "+file << oendl; 
   QString curDir = file;
   QDir *thisDir = CurrentDir();
@@ -867,5 +867,5 @@ void AdvancedFm::findFile(const QString &fileName) {
 void AdvancedFm::slotSwitchMenu(int ) {
-//   qDebug("Switch %d", item);
+//   odebug << "Switch " << item << "" << oendl; 
   //   viewMenu->setItemChecked(item, true);
 }
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,5 +1,4 @@
 TEMPLATE  = app
-CONFIG    += qt warn_on  quick-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
@@ -7,24 +6,5 @@ TARGET    = advancedfm
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
-LIBS            += -lqpe -lopiecore2 -lopieui2
+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) {
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
@@ -12,9 +12,14 @@
 #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>
@@ -25,8 +30,7 @@
 #include <qlistview.h>
+/* STD */
 #include <sys/utsname.h>
-using namespace Opie::Ui;
 void AdvancedFm::init() {
         b = false;
@@ -220,9 +224,9 @@ void AdvancedFm::init() {
         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();
         }
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,839 +1,842 @@
-/***************************************************************************
+/***************************************************************************
-   AdvancedFm.cpp
+   AdvancedFm.cpp
-  -------------------
+  -------------------
-  ** Created: Sat Mar 9 23:33:09 2002
+  ** Created: Sat Mar 9 23:33:09 2002
-    copyright            : (C) 2002 by ljp
+    copyright            : (C) 2002 by ljp
-    email               : ljp@llornkcor.com
+    email               : ljp@llornkcor.com
-    *   This program is free software; you can redistribute it and/or modify  *
+    *   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  *
+    *   it under the terms of the GNU General Public License as published by  *
-    *   the Free Software Foundation; either version 2 of the License, or     *
+    *   the Free Software Foundation; either version 2 of the License, or     *
-    *   (at your option) any later version.                                   *
+    *   (at your option) any later version.                                   *
-    ***************************************************************************/
+    ***************************************************************************/
-#include "advancedfm.h"
-#include "output.h"
+#include "advancedfm.h"
-#include "filePermissions.h"
+#include "output.h"
+#include "filePermissions.h"
-#include <qpe/lnkproperties.h>
-#include <qpe/qpeapplication.h>
+/* OPIE */
-#include <qpe/applnk.h>
+#include <opie2/odebug.h>
+#include <qpe/lnkproperties.h>
-#include <qmessagebox.h>
+#include <qpe/qpeapplication.h>
+#include <qpe/applnk.h>
+using namespace Opie::Core;
-#include <qpopupmenu.h>
-#include <qlistview.h>
+/* QT*/
-#include <errno.h>
+#include <qmessagebox.h>
-#include <stdlib.h>
+#include <qpopupmenu.h>
-#include <unistd.h>
+#include <qlistview.h>
-#include <sys/stat.h>
-#include <dirent.h>
+/* STD */
-#include <sys/sendfile.h>
-#include <fcntl.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <unistd.h>
-using namespace Opie::Core;
+#include <sys/stat.h>
-using namespace Opie::Core;
+#include <dirent.h>
-void AdvancedFm::doDirChange() {
+#include <sys/sendfile.h>
-   QString pathItem = CurrentView()->currentItem()->text(0);
+#include <fcntl.h>
-   if( pathItem == "../") {
-      ListClicked( CurrentView()->currentItem());
+void AdvancedFm::doDirChange() {
-   } else {
+   QString pathItem = CurrentView()->currentItem()->text(0);
-      if( pathItem.find(" -> ",0,TRUE) != -1)
+   if( pathItem == "../") {
-         pathItem = dealWithSymName((const QString&)pathItem)+"/";
+      ListClicked( CurrentView()->currentItem());
-//      qWarning(pathItem);
+   } else {
-      gotoDirectory( CurrentDir()->path()+"/"+pathItem.left( pathItem.length() - 1) );
+      if( pathItem.find(" -> ",0,TRUE) != -1)
-   }
+         pathItem = dealWithSymName((const QString&)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);
+void AdvancedFm::showMenuHidden() {
-      fileMenu->setItemChecked( fileMenu->idAt(0),TRUE);
+  if (b) {
-    } else {
+      CurrentDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
-      CurrentDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
+      OtherDir()->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);
-      fileMenu->setItemChecked( fileMenu->idAt(0),FALSE);
+    } else {
-    }
+      CurrentDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
-     b = !b;
+      OtherDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
-         populateView();
+      fileMenu->setItemChecked( fileMenu->idAt(0),FALSE);
-}
+    }
+     b = !b;
-void AdvancedFm::showHidden() {
+         populateView();
-  if (b) {
+}
-      CurrentDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
-      OtherDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
+void AdvancedFm::showHidden() {
-    }  else {
+  if (b) {
-      CurrentDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
+      CurrentDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
-      OtherDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
+      OtherDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
-    }
+    }  else {
-         populateView();
+      CurrentDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
-}
+      OtherDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
+    }
-QString AdvancedFm::dealWithSymName(const QString &fileName) {
+         populateView();
-   QString strItem = fileName;
+}
-   return  strItem.right( (strItem.length() - strItem.find("->",0,TRUE)) - 4);
-}
+QString AdvancedFm::dealWithSymName(const QString &fileName) {
+   QString strItem = fileName;
-void AdvancedFm::runThis() {
+   return  strItem.right( (strItem.length() - strItem.find("->",0,TRUE)) - 4);
-   if( !CurrentView()->currentItem()) return;
+}
-  QString fs;
-  QDir *thisDir = CurrentDir();
+void AdvancedFm::runThis() {
+   if( !CurrentView()->currentItem()) return;
-  QString curFile = CurrentView()->currentItem()->text(0);
+  QString fs;
-  QString path = thisDir->canonicalPath();
+  QDir *thisDir = CurrentDir();
-  if( curFile.find("@",0,TRUE) !=-1 || curFile.find("->",0,TRUE) !=-1 )  //if symlink
+  QString curFile = CurrentView()->currentItem()->text(0);
+  QString path = thisDir->canonicalPath();
-    curFile = dealWithSymName((const QString&)curFile);
+  if( curFile.find("@",0,TRUE) !=-1 || curFile.find("->",0,TRUE) !=-1 )  //if symlink
-  if(curFile != "../") {
+    curFile = dealWithSymName((const QString&)curFile);
-      fs = getFileSystemType((const QString &) path);
-      QFileInfo fileInfo( path  + "/" + curFile);
+  if(curFile != "../") {
-//      qDebug( fileInfo.owner());
+      fs = getFileSystemType((const QString &) path);
-      if( (fileInfo.permission( QFileInfo::ExeUser)
+      QFileInfo fileInfo( path  + "/" + curFile);
-           | fileInfo.permission( QFileInfo::ExeGroup)
+//      odebug << fileInfo.owner() << oendl; 
-           | fileInfo.permission( QFileInfo::ExeOther)) // & fs.find("vfat",0,TRUE) == -1) {
-          | fs == "vfat" && fileInfo.filePath().contains("/bin") ) {
+      if( (fileInfo.permission( QFileInfo::ExeUser)
-        QCopEnvelope e("QPE/System", "execute(QString)" );
+           | fileInfo.permission( QFileInfo::ExeGroup)
-        e << curFile;
+           | fileInfo.permission( QFileInfo::ExeOther)) // & fs.find("vfat",0,TRUE) == -1) {
-      } else {
+          | fs == "vfat" && fileInfo.filePath().contains("/bin") ) {
-          curFile =  path + "/" + curFile;
+        QCopEnvelope e("QPE/System", "execute(QString)" );
-          DocLnk nf(curFile);
+        e << curFile;
-          QString execStr = nf.exec();
+      } else {
-//          qDebug( execStr);
+          curFile =  path + "/" + curFile;
-          if( execStr.isEmpty() ) {
+          DocLnk nf(curFile);
-            } else {
+          QString execStr = nf.exec();
-              nf.execute();
+//          odebug << execStr << oendl; 
-            }
+          if( execStr.isEmpty() ) {
-        }
+            } else {
-    }
+              nf.execute();
-}
+            }
+        }
-void AdvancedFm::runText() {
+    }
-   if( !CurrentView()->currentItem()) return;
+}
-  QString curFile = CurrentView()->currentItem()->text(0);
-  if(curFile != "../") {
+void AdvancedFm::runText() {
-      if( curFile.find("@",0,TRUE) !=-1 || curFile.find("->",0,TRUE) !=-1 )  //if symlink
+   if( !CurrentView()->currentItem()) return;
-        curFile = dealWithSymName((const QString&)curFile);
+  QString curFile = CurrentView()->currentItem()->text(0);
-      curFile =  CurrentDir()->canonicalPath()+"/"+curFile;
+  if(curFile != "../") {
-      QCopEnvelope e("QPE/Application/textedit", "setDocument(QString)" );
+      if( curFile.find("@",0,TRUE) !=-1 || curFile.find("->",0,TRUE) !=-1 )  //if symlink
-      e << curFile;
+        curFile = dealWithSymName((const QString&)curFile);
-    }
+      curFile =  CurrentDir()->canonicalPath()+"/"+curFile;
-}
+      QCopEnvelope e("QPE/Application/textedit", "setDocument(QString)" );
+      e << curFile;
-void AdvancedFm::makeDir() {
+    }
-  InputDialog *fileDlg;
+}
-  fileDlg = new InputDialog(this,tr("Make Directory"),TRUE, 0);
-  fileDlg->exec();
+void AdvancedFm::makeDir() {
-  if( fileDlg->result() == 1 ) {
+  InputDialog *fileDlg;
-      QDir *thisDir = CurrentDir();
+  fileDlg = new InputDialog(this,tr("Make Directory"),TRUE, 0);
-      QString  filename = fileDlg->LineEdit1->text();
+  fileDlg->exec();
-      thisDir->mkdir( thisDir->canonicalPath()+"/"+filename);
+  if( fileDlg->result() == 1 ) {
-  }
+      QDir *thisDir = CurrentDir();
-    populateView();
+      QString  filename = fileDlg->LineEdit1->text();
-}
+      thisDir->mkdir( thisDir->canonicalPath()+"/"+filename);
+  }
-void AdvancedFm::doDelete() {
+    populateView();
-   QStringList curFileList = getPath();
+}
-   bool doMsg=true;
-   int count = curFileList.count();
+void AdvancedFm::doDelete() {
-   if( count > 0)  {
+   QStringList curFileList = getPath();
-      if(count > 1 ) {
+   bool doMsg=true;
-         QString msg;
+   int count = curFileList.count();
-         msg=tr("Really delete\n%1 files?").arg(count);
+   if( count > 0)  {
-         switch ( QMessageBox::warning(this,tr("Delete"),msg
+      if(count > 1 ) {
-                                       ,tr("Yes"),tr("No"),0,0,1) )
+         QString msg;
-         {
+         msg=tr("Really delete\n%1 files?").arg(count);
-         case 0:
+         switch ( QMessageBox::warning(this,tr("Delete"),msg
-            doMsg=false;
+                                       ,tr("Yes"),tr("No"),0,0,1) )
-            break;
+         {
-         case 1:
+         case 0:
-            return;
+            doMsg=false;
-            break;
+            break;
-         };
+         case 1:
-      }
+            return;
+            break;
-      QString myFile;
+         };
+      }
-      for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
-         myFile = (*it);
+      QString myFile;
-         if( myFile.find(" -> ",0,TRUE) != -1)
-            myFile = myFile.left( myFile.find(" -> ",0,TRUE));
+      for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
+         myFile = (*it);
-         QString f = CurrentDir()->canonicalPath();
+         if( myFile.find(" -> ",0,TRUE) != -1)
-         if(f.right(1).find("/",0,TRUE) == -1)
+            myFile = myFile.left( myFile.find(" -> ",0,TRUE));
-            f += "/";
-         f += myFile;
+         QString f = CurrentDir()->canonicalPath();
-         if(QDir(f).exists() && !QFileInfo(f).isSymLink() ) {
+         if(f.right(1).find("/",0,TRUE) == -1)
-            //if file is a directory
+            f += "/";
+         f += myFile;
-            switch ( QMessageBox::warning( this, tr("Delete Directory?"),
+         if(QDir(f).exists() && !QFileInfo(f).isSymLink() ) {
-                                           tr("Really delete %1\nand all it's contents ?" ).arg( f ) ,
+            //if file is a directory
-                                           tr("Yes"), tr("No"), 0, 0, 1) ) {
-            case 0:
+            switch ( QMessageBox::warning( this, tr("Delete Directory?"),
-            {
+                                           tr("Really delete %1\nand all it's contents ?" ).arg( f ) ,
-               f=f.left(f.length()-1);
+                                           tr("Yes"), tr("No"), 0, 0, 1) ) {
-               QString cmd="rm -rf "+f;
+            case 0:
-               startProcess( (const QString)cmd.latin1() );
+            {
-                             populateView();
+               f=f.left(f.length()-1);
-            }
+               QString cmd="rm -rf "+f;
-            break;
+               startProcess( (const QString)cmd.latin1() );
-            case 1:
+                             populateView();
-               // exit
+            }
-               break;
+            break;
-            };
+            case 1:
+               // exit
-         } else {
+               break;
-            if(doMsg) {
+            };
-               switch ( QMessageBox::warning(this,tr("Delete"),
-                                             tr("Really delete\n%1?").arg( myFile ),
+         } else {
-                                             tr("Yes"), tr("No"), 0, 0, 1) ) {
+            if(doMsg) {
-               case 1:
+               switch ( QMessageBox::warning(this,tr("Delete"),
-                  return;
+                                             tr("Really delete\n%1?").arg( myFile ),
-                  break;
+                                             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) {
+            QString cmd="rm "+f;
-//               qDebug("remove link files "+myFile);
+            QFile file(f);
+            QFileInfo fi(myFile);
-//               DocLnk lnk(f);
+            if( fi.fileName().find("../",0,TRUE)==-1) {
-                 DocLnk *lnk;
+//               odebug << "remove link files "+myFile << oendl; 
-                 lnk = new DocLnk(f);
-//                 qDebug("Deleting doclnk " + lnk->linkFile());
+//               DocLnk lnk(f);
-                 if(lnk->isValid())
+                 DocLnk *lnk;
-                    lnk->removeLinkFile();
+                 lnk = new DocLnk(f);
-               // delete lnk;
+//                 odebug << "Deleting doclnk " + lnk->linkFile() << oendl; 
-               file.remove();
+                 if(lnk->isValid())
-            }
+                    lnk->removeLinkFile();
-         }
+               // delete lnk;
-      }
+               file.remove();
-   }
+            }
-    populateView();
+         }
-}
+      }
+   }
-void AdvancedFm::filePerms() {
+    populateView();
-   QStringList curFileList = getPath();
+}
-   QString filePath;
+void AdvancedFm::filePerms() {
-   filePath = CurrentDir()->canonicalPath()+"/";
+   QStringList curFileList = getPath();
+   QString filePath;
-   for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
-      filePermissions *filePerm;
+   filePath = CurrentDir()->canonicalPath()+"/";
-      filePerm = new filePermissions(this, "Permissions",true,0,(const QString &)(filePath+*it));
-      QPEApplication::execDialog( filePerm );
+   for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
-      if( filePerm )
+      filePermissions *filePerm;
-         delete  filePerm;
+      filePerm = new filePermissions(this, "Permissions",true,0,(const QString &)(filePath+*it));
-   }
+      QPEApplication::execDialog( filePerm );
-    populateView();
+      if( filePerm )
-}
+         delete  filePerm;
+   }
-void AdvancedFm::doProperties() {
+    populateView();
-#if defined(QT_QWS_OPIE)
+}
-   QStringList curFileList = getPath();
+void AdvancedFm::doProperties() {
+#if defined(QT_QWS_OPIE)
-   QString filePath;
-   filePath = CurrentDir()->canonicalPath()+"/";
+   QStringList curFileList = getPath();
-//   qDebug("%d",curFileList.count());
+   QString filePath;
+   filePath = CurrentDir()->canonicalPath()+"/";
-   for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
-//      qDebug((filePath+*it));
+//   odebug << "" << curFileList.count() << "" << oendl; 
-      DocLnk lnk( (filePath+*it));
-      LnkProperties prop( &lnk );
+   for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
-      QPEApplication::execDialog( &prop );
+//      odebug << (filePath+*it) << oendl; 
-   }
+      DocLnk lnk( (filePath+*it));
-#endif
+      LnkProperties prop( &lnk );
+      QPEApplication::execDialog( &prop );
-}
+   }
+#endif
-void AdvancedFm::upDir() {
-  QDir *thisDir = CurrentDir();
+}
-  QString current = thisDir->canonicalPath();
-  QDir dir(current);
+void AdvancedFm::upDir() {
-  dir.cdUp();
+  QDir *thisDir = CurrentDir();
-  current = dir.canonicalPath();
+  QString current = thisDir->canonicalPath();
-  chdir( current.latin1() );
+  QDir dir(current);
-  thisDir->cd(  current, TRUE);
+  dir.cdUp();
+  current = dir.canonicalPath();
-    populateView();
+  chdir( current.latin1() );
-  update();
+  thisDir->cd(  current, TRUE);
-}
+    populateView();
-void AdvancedFm::copy() {
+  update();
-   qApp->processEvents();
+}
-   QStringList curFileList = getPath();
+void AdvancedFm::copy() {
-   QDir *thisDir = CurrentDir();
+   qApp->processEvents();
-   QDir *thatDir = OtherDir();
+   QStringList curFileList = getPath();
-   bool doMsg=true;
+   QDir *thisDir = CurrentDir();
-   int count=curFileList.count();
+   QDir *thatDir = OtherDir();
-   if( count > 0) {
-      if(count > 1 ){
+   bool doMsg=true;
-         QString msg;
+   int count=curFileList.count();
-         msg=tr("Really copy\n%1 files?").arg(count);
+   if( count > 0) {
-         switch ( QMessageBox::warning(this,tr("Copy"),msg
+      if(count > 1 ){
-                                       ,tr("Yes"),tr("No"),0,0,1) )
+         QString msg;
-         {
+         msg=tr("Really copy\n%1 files?").arg(count);
-         case 0:
+         switch ( QMessageBox::warning(this,tr("Copy"),msg
-            doMsg=false;
+                                       ,tr("Yes"),tr("No"),0,0,1) )
-            break;
+         {
-         case 1:
+         case 0:
-            return;
+            doMsg=false;
-            break;
+            break;
-         };
+         case 1:
-      }
+            return;
+            break;
-      QString curFile, item, destFile;
+         };
-      for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
+      }
-         item=(*it);
-         if(item.find("->",0,TRUE)) //symlink
+      QString curFile, item, destFile;
-            item = item.left(item.find("->",0,TRUE));
+      for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
+         item=(*it);
-         curFile = thisDir->canonicalPath()+"/"+ item;
+         if(item.find("->",0,TRUE)) //symlink
-         destFile = thatDir->canonicalPath()+"/"+ item;
+            item = item.left(item.find("->",0,TRUE));
-//          qDebug("Destination file is "+destFile);
+         curFile = thisDir->canonicalPath()+"/"+ item;
-//          qDebug("CurrentFile file is " + curFile);
+         destFile = thatDir->canonicalPath()+"/"+ item;
-         QFile f(destFile);
+//          odebug << "Destination file is "+destFile << oendl; 
-         if( f.exists()) {
+//          odebug << "CurrentFile file is " + curFile << oendl; 
-            if(doMsg) {
-               switch ( QMessageBox::warning(this,tr("File Exists!"),
+         QFile f(destFile);
-                                             tr("%1 exists. Ok to overwrite?").arg( item ),
+         if( f.exists()) {
-                                             tr("Yes"),tr("No"),0,0,1) ) {
+            if(doMsg) {
-               case 1:
+               switch ( QMessageBox::warning(this,tr("File Exists!"),
-                  return;
+                                             tr("%1 exists. Ok to overwrite?").arg( item ),
-                  break;
+                                             tr("Yes"),tr("No"),0,0,1) ) {
-               };
+               case 1:
-            }
+                  return;
-            f.remove();
+                  break;
-         }
+               };
+            }
-         if( !copyFile( curFile, destFile) )  {
+            f.remove();
-            QMessageBox::message("AdvancedFm",
+         }
-                                 tr( "Could not copy %1 to %2").arg( curFile ).arg( destFile ) );
-            return;
+         if( !copyFile( curFile, destFile) )  {
-         }
+            QMessageBox::message("AdvancedFm",
-      }
+                                 tr( "Could not copy %1 to %2").arg( curFile ).arg( destFile ) );
-            setOtherTabCurrent();
+            return;
-            rePopulate();
+         }
-   }
+      }
-}
+            setOtherTabCurrent();
+            rePopulate();
-void AdvancedFm::copyAs() {
+   }
-   qApp->processEvents();
+}
-   QStringList curFileList = getPath();
+void AdvancedFm::copyAs() {
-   QString curFile, item;
+   qApp->processEvents();
-   InputDialog *fileDlg;
+   QStringList curFileList = getPath();
-   QDir *thisDir = CurrentDir();
+   QString curFile, item;
-   QDir *thatDir = OtherDir();
+   InputDialog *fileDlg;
-   for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
+   QDir *thisDir = CurrentDir();
-      QString destFile;
+   QDir *thatDir = OtherDir();
-      item=(*it);
-      curFile = thisDir->canonicalPath()+"/"+(*it);
+   for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
-      fileDlg = new InputDialog( this, tr("Copy "+curFile+" As"), TRUE, 0);
+      QString destFile;
+      item=(*it);
-      fileDlg->setInputText((const QString &) destFile );
+      curFile = thisDir->canonicalPath()+"/"+(*it);
-      fileDlg->exec();
+      fileDlg = new InputDialog( this, tr("Copy "+curFile+" As"), TRUE, 0);
-      if( fileDlg->result() == 1 ) {
+      fileDlg->setInputText((const QString &) destFile );
-         QString  filename = fileDlg->LineEdit1->text();
+      fileDlg->exec();
-         destFile = thatDir->canonicalPath()+"/"+filename;
+      if( fileDlg->result() == 1 ) {
-         QFile f( destFile);
+         QString  filename = fileDlg->LineEdit1->text();
-         if( f.exists()) {
+         destFile = thatDir->canonicalPath()+"/"+filename;
-            switch (QMessageBox::warning(this,tr("File Exists!"),
-                                         item+tr("\nexists. Ok to overwrite?"),
+         QFile f( destFile);
-                                         tr("Yes"),tr("No"),0,0,1) ) {
+         if( f.exists()) {
-            case 0:
+            switch (QMessageBox::warning(this,tr("File Exists!"),
-               f.remove();
+                                         item+tr("\nexists. Ok to overwrite?"),
-               break;
+                                         tr("Yes"),tr("No"),0,0,1) ) {
-            case 1:
+            case 0:
-               return;
+               f.remove();
-               break;
+               break;
-            };
+            case 1:
-         }
+               return;
-         if( !copyFile( curFile, destFile) ) {
+               break;
-            QMessageBox::message("AdvancedFm",tr("Could not copy\n")
+            };
-                                 +curFile +tr("to\n")+destFile);
+         }
-            return;
+         if( !copyFile( curFile, destFile) ) {
-         }
+            QMessageBox::message("AdvancedFm",tr("Could not copy\n")
-      }
+                                 +curFile +tr("to\n")+destFile);
-      delete fileDlg;
+            return;
+         }
-   }
+      }
-            rePopulate();
+      delete fileDlg;
-            setOtherTabCurrent();
-}
+   }
+            rePopulate();
-void AdvancedFm::copySameDir() {
+            setOtherTabCurrent();
-  qApp->processEvents();
+}
-  QStringList curFileList = getPath();
-  QString curFile, item, destFile;
+void AdvancedFm::copySameDir() {
-  InputDialog *fileDlg;
+  qApp->processEvents();
+  QStringList curFileList = getPath();
-  QDir *thisDir = CurrentDir();
+  QString curFile, item, destFile;
+  InputDialog *fileDlg;
-  for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
-      item=(*it);
+  QDir *thisDir = CurrentDir();
-      curFile = thisDir->canonicalPath()+"/"+ item;
+  for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
-      fileDlg = new InputDialog(this,tr("Copy ")+curFile+tr(" As"),TRUE, 0);
+      item=(*it);
-      fileDlg->setInputText((const QString &) destFile );
+      curFile = thisDir->canonicalPath()+"/"+ item;
-      fileDlg->exec();
+      fileDlg = new InputDialog(this,tr("Copy ")+curFile+tr(" As"),TRUE, 0);
-      if( fileDlg->result() == 1 ) {
+      fileDlg->setInputText((const QString &) destFile );
+      fileDlg->exec();
-          QString filename = fileDlg->LineEdit1->text();
-          destFile = thisDir->canonicalPath()+"/"+filename;
+      if( fileDlg->result() == 1 ) {
-          QFile f(destFile);
+          QString filename = fileDlg->LineEdit1->text();
-          if( f.exists()) {
+          destFile = thisDir->canonicalPath()+"/"+filename;
-              switch (QMessageBox::warning(this,tr("Delete"),
-                                           destFile+tr(" already exists.\nDo you really want to delete it?"),
+          QFile f(destFile);
-                                           tr("Yes"),tr("No"),0,0,1) ) {
+          if( f.exists()) {
-              case 0:
+              switch (QMessageBox::warning(this,tr("Delete"),
+                                           destFile+tr(" already exists.\nDo you really want to delete it?"),
-                f.remove();
+                                           tr("Yes"),tr("No"),0,0,1) ) {
-                break;
+              case 0:
-              case 1:
-                return;
+                f.remove();
-                break;
+                break;
-              };
+              case 1:
-            }
+                return;
-          if(!copyFile( curFile,destFile) )  {
+                break;
-              QMessageBox::message("AdvancedFm",tr("Could not copy\n")
+              };
-                                   +curFile +tr("to\n")+destFile);
+            }
-              return;
+          if(!copyFile( curFile,destFile) )  {
-            }
+              QMessageBox::message("AdvancedFm",tr("Could not copy\n")
+                                   +curFile +tr("to\n")+destFile);
-//          qDebug("copy "+curFile+" as "+destFile);
+              return;
-        }
+            }
-      delete fileDlg;
-    }
+//          odebug << "copy "+curFile+" as "+destFile << oendl; 
-            rePopulate();
+        }
-}
+      delete fileDlg;
+    }
-void AdvancedFm::move() {
+            rePopulate();
-  qApp->processEvents();
+}
-  QStringList curFileList = getPath();
+void AdvancedFm::move() {
-  if( curFileList.count() > 0) {
+  qApp->processEvents();
-      QString curFile, destFile, item;
+  QStringList curFileList = getPath();
-      QDir *thisDir = CurrentDir();
+  if( curFileList.count() > 0) {
-      QDir *thatDir = OtherDir();
+      QString curFile, destFile, item;
-      for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
-          item=(*it);
+      QDir *thisDir = CurrentDir();
-          QString destFile =  thatDir->canonicalPath();
+      QDir *thatDir = OtherDir();
+      for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
-          if(destFile.right(1).find("/",0,TRUE) == -1)
+          item=(*it);
-            destFile+="/";
+          QString destFile =  thatDir->canonicalPath();
-          destFile += item;
-//          qDebug("Destination file is "+destFile);
+          if(destFile.right(1).find("/",0,TRUE) == -1)
+            destFile+="/";
-          curFile = thisDir->canonicalPath();
+          destFile += item;
-          if(curFile.right(1).find("/",0,TRUE) == -1)
+//          odebug << "Destination file is "+destFile << oendl; 
-                            curFile +="/";
-          curFile+= item;
+          curFile = thisDir->canonicalPath();
-//          qDebug("CurrentFile file is " + curFile);
+          if(curFile.right(1).find("/",0,TRUE) == -1)
+                            curFile +="/";
-          if(QFileInfo(curFile).isDir()) {
+          curFile+= item;
-                            moveDirectory( curFile, destFile );
+//          odebug << "CurrentFile file is " + curFile << oendl; 
-                            rePopulate();
-                            return;
+          if(QFileInfo(curFile).isDir()) {
-          }
+                            moveDirectory( curFile, destFile );
+                            rePopulate();
-                    QFile f( curFile);
+                            return;
-          if( f.exists()) {
+          }
-                            if( !copyFile(  curFile, destFile) )  {
-                                    QMessageBox::message(tr("Note"),tr("Could not move\n")+curFile);
+                    QFile f( curFile);
-                                    return;
+          if( f.exists()) {
-              } else
+                            if( !copyFile(  curFile, destFile) )  {
-                                    QFile::remove(curFile);
+                                    QMessageBox::message(tr("Note"),tr("Could not move\n")+curFile);
-          }
+                                    return;
-            }
+              } else
+                                    QFile::remove(curFile);
-  }
+          }
-            rePopulate();
+            }
-            setOtherTabCurrent();
-}
+  }
+            rePopulate();
-bool AdvancedFm::moveDirectory( const QString & src, const QString & dest ) {
+            setOtherTabCurrent();
-        int err = 0;
+}
-        if( copyDirectory( src, dest ) ) {      QString cmd = "rm -rf " + src;
-        err = system((const char*)cmd);
+bool AdvancedFm::moveDirectory( const QString & src, const QString & dest ) {
-        } else
+        int err = 0;
-                err = -1;
+        if( copyDirectory( src, dest ) ) {      QString cmd = "rm -rf " + src;
+        err = system((const char*)cmd);
-        if(err!=0) {
+        } else
-                QMessageBox::message(tr("Note"),tr("Could not move\n") + src);
+                err = -1;
-                return false;
-        }
+        if(err!=0) {
-        return true;
+                QMessageBox::message(tr("Note"),tr("Could not move\n") + src);
-}
+                return false;
+        }
-bool AdvancedFm::copyDirectory( const QString & src, const QString & dest ) {
+        return true;
+}
-        QString    cmd = "/bin/cp -fpR " + src + " " + dest;
-    qWarning(cmd);
+bool AdvancedFm::copyDirectory( const QString & src, const QString & dest ) {
-        int    err = system( (const char *) cmd );
-        if ( err != 0 ) {
+        QString    cmd = "/bin/cp -fpR " + src + " " + dest;
-                QMessageBox::message("AdvancedFm",
+    owarn << cmd << oendl; 
-                                                         tr( "Could not copy \n%1 \nto \n%2").arg( src ).arg( dest ) );
+        int    err = system( (const char *) cmd );
-                return false;
+        if ( err != 0 ) {
-        }
+                QMessageBox::message("AdvancedFm",
+                                                         tr( "Could not copy \n%1 \nto \n%2").arg( src ).arg( dest ) );
-        return true;
+                return false;
-}
+        }
+        return true;
-bool AdvancedFm::copyFile( const QString & src, const QString & dest ) {
+}
-        if(QFileInfo(src).isDir()) {
+bool AdvancedFm::copyFile( const QString & src, const QString & dest ) {
-                if( copyDirectory( src, dest )) {
-                        setOtherTabCurrent();
-                        populateView();
+        if(QFileInfo(src).isDir()) {
-                        return true;
+                if( copyDirectory( src, dest )) {
-                }
+                        setOtherTabCurrent();
-                else
+                        populateView();
-                        return false;
+                        return true;
-        }
+                }
+                else
+                        return false;
-        bool success = true;
+        }
-        struct stat status;
-        QFile srcFile(src);
-        QFile destFile(dest);
+        bool success = true;
-        int err=0;
+        struct stat status;
-        int read_fd=0;
+        QFile srcFile(src);
-   int write_fd=0;
+        QFile destFile(dest);
-   struct stat stat_buf;
+        int err=0;
-   off_t offset = 0;
+        int read_fd=0;
-      if(!srcFile.open( IO_ReadOnly|IO_Raw)) {
+   int write_fd=0;
-//         qWarning("open failed");
+   struct stat stat_buf;
-         return success = false;
+   off_t offset = 0;
-   }
+      if(!srcFile.open( IO_ReadOnly|IO_Raw)) {
-   read_fd = srcFile.handle();
+//         owarn << "open failed" << oendl; 
-   if(read_fd != -1) {
+         return success = false;
-      fstat (read_fd, &stat_buf);
+   }
-      if( !destFile.open( IO_WriteOnly|IO_Raw ) ) {
+   read_fd = srcFile.handle();
-//       qWarning("destfile open failed");
+   if(read_fd != -1) {
-       return success = false;
+      fstat (read_fd, &stat_buf);
-      }
+      if( !destFile.open( IO_WriteOnly|IO_Raw ) ) {
-      write_fd = destFile.handle();
+//       owarn << "destfile open failed" << oendl; 
-      if(write_fd != -1) {
+       return success = false;
-         err = sendfile(write_fd, read_fd, &offset, stat_buf.st_size);
+      }
-           if( err == -1) {
+      write_fd = destFile.handle();
-              QString msg;
+      if(write_fd != -1) {
-              switch(err) {
+         err = sendfile(write_fd, read_fd, &offset, stat_buf.st_size);
-              case EBADF : msg = "The input file was not opened for reading or the output file was not opened for writing. ";
+           if( err == -1) {
-              case EINVAL: msg = "Descriptor is not valid or locked. ";
+              QString msg;
-              case ENOMEM: msg = "Insufficient memory to read from in_fd.";
+              switch(err) {
-              case EIO: msg = "Unspecified error while reading from in_fd.";
+              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. ";
-              success = false;
+              case ENOMEM: msg = "Insufficient memory to read from in_fd.";
-//              qWarning(msg);
+              case EIO: msg = "Unspecified error while reading from in_fd.";
-         }
+              };
-      } else {
+              success = false;
-         success = false;
+//              owarn << msg << oendl; 
-      }
+         }
-   } else {
+      } else {
-      success = false;
+         success = false;
-   }
+      }
-   srcFile.close();
+   } else {
-   destFile.close();
+      success = false;
-    // Set file permissions
+   }
-  if( stat( (const char *) src, &status ) == 0 )  {
+   srcFile.close();
-      chmod( (const char *) dest, status.st_mode );
+   destFile.close();
-    }
+    // Set file permissions
+  if( stat( (const char *) src, &status ) == 0 )  {
-  return success;
+      chmod( (const char *) dest, status.st_mode );
-}
+    }
-void AdvancedFm::runCommand() {
+  return success;
-   if( !CurrentView()->currentItem()) return;
+}
-   QDir *thisDir = CurrentDir();
+void AdvancedFm::runCommand() {
-   QString curFile;
+   if( !CurrentView()->currentItem()) return;
-   curFile = thisDir->canonicalPath() +"/"+ CurrentView()->currentItem()->text(0);
+   QDir *thisDir = CurrentDir();
-   InputDialog *fileDlg;
+   QString curFile;
-   fileDlg = new InputDialog(this,tr("Run Command"),TRUE, 0);
+   curFile = thisDir->canonicalPath() +"/"+ CurrentView()->currentItem()->text(0);
-   fileDlg->setInputText(curFile);
-   fileDlg->exec();
+   InputDialog *fileDlg;
-   //QString command;
+   fileDlg = new InputDialog(this,tr("Run Command"),TRUE, 0);
+   fileDlg->setInputText(curFile);
-   if( fileDlg->result() == 1 ) {
+   fileDlg->exec();
-//      qDebug(fileDlg->LineEdit1->text());
+   //QString command;
-      QStringList command;
+   if( fileDlg->result() == 1 ) {
-      command << "/bin/sh";
+//      odebug << fileDlg->LineEdit1->text() << oendl; 
-      command << "-c";
+      QStringList command;
-      command <<  fileDlg->LineEdit1->text();
-      Output *outDlg;
+      command << "/bin/sh";
-      outDlg = new Output( command, this, tr("AdvancedFm Output"), true);
+      command << "-c";
-      QPEApplication::execDialog( outDlg );
+      command <<  fileDlg->LineEdit1->text();
-      qApp->processEvents();
+      Output *outDlg;
+      outDlg = new Output( command, this, tr("AdvancedFm Output"), true);
-   }
+      QPEApplication::execDialog( outDlg );
-}
+      qApp->processEvents();
-void AdvancedFm::runCommandStd() {
+   }
-   if( !CurrentView()->currentItem()) return;
+}
-   QString curFile;
-   QDir *thisDir = CurrentDir();
+void AdvancedFm::runCommandStd() {
-   QListView *thisView = CurrentView();
+   if( !CurrentView()->currentItem()) return;
-   if( thisView->currentItem())
+   QString curFile;
-      curFile = thisDir->canonicalPath() +"/"+  thisView->currentItem()->text(0);
+   QDir *thisDir = CurrentDir();
+   QListView *thisView = CurrentView();
-   InputDialog *fileDlg;
+   if( thisView->currentItem())
-   fileDlg = new InputDialog(this,tr("Run Command"),TRUE, 0);
+      curFile = thisDir->canonicalPath() +"/"+  thisView->currentItem()->text(0);
-   fileDlg->setInputText(curFile);
-   fileDlg->exec();
+   InputDialog *fileDlg;
+   fileDlg = new InputDialog(this,tr("Run Command"),TRUE, 0);
-   if( fileDlg->result() == 1 ) {
+   fileDlg->setInputText(curFile);
-      qApp->processEvents();
+   fileDlg->exec();
-      startProcess( (const QString)fileDlg->LineEdit1->text().latin1());
-   }
+   if( fileDlg->result() == 1 ) {
-}
+      qApp->processEvents();
+      startProcess( (const QString)fileDlg->LineEdit1->text().latin1());
-void AdvancedFm::fileStatus() {
+   }
-   if( !CurrentView()->currentItem()) return;
+}
-   QString curFile;
-   curFile = CurrentView()->currentItem()->text(0);
+void AdvancedFm::fileStatus() {
+   if( !CurrentView()->currentItem()) return;
-   QStringList command;
+   QString curFile;
-   command << "/bin/sh";
+   curFile = CurrentView()->currentItem()->text(0);
-   command << "-c";
-   command << "stat -l "+ curFile;
+   QStringList command;
+   command << "/bin/sh";
-   Output *outDlg;
+   command << "-c";
-   outDlg = new Output( command, this, tr("AdvancedFm Output"), true);
+   command << "stat -l "+ curFile;
-   QPEApplication::execDialog( outDlg );
-   qApp->processEvents();
+   Output *outDlg;
-}
+   outDlg = new Output( command, this, tr("AdvancedFm Output"), true);
+   QPEApplication::execDialog( outDlg );
+   qApp->processEvents();
-void AdvancedFm::mkDir() {
+}
-    makeDir();
-}
+void AdvancedFm::mkDir() {
-void AdvancedFm::rn() {
+    makeDir();
-  renameIt();
+}
-}
+void AdvancedFm::rn() {
-void AdvancedFm::del() {
+  renameIt();
-    doDelete();
+}
-}
+void AdvancedFm::del() {
-void AdvancedFm::mkSym() {
+    doDelete();
-  QString cmd;
+}
-  QStringList curFileList = getPath();
-  if( curFileList.count() > 0) {
+void AdvancedFm::mkSym() {
-      QDir *thisDir = CurrentDir();
+  QString cmd;
-      QDir * thatDir = OtherDir();
+  QStringList curFileList = getPath();
+  if( curFileList.count() > 0) {
-      for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
+      QDir *thisDir = CurrentDir();
+      QDir * thatDir = OtherDir();
-          QString destName = thatDir->canonicalPath()+"/"+(*it);
-          if(destName.right(1) == "/") {
+      for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
-              destName = destName.left( destName.length() -1);
-            }
+          QString destName = thatDir->canonicalPath()+"/"+(*it);
+          if(destName.right(1) == "/") {
-          QString curFile =  thisDir->canonicalPath()+"/"+(*it);
+              destName = destName.left( destName.length() -1);
+            }
-          if( curFile.right(1) == "/") {
-              curFile = curFile.left( curFile.length() -1);
+          QString curFile =  thisDir->canonicalPath()+"/"+(*it);
-            }
+          if( curFile.right(1) == "/") {
-          cmd = "ln -s "+curFile+" "+destName;
+              curFile = curFile.left( curFile.length() -1);
-//          qDebug(cmd);
+            }
-          startProcess( (const QString)cmd );
-        }
+          cmd = "ln -s "+curFile+" "+destName;
-            rePopulate();
+//          odebug << cmd << oendl; 
-            setOtherTabCurrent();
+          startProcess( (const QString)cmd );
-    }
+        }
-}
+            rePopulate();
+            setOtherTabCurrent();
-void AdvancedFm::doBeam() {
+    }
-   Ir ir;
+}
-   if(!ir.supported())  {
-   } else {
+void AdvancedFm::doBeam() {
-      QStringList curFileList = getPath();
+   Ir ir;
-      if( curFileList.count() > 0)  {
+   if(!ir.supported())  {
-         for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
+   } else {
-            QString curFile = (*it);
+      QStringList curFileList = getPath();
-            QString curFilePath =  CurrentDir()->canonicalPath()+"/"+curFile;
+      if( curFileList.count() > 0)  {
-            if( curFilePath.right(1) == "/") {
+         for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
-               curFilePath = curFilePath.left( curFilePath.length() -1);
+            QString curFile = (*it);
-            }
+            QString curFilePath =  CurrentDir()->canonicalPath()+"/"+curFile;
-            Ir *file = new Ir(this, "IR");
+            if( curFilePath.right(1) == "/") {
-            connect(file, SIGNAL(done(Ir*)), this, SLOT( fileBeamFinished(Ir*)));
+               curFilePath = curFilePath.left( curFilePath.length() -1);
-            file->send( curFilePath, curFile );
+            }
-         }
+            Ir *file = new Ir(this, "IR");
-      }
+            connect(file, SIGNAL(done(Ir*)), this, SLOT( fileBeamFinished(Ir*)));
-   }
+            file->send( curFilePath, curFile );
-}
+         }
+      }
-void AdvancedFm::fileBeamFinished( Ir *) {
+   }
-  QMessageBox::message( tr("Advancedfm Beam out"), tr("Ir sent.") ,tr("Ok") );
+}
-}
+void AdvancedFm::fileBeamFinished( Ir *) {
-void AdvancedFm::selectAll() {
+  QMessageBox::message( tr("Advancedfm Beam out"), tr("Ir sent.") ,tr("Ok") );
-  QListView *thisView = CurrentView();
+}
-  thisView->selectAll(true);
-  thisView->setSelected( thisView->firstChild(),false);
+void AdvancedFm::selectAll() {
-}
+  QListView *thisView = CurrentView();
+  thisView->selectAll(true);
-void AdvancedFm::startProcess(const QString & cmd) {
+  thisView->setSelected( thisView->firstChild(),false);
-  QStringList command;
+}
-  OProcess *process;
-  process = new OProcess();
+void AdvancedFm::startProcess(const QString & cmd) {
-  connect(process, SIGNAL(processExited(Opie::Core::OProcess*)),
+  QStringList command;
-          this, SLOT( processEnded(Opie::Core::OProcess*)));
+  OProcess *process;
+  process = new OProcess();
-  connect(process, SIGNAL( receivedStderr(Opie::Core::OProcess*,char*,int)),
+  connect(process, SIGNAL(processExited(Opie::Core::OProcess*)),
-          this, SLOT( oprocessStderr(Opie::Core::OProcess*,char*,int)));
+          this, SLOT( processEnded(Opie::Core::OProcess*)));
-  command << "/bin/sh";
+  connect(process, SIGNAL( receivedStderr(Opie::Core::OProcess*,char*,int)),
-  command << "-c";
+          this, SLOT( oprocessStderr(Opie::Core::OProcess*,char*,int)));
-  command << cmd.latin1();
-  *process << command;
+  command << "/bin/sh";
-  if(!process->start(OProcess::NotifyOnExit, OProcess::All) )
+  command << "-c";
-    qDebug("could not start process");
+  command << cmd.latin1();
-}
+  *process << command;
+  if(!process->start(OProcess::NotifyOnExit, OProcess::All) )
-void AdvancedFm::processEnded(OProcess *) {
+    odebug << "could not start process" << oendl; 
-            rePopulate();
+}
-}
+void AdvancedFm::processEnded(OProcess *) {
-void AdvancedFm::oprocessStderr(OProcess*, char *buffer, int ) {
+            rePopulate();
-//    qWarning("received stderrt %d bytes", buflen);
+}
-    QString lineStr = buffer;
+void AdvancedFm::oprocessStderr(OProcess*, char *buffer, int ) {
-    QMessageBox::warning( this, tr("Error"), lineStr ,tr("Ok") );
+//    owarn << "received stderrt " << buflen << " bytes" << oendl; 
-}
+    QString lineStr = buffer;
-bool AdvancedFm::eventFilter( QObject * o, QEvent * e ) {
+    QMessageBox::warning( this, tr("Error"), lineStr ,tr("Ok") );
-  if ( o->inherits( "QLineEdit" ) )  {
+}
-      if ( e->type() == QEvent::KeyPress ) {
-          QKeyEvent *ke = (QKeyEvent*)e;
+bool AdvancedFm::eventFilter( QObject * o, QEvent * e ) {
-          if ( ke->key() == Key_Return ||
+  if ( o->inherits( "QLineEdit" ) )  {
-               ke->key() == Key_Enter )  {
+      if ( e->type() == QEvent::KeyPress ) {
-              okRename();
+          QKeyEvent *ke = (QKeyEvent*)e;
-              return true;
+          if ( ke->key() == Key_Return ||
-            }
+               ke->key() == Key_Enter )  {
-          else if ( ke->key() == Key_Escape ) {
+              okRename();
-                cancelRename();
+              return true;
-                return true;
+            }
-              }
+          else if ( ke->key() == Key_Escape ) {
-        }
+                cancelRename();
-      else if ( e->type() == QEvent::FocusOut ) {
+                return true;
-            cancelRename();
+              }
-            return true;
+        }
-          }
+      else if ( e->type() == QEvent::FocusOut ) {
-    }
+            cancelRename();
-   if ( o->inherits( "QListView" ) ) {
+            return true;
-       if ( e->type() == QEvent::FocusIn ) {
+          }
-          if( o == Local_View) { //keep track of which view
+    }
-             whichTab=1;
+   if ( o->inherits( "QListView" ) ) {
-          }
+       if ( e->type() == QEvent::FocusIn ) {
-          else {
+          if( o == Local_View) { //keep track of which view
-             whichTab=2;
+             whichTab=1;
-          }
+          }
-       }
+          else {
-       OtherView()->setSelected( OtherView()->currentItem(), FALSE );//make sure there's correct selection
+             whichTab=2;
-     }
+          }
+       }
-  return QWidget::eventFilter( o, e );
+       OtherView()->setSelected( OtherView()->currentItem(), FALSE );//make sure there's correct selection
-}
+     }
+  return QWidget::eventFilter( o, e );
-void AdvancedFm::cancelRename() {
+}
-//  qDebug("cancel rename");
-  QListView * view;
-  view = CurrentView();
+void AdvancedFm::cancelRename() {
+//  odebug << "cancel rename" << oendl; 
-  bool resetFocus = view->viewport()->focusProxy() == renameBox;
+  QListView * view;
-  delete renameBox;
+  view = CurrentView();
-  renameBox = 0;
-  if ( resetFocus ) {
+  bool resetFocus = view->viewport()->focusProxy() == renameBox;
-      view->viewport()->setFocusProxy( view);
+  delete renameBox;
-      view->setFocus();
+  renameBox = 0;
-    }
+  if ( resetFocus ) {
-}
+      view->viewport()->setFocusProxy( view);
+      view->setFocus();
-void AdvancedFm::doRename(QListView * view) {
+    }
-   if( !CurrentView()->currentItem()) return;
+}
-    QRect r = view->itemRect( view->currentItem( ));
+void AdvancedFm::doRename(QListView * view) {
-    r = QRect( view->viewportToContents( r.topLeft() ), r.size() );
+   if( !CurrentView()->currentItem()) return;
-    r.setX( view->contentsX() );
+    QRect r = view->itemRect( view->currentItem( ));
-        if ( r.width() > view->visibleWidth() )
+    r = QRect( view->viewportToContents( r.topLeft() ), r.size() );
-        r.setWidth( view->visibleWidth() );
+    r.setX( view->contentsX() );
-    renameBox = new QLineEdit( view->viewport(), "qt_renamebox" );
+        if ( r.width() > view->visibleWidth() )
-    renameBox->setFrame(true);
+        r.setWidth( view->visibleWidth() );
-    renameBox->setText(  view->currentItem()->text(0) );
+    renameBox = new QLineEdit( view->viewport(), "qt_renamebox" );
+    renameBox->setFrame(true);
-    renameBox->selectAll();
-    renameBox->installEventFilter( this );
+    renameBox->setText(  view->currentItem()->text(0) );
-    view->addChild( renameBox, r.x(), r.y() );
+    renameBox->selectAll();
+    renameBox->installEventFilter( this );
-        renameBox->resize( r.size() );
+    view->addChild( renameBox, r.x(), r.y() );
-        view->viewport()->setFocusProxy( renameBox );
+        renameBox->resize( r.size() );
-        renameBox->setFocus();
-    renameBox->show();
+        view->viewport()->setFocusProxy( renameBox );
-}
+        renameBox->setFocus();
+    renameBox->show();
-void AdvancedFm::renameIt() {
+}
-        if( !CurrentView()->currentItem()) return;
-        QListView *thisView = CurrentView();
+void AdvancedFm::renameIt() {
-    oldName = thisView->currentItem()->text(0);
+        if( !CurrentView()->currentItem()) return;
-    doRename( thisView );
-}
+        QListView *thisView = CurrentView();
+    oldName = thisView->currentItem()->text(0);
-void AdvancedFm::okRename() {
+    doRename( thisView );
-   if( !renameBox) return;
+}
-   QString newName = renameBox->text();
+void AdvancedFm::okRename() {
-     cancelRename();
+   if( !renameBox) return;
-     QListView * view = CurrentView();
-   QString path =  CurrentDir()->canonicalPath() + "/";
+   QString newName = renameBox->text();
-   oldName = path + oldName;
+     cancelRename();
-   newName = path + newName;
+     QListView * view = CurrentView();
-   if( rename( oldName.latin1(), newName.latin1())== -1)
+   QString path =  CurrentDir()->canonicalPath() + "/";
-      QMessageBox::message(tr("Note"),tr("Could not rename"));
+   oldName = path + oldName;
-   else
+   newName = path + newName;
-      oldName = "";
+   if( rename( oldName.latin1(), newName.latin1())== -1)
-   QListViewItem *item = view->currentItem();
+      QMessageBox::message(tr("Note"),tr("Could not rename"));
-   view->takeItem( item );
+   else
-   delete item;
+      oldName = "";
-     rePopulate();
+   QListViewItem *item = view->currentItem();
-}
+   view->takeItem( item );
+   delete item;
-void AdvancedFm::openSearch() {
+     rePopulate();
-    QMessageBox::message(tr("Note"),tr("Not Yet Implemented"));
+}
-}
+void AdvancedFm::openSearch() {
+    QMessageBox::message(tr("Note"),tr("Not Yet Implemented"));
+}
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
@@ -33,5 +33,5 @@ filePermissions::filePermissions( QWidget* parent,  const char* name, bool modal
    if ( !name )
  setName( tr("filePermissions") );
-//    qDebug("FilePermissions "+fileName);
+//    odebug << "FilePermissions "+fileName << oendl; 
 /*    resize( 236, 210 );
    setMaximumSize( QSize( 236, 210 ) );
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
@@ -6,7 +6,11 @@
 #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>
@@ -14,9 +18,8 @@
 #include <qlayout.h>
+/* STD */
 #include <errno.h>
 /* XPM */
-using namespace Opie::Core;
-using namespace Opie::Core;
 static char * filesave_xpm[] = {
 "16 16 78 1",
@@ -122,5 +125,5 @@ Output::Output( const QStringList commands, QWidget* parent,  const char* name,
 //   cmmds=QStringList::split( " ", commands, false);
   cmmds=commands;
-//   qDebug("count %d", cmmds.count());
+//   odebug << "count " << cmmds.count() << "" << oendl; 
   if ( !name )
       setName( tr("Output"));
@@ -158,5 +161,5 @@ Output::Output( const QStringList commands, QWidget* parent,  const char* name,
 //    * proc << commands.latin1();
      for ( QStringList::Iterator it = cmmds.begin(); it != cmmds.end(); ++it ) {
-         qDebug( "%s", (*it).latin1() );
+         odebug << "" << (*it).latin1() << "" << oendl; 
         * proc << (*it).latin1();
      }
@@ -187,5 +190,5 @@ void Output::saveOutput() {
      QString name = fileDlg->LineEdit1->text();
      filename+="text/plain/"+name;
-      qDebug(filename);
+      odebug << filename << oendl; 
      QFile f(filename);
@@ -197,8 +200,8 @@ void Output::saveOutput() {
          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();
    }
@@ -206,5 +209,5 @@ void Output::saveOutput() {
 void Output::commandStdout(OProcess*, char *buffer, int buflen) {
-    qWarning("received stdout %d bytes", buflen);
+    owarn << "received stdout " << buflen << " bytes" << oendl; 
 //     QByteArray data(buflen);
@@ -223,5 +226,5 @@ void Output::commandStdout(OProcess*, char *buffer, int buflen) {
 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());
@@ -229,5 +232,5 @@ void Output::commandStdin( const QByteArray &data) {
 void Output::commandStderr(OProcess*, char *buffer, int buflen) {
-    qWarning("received stderrt %d bytes", buflen);
+    owarn << "received stderrt " << buflen << " bytes" << oendl; 
    QString lineStr = buffer;
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
@@ -1,3 +1,3 @@
-CONFIG    = qt warn_on  quick-app
+CONFIG    = qt warn_on quick-app
 HEADERS   = mainwindow.h \
      cbinfo.h        \
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
@@ -28,4 +28,11 @@
 #include "listedit.h"
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/resource.h>
+using namespace Opie::Core;
+/* QT */
 #include <qlayout.h>
 #include <qlineedit.h>
@@ -34,6 +41,4 @@
 #include <qcombobox.h>
 #include <qpushbutton.h>
-#include <qpe/resource.h>
 // --- ListEdit ---------------------------------------------------------------
@@ -303,5 +308,5 @@ void ListEdit::slotClick(QListViewItem *itm, const QPoint &pnt, int col)
        _stack->raiseWidget(_box);
    } else {
-        qDebug( "Unsupported column type for column %s", (const char *)pDef->getName() );
+        odebug << "Unsupported column type for column " << (const char *)pDef->getName() << "" << oendl; 
        _typeEdit->setText("");
        _stack->raiseWidget(_typeEdit);
diff --git a/noncore/apps/checkbook/tabledef.cpp b/noncore/apps/checkbook/tabledef.cpp
index 9a42308..745cd80 100644
--- a/noncore/apps/checkbook/tabledef.cpp
+++ b/noncore/apps/checkbook/tabledef.cpp
@@ -29,4 +29,6 @@
 #include "tabledef.h"
+#include <opie2/odebug.h>
+using namespace Opie::Core;
 // --- ColumnDef --------------------------------------------------------------
@@ -43,5 +45,5 @@ 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);
@@ -50,5 +52,5 @@ 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);
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
@@ -32,6 +32,10 @@
 #include "checkbook.h"
+/* OPIE */
+#include <opie2/odebug.h>
 #include <qpe/datebookmonth.h>
+using namespace Opie::Core;
+/* QT */
 #include <qbuttongroup.h>
 #include <qcombobox.h>
@@ -333,5 +337,5 @@ void Transaction::slotActivated(const QString &arg )
 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
+CONFIG        = qt warn_on quick-app
-HEADERS        = mainwindow.h listviewconfdir.h listviewitemconffile.h listviewitemconfigentry.h editwidget.h listviewitemconf.h
+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
+SOURCES       = main.cpp mainwindow.cpp listviewconfdir.cpp listviewitemconffile.cpp listviewitemconfigentry.cpp editwidget.cpp listviewitemconf.cpp
-INCLUDEPATH     += $(OPIEDIR)/include
+INCLUDEPATH   += $(OPIEDIR)/include
 DEPENDPATH    += $(OPIEDIR)/include
-INTERFACES    =
+LIBS          += -lqpe -lopiecore2
-LIBS            += -lopiecore2
 TARGET        = confedit
-!contains( platform, x11 ) {
+include ( $(OPIEDIR)/include.pro )
-  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
@@ -10,8 +10,12 @@
 #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 )
@@ -37,5 +41,5 @@ void ListViewConfDir::readConfFiles()
 {
-        confDir.setFilter( QDir::Files | QDir::NoSymLinks );
+  confDir.setFilter( QDir::Files | QDir::NoSymLinks );
  confDir.setSorting( QDir::Name );
  confDir.setNameFilter("*.conf");
@@ -48,5 +52,5 @@ void ListViewConfDir::readConfFiles()
        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");
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
@@ -10,7 +10,13 @@
 #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
@@ -20,5 +26,5 @@ ListViewItemConfFile::ListViewItemConfFile(QFileInfo *file, QListView *parent)
 {
  confFileInfo = file;
-//  parseFile();
+  //  parseFile();
  displayText();
 }
@@ -41,6 +47,6 @@ QString ListViewItemConfFile::fileName()
 void ListViewItemConfFile::parseFile()
 {
-        //qDebug("ListViewItemConfFile::parseFile BEGIN");
+        //odebug << "ListViewItemConfFile::parseFile BEGIN" << oendl; 
-  QFile confFile(confFileInfo->absFilePath());
+        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);
@@ -53,5 +59,5 @@ void ListViewItemConfFile::parseFile()
  {
          s = t.readLine().stripWhiteSpace();
-                //qDebug( "line: >%s<\n", s.latin1() );
+                //odebug << "line: >" << s.latin1() << "<\n" << oendl; 
          if (s.contains("<?xml"))
           {
@@ -61,5 +67,5 @@ void ListViewItemConfFile::parseFile()
    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") );
@@ -69,6 +75,6 @@ void ListViewItemConfFile::parseFile()
    if ( int pos = s.find('=') )
    {
-//      qDebug("got key"+s);
+//      odebug << "got key"+s << oendl; 
-             if (!groupItem) qDebug("PANIK NO GROUP! >%s<",group.latin1());
+             if (!groupItem) odebug << "PANIK NO GROUP! >" << group.latin1() << "<" << oendl; 
            item = new ListViewItemConfigEntry(this, group, s );
      groupItem->insertItem( item );
@@ -77,5 +83,5 @@ void ListViewItemConfFile::parseFile()
        confFile.close();
        setExpandable( _valid );
-        //qDebug("ListViewItemConfFile::parseFile END");
+        //odebug << "ListViewItemConfFile::parseFile END" << oendl; 
 }
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
@@ -12,13 +12,16 @@
 #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)
@@ -34,10 +37,10 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
-  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() ) );
@@ -99,5 +102,5 @@ MainWindow::~MainWindow()
 void MainWindow::setCurrent(QListViewItem *item)
 {
-        //qDebug("MainWindow::setCurrent");
+        //odebug << "MainWindow::setCurrent" << oendl; 
        if (!item) return;
         _item = (ListViewItemConf*) item;
@@ -175,5 +178,5 @@ void MainWindow::removeConfFile()
 void MainWindow::showPopup()
 {
-qDebug("showPopup");
+odebug << "showPopup" << oendl; 
         if (!_item) return;
         popupActionRevert->setEnabled(_item->revertable());
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,5 +1,11 @@
-#include <qmessagebox.h>
 #include "cfgfile.h"
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+/* QT */
+#include <qmessagebox.h>
 // CfgEntry implementation
 CfgEntry::CfgEntry() {
@@ -96,5 +102,5 @@ bool CfgParser::load(QString file, CfgFile& cfg) {
        if (!err.isEmpty()) {
-                qDebug(err);
+                odebug << err << oendl; 
                return false;
        }
@@ -107,5 +113,5 @@ bool CfgParser::load(QString file, CfgFile& cfg) {
                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()) {
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
@@ -2,3 +2,3 @@
    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
@@ -3,9 +3,9 @@ DESTDIR         = $(OPIEDIR)/bin
        CONFIG  = qt warn_on 
        HEADERS         = zkb.h \
-                                zkbcfg.h \
+                  zkbcfg.h \
-                                zkbnames.h \
+                  zkbnames.h \
-                                zkbxml.h \
+                  zkbxml.h \
-                                cfgdlg.h \
+                  cfgdlg.h \
-                                cfgfile.h
+                  cfgfile.h
        SOURCES         = main.cpp \
@@ -14,10 +14,10 @@ SOURCES		= main.cpp \
                  zkb.cpp \
                  zkbcfg.cpp \
-                        zkbnames.cpp \
+                  zkbnames.cpp \
-                        zkbxml.cpp
+                  zkbxml.cpp
 INCLUDEPATH     += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
-        LIBS    += -lqpe
+        LIBS    += -lqpe -lopiecore2
        TARGET          = keyz-cfg
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
@@ -365,5 +365,5 @@ State* Keymap::getStateByLabel(const QString& label) {
        }
-        //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()) {
@@ -417,5 +417,5 @@ bool Keymap::setCurrentState(State* state) {
                                currentLabel = tit.data();
                        } else {
-        //                      qDebug("no label for: " + currentStateName + "\n");
+        //                      odebug << "no label for: " + currentStateName + "\n" << oendl; 
                                currentLabel = "";
                        }
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,6 +1,10 @@
-#include <qfileinfo.h>
 #include "zkbcfg.h"
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+/* QT */
+#include <qfileinfo.h>
 // Implementation of XkbConfig class
@@ -16,5 +20,5 @@ bool ZkbConfig::load(const QString& file, Keymap& keymap, const QString& prefix)
        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;
@@ -31,6 +35,5 @@ bool ZkbConfig::load(const QString& file, Keymap& keymap, const QString& prefix)
        includedFiles.remove(fi.absFilePath());
-        qDebug("end loading file=%s : status=%s\n", (const char*) file.utf8(),
+        odebug << "end loading file=" << file.utf8() << ": status=" << err.utf8() << oendl;
-                (const char*) err.utf8());
        return ret;
 }
@@ -123,5 +126,5 @@ bool ZkbHandler::startStateElement(const QString& 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;
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
@@ -17,10 +17,11 @@
 #include "bac.h"
-#include <qtoolbar.h>
+/* OPIE */
-#include <qmenubar.h>
+#include <opie2/odebug.h>
-//#include <opie2/colorpopupmenu.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
+using namespace Opie::Core;
+/* QT */
 #include <qlineedit.h>
 #include <qdir.h>
@@ -34,5 +35,8 @@
 #include <qlistview.h>
 #include <qlayout.h>
+#include <qtoolbar.h>
+#include <qmenubar.h>
+/* STD */
 #include <fcntl.h>
 #include <unistd.h>
@@ -41,5 +45,4 @@
 #include <errno.h>
 Bartender::Bartender( QWidget* parent,  const char* name, WFlags fl )
    : QMainWindow( parent, name, fl ) {
@@ -145,5 +148,5 @@ void Bartender::fillList() {
        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));
@@ -151,5 +154,5 @@ void Bartender::fillList() {
        }
    }
-    qDebug("there are currently %d of drinks", i);
+    odebug << "there are currently " << i << " of drinks" << oendl; 
 }
@@ -172,5 +175,5 @@ void Bartender::fileNew() {
        QString newDrink="\n# "+newName+"\n";
        newDrink.append(newIng+"\n");
-        qDebug("writing "+newDrink);
+        odebug << "writing "+newDrink << oendl; 
        dbFile.writeBlock( newDrink.latin1(), newDrink.length());
        clearList();
@@ -208,5 +211,5 @@ void Bartender::showDrink( QListViewItem *item) {
                s2 = t.readLine();
                if(s2.find("#",0,TRUE) == -1 || dbFile.atEnd() ) {
-//                    qDebug(s2);
+//                    odebug << s2 << oendl; 
                    showDrinks->MultiLineEdit1->append(s2);
                }
@@ -249,5 +252,5 @@ void Bartender::doSearchByName() {
        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));
            }
@@ -280,8 +283,8 @@ void Bartender::doSearchByDrink() {
            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;
@@ -314,5 +317,5 @@ void Bartender::showSearchResult(QStringList &searchList) {
    for ( ; it2.current(); ++it2 ) {
        if ( it2.current()->text(0)== result ) {
-//                qDebug( it2.current()->text(0));
+//                odebug << it2.current()->text(0) << oendl; 
            showDrink(it2.current());
        }
@@ -344,5 +347,5 @@ void Bartender::doEdit() {
                s2 = t.readLine();
                if(s2.find("#",0,TRUE) == -1 || dbFile.atEnd() ) {
-//                    qDebug(s2);
+//                    odebug << s2 << oendl; 
                    newDrinks->MultiLineEdit1->append(s2);
                    newDrinks->LineEdit1->setText(myDrink);
@@ -371,5 +374,5 @@ void Bartender::doEdit() {
        QString newDrink="# "+newName+"\n";
        newDrink.append(newIng+"\n");
-        qDebug("writing "+newDrink);
+        odebug << "writing "+newDrink << oendl; 
        dbFile.writeBlock( newDrink.latin1(), newDrink.length());
        clearList();
@@ -398,5 +401,5 @@ void Bartender::openCurrentDrink() {
 void Bartender::fileMenuActivated( int item) {
-    qDebug("Item %d", item);
+    odebug << "Item " << item << "" << oendl; 
    switch(item) {
      case -3: //        new -3
@@ -419,5 +422,5 @@ void Bartender::fileMenuActivated( int item) {
 void Bartender::editMenuActivated(int item) {
-    qDebug("Item %d", item);
+    odebug << "Item " << item << "" << oendl; 
      /*
        edit -8
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,4 +1,3 @@
 TEMPLATE  = app
-#CONFIG   = qt warn_on 
 CONFIG    = qt warn_on 
 HEADERS   = bartender.h newdrinks.h showdrinks.h inputDialog.h searchresults.h bac.h
@@ -6,7 +5,7 @@ SOURCES   = main.cpp bartender.cpp newdrinks.cpp showdrinks.cpp inputDialog.cpp
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
-LIBS            += -lqpe
+LIBS        += -lqpe -lopiecore2
-DESTDIR = $(OPIEDIR)/bin
+DESTDIR     = $(OPIEDIR)/bin
-TARGET    = bartender
+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
@@ -2,3 +2,4 @@
    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
@@ -64,8 +64,16 @@
 */
+#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>
@@ -82,8 +90,4 @@
 #endif
-#include "procctl.h"
-#include "MyPty.h"
 #undef VERBOSE_DEBUG
@@ -98,5 +102,5 @@
 void MyPty::setSize(int lines, int columns)
 {
-    qWarning("setting size");
+    owarn << "setting size" << oendl; 
  struct winsize wsize;
  wsize.ws_row = (unsigned short)lines;
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
@@ -1030,5 +1030,5 @@ bool TEWidget::eventFilter( QObject *obj, QEvent *e )
    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 ) {
@@ -1069,9 +1069,9 @@ bool TEWidget::eventFilter( QObject *obj, QEvent *e )
          // 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
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
@@ -71,4 +71,10 @@
 #include "TEmulation.h"
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+/* STD */
 #include <stdio.h>
 #include <stdlib.h>
@@ -205,5 +211,5 @@ void TEmulation::onRcvChar(int c)
 void TEmulation::onKeyPress( QKeyEvent* ev )
 {
-    qWarning("onKeyPress,....");
+    owarn << "onKeyPress,...." << oendl; 
  if (!connected) return; // someone else gets the keys
  if (scr->getHistCursor() != scr->getHistLines());
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,3 +1,10 @@
+#include "atconfigdialog.h"
+#include "io_modem.h"
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+/* QT */
 #include <qlineedit.h>
 #include <qspinbox.h>
@@ -8,8 +15,4 @@
 #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 ) {
@@ -153,5 +156,5 @@ QWidget* ATConfigDialog::tab1( QWidget* parent ) {
 void ATConfigDialog::readConfig( const Profile& config ) {
-    qWarning("config in atconfigdialog");
+    owarn << "config in atconfigdialog" << oendl; 
    initStringLine->setText( config.readEntry("InitString", MODEM_DEFAULT_INIT_STRING ) );
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,4 +1,10 @@
 #include "dialer.h"
+#include "io_modem.h"
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+/* QT */
 #include <qlayout.h>
 #include <qprogressbar.h>
@@ -9,4 +15,5 @@
 #include <qmessagebox.h>
+/* STD */
 #include <unistd.h>
 #include <string.h>
@@ -14,6 +21,4 @@
 #include <errno.h>
-#include "io_modem.h"
 // State machine:          | When an error occurs, we don't have to
 //                         | reset everything.
@@ -105,5 +110,5 @@ void Dialer::slotCancel()
 void Dialer::reset()
 {
-    qWarning("reset");
+    owarn << "reset" << oendl; 
        switchState(state_cancel);
 }
@@ -137,9 +142,9 @@ void Dialer::dial(const QString& number)
 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");
        }
@@ -148,5 +153,5 @@ void Dialer::trydial(const QString& number)
        {
                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();
@@ -159,5 +164,5 @@ void Dialer::trydial(const QString& number)
                switchState(state_options);
-                qWarning("ATM3l3");
+                owarn << "ATM3l3" << oendl; 
                send("ATM3L3\r");
                QString response3 = receive();
@@ -179,5 +184,5 @@ void Dialer::trydial(const QString& number)
        if(state != state_cancel)
        {
-            qWarning("progress");
+            owarn << "progress" << oendl; 
                switchState(state_dialing);
@@ -215,5 +220,5 @@ void Dialer::send(const QString& msg)
        QString termination;
-        qWarning("Sending: %s", m.latin1());
+        owarn << "Sending: " << m.latin1() << "" << oendl; 
        /*termination = "\r";
@@ -248,9 +253,9 @@ QString Dialer::receive()
                                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;
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,9 +1,11 @@
 #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 )
@@ -129,9 +131,9 @@ QColor EmulationHandler::foreColor(int col) {
        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;
@@ -153,9 +155,9 @@ QColor EmulationHandler::backColor(int col ) {
        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;
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
@@ -225,7 +225,7 @@ void EmulationWidget::calcGeometry()
        m_scrollbar->resize(QApplication::style().scrollBarExtent().width(), contentsRect().height() );
-        qDebug( QString(" TEST").arg( contentsRect().width() ) );
+        odebug << QString(" TEST").arg( contentsRect().width() ) << oendl; 
-        qDebug( QString(" TEST").arg( contentsRect().height() ) );
+        odebug << QString(" TEST").arg( contentsRect().height() ) << oendl; 
-        qDebug("NEUER TESTT!!!!!!!!");
+        odebug << "NEUER TESTT!!!!!!!!" << oendl; 
               switch( scrollLoc )
@@ -259,5 +259,5 @@ void EmulationWidget::calcGeometry()
 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 )
    {
@@ -273,5 +273,5 @@ void EmulationWidget::drawAttrString( QString& string, QPainter &painter, QRect
        {
            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 );
        }
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,4 +1,9 @@
 #include "function_keyboard.h"
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+/* QT */
 #include <qlayout.h>
 #include <qlistbox.h>
@@ -38,5 +43,5 @@ FunctionKeyboard::FunctionKeyboard(QWidget *parent) :
            );
        }
-    //qWarning("loaded %d keys", keys.count());
+    //owarn << "loaded " << keys.count() << " keys" << oendl; 
    */
    if (keys.isEmpty()) loadDefaults();
@@ -257,5 +262,5 @@ FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* par
      selectedRow(0), selectedCol(0)
 {
-    qWarning("FunctionKeyboardConfig");
+    owarn << "FunctionKeyboardConfig" << oendl; 
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
@@ -2,5 +2,8 @@
 #include "io_bt.h"
+/* OPIE */
+#include <opie2/odebug.h>
 using namespace Opie::Core;
 IOBt::IOBt( const Profile &config ) : IOSerial( config ) {
    m_attach = 0;
@@ -44,5 +47,5 @@ bool IOBt::open() {
            ret = IOSerial::open();
        } else {
-            qWarning("could not attach to device");
+            owarn << "could not attach to device" << oendl; 
            delete m_attach;
            m_attach = 0;
@@ -90,4 +93,4 @@ bool IOBt::isConnected() {
 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,6 +1,8 @@
 #include "io_irda.h"
+/* OPIE */
+#include <opie2/odebug.h>
 using namespace Opie::Core;
 IOIrda::IOIrda( const Profile &config ) : IOSerial( config ) {
    m_attach = 0;
@@ -36,5 +38,5 @@ bool IOIrda::open() {
    } else {
    // emit error!!!
-        qWarning("could not attach to device");
+        owarn << "could not attach to device" << oendl; 
        delete m_attach;
        m_attach = 0l;
@@ -75,4 +77,4 @@ bool IOIrda::isConnected() {
 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,9 +1,10 @@
 #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 ) {
@@ -13,5 +14,4 @@ IOModem::IOModem( const Profile &profile )
 IOModem::~IOModem() {
 }
@@ -105,4 +105,4 @@ bool IOModem::isConnected() {
 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
@@ -92,5 +92,5 @@ int main(int argc, char **argv) {
 #ifdef   FSCKED_DISTRIBUTION
-    qWarning("fscked");
+    owarn << "fscked" << oendl; 
    FixIt it;
    it.fixIt();
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,15 +1,2 @@
-#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"
@@ -24,6 +11,22 @@
 #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();
@@ -447,5 +450,5 @@ void MainWindow::slotClose() {
    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;
@@ -453,5 +456,5 @@ void MainWindow::slotClose() {
    /*it's autodelete */
    m_sessions.remove( ses );
-    qWarning("after remove!!");
+    owarn << "after remove!!" << oendl; 
    if (!currentSession() ) {
@@ -571,5 +574,5 @@ void MainWindow::slotOpenButtons( bool state ) {
 void MainWindow::slotSessionChanged( Session* ses ) {
-    qWarning("changed!");
+    owarn << "changed!" << oendl; 
    if(m_curSession)
@@ -580,5 +583,5 @@ void MainWindow::slotSessionChanged( Session* ses ) {
    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 );
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,5 +1,11 @@
+#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>
@@ -8,7 +14,4 @@
 #include <qhbox.h>
-#include "modemconfigwidget.h"
-#include "dialdialog.h"
 namespace {
    void setCurrent( const QString& str, QComboBox* bo ) {
@@ -136,5 +139,5 @@ void ModemConfigWidget::load( const Profile& prof ) {
    atConf->readConfig( prof );
    if ( prof.readEntry( "Device" ).isEmpty() ) {
-        qWarning("device empty!");
+        owarn << "device empty!" << oendl; 
        return;
    }
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,6 +1,4 @@
 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 \
@@ -71,5 +69,5 @@ LIBS        += -lqpe -lopiecore2 -lopieui2 -lutil
 TARGET       = opie-console
+DEFINES += HAVE_OPENPTY
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
@@ -42,5 +42,5 @@ void SzTransfer::sendFile(const QString& file) {
 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);
@@ -66,5 +66,5 @@ void SzTransfer::SzReceivedStderr(OProcess *, char *buffer, int length) {
 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
@@ -75,5 +75,5 @@ void SzTransfer::receivedStdin(const QByteArray &data) {
 void SzTransfer::sent() {
-    qWarning("sent file");
+    owarn << "sent file" << oendl; 
    //setcbreak(0); /* default */
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,6 +1,9 @@
 #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 ) {
@@ -13,5 +16,5 @@ 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() );
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,2 +1,9 @@
+#include "terminalwidget.h"
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+/* QT */
 #include <qlabel.h>
 #include <qcheckbox.h>
@@ -7,6 +14,4 @@
 #include <qlayout.h>
-#include "terminalwidget.h"
 namespace {
    enum TermIds {
@@ -70,5 +75,5 @@ TerminalWidget::TerminalWidget( const QString& name, QWidget* parent,
    // 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 */);
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
@@ -27,5 +27,5 @@ SenderUI::SenderUI()
    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&) ),
@@ -33,7 +33,7 @@ SenderUI::SenderUI()
    if ( ser->open() )
-        qWarning("opened!!!");
+        owarn << "opened!!!" << oendl; 
    else
-        qWarning("could not open");
+        owarn << "could not open" << oendl; 
@@ -53,10 +53,10 @@ void SenderUI::slotSendFile() {
 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] );
@@ -67,5 +67,5 @@ void SenderUI::got(const QByteArray& ar) {
 void SenderUI::fileTransComplete() {
-    qWarning("file transfer complete");
+    owarn << "file transfer complete" << oendl; 
 }
 void SenderUI::send() {
@@ -73,5 +73,5 @@ 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
@@ -996,5 +996,5 @@ bool Widget::eventFilter( QObject *obj, QEvent *e )
    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 ) {
@@ -1035,9 +1035,9 @@ bool Widget::eventFilter( QObject *obj, QEvent *e )
          // 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
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
@@ -76,5 +76,5 @@ bool WidgetLayer::eventFilter( QObject *obj, QEvent *e )
    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 ) {
@@ -116,5 +116,5 @@ QChar(a,0));
          // 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
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
@@ -21,10 +21,14 @@
 #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>
@@ -445,5 +449,5 @@ void MainWindow::fileOpen()
 void MainWindow::fileRevert()
 {
-    qDebug( "QMainWindow::fileRevert needs to be done" );
+    odebug << "QMainWindow::fileRevert needs to be done" << oendl; 
 }
@@ -457,5 +461,5 @@ void MainWindow::fileNew()
 void MainWindow::insertTable()
 {
-    qDebug( "MainWindow::insertTable() needs to be done" );
+    odebug << "MainWindow::insertTable() needs to be done" << oendl; 
 }
@@ -476,5 +480,5 @@ void MainWindow::openFile( const DocLnk &dl )
    QString txt;
    if ( !fm.loadFile( dl, txt ) )
-  qDebug( "couldn't open file" );
+  odebug << "couldn't open file" << oendl; 
    clear();
    editorStack->raiseWidget( editor );
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,5 +1,4 @@
-CONFIG        += qt warn on  quick-app
+CONFIG        += qt warn on quick-app
 HEADERS    =    qcleanuphandler.h \
diff --git a/noncore/apps/opie-write/qcomplextext.cpp b/noncore/apps/opie-write/qcomplextext.cpp
index 473f184..00a91c5 100644
--- a/noncore/apps/opie-write/qcomplextext.cpp
+++ b/noncore/apps/opie-write/qcomplextext.cpp
@@ -107,5 +107,5 @@ QBidiContext::~QBidiContext()
 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;
@@ -125,5 +125,5 @@ static inline const QChar *nextChar( const QString &str, int pos)
    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;
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
@@ -38,4 +38,9 @@
 #include "qrichtext_p.h"
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+/* QT */
 #include "qdragobject.h"
 #include "qpaintdevicemetrics.h"
@@ -43,4 +48,5 @@
 #include "qcleanuphandler.h"
+/* STD */
 #include <stdlib.h>
@@ -185,5 +191,5 @@ 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;
    }
@@ -213,5 +219,5 @@ 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;
    }
@@ -1545,8 +1551,8 @@ void QTextDocument::setRichTextInternal( const QString &text, QTextCursor* curso
                            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; 
                                }
                            }
@@ -2153,5 +2159,5 @@ QString QTextDocument::richText() const
    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;
    }
@@ -4097,5 +4103,5 @@ int QTextParagraph::lineHeightOfChar( int i, int *bl, int *y ) const
    }
-    qWarning( "QTextParagraph::lineHeightOfChar: couldn't find lh for %d", i );
+    owarn << "QTextParagraph::lineHeightOfChar: couldn't find lh for " << i << "" << oendl; 
    return 15;
 }
@@ -4123,5 +4129,5 @@ QTextStringChar *QTextParagraph::lineStartOfChar( int i, int *index, int *line )
    }
-    qWarning( "QTextParagraph::lineStartOfChar: couldn't find %d", i );
+    owarn << "QTextParagraph::lineStartOfChar: couldn't find " << i << "" << oendl; 
    return 0;
 }
@@ -4150,5 +4156,5 @@ QTextStringChar *QTextParagraph::lineStartOfLine( int line, int *index ) const
    }
-    qWarning( "QTextParagraph::lineStartOfLine: couldn't find %d", line );
+    owarn << "QTextParagraph::lineStartOfLine: couldn't find " << line << "" << oendl; 
    return 0;
 }
@@ -5698,5 +5704,5 @@ QTextFormat *QTextFormatCollection::format( const QFont &f, const QColor &c )
    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;
 }
@@ -6084,9 +6090,9 @@ QTextImage::QTextImage( QTextDocument *p, const QMap<QString, QString> &attr, co
                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; 
                }
            }
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
@@ -36,4 +36,7 @@
 **********************************************************************/
+#include <opie2/odebug.h>
+using namespace Opie::Core;
 #include "qrichtext_p.h"
@@ -138,5 +141,5 @@ void QTextCursor::gotoPosition( QTextParagraph* p, int index )
    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;
@@ -478,5 +481,5 @@ 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;
    }
@@ -494,5 +497,5 @@ 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;
    }
@@ -510,5 +513,5 @@ 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;
    }
@@ -526,6 +529,6 @@ void QTextParagraph::lineInfo( int l, int &y, int &h, int &bl ) const
 {
    if ( l > (int)lineStarts.count() - 1 ) {
-        qWarning( "QTextParagraph::lineInfo: line %d out of range!", l );
+        owarn << "QTextParagraph::lineInfo: line " << l << " out of range!" << oendl; 
-        qDebug( "%d %d", (int)lineStarts.count() - 1, l );
+        odebug << "" << (int)lineStarts.count() - 1 << " " << l << "" << oendl; 
        y = 0;
        h = 15;
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,5 +1,2 @@
-#include <qmessagebox.h>
-#include <qheader.h>
 #include "accountdisplay.h"
 #include "newaccount.h"
@@ -8,4 +5,12 @@
 #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;
@@ -268,5 +273,5 @@ void AccountDisplay::getTransferAccounts ( QListViewItem * item )
            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 )
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
@@ -2,3 +2,3 @@
    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
@@ -44,5 +44,5 @@ 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
@@ -18,13 +18,21 @@
 **
 **********************************************************************/ 
-#include <stdlib.h>
+#include "common.h"   
+#include "datacache.h"
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/timestring.h>
+using namespace Opie::Core;
+/* QT */
 #include <qstring.h>
 #include <qheader.h>
 #include <qvector.h>
 #include <qdatetime.h>
-#include <qpe/timestring.h>
-#include "common.h"
+/* STD */
-#include "datacache.h"
 #include <assert.h>
+#include <stdlib.h>
 static const int del_flag = 0x1;
@@ -313,5 +321,5 @@ void TVVariant::load(QDataStream &s )
      break;
        default:
-      qFatal("Unrecognized data type");
+      ofatal << "Unrecognized data type" << oendl; 
    }
 }
@@ -1079,5 +1087,5 @@ QDataStream &operator>>( QDataStream &s, DataElem &d)
    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 */
    }
@@ -1378,5 +1386,5 @@ bool DataElem::contains(int i, TVVariant v) const
            break;
        default:
-            qWarning("Tried to compare unknown data type");
+            owarn << "Tried to compare unknown data type" << oendl; 
    }
    return FALSE;
@@ -1404,5 +1412,5 @@ bool DataElem::startsWith(int i, TVVariant v) const
            return FALSE;
        default:
-            qWarning("Tried to compare unknown data type");
+            owarn << "Tried to compare unknown data type" << oendl; 
    }
    return FALSE;
@@ -1430,5 +1438,5 @@ bool DataElem::endsWith(int i, TVVariant v) const
            return FALSE;
        default:
-            qWarning("Tried to compare unknown data type");
+            owarn << "Tried to compare unknown data type" << oendl; 
    }
    return FALSE;
@@ -1462,5 +1470,5 @@ bool DataElem::closer(DataElem*d1, DataElem *d2, TVVariant target, int column)
        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;
        }
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
@@ -27,7 +27,15 @@
 #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
@@ -151,5 +159,5 @@ 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;
    }
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
@@ -19,10 +19,16 @@
 **********************************************************************/ 
 #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) 
@@ -141,5 +147,5 @@ DBXmlHandler::~DBXmlHandler()
 QString DBXmlHandler::errorProtocol()
 {
-    qWarning("Error reading file");
+    owarn << "Error reading file" << oendl; 
        return errorProt;
 }
@@ -173,5 +179,5 @@ bool DBXmlHandler::startElement(const QString&, const QString&,
        key = atts.value("name");
        if (key.isEmpty()) {
-            qWarning("empty key name");
+            owarn << "empty key name" << oendl; 
            return FALSE;
        }
@@ -191,5 +197,5 @@ bool DBXmlHandler::startElement(const QString&, const QString&,
        if (!keyIndexList[qName]) {
            /* invalid key, we failed */
-            qWarning("Invalid key in record");
+            owarn << "Invalid key in record" << oendl; 
            return FALSE;
        }
@@ -197,5 +203,5 @@ bool DBXmlHandler::startElement(const QString&, const QString&,
                return TRUE;
        }
-    qWarning("Unable to determine tag type");
+    owarn << "Unable to determine tag type" << oendl; 
        return FALSE;
 }
@@ -226,5 +232,5 @@ bool DBXmlHandler::endElement(const QString&, const QString&,
        default:
                // should only get a 'endElement' from one of the above states.
-        qWarning("Invalid end tag");
+        owarn << "Invalid end tag" << oendl; 
                return FALSE;
                break;
@@ -255,5 +261,5 @@ bool DBXmlHandler::characters(const QString& ch)
        }
        
-    qWarning("Junk characters found... ignored");
+    owarn << "Junk characters found... ignored" << oendl; 
    return TRUE;
 }
@@ -271,5 +277,5 @@ bool DBXmlHandler::warning(const QXmlParseException& exception)
        .arg(exception.columnNumber());
-    qWarning(errorProt);
+    owarn << errorProt << oendl; 
    return QXmlDefaultHandler::fatalError(exception);
 }
@@ -282,5 +288,5 @@ bool DBXmlHandler::error(const QXmlParseException& exception)
        .arg(exception.columnNumber());
-    qWarning(errorProt);
+    owarn << errorProt << oendl; 
    return QXmlDefaultHandler::fatalError(exception);
 }
@@ -293,5 +299,5 @@ bool DBXmlHandler::fatalError(const QXmlParseException& exception)
        .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
@@ -19,5 +19,4 @@
 **********************************************************************/ 
-/* local includes */
 #include "tableviewer.h"
 #include "ui/tvbrowseview.h"
@@ -28,11 +27,13 @@
 #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>
@@ -40,4 +41,5 @@
 #include <qlayout.h>
 #include <qbuffer.h>
 /*!
    \class TableViewerWindow
@@ -202,5 +204,5 @@ void TableViewerWindow::saveDocument()
    if(!ds->saveSource(dev, doc.type())){
-  qWarning("Save unsuccessful");
+  owarn << "Save unsuccessful" << oendl; 
  return;
    }
@@ -289,5 +291,5 @@ void TableViewerWindow::openDocument(const DocLnk &f)
  dirty = FALSE;
    } else {
-        qWarning(tr("could not load Document"));
+        owarn << tr("could not load Document") << oendl; 
    }
    dev->close();
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
@@ -1,3 +1,3 @@
-        CONFIG  = qt warn_on  quick-app
+        CONFIG  = qt warn_on quick-app
        SUBDIRS         = db ui
        HEADERS         = tableviewer.h \
@@ -32,7 +32,7 @@ SOURCES		= main.cpp \
        INTERFACES= ui/tvkeyedit_gen.ui
        TARGET  = tableviewer
-INCLUDEPATH += $(OPIEDIR)/include
+        INCLUDEPATH+= $(OPIEDIR)/include
-DEPENDPATH     += $(OPIEDIR)/include
+        DEPENDPATH+= $(OPIEDIR)/include
-        LIBS       += -lqpe -lopiecore2
+        LIBS    += -lqpe -lopiecore2
 include ( $(OPIEDIR)/include.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
@@ -18,6 +18,13 @@
 **
 **********************************************************************/ 
 #include "tvlistview.h"
 #include "../db/common.h"
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+/* QT */
 #include <qtoolbutton.h>
 #include <qlistview.h>
@@ -164,5 +171,5 @@ void TVListView::first()
 void TVListView::last()
 {
-    qWarning("TVListView::last not yet implemented");
+    owarn << "TVListView::last not yet implemented" << oendl; 
 }
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
@@ -1,77 +1,74 @@
 TEMPLATE    = lib
-CONFIG        = qt warn_on 
+CONFIG      = qt warn_on 
-HEADERS        = microkde/kapplication.h \
+HEADERS     = microkde/kapplication.h \
-          kateconfig.h \
+              kateconfig.h \
-                  microkde/kdebug.h \
+              microkde/kdebug.h \
-                  microkde/kdialog.h \
+              microkde/kdialog.h \
-                  microkde/kdialogbase.h \
+              microkde/kdialogbase.h \
-                  microkde/kfiledialog.h \
+              microkde/kfiledialog.h \
-                  microkde/kglobal.h \
+              microkde/kglobal.h \
-                  microkde/kiconloader.h \
+              microkde/kiconloader.h \
-                  microkde/klineedit.h \
+              microkde/klineedit.h \ 
-                  microkde/klocale.h \
+              microkde/klocale.h \
-                  microkde/kmessagebox.h \
+              microkde/kmessagebox.h \
-                  microkde/kprinter.h \
+              microkde/kprinter.h \
-                  microkde/krestrictedline.h \
+              microkde/krestrictedline.h \
-                  microkde/kseparator.h \
+              microkde/kseparator.h \
-                  microkde/kstandarddirs.h \
+              microkde/kstandarddirs.h \
-                  microkde/ktempfile.h \
+              microkde/ktempfile.h \
-                  microkde/kunload.h \
+              microkde/kunload.h \
-                  microkde/kurlrequester.h \
+              microkde/kurlrequester.h \
-                  microkde/kfontdialog.h \
+              microkde/kfontdialog.h \
-                  microkde/krun.h \
+              microkde/krun.h \
-                  microkde/knumvalidator.h \
+              microkde/knumvalidator.h \
-                  microkde/kstaticdeleter.h \
+              microkde/kstaticdeleter.h \
-                  microkde/klistview.h \
+              microkde/klistview.h \
-                  microkde/kglobalsettings.h \
+              microkde/kglobalsettings.h \
-          microkde/kcolorbtn.h \
+              microkde/kcolorbtn.h \
-          \
              \
-          qt3back/qregexp3.h \
+              qt3back/qregexp3.h \
-          microkde/ksharedptr.h \
+              microkde/ksharedptr.h \
-          document/katebuffer.h  document/katedialogs.h \
+              document/katebuffer.h  document/katedialogs.h \
-          document/katetextline.h \
+              document/katetextline.h \
-          document/katecmd.h \
+              document/katecmd.h \
-          document/katehighlight.h \
+              document/katehighlight.h \
-          document/katecmds.h    document/katedocument.h  \
+              document/katecmds.h    document/katedocument.h  \
-          document/katesyntaxdocument.h \
+              document/katesyntaxdocument.h \
-          view/kateundohistory.h  \
+              view/kateundohistory.h  \
-          view/kateview.h  \
+              view/kateview.h  \
-          view/kateviewdialog.h \
+              view/kateviewdialog.h \
-          interfaces/view.h \
+              interfaces/view.h \
-          interfaces/document.h \
+              interfaces/document.h \
-          ktexteditor/ktexteditor.h
+              ktexteditor/ktexteditor.h
-SOURCES        = microkde/kapplication.cpp \
+SOURCES     = microkde/kapplication.cpp \
-                  microkde/kdialogbase.cpp \
+              microkde/kdialogbase.cpp \
-          kateconfig.cpp \
+              kateconfig.cpp \
-                  microkde/klocale.cpp \
+              microkde/klocale.cpp \
-                  microkde/kmessagebox.cpp \
+              microkde/kmessagebox.cpp \
-                  microkde/kprocess.cpp \
+              microkde/kprocess.cpp \
-                  microkde/kstandarddirs.cpp \
+              microkde/kstandarddirs.cpp \
-                  microkde/ktempfile.cpp \
+              microkde/ktempfile.cpp \
-                  microkde/kurlrequester.cpp \
+              microkde/kurlrequester.cpp \
-                  microkde/kfontdialog.cpp \
+              microkde/kfontdialog.cpp \
-                  microkde/krun.cpp \
+              microkde/krun.cpp \
-                  microkde/knumvalidator.cpp \
+              microkde/knumvalidator.cpp \
-                  microkde/kglobal.cpp \
+              microkde/kglobal.cpp \
-                  microkde/kglobalsettings.cpp \
+              microkde/kglobalsettings.cpp \
-          microkde/kcolorbtn.cpp \
+              microkde/kcolorbtn.cpp \
-          \
+              \
-          \
+              qt3back/qregexp3.cpp \
-          qt3back/qregexp3.cpp \
+              ktexteditor/ktexteditor.cpp \
-          ktexteditor/ktexteditor.cpp \
+              document/katebuffer.cpp  document/katedialogs.cpp \
-          document/katebuffer.cpp  document/katedialogs.cpp \
+              document/katehighlight.cpp  \
-          document/katehighlight.cpp  \
+              document/katecmd.cpp   \
-          document/katecmd.cpp   \
+              document/katesyntaxdocument.cpp document/katecmds.cpp \
-          document/katesyntaxdocument.cpp document/katecmds.cpp \
+              document/katedocument.cpp    document/katetextline.cpp \
-          document/katedocument.cpp    document/katetextline.cpp \
+              view/kateundohistory.cpp \
-          view/kateundohistory.cpp \
+              view/kateview.cpp \
-          view/kateview.cpp \
+              view/kateviewdialog.cpp \
-          view/kateviewdialog.cpp \
+              interfaces/interfaces.cpp
-          interfaces/interfaces.cpp
+INTERFACES  =
+INCLUDEPATH += $(OPIEDIR)/include \
-INTERFACES    =
-INCLUDEPATH    += $(OPIEDIR)/include \
            $(OPIEDIR)/noncore/apps/tinykate/libkate \
            $(OPIEDIR)/noncore/apps/tinykate/libkate/microkde \
@@ -81,7 +78,7 @@ INCLUDEPATH    += $(OPIEDIR)/include \
            $(OPIEDIR)/noncore/apps/tinykate/libkate/ktexteditor \
            $(OPIEDIR)/noncore/apps/tinykate/libkate/qt3back
-DEPENDPATH    += $(OPIEDIR)/include
+DEPENDPATH  += $(OPIEDIR)/include
-LIBS            += -lqpe -lqtaux2 -lopiecore2 -lopieui2
+LIBS        += -lqpe -lqtaux2 -lopiecore2 -lopieui2
-TARGET        = tinykate
+TARGET      = tinykate
 INCLUDEPATH += $(OPIEDIR)/include
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,20 +1,18 @@
-TEMPLATE    = app
+TEMPLATE       = app
-CONFIG        = qt warn_on  quick-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 \
-            $(OPIEDIR)/noncore/apps/tinykate/libkate/microkde \
+               $(OPIEDIR)/noncore/apps/tinykate/libkate/microkde \
-                        $(OPIEDIR)/noncore/apps/tinykate/libkate/document \
+               $(OPIEDIR)/noncore/apps/tinykate/libkate/document \
-                        $(OPIEDIR)/noncore/apps/tinykate/libkate/view \
+               $(OPIEDIR)/noncore/apps/tinykate/libkate/view \
-                        $(OPIEDIR)/noncore/apps/tinykate/libkate/interfaces \
+               $(OPIEDIR)/noncore/apps/tinykate/libkate/interfaces \
-                        $(OPIEDIR)/noncore/apps/tinykate/libkate/ktexteditor \
+               $(OPIEDIR)/noncore/apps/tinykate/libkate/ktexteditor \
-                        $(OPIEDIR)/noncore/apps/tinykate/libkate/qt3back
+               $(OPIEDIR)/noncore/apps/tinykate/libkate/qt3back
+DEPENDPATH     += $(OPIEDIR)/include
-DEPENDPATH    += $(OPIEDIR)/include
+LIBS           += -lqpe -ltinykate -lopiecore2 -lopieui2
-LIBS            += -lqpe -ltinykate -lopiecore2 -lopieui2
+TARGET         = kate
-TARGET        = kate
diff --git a/noncore/apps/zsafe/config.in b/noncore/apps/zsafe/config.in
index 6e321f3..b6d3ffe 100644
--- a/noncore/apps/zsafe/config.in
+++ b/noncore/apps/zsafe/config.in
@@ -2,4 +2,4 @@ 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,12 +1,9 @@
-/****************************************************************************
-** 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>
@@ -217,40 +214,40 @@ ScQtFileDlg::~ScQtFileDlg()
 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
@@ -30,5 +30,6 @@
 #ifndef NO_OPIE
 #include <opie2/ofiledialog.h>
+#include <opie2/odebug.h>
+using namespace Opie::Core;
 using namespace Opie::Ui;
 #else
@@ -39,6 +40,4 @@ using namespace Opie::Ui;
 #include <qclipboard.h>
-#include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -2070,5 +2069,4 @@ int ZSafe::loadInit(const char* _filename, const char *password)
    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
@@ -2090,5 +2088,4 @@ int ZSafe::loadInit(const char* _filename, const char *password)
            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) {
@@ -2260,5 +2257,5 @@ bool ZSafe::saveDocument(const char* _filename,
           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;
@@ -2304,5 +2301,5 @@ bool ZSafe::saveDocument(const char* _filename,
              }
              if (retval == PWERR_DATA) {
-                        qWarning("1: Error writing file, contents not saved");
+                        owarn << "1: Error writing file, contents not saved" << oendl; 
                        saveFinalize();
                        return false;
@@ -2313,5 +2310,5 @@ bool ZSafe::saveDocument(const char* _filename,
    if (saveFinalize() == PWERR_DATA) {
-                qWarning("2: Error writing file, contents not saved");
+                owarn << "2: Error writing file, contents not saved" << oendl; 
        return false;
    } else {
@@ -3191,5 +3188,5 @@ void ZSafe::editCategory()
           if (cat)
           {
-              qWarning("Category found");
+              owarn << "Category found" << oendl; 
              // if (!icon.isEmpty() && !icon.isNull())
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,4 +1,4 @@
-TEMPLATE        = app
+TEMPLATE     = app
-CONFIG         = qt warn_on 
+CONFIG       = qt warn_on 
 DESTDIR      = $(OPIEDIR)/bin
 HEADERS      = zsafe.h krc2.h category.h categorylist.h zlistview.h \
@@ -8,9 +8,9 @@ SOURCES      = main.cpp zsafe.cpp krc2.cpp category.cpp \
               scqtfileedit.cpp scqtfileedit.moc.cpp \
               scqtfiledlg.cpp
-INTERFACES     = newdialog.ui searchdialog.ui passworddialog.ui categorydialog.ui infoform.ui wait.ui
+INTERFACES   = newdialog.ui searchdialog.ui passworddialog.ui categorydialog.ui infoform.ui wait.ui
-INCLUDEPATH    += $(OPIEDIR)/include
+INCLUDEPATH  += $(OPIEDIR)/include
-DEPENDPATH    += $(OPIEDIR)/include
+DEPENDPATH   += $(OPIEDIR)/include
-LIBS        += -Wl,-rpath,$(OPIEDIR)/lib -L$(OPIEDIR)/lib -lqpe -lopiecore2 -lopieui2
+LIBS         += -lqpe -lopiecore2 -lopieui2
-TARGET         = zsafe
+TARGET       = zsafe
 include ( $(OPIEDIR)/include.pro )