convert to Opie Debugging Framework

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
@@ -71,7 +71,7 @@ void AdvancedFm::cleanUp() {
 }
 
 void AdvancedFm::tabChanged(QWidget *) {
-//   qWarning("tab changed");
+//   owarn << "tab changed" << oendl; 
    QString path = CurrentDir()->canonicalPath();
    currentPathCombo->lineEdit()->setText( path );
 
@@ -93,13 +93,13 @@ void AdvancedFm::tabChanged(QWidget *) {
 
 void AdvancedFm::populateView() {
 
-// qWarning("PopulateView");
+// owarn << "PopulateView" << oendl; 
         QPixmap pm;
         QListView *thisView = CurrentView();
         QDir *thisDir = CurrentDir();
         QString path = thisDir->canonicalPath();
 
-//qWarning("path is "+path);
+//owarn << "path is "+path << oendl; 
         thisView->clear();
         thisDir->setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
         thisDir->setMatchAllDirs(TRUE);
@@ -160,7 +160,7 @@ 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" );
 //                QPixmap lnk = Resource::loadPixmap( "opie/symlink" );
@@ -184,7 +184,7 @@ void AdvancedFm::populateView() {
                 if((dir = opendir( path.latin1())) != NULL)
                         while ((mydirent = readdir(dir)) != NULL) {
                                 lstat( mydirent->d_name, &buf);
-//        qDebug(mydirent->d_name);
+//        odebug << mydirent->d_name << oendl; 
                                 fileL.sprintf("%s", mydirent->d_name);
                                 devT = buf.st_dev;
                                 fileS.sprintf("%d, %d", (int) ( devT >>8) &0xFF, (int)devT &0xFF);
@@ -209,7 +209,7 @@ void AdvancedFm::rePopulate() {
      populateView();
 
 //      int tmpTab = whichTab;
-// //  qDebug("%d", tmpTab);
+// //  odebug << "" << tmpTab << "" << oendl; 
 
 //    for(int i =1; i < 3; i++) {
 //       TabWidget->setCurrentWidget(i - 1);
@@ -219,10 +219,10 @@ 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();
       bool isDirectory = false;
@@ -267,13 +267,13 @@ 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();
 }
 
 void AdvancedFm::switchToRemoteTab() {
-//qWarning("switch to local view");
+//owarn << "switch to local view" << oendl; 
    TabWidget->setCurrentWidget(1);
    Remote_View->setFocus();
 }
@@ -329,7 +329,7 @@ QStringList AdvancedFm::getPath() {
    for ( ; it.current(); ++it ) {
       if ( it.current()->isSelected() ) {
          strList <<  it.current()->text(0);
-//        qDebug(it.current()->text(0));
+//        odebug << it.current()->text(0) << oendl; 
       }
    }
    return strList;
@@ -380,7 +380,7 @@ void AdvancedFm::doAbout() {
 }
 
 void AdvancedFm::keyPressEvent( QKeyEvent *e) {
-//   qWarning("key %d", e->key());
+//   owarn << "key " << e->key() << "" << oendl; 
 //   if( CurrentView()->hasFocus()  )
    {
       switch ( e->key() ) {
@@ -638,7 +638,7 @@ void AdvancedFm::addToDocs() {
       QString curFile;
       for ( QStringList::Iterator it = strListPaths.begin(); it != strListPaths.end(); ++it ) {
          curFile = thisDir->canonicalPath()+"/"+(*it);
-//                qDebug(curFile);
+//                odebug << curFile << oendl; 
          QFileInfo fi(curFile);
          DocLnk f;
 //                curFile.replace(QRegExp("\\..*"),"");
@@ -711,7 +711,7 @@ void AdvancedFm::addCustomDir() {
 }
 
 void AdvancedFm::removeCustomDir() {
-//  qDebug("remove custom dir");
+//  odebug << "remove custom dir" << oendl; 
    Config cfg("AdvancedFm");
    cfg.setGroup("Menu");
    QString dir;
@@ -746,7 +746,7 @@ 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();
 //     if( curDir.isEmpty()) {
@@ -787,10 +787,10 @@ 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;
    }
 }
@@ -803,7 +803,7 @@ QListView * AdvancedFm::OtherView() {
 }
 
 void AdvancedFm::setOtherTabCurrent() {
-//   qWarning("setOtherTabCurrent() %d", whichTab);
+//   owarn << "setOtherTabCurrent() " << whichTab << "" << oendl; 
    if ( whichTab == 1) {
       TabWidget->setCurrentWidget(1);
    } else {
@@ -814,10 +814,10 @@ 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;
       gotoDirectory( (const QString &) file);
@@ -830,7 +830,7 @@ 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();
    if(QDir( curDir).exists() )  {
@@ -866,7 +866,7 @@ 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,31 +1,11 @@
 TEMPLATE  = app
-CONFIG    += qt warn_on  quick-app
-# CONFIG    += qt warn_on 
+CONFIG    += qt warn_on quick-app
 HEADERS   = advancedfm.h filePermissions.h output.h
 SOURCES   = advancedfm.cpp advancedfmData.cpp advancedfmMenu.cpp filePermissions.cpp output.cpp main.cpp
 TARGET    = advancedfm
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
-LIBS            += -lqpe -lopiecore2 -lopieui2
-
-TRANSLATIONS = ../../../i18n/de/advancedfm.ts \
-     ../../../i18n/nl/advancedfm.ts \
-     ../../../i18n/da/advancedfm.ts \
-     ../../../i18n/xx/advancedfm.ts \
-   ../../../i18n/en/advancedfm.ts \
-   ../../../i18n/es/advancedfm.ts \
-   ../../../i18n/fr/advancedfm.ts \
-   ../../../i18n/hu/advancedfm.ts \
-   ../../../i18n/ja/advancedfm.ts \
-   ../../../i18n/ko/advancedfm.ts \
-   ../../../i18n/no/advancedfm.ts \
-   ../../../i18n/pl/advancedfm.ts \
-   ../../../i18n/pt/advancedfm.ts \
-   ../../../i18n/pt_BR/advancedfm.ts \
-   ../../../i18n/sl/advancedfm.ts \
-   ../../../i18n/zh_CN/advancedfm.ts \
-   ../../../i18n/zh_TW/advancedfm.ts
-
+LIBS        += -lqpe -lopiecore2 -lopieui2
 
 !contains(CONFIG,quick-app) {
  DESTDIR = $(OPIEDIR)/bin
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
@@ -11,11 +11,16 @@
  ***************************************************************************/
 #include "advancedfm.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
 #include <qpe/storage.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <qpe/menubutton.h>
+using namespace Opie::Core;
+using namespace Opie::Ui;
 
+/* QT */
 #include <qlayout.h>
 #include <qhbox.h>
 #include <qmenubar.h>
@@ -24,10 +29,9 @@
 #include <qlineedit.h>
 #include <qlistview.h>
 
+/* STD */
 #include <sys/utsname.h>
 
-
-using namespace Opie::Ui;
 void AdvancedFm::init() {
 	 b = false;
 	 setCaption( tr( "AdvancedFm" ) );
@@ -219,11 +223,11 @@ 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();
 	 }
 	 currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp
index 81a4318..d34f330 100644
--- a/noncore/apps/advancedfm/advancedfmMenu.cpp
+++ b/noncore/apps/advancedfm/advancedfmMenu.cpp
@@ -1,839 +1,842 @@
-/***************************************************************************

-   AdvancedFm.cpp

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

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

-    copyright            : (C) 2002 by ljp

-    email               : ljp@llornkcor.com

-    *   This program is free software; you can redistribute it and/or modify  *

-    *   it under the terms of the GNU General Public License as published by  *

-    *   the Free Software Foundation; either version 2 of the License, or     *

-    *   (at your option) any later version.                                   *

-    ***************************************************************************/

-#include "advancedfm.h"

-#include "output.h"

-#include "filePermissions.h"

-

-#include <qpe/lnkproperties.h>

-#include <qpe/qpeapplication.h>

-#include <qpe/applnk.h>

-

-#include <qmessagebox.h>

-

-

-#include <qpopupmenu.h>

-#include <qlistview.h>

-

-#include <errno.h>

-#include <stdlib.h>

-#include <unistd.h>

-#include <sys/stat.h>

-#include <dirent.h>

-#include <sys/sendfile.h>

-#include <fcntl.h>

-

-

-using namespace Opie::Core;

-using namespace Opie::Core;

-void AdvancedFm::doDirChange() {

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

-   if( pathItem == "../") {

-      ListClicked( CurrentView()->currentItem());

-   } else {

-      if( pathItem.find(" -> ",0,TRUE) != -1)

-         pathItem = dealWithSymName((const QString&)pathItem)+"/";

-//      qWarning(pathItem);

-      gotoDirectory( CurrentDir()->path()+"/"+pathItem.left( pathItem.length() - 1) );

-   }

-}

-

-void AdvancedFm::showMenuHidden() {

-  if (b) {

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

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

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

-    } else {

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

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

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

-    }

-     b = !b;

-         populateView();

-}

-

-void AdvancedFm::showHidden() {

-  if (b) {

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

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

-    }  else {

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

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

-    }

-         populateView();

-}

-

-QString AdvancedFm::dealWithSymName(const QString &fileName) {

-   QString strItem = fileName;

-   return  strItem.right( (strItem.length() - strItem.find("->",0,TRUE)) - 4);

-}

-

-void AdvancedFm::runThis() {

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

-  QString fs;

-  QDir *thisDir = CurrentDir();

-

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

-  QString path = thisDir->canonicalPath();

-

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

-

-    curFile = dealWithSymName((const QString&)curFile);

-

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

-

-      fs = getFileSystemType((const QString &) path);

-      QFileInfo fileInfo( path  + "/" + curFile);

-//      qDebug( fileInfo.owner());

-

-      if( (fileInfo.permission( QFileInfo::ExeUser)

-           | fileInfo.permission( QFileInfo::ExeGroup)

-           | fileInfo.permission( QFileInfo::ExeOther)) // & fs.find("vfat",0,TRUE) == -1) {

-          | fs == "vfat" && fileInfo.filePath().contains("/bin") ) {

-        QCopEnvelope e("QPE/System", "execute(QString)" );

-        e << curFile;

-      } else {

-          curFile =  path + "/" + curFile;

-          DocLnk nf(curFile);

-          QString execStr = nf.exec();

-//          qDebug( execStr);

-          if( execStr.isEmpty() ) {

-            } else {

-              nf.execute();

-            }

-        }

-    }

-}

-

-void AdvancedFm::runText() {

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

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

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

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

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

-  if( fileDlg->result() == 1 ) {

-      QDir *thisDir = CurrentDir();

-      QString  filename = fileDlg->LineEdit1->text();

-      thisDir->mkdir( thisDir->canonicalPath()+"/"+filename);

-  }

-    populateView();

-}

-

-void AdvancedFm::doDelete() {

-   QStringList curFileList = getPath();

-   bool doMsg=true;

-   int count = curFileList.count();

-   if( count > 0)  {

-      if(count > 1 ) {

-         QString msg;

-         msg=tr("Really delete\n%1 files?").arg(count);

-         switch ( QMessageBox::warning(this,tr("Delete"),msg

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

-         {

-         case 0:

-            doMsg=false;

-            break;

-         case 1:

-            return;

-            break;

-         };

-      }

-

-      QString myFile;

-

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

-         myFile = (*it);

-         if( myFile.find(" -> ",0,TRUE) != -1)

-            myFile = myFile.left( myFile.find(" -> ",0,TRUE));

-

-         QString f = CurrentDir()->canonicalPath();

-         if(f.right(1).find("/",0,TRUE) == -1)

-            f += "/";

-         f += myFile;

-         if(QDir(f).exists() && !QFileInfo(f).isSymLink() ) {

-            //if file is a directory

-

-            switch ( QMessageBox::warning( this, tr("Delete Directory?"),

-                                           tr("Really delete %1\nand all it's contents ?" ).arg( f ) ,

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

-            case 0:

-            {

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

-               QString cmd="rm -rf "+f;

-               startProcess( (const QString)cmd.latin1() );

-                             populateView();

-            }

-            break;

-            case 1:

-               // exit

-               break;

-            };

-

-         } else {

-            if(doMsg) {

-               switch ( QMessageBox::warning(this,tr("Delete"),

-                                             tr("Really delete\n%1?").arg( myFile ),

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

-               case 1:

-                  return;

-                  break;

-               };

-            }

-

-            QString cmd="rm "+f;

-            QFile file(f);

-            QFileInfo fi(myFile);

-            if( fi.fileName().find("../",0,TRUE)==-1) {

-//               qDebug("remove link files "+myFile);

-

-//               DocLnk lnk(f);

-                 DocLnk *lnk;

-                 lnk = new DocLnk(f);

-//                 qDebug("Deleting doclnk " + lnk->linkFile());

-                 if(lnk->isValid())

-                    lnk->removeLinkFile();

-               // delete lnk;

-               file.remove();

-            }

-         }

-      }

-   }

-    populateView();

-}

-

-void AdvancedFm::filePerms() {

-   QStringList curFileList = getPath();

-   QString filePath;

-

-   filePath = CurrentDir()->canonicalPath()+"/";

-

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

-      filePermissions *filePerm;

-      filePerm = new filePermissions(this, "Permissions",true,0,(const QString &)(filePath+*it));

-      QPEApplication::execDialog( filePerm );

-      if( filePerm )

-         delete  filePerm;

-   }

-    populateView();

-}

-

-void AdvancedFm::doProperties() {

-#if defined(QT_QWS_OPIE)

-

-   QStringList curFileList = getPath();

-

-   QString filePath;

-   filePath = CurrentDir()->canonicalPath()+"/";

-

-//   qDebug("%d",curFileList.count());

-

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

-//      qDebug((filePath+*it));

-      DocLnk lnk( (filePath+*it));

-      LnkProperties prop( &lnk );

-      QPEApplication::execDialog( &prop );

-   }

-#endif

-

-}

-

-void AdvancedFm::upDir() {

-  QDir *thisDir = CurrentDir();

-  QString current = thisDir->canonicalPath();

-  QDir dir(current);

-  dir.cdUp();

-  current = dir.canonicalPath();

-  chdir( current.latin1() );

-  thisDir->cd(  current, TRUE);

-

-    populateView();

-  update();

-}

-

-void AdvancedFm::copy() {

-   qApp->processEvents();

-   QStringList curFileList = getPath();

-

-   QDir *thisDir = CurrentDir();

-   QDir *thatDir = OtherDir();

-

-   bool doMsg=true;

-   int count=curFileList.count();

-   if( count > 0) {

-      if(count > 1 ){

-         QString msg;

-         msg=tr("Really copy\n%1 files?").arg(count);

-         switch ( QMessageBox::warning(this,tr("Copy"),msg

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

-         {

-         case 0:

-            doMsg=false;

-            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

-            item = item.left(item.find("->",0,TRUE));

-

-         curFile = thisDir->canonicalPath()+"/"+ item;

-         destFile = thatDir->canonicalPath()+"/"+ item;

-

-//          qDebug("Destination file is "+destFile);

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

-

-         QFile f(destFile);

-         if( f.exists()) {

-            if(doMsg) {

-               switch ( QMessageBox::warning(this,tr("File Exists!"),

-                                             tr("%1 exists. Ok to overwrite?").arg( item ),

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

-               case 1:

-                  return;

-                  break;

-               };

-            }

-            f.remove();

-         }

-

-         if( !copyFile( curFile, destFile) )  {

-            QMessageBox::message("AdvancedFm",

-                                 tr( "Could not copy %1 to %2").arg( curFile ).arg( destFile ) );

-            return;

-         }

-      }

-            setOtherTabCurrent();

-            rePopulate();

-   }

-}

-

-void AdvancedFm::copyAs() {

-   qApp->processEvents();

-

-   QStringList curFileList = getPath();

-   QString curFile, item;

-   InputDialog *fileDlg;

-

-   QDir *thisDir = CurrentDir();

-   QDir *thatDir = OtherDir();

-

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

-      QString destFile;

-      item=(*it);

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

-      fileDlg = new InputDialog( this, tr("Copy "+curFile+" As"), TRUE, 0);

-

-      fileDlg->setInputText((const QString &) destFile );

-      fileDlg->exec();

-

-      if( fileDlg->result() == 1 ) {

-         QString  filename = fileDlg->LineEdit1->text();

-         destFile = thatDir->canonicalPath()+"/"+filename;

-

-         QFile f( destFile);

-         if( f.exists()) {

-            switch (QMessageBox::warning(this,tr("File Exists!"),

-                                         item+tr("\nexists. Ok to overwrite?"),

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

-            case 0:

-               f.remove();

-               break;

-            case 1:

-               return;

-               break;

-            };

-         }

-         if( !copyFile( curFile, destFile) ) {

-            QMessageBox::message("AdvancedFm",tr("Could not copy\n")

-                                 +curFile +tr("to\n")+destFile);

-            return;

-         }

-      }

-      delete fileDlg;

-

-   }

-            rePopulate();

-            setOtherTabCurrent();

-}

-

-void AdvancedFm::copySameDir() {

-  qApp->processEvents();

-  QStringList curFileList = getPath();

-  QString curFile, item, destFile;

-  InputDialog *fileDlg;

-

-  QDir *thisDir = CurrentDir();

-

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

-      item=(*it);

-      curFile = thisDir->canonicalPath()+"/"+ item;

-

-      fileDlg = new InputDialog(this,tr("Copy ")+curFile+tr(" As"),TRUE, 0);

-      fileDlg->setInputText((const QString &) destFile );

-      fileDlg->exec();

-

-      if( fileDlg->result() == 1 ) {

-

-          QString filename = fileDlg->LineEdit1->text();

-          destFile = thisDir->canonicalPath()+"/"+filename;

-

-          QFile f(destFile);

-          if( f.exists()) {

-              switch (QMessageBox::warning(this,tr("Delete"),

-                                           destFile+tr(" already exists.\nDo you really want to delete it?"),

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

-              case 0:

-

-                f.remove();

-                break;

-              case 1:

-                return;

-                break;

-              };

-            }

-          if(!copyFile( curFile,destFile) )  {

-              QMessageBox::message("AdvancedFm",tr("Could not copy\n")

-                                   +curFile +tr("to\n")+destFile);

-              return;

-            }

-

-//          qDebug("copy "+curFile+" as "+destFile);

-        }

-      delete fileDlg;

-    }

-            rePopulate();

-}

-

-void AdvancedFm::move() {

-  qApp->processEvents();

-

-  QStringList curFileList = getPath();

-  if( curFileList.count() > 0) {

-      QString curFile, destFile, item;

-

-      QDir *thisDir = CurrentDir();

-      QDir *thatDir = OtherDir();

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

-          item=(*it);

-          QString destFile =  thatDir->canonicalPath();

-

-          if(destFile.right(1).find("/",0,TRUE) == -1)

-            destFile+="/";

-          destFile += item;

-//          qDebug("Destination file is "+destFile);

-

-          curFile = thisDir->canonicalPath();

-          if(curFile.right(1).find("/",0,TRUE) == -1)

-                            curFile +="/";

-          curFile+= item;

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

-

-          if(QFileInfo(curFile).isDir()) {

-                            moveDirectory( curFile, destFile );

-                            rePopulate();

-                            return;

-          }

-

-                    QFile f( curFile);

-          if( f.exists()) {

-                            if( !copyFile(  curFile, destFile) )  {

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

-                                    return;

-              } else

-                                    QFile::remove(curFile);

-          }

-            }

-

-  }

-            rePopulate();

-            setOtherTabCurrent();

-}

-

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

-        int err = 0;

-        if( copyDirectory( src, dest ) ) {      QString cmd = "rm -rf " + src;

-        err = system((const char*)cmd);

-        } else

-                err = -1;

-

-        if(err!=0) {

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

-                return false;

-        }

-        return true;

-}

-

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

-

-        QString    cmd = "/bin/cp -fpR " + src + " " + dest;

-    qWarning(cmd);

-        int    err = system( (const char *) cmd );

-        if ( err != 0 ) {

-                QMessageBox::message("AdvancedFm",

-                                                         tr( "Could not copy \n%1 \nto \n%2").arg( src ).arg( dest ) );

-                return false;

-        }

-

-        return true;

-}

-

-

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

-

-

-        if(QFileInfo(src).isDir()) {

-                if( copyDirectory( src, dest )) {

-                        setOtherTabCurrent();

-                        populateView();

-                        return true;

-                }

-                else

-                        return false;

-        }

-

-

-        bool success = true;

-        struct stat status;

-        QFile srcFile(src);

-        QFile destFile(dest);

-        int err=0;

-        int read_fd=0;

-   int write_fd=0;

-   struct stat stat_buf;

-   off_t offset = 0;

-      if(!srcFile.open( IO_ReadOnly|IO_Raw)) {

-//         qWarning("open failed");

-         return success = false;

-   }

-   read_fd = srcFile.handle();

-   if(read_fd != -1) {

-      fstat (read_fd, &stat_buf);

-      if( !destFile.open( IO_WriteOnly|IO_Raw ) ) {

-//       qWarning("destfile open failed");

-       return success = false;

-      }

-      write_fd = destFile.handle();

-      if(write_fd != -1) {

-         err = sendfile(write_fd, read_fd, &offset, stat_buf.st_size);

-           if( err == -1) {

-              QString msg;

-              switch(err) {

-              case EBADF : msg = "The input file was not opened for reading or the output file was not opened for writing. ";

-              case EINVAL: msg = "Descriptor is not valid or locked. ";

-              case ENOMEM: msg = "Insufficient memory to read from in_fd.";

-              case EIO: msg = "Unspecified error while reading from in_fd.";

-              };

-              success = false;

-//              qWarning(msg);

-         }

-      } else {

-         success = false;

-      }

-   } else {

-      success = false;

-   }

-   srcFile.close();

-   destFile.close();

-    // Set file permissions

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

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

-    }

-

-  return success;

-}

-

-void AdvancedFm::runCommand() {

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

-   QDir *thisDir = CurrentDir();

-

-   QString curFile;

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

-

-   InputDialog *fileDlg;

-   fileDlg = new InputDialog(this,tr("Run Command"),TRUE, 0);

-   fileDlg->setInputText(curFile);

-   fileDlg->exec();

-   //QString command;

-

-   if( fileDlg->result() == 1 ) {

-//      qDebug(fileDlg->LineEdit1->text());

-      QStringList command;

-

-      command << "/bin/sh";

-      command << "-c";

-      command <<  fileDlg->LineEdit1->text();

-      Output *outDlg;

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

-      QPEApplication::execDialog( outDlg );

-      qApp->processEvents();

-

-   }

-}

-

-void AdvancedFm::runCommandStd() {

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

-   QString curFile;

-   QDir *thisDir = CurrentDir();

-   QListView *thisView = CurrentView();

-   if( thisView->currentItem())

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

-

-   InputDialog *fileDlg;

-   fileDlg = new InputDialog(this,tr("Run Command"),TRUE, 0);

-   fileDlg->setInputText(curFile);

-   fileDlg->exec();

-

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

-

-   QStringList command;

-   command << "/bin/sh";

-   command << "-c";

-   command << "stat -l "+ curFile;

-

-   Output *outDlg;

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

-   QPEApplication::execDialog( outDlg );

-   qApp->processEvents();

-}

-

-

-void AdvancedFm::mkDir() {

-    makeDir();

-}

-

-void AdvancedFm::rn() {

-  renameIt();

-}

-

-void AdvancedFm::del() {

-    doDelete();

-}

-

-void AdvancedFm::mkSym() {

-  QString cmd;

-  QStringList curFileList = getPath();

-  if( curFileList.count() > 0) {

-      QDir *thisDir = CurrentDir();

-      QDir * thatDir = OtherDir();

-

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

-

-          QString destName = thatDir->canonicalPath()+"/"+(*it);

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

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

-            }

-

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

-

-          if( curFile.right(1) == "/") {

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

-            }

-

-          cmd = "ln -s "+curFile+" "+destName;

-//          qDebug(cmd);

-          startProcess( (const QString)cmd );

-        }

-            rePopulate();

-            setOtherTabCurrent();

-    }

-}

-

-void AdvancedFm::doBeam() {

-   Ir ir;

-   if(!ir.supported())  {

-   } else {

-      QStringList curFileList = getPath();

-      if( curFileList.count() > 0)  {

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

-            QString curFile = (*it);

-            QString curFilePath =  CurrentDir()->canonicalPath()+"/"+curFile;

-            if( curFilePath.right(1) == "/") {

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

-            }

-            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::selectAll() {

-  QListView *thisView = CurrentView();

-  thisView->selectAll(true);

-  thisView->setSelected( thisView->firstChild(),false);

-}

-

-void AdvancedFm::startProcess(const QString & cmd) {

-  QStringList command;

-  OProcess *process;

-  process = new OProcess();

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

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

-

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

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

-

-  command << "/bin/sh";

-  command << "-c";

-  command << cmd.latin1();

-  *process << command;

-  if(!process->start(OProcess::NotifyOnExit, OProcess::All) )

-    qDebug("could not start process");

-}

-

-void AdvancedFm::processEnded(OProcess *) {

-            rePopulate();

-}

-

-void AdvancedFm::oprocessStderr(OProcess*, char *buffer, int ) {

-//    qWarning("received stderrt %d bytes", buflen);

-

-    QString lineStr = buffer;

-    QMessageBox::warning( this, tr("Error"), lineStr ,tr("Ok") );

-}

-

-bool AdvancedFm::eventFilter( QObject * o, QEvent * e ) {

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

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

-          QKeyEvent *ke = (QKeyEvent*)e;

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

-               ke->key() == Key_Enter )  {

-              okRename();

-              return true;

-            }

-          else if ( ke->key() == Key_Escape ) {

-                cancelRename();

-                return true;

-              }

-        }

-      else if ( e->type() == QEvent::FocusOut ) {

-            cancelRename();

-            return true;

-          }

-    }

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

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

-          if( o == Local_View) { //keep track of which view

-             whichTab=1;

-          }

-          else {

-             whichTab=2;

-          }

-       }

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

-     }

-

-  return QWidget::eventFilter( o, e );

-}

-

-

-void AdvancedFm::cancelRename() {

-//  qDebug("cancel rename");

-  QListView * view;

-  view = CurrentView();

-

-  bool resetFocus = view->viewport()->focusProxy() == renameBox;

-  delete renameBox;

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

-    r = QRect( view->viewportToContents( r.topLeft() ), r.size() );

-    r.setX( view->contentsX() );

-

-        if ( r.width() > view->visibleWidth() )

-        r.setWidth( view->visibleWidth() );

-

-    renameBox = new QLineEdit( view->viewport(), "qt_renamebox" );

-    renameBox->setFrame(true);

-

-    renameBox->setText(  view->currentItem()->text(0) );

-

-    renameBox->selectAll();

-    renameBox->installEventFilter( this );

-

-    view->addChild( renameBox, r.x(), r.y() );

-

-        renameBox->resize( r.size() );

-

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

-

-        renameBox->setFocus();

-    renameBox->show();

-}

-

-

-void AdvancedFm::renameIt() {

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

-

-        QListView *thisView = CurrentView();

-    oldName = thisView->currentItem()->text(0);

-    doRename( thisView );

-}

-

-void AdvancedFm::okRename() {

-   if( !renameBox) return;

-

-   QString newName = renameBox->text();

-     cancelRename();

-     QListView * view = CurrentView();

-   QString path =  CurrentDir()->canonicalPath() + "/";

-   oldName = path + oldName;

-   newName = path + newName;

-   if( rename( oldName.latin1(), newName.latin1())== -1)

-      QMessageBox::message(tr("Note"),tr("Could not rename"));

-   else

-      oldName = "";

-   QListViewItem *item = view->currentItem();

-   view->takeItem( item );

-   delete item;

-     rePopulate();

-}

-

-void AdvancedFm::openSearch() {

-    QMessageBox::message(tr("Note"),tr("Not Yet Implemented"));

-}

+/***************************************************************************
+   AdvancedFm.cpp
+  -------------------
+  ** Created: Sat Mar 9 23:33:09 2002
+    copyright            : (C) 2002 by ljp
+    email               : ljp@llornkcor.com
+    *   This program is free software; you can redistribute it and/or modify  *
+    *   it under the terms of the GNU General Public License as published by  *
+    *   the Free Software Foundation; either version 2 of the License, or     *
+    *   (at your option) any later version.                                   *
+    ***************************************************************************/
+
+#include "advancedfm.h"
+#include "output.h"
+#include "filePermissions.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/lnkproperties.h>
+#include <qpe/qpeapplication.h>
+#include <qpe/applnk.h>
+using namespace Opie::Core;
+
+/* QT*/
+
+#include <qmessagebox.h>
+#include <qpopupmenu.h>
+#include <qlistview.h>
+
+/* STD */
+
+#include <errno.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/stat.h>
+#include <dirent.h>
+#include <sys/sendfile.h>
+#include <fcntl.h>
+
+void AdvancedFm::doDirChange() {
+   QString pathItem = CurrentView()->currentItem()->text(0);
+   if( pathItem == "../") {
+      ListClicked( CurrentView()->currentItem());
+   } else {
+      if( pathItem.find(" -> ",0,TRUE) != -1)
+         pathItem = dealWithSymName((const QString&)pathItem)+"/";
+//      owarn << pathItem << oendl; 
+      gotoDirectory( CurrentDir()->path()+"/"+pathItem.left( pathItem.length() - 1) );
+   }
+}
+
+void AdvancedFm::showMenuHidden() {
+  if (b) {
+      CurrentDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
+      OtherDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
+      fileMenu->setItemChecked( fileMenu->idAt(0),TRUE);
+    } else {
+      CurrentDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
+      OtherDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
+      fileMenu->setItemChecked( fileMenu->idAt(0),FALSE);
+    }
+     b = !b;
+         populateView();
+}
+
+void AdvancedFm::showHidden() {
+  if (b) {
+      CurrentDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
+      OtherDir()->setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
+    }  else {
+      CurrentDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
+      OtherDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
+    }
+         populateView();
+}
+
+QString AdvancedFm::dealWithSymName(const QString &fileName) {
+   QString strItem = fileName;
+   return  strItem.right( (strItem.length() - strItem.find("->",0,TRUE)) - 4);
+}
+
+void AdvancedFm::runThis() {
+   if( !CurrentView()->currentItem()) return;
+  QString fs;
+  QDir *thisDir = CurrentDir();
+
+  QString curFile = CurrentView()->currentItem()->text(0);
+  QString path = thisDir->canonicalPath();
+
+  if( curFile.find("@",0,TRUE) !=-1 || curFile.find("->",0,TRUE) !=-1 )  //if symlink
+
+    curFile = dealWithSymName((const QString&)curFile);
+
+  if(curFile != "../") {
+
+      fs = getFileSystemType((const QString &) path);
+      QFileInfo fileInfo( path  + "/" + curFile);
+//      odebug << fileInfo.owner() << oendl; 
+
+      if( (fileInfo.permission( QFileInfo::ExeUser)
+           | fileInfo.permission( QFileInfo::ExeGroup)
+           | fileInfo.permission( QFileInfo::ExeOther)) // & fs.find("vfat",0,TRUE) == -1) {
+          | fs == "vfat" && fileInfo.filePath().contains("/bin") ) {
+        QCopEnvelope e("QPE/System", "execute(QString)" );
+        e << curFile;
+      } else {
+          curFile =  path + "/" + curFile;
+          DocLnk nf(curFile);
+          QString execStr = nf.exec();
+//          odebug << execStr << oendl; 
+          if( execStr.isEmpty() ) {
+            } else {
+              nf.execute();
+            }
+        }
+    }
+}
+
+void AdvancedFm::runText() {
+   if( !CurrentView()->currentItem()) return;
+  QString curFile = CurrentView()->currentItem()->text(0);
+  if(curFile != "../") {
+      if( curFile.find("@",0,TRUE) !=-1 || curFile.find("->",0,TRUE) !=-1 )  //if symlink
+        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();
+  if( fileDlg->result() == 1 ) {
+      QDir *thisDir = CurrentDir();
+      QString  filename = fileDlg->LineEdit1->text();
+      thisDir->mkdir( thisDir->canonicalPath()+"/"+filename);
+  }
+    populateView();
+}
+
+void AdvancedFm::doDelete() {
+   QStringList curFileList = getPath();
+   bool doMsg=true;
+   int count = curFileList.count();
+   if( count > 0)  {
+      if(count > 1 ) {
+         QString msg;
+         msg=tr("Really delete\n%1 files?").arg(count);
+         switch ( QMessageBox::warning(this,tr("Delete"),msg
+                                       ,tr("Yes"),tr("No"),0,0,1) )
+         {
+         case 0:
+            doMsg=false;
+            break;
+         case 1:
+            return;
+            break;
+         };
+      }
+
+      QString myFile;
+
+      for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
+         myFile = (*it);
+         if( myFile.find(" -> ",0,TRUE) != -1)
+            myFile = myFile.left( myFile.find(" -> ",0,TRUE));
+
+         QString f = CurrentDir()->canonicalPath();
+         if(f.right(1).find("/",0,TRUE) == -1)
+            f += "/";
+         f += myFile;
+         if(QDir(f).exists() && !QFileInfo(f).isSymLink() ) {
+            //if file is a directory
+
+            switch ( QMessageBox::warning( this, tr("Delete Directory?"),
+                                           tr("Really delete %1\nand all it's contents ?" ).arg( f ) ,
+                                           tr("Yes"), tr("No"), 0, 0, 1) ) {
+            case 0:
+            {
+               f=f.left(f.length()-1);
+               QString cmd="rm -rf "+f;
+               startProcess( (const QString)cmd.latin1() );
+                             populateView();
+            }
+            break;
+            case 1:
+               // exit
+               break;
+            };
+
+         } else {
+            if(doMsg) {
+               switch ( QMessageBox::warning(this,tr("Delete"),
+                                             tr("Really delete\n%1?").arg( myFile ),
+                                             tr("Yes"), tr("No"), 0, 0, 1) ) {
+               case 1:
+                  return;
+                  break;
+               };
+            }
+
+            QString cmd="rm "+f;
+            QFile file(f);
+            QFileInfo fi(myFile);
+            if( fi.fileName().find("../",0,TRUE)==-1) {
+//               odebug << "remove link files "+myFile << oendl; 
+
+//               DocLnk lnk(f);
+                 DocLnk *lnk;
+                 lnk = new DocLnk(f);
+//                 odebug << "Deleting doclnk " + lnk->linkFile() << oendl; 
+                 if(lnk->isValid())
+                    lnk->removeLinkFile();
+               // delete lnk;
+               file.remove();
+            }
+         }
+      }
+   }
+    populateView();
+}
+
+void AdvancedFm::filePerms() {
+   QStringList curFileList = getPath();
+   QString filePath;
+
+   filePath = CurrentDir()->canonicalPath()+"/";
+
+   for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
+      filePermissions *filePerm;
+      filePerm = new filePermissions(this, "Permissions",true,0,(const QString &)(filePath+*it));
+      QPEApplication::execDialog( filePerm );
+      if( filePerm )
+         delete  filePerm;
+   }
+    populateView();
+}
+
+void AdvancedFm::doProperties() {
+#if defined(QT_QWS_OPIE)
+
+   QStringList curFileList = getPath();
+
+   QString filePath;
+   filePath = CurrentDir()->canonicalPath()+"/";
+
+//   odebug << "" << curFileList.count() << "" << oendl; 
+
+   for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
+//      odebug << (filePath+*it) << oendl; 
+      DocLnk lnk( (filePath+*it));
+      LnkProperties prop( &lnk );
+      QPEApplication::execDialog( &prop );
+   }
+#endif
+
+}
+
+void AdvancedFm::upDir() {
+  QDir *thisDir = CurrentDir();
+  QString current = thisDir->canonicalPath();
+  QDir dir(current);
+  dir.cdUp();
+  current = dir.canonicalPath();
+  chdir( current.latin1() );
+  thisDir->cd(  current, TRUE);
+
+    populateView();
+  update();
+}
+
+void AdvancedFm::copy() {
+   qApp->processEvents();
+   QStringList curFileList = getPath();
+
+   QDir *thisDir = CurrentDir();
+   QDir *thatDir = OtherDir();
+
+   bool doMsg=true;
+   int count=curFileList.count();
+   if( count > 0) {
+      if(count > 1 ){
+         QString msg;
+         msg=tr("Really copy\n%1 files?").arg(count);
+         switch ( QMessageBox::warning(this,tr("Copy"),msg
+                                       ,tr("Yes"),tr("No"),0,0,1) )
+         {
+         case 0:
+            doMsg=false;
+            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
+            item = item.left(item.find("->",0,TRUE));
+
+         curFile = thisDir->canonicalPath()+"/"+ item;
+         destFile = thatDir->canonicalPath()+"/"+ item;
+
+//          odebug << "Destination file is "+destFile << oendl; 
+//          odebug << "CurrentFile file is " + curFile << oendl; 
+
+         QFile f(destFile);
+         if( f.exists()) {
+            if(doMsg) {
+               switch ( QMessageBox::warning(this,tr("File Exists!"),
+                                             tr("%1 exists. Ok to overwrite?").arg( item ),
+                                             tr("Yes"),tr("No"),0,0,1) ) {
+               case 1:
+                  return;
+                  break;
+               };
+            }
+            f.remove();
+         }
+
+         if( !copyFile( curFile, destFile) )  {
+            QMessageBox::message("AdvancedFm",
+                                 tr( "Could not copy %1 to %2").arg( curFile ).arg( destFile ) );
+            return;
+         }
+      }
+            setOtherTabCurrent();
+            rePopulate();
+   }
+}
+
+void AdvancedFm::copyAs() {
+   qApp->processEvents();
+
+   QStringList curFileList = getPath();
+   QString curFile, item;
+   InputDialog *fileDlg;
+
+   QDir *thisDir = CurrentDir();
+   QDir *thatDir = OtherDir();
+
+   for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
+      QString destFile;
+      item=(*it);
+      curFile = thisDir->canonicalPath()+"/"+(*it);
+      fileDlg = new InputDialog( this, tr("Copy "+curFile+" As"), TRUE, 0);
+
+      fileDlg->setInputText((const QString &) destFile );
+      fileDlg->exec();
+
+      if( fileDlg->result() == 1 ) {
+         QString  filename = fileDlg->LineEdit1->text();
+         destFile = thatDir->canonicalPath()+"/"+filename;
+
+         QFile f( destFile);
+         if( f.exists()) {
+            switch (QMessageBox::warning(this,tr("File Exists!"),
+                                         item+tr("\nexists. Ok to overwrite?"),
+                                         tr("Yes"),tr("No"),0,0,1) ) {
+            case 0:
+               f.remove();
+               break;
+            case 1:
+               return;
+               break;
+            };
+         }
+         if( !copyFile( curFile, destFile) ) {
+            QMessageBox::message("AdvancedFm",tr("Could not copy\n")
+                                 +curFile +tr("to\n")+destFile);
+            return;
+         }
+      }
+      delete fileDlg;
+
+   }
+            rePopulate();
+            setOtherTabCurrent();
+}
+
+void AdvancedFm::copySameDir() {
+  qApp->processEvents();
+  QStringList curFileList = getPath();
+  QString curFile, item, destFile;
+  InputDialog *fileDlg;
+
+  QDir *thisDir = CurrentDir();
+
+  for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
+      item=(*it);
+      curFile = thisDir->canonicalPath()+"/"+ item;
+
+      fileDlg = new InputDialog(this,tr("Copy ")+curFile+tr(" As"),TRUE, 0);
+      fileDlg->setInputText((const QString &) destFile );
+      fileDlg->exec();
+
+      if( fileDlg->result() == 1 ) {
+
+          QString filename = fileDlg->LineEdit1->text();
+          destFile = thisDir->canonicalPath()+"/"+filename;
+
+          QFile f(destFile);
+          if( f.exists()) {
+              switch (QMessageBox::warning(this,tr("Delete"),
+                                           destFile+tr(" already exists.\nDo you really want to delete it?"),
+                                           tr("Yes"),tr("No"),0,0,1) ) {
+              case 0:
+
+                f.remove();
+                break;
+              case 1:
+                return;
+                break;
+              };
+            }
+          if(!copyFile( curFile,destFile) )  {
+              QMessageBox::message("AdvancedFm",tr("Could not copy\n")
+                                   +curFile +tr("to\n")+destFile);
+              return;
+            }
+
+//          odebug << "copy "+curFile+" as "+destFile << oendl; 
+        }
+      delete fileDlg;
+    }
+            rePopulate();
+}
+
+void AdvancedFm::move() {
+  qApp->processEvents();
+
+  QStringList curFileList = getPath();
+  if( curFileList.count() > 0) {
+      QString curFile, destFile, item;
+
+      QDir *thisDir = CurrentDir();
+      QDir *thatDir = OtherDir();
+      for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
+          item=(*it);
+          QString destFile =  thatDir->canonicalPath();
+
+          if(destFile.right(1).find("/",0,TRUE) == -1)
+            destFile+="/";
+          destFile += item;
+//          odebug << "Destination file is "+destFile << oendl; 
+
+          curFile = thisDir->canonicalPath();
+          if(curFile.right(1).find("/",0,TRUE) == -1)
+                            curFile +="/";
+          curFile+= item;
+//          odebug << "CurrentFile file is " + curFile << oendl; 
+
+          if(QFileInfo(curFile).isDir()) {
+                            moveDirectory( curFile, destFile );
+                            rePopulate();
+                            return;
+          }
+
+                    QFile f( curFile);
+          if( f.exists()) {
+                            if( !copyFile(  curFile, destFile) )  {
+                                    QMessageBox::message(tr("Note"),tr("Could not move\n")+curFile);
+                                    return;
+              } else
+                                    QFile::remove(curFile);
+          }
+            }
+
+  }
+            rePopulate();
+            setOtherTabCurrent();
+}
+
+bool AdvancedFm::moveDirectory( const QString & src, const QString & dest ) {
+        int err = 0;
+        if( copyDirectory( src, dest ) ) {      QString cmd = "rm -rf " + src;
+        err = system((const char*)cmd);
+        } else
+                err = -1;
+
+        if(err!=0) {
+                QMessageBox::message(tr("Note"),tr("Could not move\n") + src);
+                return false;
+        }
+        return true;
+}
+
+bool AdvancedFm::copyDirectory( const QString & src, const QString & dest ) {
+
+        QString    cmd = "/bin/cp -fpR " + src + " " + dest;
+    owarn << cmd << oendl; 
+        int    err = system( (const char *) cmd );
+        if ( err != 0 ) {
+                QMessageBox::message("AdvancedFm",
+                                                         tr( "Could not copy \n%1 \nto \n%2").arg( src ).arg( dest ) );
+                return false;
+        }
+
+        return true;
+}
+
+
+bool AdvancedFm::copyFile( const QString & src, const QString & dest ) {
+
+
+        if(QFileInfo(src).isDir()) {
+                if( copyDirectory( src, dest )) {
+                        setOtherTabCurrent();
+                        populateView();
+                        return true;
+                }
+                else
+                        return false;
+        }
+
+
+        bool success = true;
+        struct stat status;
+        QFile srcFile(src);
+        QFile destFile(dest);
+        int err=0;
+        int read_fd=0;
+   int write_fd=0;
+   struct stat stat_buf;
+   off_t offset = 0;
+      if(!srcFile.open( IO_ReadOnly|IO_Raw)) {
+//         owarn << "open failed" << oendl; 
+         return success = false;
+   }
+   read_fd = srcFile.handle();
+   if(read_fd != -1) {
+      fstat (read_fd, &stat_buf);
+      if( !destFile.open( IO_WriteOnly|IO_Raw ) ) {
+//       owarn << "destfile open failed" << oendl; 
+       return success = false;
+      }
+      write_fd = destFile.handle();
+      if(write_fd != -1) {
+         err = sendfile(write_fd, read_fd, &offset, stat_buf.st_size);
+           if( err == -1) {
+              QString msg;
+              switch(err) {
+              case EBADF : msg = "The input file was not opened for reading or the output file was not opened for writing. ";
+              case EINVAL: msg = "Descriptor is not valid or locked. ";
+              case ENOMEM: msg = "Insufficient memory to read from in_fd.";
+              case EIO: msg = "Unspecified error while reading from in_fd.";
+              };
+              success = false;
+//              owarn << msg << oendl; 
+         }
+      } else {
+         success = false;
+      }
+   } else {
+      success = false;
+   }
+   srcFile.close();
+   destFile.close();
+    // Set file permissions
+  if( stat( (const char *) src, &status ) == 0 )  {
+      chmod( (const char *) dest, status.st_mode );
+    }
+
+  return success;
+}
+
+void AdvancedFm::runCommand() {
+   if( !CurrentView()->currentItem()) return;
+   QDir *thisDir = CurrentDir();
+
+   QString curFile;
+   curFile = thisDir->canonicalPath() +"/"+ CurrentView()->currentItem()->text(0);
+
+   InputDialog *fileDlg;
+   fileDlg = new InputDialog(this,tr("Run Command"),TRUE, 0);
+   fileDlg->setInputText(curFile);
+   fileDlg->exec();
+   //QString command;
+
+   if( fileDlg->result() == 1 ) {
+//      odebug << fileDlg->LineEdit1->text() << oendl; 
+      QStringList command;
+
+      command << "/bin/sh";
+      command << "-c";
+      command <<  fileDlg->LineEdit1->text();
+      Output *outDlg;
+      outDlg = new Output( command, this, tr("AdvancedFm Output"), true);
+      QPEApplication::execDialog( outDlg );
+      qApp->processEvents();
+
+   }
+}
+
+void AdvancedFm::runCommandStd() {
+   if( !CurrentView()->currentItem()) return;
+   QString curFile;
+   QDir *thisDir = CurrentDir();
+   QListView *thisView = CurrentView();
+   if( thisView->currentItem())
+      curFile = thisDir->canonicalPath() +"/"+  thisView->currentItem()->text(0);
+
+   InputDialog *fileDlg;
+   fileDlg = new InputDialog(this,tr("Run Command"),TRUE, 0);
+   fileDlg->setInputText(curFile);
+   fileDlg->exec();
+
+   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);
+
+   QStringList command;
+   command << "/bin/sh";
+   command << "-c";
+   command << "stat -l "+ curFile;
+
+   Output *outDlg;
+   outDlg = new Output( command, this, tr("AdvancedFm Output"), true);
+   QPEApplication::execDialog( outDlg );
+   qApp->processEvents();
+}
+
+
+void AdvancedFm::mkDir() {
+    makeDir();
+}
+
+void AdvancedFm::rn() {
+  renameIt();
+}
+
+void AdvancedFm::del() {
+    doDelete();
+}
+
+void AdvancedFm::mkSym() {
+  QString cmd;
+  QStringList curFileList = getPath();
+  if( curFileList.count() > 0) {
+      QDir *thisDir = CurrentDir();
+      QDir * thatDir = OtherDir();
+
+      for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
+
+          QString destName = thatDir->canonicalPath()+"/"+(*it);
+          if(destName.right(1) == "/") {
+              destName = destName.left( destName.length() -1);
+            }
+
+          QString curFile =  thisDir->canonicalPath()+"/"+(*it);
+
+          if( curFile.right(1) == "/") {
+              curFile = curFile.left( curFile.length() -1);
+            }
+
+          cmd = "ln -s "+curFile+" "+destName;
+//          odebug << cmd << oendl; 
+          startProcess( (const QString)cmd );
+        }
+            rePopulate();
+            setOtherTabCurrent();
+    }
+}
+
+void AdvancedFm::doBeam() {
+   Ir ir;
+   if(!ir.supported())  {
+   } else {
+      QStringList curFileList = getPath();
+      if( curFileList.count() > 0)  {
+         for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
+            QString curFile = (*it);
+            QString curFilePath =  CurrentDir()->canonicalPath()+"/"+curFile;
+            if( curFilePath.right(1) == "/") {
+               curFilePath = curFilePath.left( curFilePath.length() -1);
+            }
+            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::selectAll() {
+  QListView *thisView = CurrentView();
+  thisView->selectAll(true);
+  thisView->setSelected( thisView->firstChild(),false);
+}
+
+void AdvancedFm::startProcess(const QString & cmd) {
+  QStringList command;
+  OProcess *process;
+  process = new OProcess();
+  connect(process, SIGNAL(processExited(Opie::Core::OProcess*)),
+          this, SLOT( processEnded(Opie::Core::OProcess*)));
+
+  connect(process, SIGNAL( receivedStderr(Opie::Core::OProcess*,char*,int)),
+          this, SLOT( oprocessStderr(Opie::Core::OProcess*,char*,int)));
+
+  command << "/bin/sh";
+  command << "-c";
+  command << cmd.latin1();
+  *process << command;
+  if(!process->start(OProcess::NotifyOnExit, OProcess::All) )
+    odebug << "could not start process" << oendl; 
+}
+
+void AdvancedFm::processEnded(OProcess *) {
+            rePopulate();
+}
+
+void AdvancedFm::oprocessStderr(OProcess*, char *buffer, int ) {
+//    owarn << "received stderrt " << buflen << " bytes" << oendl; 
+
+    QString lineStr = buffer;
+    QMessageBox::warning( this, tr("Error"), lineStr ,tr("Ok") );
+}
+
+bool AdvancedFm::eventFilter( QObject * o, QEvent * e ) {
+  if ( o->inherits( "QLineEdit" ) )  {
+      if ( e->type() == QEvent::KeyPress ) {
+          QKeyEvent *ke = (QKeyEvent*)e;
+          if ( ke->key() == Key_Return ||
+               ke->key() == Key_Enter )  {
+              okRename();
+              return true;
+            }
+          else if ( ke->key() == Key_Escape ) {
+                cancelRename();
+                return true;
+              }
+        }
+      else if ( e->type() == QEvent::FocusOut ) {
+            cancelRename();
+            return true;
+          }
+    }
+   if ( o->inherits( "QListView" ) ) {
+       if ( e->type() == QEvent::FocusIn ) {
+          if( o == Local_View) { //keep track of which view
+             whichTab=1;
+          }
+          else {
+             whichTab=2;
+          }
+       }
+       OtherView()->setSelected( OtherView()->currentItem(), FALSE );//make sure there's correct selection
+     }
+
+  return QWidget::eventFilter( o, e );
+}
+
+
+void AdvancedFm::cancelRename() {
+//  odebug << "cancel rename" << oendl; 
+  QListView * view;
+  view = CurrentView();
+
+  bool resetFocus = view->viewport()->focusProxy() == renameBox;
+  delete renameBox;
+  renameBox = 0;
+  if ( resetFocus ) {
+      view->viewport()->setFocusProxy( view);
+      view->setFocus();
+    }
+}
+
+void AdvancedFm::doRename(QListView * view) {
+   if( !CurrentView()->currentItem()) return;
+
+    QRect r = view->itemRect( view->currentItem( ));
+    r = QRect( view->viewportToContents( r.topLeft() ), r.size() );
+    r.setX( view->contentsX() );
+
+        if ( r.width() > view->visibleWidth() )
+        r.setWidth( view->visibleWidth() );
+
+    renameBox = new QLineEdit( view->viewport(), "qt_renamebox" );
+    renameBox->setFrame(true);
+
+    renameBox->setText(  view->currentItem()->text(0) );
+
+    renameBox->selectAll();
+    renameBox->installEventFilter( this );
+
+    view->addChild( renameBox, r.x(), r.y() );
+
+        renameBox->resize( r.size() );
+
+        view->viewport()->setFocusProxy( renameBox );
+
+        renameBox->setFocus();
+    renameBox->show();
+}
+
+
+void AdvancedFm::renameIt() {
+        if( !CurrentView()->currentItem()) return;
+
+        QListView *thisView = CurrentView();
+    oldName = thisView->currentItem()->text(0);
+    doRename( thisView );
+}
+
+void AdvancedFm::okRename() {
+   if( !renameBox) return;
+
+   QString newName = renameBox->text();
+     cancelRename();
+     QListView * view = CurrentView();
+   QString path =  CurrentDir()->canonicalPath() + "/";
+   oldName = path + oldName;
+   newName = path + newName;
+   if( rename( oldName.latin1(), newName.latin1())== -1)
+      QMessageBox::message(tr("Note"),tr("Could not rename"));
+   else
+      oldName = "";
+   QListViewItem *item = view->currentItem();
+   view->takeItem( item );
+   delete item;
+     rePopulate();
+}
+
+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
@@ -32,7 +32,7 @@ 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 ) );
 */    setCaption( tr( "Set File Permissions" ) );
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
@@ -5,19 +5,22 @@
 ****************************************************************************/
 #include "output.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/applnk.h>
+using namespace Opie::Core;
 
+/* QT */
 #include <qfile.h>
 #include <qmultilineedit.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 
+/* STD */
 #include <errno.h>
 
 /* XPM */
-using namespace Opie::Core;
-using namespace Opie::Core;
 static char * filesave_xpm[] = {
 "16 16 78 1",
 "   c None",
@@ -121,7 +124,7 @@ Output::Output( const QStringList commands, QWidget* parent,  const char* name,
    QStringList cmmds;
 //   cmmds=QStringList::split( " ", commands, false);
    cmmds=commands;
-//   qDebug("count %d", cmmds.count());
+//   odebug << "count " << cmmds.count() << "" << oendl; 
    if ( !name )
        setName( tr("Output"));
     resize( 196, 269 );
@@ -157,7 +160,7 @@ 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();
       }
 
@@ -186,7 +189,7 @@ void Output::saveOutput() {
           filename+="/";
       QString name = fileDlg->LineEdit1->text();
       filename+="text/plain/"+name;
-      qDebug(filename);
+      odebug << filename << oendl; 
 
       QFile f(filename);
       f.open( IO_WriteOnly);
@@ -196,16 +199,16 @@ void Output::saveOutput() {
           lnk.setFile(filename); //sets File property
           lnk.setType("text/plain");
           if(!lnk.writeLink()) {
-              qDebug("Writing doclink did not work");
+              odebug << "Writing doclink did not work" << oendl; 
           }
       } else
-          qWarning("Could not write file");
+          owarn << "Could not write file" << oendl; 
       f.close();
     }
 }
 
 void Output::commandStdout(OProcess*, char *buffer, int buflen) {
-    qWarning("received stdout %d bytes", buflen);
+    owarn << "received stdout " << buflen << " bytes" << oendl; 
 
 //     QByteArray data(buflen);
 //     data.fill(*buffer, buflen);
@@ -222,13 +225,13 @@ 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());
 }
 
 void Output::commandStderr(OProcess*, char *buffer, int buflen) {
-    qWarning("received stderrt %d bytes", buflen);
+    owarn << "received stderrt " << buflen << " bytes" << oendl; 
 
     QString lineStr = buffer;
 //    lineStr=lineStr.left(lineStr.length()-1);
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,4 +1,4 @@
-CONFIG    = qt warn_on  quick-app
+CONFIG    = qt warn_on quick-app
 HEADERS   = mainwindow.h \
       cbinfo.h        \
       traninfo.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
@@ -27,14 +27,19 @@
 */
 
 #include "listedit.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/resource.h>
+using namespace Opie::Core;
+
+/* QT */
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qlistview.h>
 #include <qwidgetstack.h>
 #include <qcombobox.h>
 #include <qpushbutton.h>
-#include <qpe/resource.h>
-
 
 // --- ListEdit ---------------------------------------------------------------
 ListEdit::ListEdit( QWidget *parent, const char *sName )
@@ -302,7 +307,7 @@ 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
@@ -28,6 +28,8 @@
 
 #include "tabledef.h"
 
+#include <opie2/odebug.h>
+using namespace Opie::Core;
 
 // --- ColumnDef --------------------------------------------------------------
 ColumnDef::ColumnDef(const char *sName, ColumnType type, const char *sNewValue)
@@ -42,14 +44,14 @@ ColumnDef::ColumnDef(const char *sName, ColumnType type, const char *sNewValue)
 void ColumnDef::addColumnValue(const QString &sValue)
 {
     if( (_type & 0x00ffffff) !=typeList )
-        qDebug("Column %s is not a list", (const char *)_sName);
+        odebug << "Column " << (const char *)_sName << " is not a list" << oendl; 
     else
         _valueList.append(sValue);
 }
 void ColumnDef::addColumnValue(const char *sValue)
 {
     if( (_type & 0x00ffffff)!=typeList )
-        qDebug("Column %s is not a list", (const char *)_sName);
+        odebug << "Column " << (const char *)_sName << " is not a list" << oendl; 
     else
         _valueList.append(sValue);
 }
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
@@ -31,8 +31,12 @@
 #include "cfg.h"
 #include "checkbook.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
 #include <qpe/datebookmonth.h>
+using namespace Opie::Core;
 
+/* QT */
 #include <qbuttongroup.h>
 #include <qcombobox.h>
 #include <qlabel.h>
@@ -332,6 +336,6 @@ void Transaction::slotActivated(const QString &arg )
 // slotNotNew -----------------------------------------------------------------
 void Transaction::slotNotNew()
 {
-    qDebug("Not new");
+    odebug << "Not new" << oendl; 
     _bNew=false;
 }
diff --git a/noncore/apps/confedit/confedit.pro b/noncore/apps/confedit/confedit.pro
index 5a71680..785c588 100644
--- a/noncore/apps/confedit/confedit.pro
+++ b/noncore/apps/confedit/confedit.pro
@@ -1,21 +1,9 @@
-CONFIG        = qt warn_on  quick-app
-HEADERS        = mainwindow.h listviewconfdir.h listviewitemconffile.h listviewitemconfigentry.h editwidget.h listviewitemconf.h
-SOURCES        = main.cpp mainwindow.cpp listviewconfdir.cpp listviewitemconffile.cpp listviewitemconfigentry.cpp editwidget.cpp listviewitemconf.cpp
-INCLUDEPATH     += $(OPIEDIR)/include
+CONFIG        = qt warn_on quick-app
+HEADERS       = mainwindow.h listviewconfdir.h listviewitemconffile.h listviewitemconfigentry.h editwidget.h listviewitemconf.h
+SOURCES       = main.cpp mainwindow.cpp listviewconfdir.cpp listviewitemconffile.cpp listviewitemconfigentry.cpp editwidget.cpp listviewitemconf.cpp
+INCLUDEPATH   += $(OPIEDIR)/include
 DEPENDPATH    += $(OPIEDIR)/include
-INTERFACES    =
-LIBS            += -lopiecore2
+LIBS          += -lqpe -lopiecore2
 TARGET        = confedit
 
-!contains( platform, x11 ) {
-
-  include ( $(OPIEDIR)/include.pro )
-  LIBS += -lqpe
-}
-
-contains( platform, x11 ) {
-  LIBS        += -L$(OPIEDIR)/lib -Wl,-rpath,$(OPIEDIR)/lib
-}
-
-
-
+include ( $(OPIEDIR)/include.pro )
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
@@ -9,10 +9,14 @@
   // (c) 2002 Patrick S. Vogtp <tille@handhelds.org>
 
 #include "listviewconfdir.h"
+#include "listviewitemconffile.h"
 
-#include <qmessagebox.h>
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
 
-#include "listviewitemconffile.h"
+/* QT */
+#include <qmessagebox.h>
 
 ListViewConfDir::ListViewConfDir(QString settingsPath, QWidget *parent, const char *name )
   : QListView(parent,name), confDir(settingsPath)
@@ -36,7 +40,7 @@ ListViewConfDir::~ListViewConfDir()
 void ListViewConfDir::readConfFiles()
 {
 
-	confDir.setFilter( QDir::Files | QDir::NoSymLinks );
+  confDir.setFilter( QDir::Files | QDir::NoSymLinks );
   confDir.setSorting( QDir::Name );
   confDir.setNameFilter("*.conf");
   const QFileInfoList *list = confDir.entryInfoList();
@@ -47,7 +51,7 @@ 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");
   	++it;
diff --git a/noncore/apps/confedit/listviewitemconffile.cpp b/noncore/apps/confedit/listviewitemconffile.cpp
index 1ff2c44..2958cf5 100644
--- a/noncore/apps/confedit/listviewitemconffile.cpp
+++ b/noncore/apps/confedit/listviewitemconffile.cpp
@@ -9,9 +9,15 @@
 // (c) 2002 Patrick S. Vogt <tille@handhelds.org>
 
 #include "listviewitemconffile.h"
+#include "listviewitemconfigentry.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
+/* QT */
 #include <qmessagebox.h>
 #include <qtextstream.h>
-#include "listviewitemconfigentry.h"
 
 #define tr QObject::tr
 
@@ -19,7 +25,7 @@ ListViewItemConfFile::ListViewItemConfFile(QFileInfo *file, QListView *parent)
    : ListViewItemConf(parent), _valid(false)
 {
   confFileInfo = file;
-//  parseFile();
+  //  parseFile();
   displayText();
 }
 
@@ -40,8 +46,8 @@ QString ListViewItemConfFile::fileName()
 
 void ListViewItemConfFile::parseFile()
 {
-	//qDebug("ListViewItemConfFile::parseFile BEGIN");
-  QFile confFile(confFileInfo->absFilePath());
+	//odebug << "ListViewItemConfFile::parseFile BEGIN" << oendl; 
+        QFile confFile(confFileInfo->absFilePath());
 	if(! confFile.open(IO_ReadOnly))
  		QMessageBox::critical(0,tr("Could not open"),tr("The file ")+confFileInfo->fileName()+tr(" could not be opened."),1,0);	
 	QTextStream t( &confFile );
@@ -52,7 +58,7 @@ void ListViewItemConfFile::parseFile()
   while ( !t.atEnd() )
   {
   	s = t.readLine().stripWhiteSpace();
-		//qDebug( "line: >%s<\n", s.latin1() );
+		//odebug << "line: >" << s.latin1() << "<\n" << oendl; 
   	if (s.contains("<?xml"))
    	{
     	_valid = false;
@@ -60,7 +66,7 @@ void ListViewItemConfFile::parseFile()
     }else
     if ( s[0] == '[' && s[s.length()-1] == ']' )
    	{
-  //    qDebug("got group"+s);
+  //    odebug << "got group"+s << oendl; 
       group = s.mid(1,s.length()-2);
       if (!groupItem) groupItem = new ListViewItemConfigEntry(this, tr("no group") );
       groupItem = new ListViewItemConfigEntry(this, group );
@@ -68,15 +74,15 @@ void ListViewItemConfFile::parseFile()
     } else
     if ( int pos = s.find('=') )
     {
-//      qDebug("got key"+s);
-     	if (!groupItem) qDebug("PANIK NO GROUP! >%s<",group.latin1());
+//      odebug << "got key"+s << oendl; 
+     	if (!groupItem) odebug << "PANIK NO GROUP! >" << group.latin1() << "<" << oendl; 
     	item = new ListViewItemConfigEntry(this, group, s );
       groupItem->insertItem( item );
     }
   }	
 	confFile.close();
 	setExpandable( _valid );
-//	qDebug("ListViewItemConfFile::parseFile END");
+//	odebug << "ListViewItemConfFile::parseFile END" << oendl; 
 }
 
 
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
@@ -11,15 +11,18 @@
 
 
 #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)
 {
@@ -33,12 +36,12 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
   mainLayout->setMargin( 0 );
 
 
-  qDebug("creating settingList");
+  odebug << "creating settingList" << oendl; 
   settingList = new ListViewConfDir( QDir::homeDirPath() + "/Settings", this, "settingslist");
   settingList->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));//, sizePolicy().hasHeightForWidth() ) );
   mainLayout->addWidget( settingList, 0);
 
-  qDebug("creating editor");
+  odebug << "creating editor" << oendl; 
   editor = new EditWidget(this);
   editor->setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Maximum));//, sizePolicy().hasHeightForWidth() ) );
   mainLayout->addWidget( editor, 1 );
@@ -98,7 +101,7 @@ MainWindow::~MainWindow()
 
 void MainWindow::setCurrent(QListViewItem *item)
 {
-//	qDebug("MainWindow::setCurrent");
+//	odebug << "MainWindow::setCurrent" << oendl; 
 	if (!item) return;
  	_item = (ListViewItemConf*) item;
   if (!_item) return;
@@ -174,7 +177,7 @@ void MainWindow::removeConfFile()
 
 void MainWindow::showPopup()
 {
-qDebug("showPopup");
+odebug << "showPopup" << oendl; 
  	if (!_item) return;
  	popupActionRevert->setEnabled(_item->revertable());
 	popupActionSave->setEnabled(_item->isChanged());
diff --git a/noncore/apps/keyz-cfg/cfgfile.cpp b/noncore/apps/keyz-cfg/cfgfile.cpp
index b0dc968..81d1ee1 100644
--- a/noncore/apps/keyz-cfg/cfgfile.cpp
+++ b/noncore/apps/keyz-cfg/cfgfile.cpp
@@ -1,6 +1,12 @@
-#include <qmessagebox.h>
 #include "cfgfile.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
+/* QT */
+#include <qmessagebox.h>
+
 // CfgEntry implementation
 CfgEntry::CfgEntry() {
 }
@@ -95,7 +101,7 @@ bool CfgParser::load(QString file, CfgFile& cfg) {
 	reader.parse(is);
 
 	if (!err.isEmpty()) {
-		qDebug(err);
+		odebug << err << oendl; 
 		return false;
 	}
 
@@ -106,7 +112,7 @@ bool CfgParser::load(QString file, CfgFile& cfg) {
 		QString prefix = fit.data();
 		QString label = "";
 
-		qDebug("include: file=" + fit.key() + ", prefix=" + fit.data());
+		odebug << "include: file=" + fit.key() + ", prefix=" + fit.data() << oendl; 
 		lit = labels.find(prefix+":*");
 		if (lit != labels.end()) {
 			label = lit.data();
diff --git a/noncore/apps/keyz-cfg/config.in b/noncore/apps/keyz-cfg/config.in
index 29a10f5..8e1be2d 100644
--- a/noncore/apps/keyz-cfg/config.in
+++ b/noncore/apps/keyz-cfg/config.in
@@ -1,4 +1,4 @@
   config KEYZCFG
     boolean "keyz-cfg (configuration tool for keyz applet)"
     default "n"
-    depends ( LIBQPE || LIBQPE-X11 )
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
diff --git a/noncore/apps/keyz-cfg/keyz-cfg.pro b/noncore/apps/keyz-cfg/keyz-cfg.pro
index 44bbb5f..7ac604b 100644
--- a/noncore/apps/keyz-cfg/keyz-cfg.pro
+++ b/noncore/apps/keyz-cfg/keyz-cfg.pro
@@ -2,23 +2,23 @@ TEMPLATE        = app
 DESTDIR         = $(OPIEDIR)/bin
 CONFIG		= qt warn_on 
 HEADERS		= zkb.h \
-				zkbcfg.h \
-				zkbnames.h \
-				zkbxml.h \
-				cfgdlg.h \
-				cfgfile.h
+		  zkbcfg.h \
+		  zkbnames.h \
+		  zkbxml.h \
+		  cfgdlg.h \
+		  cfgfile.h
 
 SOURCES		= main.cpp \
 		  cfgdlg.cpp \
 		  cfgfile.cpp \
 		  zkb.cpp \
 		  zkbcfg.cpp \
-			zkbnames.cpp \
-			zkbxml.cpp
+		  zkbnames.cpp \
+		  zkbxml.cpp
 
 INCLUDEPATH     += $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
-LIBS		+= -lqpe
+LIBS		+= -lqpe -lopiecore2
 TARGET 		= keyz-cfg
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/keyz-cfg/zkb.cpp b/noncore/apps/keyz-cfg/zkb.cpp
index f315d4b..8382615 100644
--- a/noncore/apps/keyz-cfg/zkb.cpp
+++ b/noncore/apps/keyz-cfg/zkb.cpp
@@ -364,7 +364,7 @@ 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()) {
 		state = sit.data();
@@ -416,7 +416,7 @@ bool Keymap::setCurrentState(State* state) {
 			if (tit != stateLabelMap.end()) {
 				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,7 +1,11 @@
-#include <qfileinfo.h>
-
 #include "zkbcfg.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
+/* QT */
+#include <qfileinfo.h>
 
 // Implementation of XkbConfig class
 ZkbConfig::ZkbConfig(const QString& dir):path(dir) {
@@ -15,7 +19,7 @@ bool ZkbConfig::load(const QString& file, Keymap& keymap, const QString& prefix)
 	QFile f(path+"/"+file);
 	QFileInfo fi(f);
 
-	qDebug("start loading file=%s\n", (const char*) file.utf8());
+	odebug << "start loading file=" << (const char*) file.utf8() << "\n" << oendl; 
 	if (includedFiles.find(fi.absFilePath()) != includedFiles.end()) {
 		return false;
 	}
@@ -30,8 +34,7 @@ bool ZkbConfig::load(const QString& file, Keymap& keymap, const QString& prefix)
 	ret = reader.parse(is);
 	includedFiles.remove(fi.absFilePath());
 
-	qDebug("end loading file=%s : status=%s\n", (const char*) file.utf8(),
-		(const char*) err.utf8());
+	odebug << "end loading file=" << file.utf8() << ": status=" << err.utf8() << oendl;
 	return ret;
 }
 
@@ -122,7 +125,7 @@ bool ZkbHandler::startStateElement(const QString& name,
 	currentStateName = prefix + name;
 	currentState = keymap.getStateByName(currentStateName);
 
-//	qDebug("state name=%s\n", (const char*) currentStateName.utf8());
+//	odebug << "state name=" << (const char*) currentStateName.utf8() << "\n" << oendl; 
 
 	State* parent = 0;
 	if (!parentName.isEmpty()) {
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
@@ -16,12 +16,13 @@
 #include "searchresults.h"
 #include "bac.h"
 
-#include <qtoolbar.h>
-#include <qmenubar.h>
-//#include <opie2/colorpopupmenu.h>
+/* OPIE */
+#include <opie2/odebug.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
+using namespace Opie::Core;
 
+/* QT */
 #include <qlineedit.h>
 #include <qdir.h>
 #include <qpushbutton.h>
@@ -33,14 +34,16 @@
 #include <qheader.h>
 #include <qlistview.h>
 #include <qlayout.h>
+#include <qtoolbar.h>
+#include <qmenubar.h>
 
+/* STD */
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
 
-
 Bartender::Bartender( QWidget* parent,  const char* name, WFlags fl )
     : QMainWindow( parent, name, fl ) {
     if ( !name )
@@ -144,13 +147,13 @@ void Bartender::fillList() {
     while ( !t.eof()) {
         s = t.readLine();
         if(s.find("#",0,TRUE) != -1) {
-//            qDebug(s.right(s.length()-2));
+//            odebug << s.right(s.length()-2) << oendl; 
             item= new QListViewItem( DrinkView, 0 );
             item->setText( 0, s.right(s.length()-2));
             i++;
         }
     }
-    qDebug("there are currently %d of drinks", i);
+    odebug << "there are currently " << i << " of drinks" << oendl; 
 }
 
 void Bartender::fileNew() {
@@ -171,7 +174,7 @@ void Bartender::fileNew() {
     if(newDrinks ->result() == 1 ) {
         QString newDrink="\n# "+newName+"\n";
         newDrink.append(newIng+"\n");
-        qDebug("writing "+newDrink);
+        odebug << "writing "+newDrink << oendl; 
         dbFile.writeBlock( newDrink.latin1(), newDrink.length());
         clearList();
         dbFile.close();
@@ -207,7 +210,7 @@ void Bartender::showDrink( QListViewItem *item) {
             for(int i=0;s2.find( "#", 0, TRUE) == -1;i++) {
                 s2 = t.readLine();
                 if(s2.find("#",0,TRUE) == -1 || dbFile.atEnd() ) {
-//                    qDebug(s2);
+//                    odebug << s2 << oendl; 
                     showDrinks->MultiLineEdit1->append(s2);
                 }
                 if( dbFile.atEnd() ) break;
@@ -248,7 +251,7 @@ void Bartender::doSearchByName() {
         QListViewItemIterator it( DrinkView );
         for ( ; it.current(); ++it ) {
             if ( it.current()->text(0).find( searchForDrinkName, 0, TRUE) != -1 ) {
-//                 qDebug( it.current()->text(0));
+//                 odebug << it.current()->text(0) << oendl; 
                 searchList.append(it.current()->text(0));
             }
         }
@@ -279,10 +282,10 @@ void Bartender::doSearchByDrink() {
             s = t.readLine();
             if(s.find("#",0,TRUE) != -1) {
                 lastDrinkName=s.right(s.length()-2);
-//                qDebug("last drink name "+lastDrinkName);
+//                odebug << "last drink name "+lastDrinkName << oendl; 
             }
             else if( s.find( searchForDrinkName ,0, FALSE) != -1 && lastDrinkName != tempName ) {
-//                qDebug("appending "+lastDrinkName);
+//                odebug << "appending "+lastDrinkName << oendl; 
                 searchList.append( lastDrinkName);
                 tempName=lastDrinkName;
             }
@@ -313,7 +316,7 @@ void Bartender::showSearchResult(QStringList &searchList) {
     QListViewItemIterator it2( DrinkView );
     for ( ; it2.current(); ++it2 ) {
         if ( it2.current()->text(0)== result ) {
-//                qDebug( it2.current()->text(0));
+//                odebug << it2.current()->text(0) << oendl; 
             showDrink(it2.current());
         }
     }
@@ -343,7 +346,7 @@ void Bartender::doEdit() {
             for(int i=0;s2.find( "#", 0, TRUE) == -1;i++) {
                 s2 = t.readLine();
                 if(s2.find("#",0,TRUE) == -1 || dbFile.atEnd() ) {
-//                    qDebug(s2);
+//                    odebug << s2 << oendl; 
                     newDrinks->MultiLineEdit1->append(s2);
                     newDrinks->LineEdit1->setText(myDrink);
                 }
@@ -370,7 +373,7 @@ void Bartender::doEdit() {
         ////////// FIXME write to user file
         QString newDrink="# "+newName+"\n";
         newDrink.append(newIng+"\n");
-        qDebug("writing "+newDrink);
+        odebug << "writing "+newDrink << oendl; 
         dbFile.writeBlock( newDrink.latin1(), newDrink.length());
         clearList();
 
@@ -397,7 +400,7 @@ void Bartender::openCurrentDrink() {
 }
 
 void Bartender::fileMenuActivated( int item) {
-    qDebug("Item %d", item);
+    odebug << "Item " << item << "" << oendl; 
     switch(item) {
       case -3: //        new -3
           fileNew();
@@ -418,7 +421,7 @@ 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,12 +1,11 @@
 TEMPLATE  = app
-#CONFIG   = qt warn_on 
 CONFIG    = qt warn_on 
 HEADERS   = bartender.h newdrinks.h showdrinks.h inputDialog.h searchresults.h bac.h
 SOURCES   = main.cpp bartender.cpp newdrinks.cpp showdrinks.cpp inputDialog.cpp searchresults.cpp bac.cpp
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
-LIBS            += -lqpe
-DESTDIR = $(OPIEDIR)/bin
-TARGET    = bartender
+LIBS        += -lqpe -lopiecore2
+DESTDIR     = $(OPIEDIR)/bin
+TARGET      = bartender
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/opie-bartender/config.in b/noncore/apps/opie-bartender/config.in
index c6ca2e6..c39a7d6 100644
--- a/noncore/apps/opie-bartender/config.in
+++ b/noncore/apps/opie-bartender/config.in
@@ -1,4 +1,5 @@
   config BARTENDER
     boolean "bartender - bar receipe and blood alcohol estimator"
     default "n"
-    depends ( LIBQPE || LIBQPE-X11 )
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
+
diff --git a/noncore/apps/opie-console/MyPty.cpp b/noncore/apps/opie-console/MyPty.cpp
index a37f980..6d57703 100644
--- a/noncore/apps/opie-console/MyPty.cpp
+++ b/noncore/apps/opie-console/MyPty.cpp
@@ -63,10 +63,18 @@
     nessesary to make everything work as it should.
 */
 
+#include "procctl.h"
+#include "MyPty.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
+/* QT */
 #include <qsocketnotifier.h>
 #include <qfile.h>
 
+/* STD */
 #include <stdlib.h>
 #include <stdio.h>
 #include <signal.h>
@@ -81,10 +89,6 @@
 #include <pty.h>
 #endif
 
-#include "procctl.h"
-#include "MyPty.h"
-
-
 #undef VERBOSE_DEBUG
 
 
@@ -97,7 +101,7 @@
 
 void MyPty::setSize(int lines, int columns)
 {
-    qWarning("setting size");
+    owarn << "setting size" << oendl; 
   struct winsize wsize;
   wsize.ws_row = (unsigned short)lines;
   wsize.ws_col = (unsigned short)columns;
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
@@ -1029,7 +1029,7 @@ bool TEWidget::eventFilter( QObject *obj, QEvent *e )
 #ifdef FAKE_CTRL_AND_ALT
     static bool control = FALSE;
     static bool alt = FALSE;
-//    qDebug(" Has a keyboard with no CTRL and ALT keys, but we fake it:");
+//    odebug << " Has a keyboard with no CTRL and ALT keys, but we fake it:" << oendl; 
     bool dele=FALSE;
     if ( e->type() == QEvent::KeyPress || e->type() == QEvent::KeyRelease ) {
         QKeyEvent* ke = (QKeyEvent*)e;
@@ -1068,11 +1068,11 @@ bool TEWidget::eventFilter( QObject *obj, QEvent *e )
         actSel=0; // Key stroke implies a screen update, so TEWidget won't
           // know where the current selection is.
 
-//     qDebug("key pressed is 0x%x",ke->key());
+//     odebug << "key pressed is 0x" << ke->key() << "" << oendl; 
 
         if( ke->state() == ShiftButton && ke->key() == Key_Tab) { //lets hardcode this sucker
 
-//     qDebug("key pressed 2 is 0x%x",ke->key());
+//     odebug << "key pressed 2 is 0x" << ke->key() << "" << oendl; 
             emitText("\\"); // expose
         } else
             emit keyPressedSignal(ke); // expose
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
@@ -70,6 +70,12 @@
 */
 
 #include "TEmulation.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
+/* STD */
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -204,7 +210,7 @@ void TEmulation::onRcvChar(int c)
 
 void TEmulation::onKeyPress( QKeyEvent* ev )
 {
-    qWarning("onKeyPress,....");
+    owarn << "onKeyPress,...." << oendl; 
   if (!connected) return; // someone else gets the keys
   if (scr->getHistCursor() != scr->getHistLines());
     scr->setHistCursor(scr->getHistLines());
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,4 +1,11 @@
+#include "atconfigdialog.h"
+#include "io_modem.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
+/* QT */
 #include <qlineedit.h>
 #include <qspinbox.h>
 #include <qlayout.h>
@@ -7,10 +14,6 @@
 #include <qlabel.h>
 #include <qscrollview.h>
 
-#include "atconfigdialog.h"
-#include "io_modem.h"
-
-
 ATConfigDialog::ATConfigDialog(  QWidget* parent, const char* name, bool modal, WFlags fl )
     : QDialog( parent, name, modal, fl ) {
 
@@ -152,7 +155,7 @@ 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 ) );
     resetStringLine->setText( config.readEntry("ResetString", MODEM_DEFAULT_RESET_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,5 +1,11 @@
 #include "dialer.h"
+#include "io_modem.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
 
+/* QT */
 #include <qlayout.h>
 #include <qprogressbar.h>
 #include <qlabel.h>
@@ -8,13 +14,12 @@
 #include <qtimer.h>
 #include <qmessagebox.h>
 
+/* STD */
 #include <unistd.h>
 #include <string.h>
 #include <fcntl.h>
 #include <errno.h>
 
-#include "io_modem.h"
-
 // State machine:          | When an error occurs, we don't have to
 //                         | reset everything.
 // (init) <------+         | But if the user wants to reset,
@@ -104,7 +109,7 @@ void Dialer::slotCancel()
 
 void Dialer::reset()
 {
-    qWarning("reset");
+    owarn << "reset" << oendl; 
 	switchState(state_cancel);
 }
 
@@ -136,18 +141,18 @@ 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");
 	}
 
 	if(state != state_cancel)
 	{
 		switchState(state_init);
-//                qWarning("Init String " + m_profile.readEntry("InitString") );
+//                owarn << "Init String " + m_profile.readEntry("InitString") << oendl; 
 		send(m_profile.readEntry("InitString",MODEM_DEFAULT_INIT_STRING ) + "\r");
 		QString response2 = receive();
 		if(!response2.contains("\nOK\r"))
@@ -158,7 +163,7 @@ void Dialer::trydial(const QString& number)
 	{
 		switchState(state_options);
 
-                qWarning("ATM3l3");
+                owarn << "ATM3l3" << oendl; 
 		send("ATM3L3\r");
 		QString response3 = receive();
 		if(!response3.contains("\nOK\r"))
@@ -178,7 +183,7 @@ void Dialer::trydial(const QString& number)
 
 	if(state != state_cancel)
 	{
-            qWarning("progress");
+            owarn << "progress" << oendl; 
 		switchState(state_dialing);
 
 //		send(QString("ATDT %1\r").arg(number));
@@ -214,7 +219,7 @@ void Dialer::send(const QString& msg)
 	int bytes;
 	QString termination;
 
-	qWarning("Sending: %s", m.latin1());
+	owarn << "Sending: " << m.latin1() << "" << oendl; 
 
 /*	termination = "\r";
 	//termination = m_profile.readEntry("Termination");
@@ -247,11 +252,11 @@ QString Dialer::receive()
 			for(int i = 0; i < ret; i++)
 				buffer[i] = buffer[i] & 0x7F;
 			buffer[ret] = 0;
-			qWarning("Got: %s", buffer);
+			owarn << "Got: " << buffer << "" << oendl; 
 			buf.append(QString(buffer));
 			if(buf.contains("OK") || buf.contains("ERROR") || buf.contains("CONNECT") || (buf.contains("BUSY")))
 			{
-				//qWarning("Receiving: '%s'", buf.latin1());
+				//owarn << "Receiving: '" << buf.latin1() << "'" << oendl; 
 				cleanshutdown = 1;
 				return buf;
 			}else if (buf.contains("NO CARRIER") || buf.contains("NO DIALTONE")  ) {
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,10 +1,12 @@
-
 #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 )
 {
@@ -128,11 +130,11 @@ QColor EmulationHandler::foreColor(int col) {
         co = Qt::black;
         break;
     case Profile::Green:
-        qWarning("Foreground green");
+        owarn << "Foreground green" << oendl; 
         co = Qt::green;
         break;
     case Profile::Orange:
-        qWarning("Foreground orange");
+        owarn << "Foreground orange" << oendl; 
         co.setRgb( 231, 184, 98 );
         break;
     }
@@ -152,11 +154,11 @@ QColor EmulationHandler::backColor(int col ) {
         co = Qt::white;
         break;
     case Profile::Green:
-        qWarning("Background black");
+        owarn << "Background black" << oendl; 
         co = Qt::black;
         break;
     case Profile::Orange:
-        qWarning("Background black");
+        owarn << "Background black" << oendl; 
         co = Qt::black;
         break;
     }
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
@@ -224,9 +224,9 @@ void EmulationWidget::calcGeometry()
 {
 	m_scrollbar->resize(QApplication::style().scrollBarExtent().width(), contentsRect().height() );
 
-        qDebug( QString(" TEST").arg( contentsRect().width() ) );
-        qDebug( QString(" TEST").arg( contentsRect().height() ) );
-        qDebug("NEUER TESTT!!!!!!!!");
+        odebug << QString(" TEST").arg( contentsRect().width() ) << oendl; 
+        odebug << QString(" TEST").arg( contentsRect().height() ) << oendl; 
+        odebug << "NEUER TESTT!!!!!!!!" << oendl; 
 
        	switch( scrollLoc )
 	{
@@ -258,7 +258,7 @@ 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 )
     {
 	painter.setBackgroundMode( TransparentMode );
@@ -272,7 +272,7 @@ void EmulationWidget::drawAttrString( QString& string, QPainter &painter, QRect
 	else
 	{
 	    painter.setBackgroundMode( OpaqueMode );
-            qWarning("Color %s", color_table[attr.b].color.name().latin1() );
+            owarn << "Color " << color_table[attr.b].color.name().latin1() << "" << oendl; 
 	    painter.setBackgroundColor( color_table[attr.b].color );
 	}
     }
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,5 +1,10 @@
 #include "function_keyboard.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
+/* QT */
 #include <qlayout.h>
 #include <qlistbox.h>
 #include <qlabel.h>
@@ -37,7 +42,7 @@ FunctionKeyboard::FunctionKeyboard(QWidget *parent) :
                  FKey (value_list[0], value_list[1], value_list[2].toUShort(), value_list[3].toUShort())
             );
         }
-    //qWarning("loaded %d keys", keys.count());
+    //owarn << "loaded " << keys.count() << " keys" << oendl; 
     */
     if (keys.isEmpty()) loadDefaults();
 
@@ -256,7 +261,7 @@ FunctionKeyboardConfig::FunctionKeyboardConfig(const QString& name, QWidget* par
     : ProfileDialogKeyWidget(name, parent, na),
       selectedRow(0), selectedCol(0)
 {
-    qWarning("FunctionKeyboardConfig");
+    owarn << "FunctionKeyboardConfig" << oendl; 
 
 
     kb = new FunctionKeyboard(this);
diff --git a/noncore/apps/opie-console/io_bt.cpp b/noncore/apps/opie-console/io_bt.cpp
index a29fa8e..c102427 100644
--- a/noncore/apps/opie-console/io_bt.cpp
+++ b/noncore/apps/opie-console/io_bt.cpp
@@ -1,7 +1,10 @@
 
 #include "io_bt.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
 using namespace Opie::Core;
+
 IOBt::IOBt( const Profile &config ) : IOSerial( config ) {
     m_attach = 0;
 }
@@ -43,7 +46,7 @@ bool IOBt::open() {
         if ( m_attach->start() ) {
             ret = IOSerial::open();
         } else {
-            qWarning("could not attach to device");
+            owarn << "could not attach to device" << oendl; 
             delete m_attach;
             m_attach = 0;
         }
@@ -89,5 +92,5 @@ 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,7 +1,9 @@
-
 #include "io_irda.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
 using namespace Opie::Core;
+
 IOIrda::IOIrda( const Profile &config ) : IOSerial( config ) {
     m_attach = 0;
 }
@@ -35,7 +37,7 @@ bool IOIrda::open() {
         ret= IOSerial::open();
     } else {
     // emit error!!!
-        qWarning("could not attach to device");
+        owarn << "could not attach to device" << oendl; 
         delete m_attach;
 	m_attach = 0l;
     }
@@ -74,5 +76,5 @@ 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,10 +1,11 @@
 
 #include "io_modem.h"
-
 #include "dialer.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
 using namespace Opie::Core;
-using namespace Opie::Core;
+
 IOModem::IOModem( const Profile &profile )
 	: IOSerial( profile ) {
 	m_profile = profile;
@@ -12,7 +13,6 @@ IOModem::IOModem( const Profile &profile )
 
 
 IOModem::~IOModem() {
-
 }
 
 
@@ -104,5 +104,5 @@ 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
@@ -91,7 +91,7 @@ int main(int argc, char **argv) {
     QPEApplication app( argc, argv );
 
 #ifdef   FSCKED_DISTRIBUTION
-    qWarning("fscked");
+    owarn << "fscked" << oendl; 
     FixIt it;
     it.fixIt();
 #endif
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,16 +1,3 @@
-#include <assert.h>
-
-#include <qaction.h>
-#include <qmenubar.h>
-#include <qtoolbar.h>
-#include <qmessagebox.h>
-#include <qwhatsthis.h>
-#include <qfileinfo.h>
-
-#include <qpe/filemanager.h>
-
-#include <opie2/ofiledialog.h>
-
 #include "TEmulation.h"
 #include "profileeditordialog.h"
 #include "configdialog.h"
@@ -23,8 +10,24 @@
 #include "emulation_handler.h"
 #include "script.h"
 
-
+/* OPIE */
+#include <opie2/odebug.h>
+#include <opie2/ofiledialog.h>
+#include <qpe/filemanager.h>
+using namespace Opie::Core;
 using namespace Opie::Ui;
+
+/* QT */
+#include <qaction.h>
+#include <qmenubar.h>
+#include <qtoolbar.h>
+#include <qmessagebox.h>
+#include <qwhatsthis.h>
+#include <qfileinfo.h>
+
+/* STD */
+#include <assert.h>
+
 MainWindow::MainWindow(QWidget *parent, const char *name, WFlags) : QMainWindow(parent, name, WStyle_ContextHelp)  {
     KeyTrans::loadAll();
     for (int i = 0; i < KeyTrans::count(); i++ ) {
@@ -446,13 +449,13 @@ void MainWindow::slotClose() {
         return;
 
     Session* ses = currentSession();
-    qWarning("removing! currentSession %s", currentSession()->name().latin1() );
+    owarn << "removing! currentSession " << currentSession()->name().latin1() << "" << oendl; 
     /* set to NULL to be safe, if its needed slotSessionChanged resets it automatically */
     m_curSession = NULL;
     tabWidget()->remove( /*currentSession()*/ses );
     /*it's autodelete */
     m_sessions.remove( ses );
-    qWarning("after remove!!");
+    owarn << "after remove!!" << oendl; 
 
     if (!currentSession() ) {
         m_connect->setEnabled( false );
@@ -570,7 +573,7 @@ void MainWindow::slotOpenButtons( bool state ) {
 
 
 void MainWindow::slotSessionChanged( Session* ses ) {
-    qWarning("changed!");
+    owarn << "changed!" << oendl; 
 
     if(m_curSession)
         if(m_curSession->transferDialog()) m_curSession->transferDialog()->hide();
@@ -579,7 +582,7 @@ 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 );
             m_disconnect->setEnabled( true );
diff --git a/noncore/apps/opie-console/modemconfigwidget.cpp b/noncore/apps/opie-console/modemconfigwidget.cpp
index 3466e3a..9fdaf73 100644
--- a/noncore/apps/opie-console/modemconfigwidget.cpp
+++ b/noncore/apps/opie-console/modemconfigwidget.cpp
@@ -1,15 +1,18 @@
+#include "modemconfigwidget.h"
+#include "dialdialog.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
 #include <qpe/qpeapplication.h>
+using namespace Opie::Core;
 
+/* QT */
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qcombobox.h>
 #include <qpushbutton.h>
 #include <qhbox.h>
 
-#include "modemconfigwidget.h"
-#include "dialdialog.h"
-
 namespace {
     void setCurrent( const QString& str, QComboBox* bo ) {
         uint b = bo->count();
@@ -135,7 +138,7 @@ void ModemConfigWidget::load( const Profile& prof ) {
 
     atConf->readConfig( prof );
     if ( prof.readEntry( "Device" ).isEmpty() ) {
-        qWarning("device empty!");
+        owarn << "device empty!" << oendl; 
         return;
     }
     setCurrent( prof.readEntry( "Device" ), m_deviceCmb );
diff --git a/noncore/apps/opie-console/opie-console.pro b/noncore/apps/opie-console/opie-console.pro
index 7a15828..f7e33e9 100644
--- a/noncore/apps/opie-console/opie-console.pro
+++ b/noncore/apps/opie-console/opie-console.pro
@@ -1,7 +1,5 @@
 TEMPLATE     = app
-TMAKE_CXXFLAGS    += -DHAVE_OPENPTY
 CONFIG       += qt warn_on 
-#CONFIG          = qt 
 DESTDIR      = $(OPIEDIR)/bin
 HEADERS      = io_layer.h io_serial.h io_irda.h io_bt.h io_modem.h \
            file_layer.h filetransfer.h \
@@ -70,7 +68,7 @@ DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lqpe -lopiecore2 -lopieui2 -lutil
 TARGET       = opie-console
 
-
+DEFINES += HAVE_OPENPTY
 
 
 include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/apps/opie-console/sz_transfer.cpp b/noncore/apps/opie-console/sz_transfer.cpp
index fbc5306..f505998 100644
--- a/noncore/apps/opie-console/sz_transfer.cpp
+++ b/noncore/apps/opie-console/sz_transfer.cpp
@@ -41,7 +41,7 @@ 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);
     data.fill(*buffer, buflen);
@@ -65,7 +65,7 @@ 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
     proc->writeStdin(data.data(), data.size());
@@ -74,7 +74,7 @@ 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,7 +1,10 @@
-
 #include "tabwidget.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
 using namespace Opie::Ui;
+
 TabWidget::TabWidget( QWidget* parent, const char* name )
     : OTabWidget( parent, name ) {
     connect(this, SIGNAL( currentChanged(QWidget*) ),
@@ -12,7 +15,7 @@ TabWidget::~TabWidget() {
 }
 
 void TabWidget::add( Session* ses ) {
-    qWarning("session ses " + ses->name() );
+    owarn << "session ses " + ses->name() << oendl; 
     if ( !ses->widgetStack() ) return;
     //reparent( ses->widgetStack(), QPoint() );
     addTab( ses->widgetStack(), "console/konsole", ses->name() );
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,3 +1,10 @@
+#include "terminalwidget.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
+/* QT */
 #include <qlabel.h>
 #include <qcheckbox.h>
 #include <qcombobox.h>
@@ -6,8 +13,6 @@
 #include <qhbuttongroup.h>
 #include <qlayout.h>
 
-#include "terminalwidget.h"
-
 namespace {
     enum TermIds {
         id_term_vt100 = 0,
@@ -69,7 +74,7 @@ TerminalWidget::TerminalWidget( const QString& name, QWidget* parent,
     m_lroot->addStretch( 0 );
 
     // Fill in some options
-    qWarning("Options for terminal box");
+    owarn << "Options for terminal box" << oendl; 
     m_terminalBox->insertItem( tr("VT 100"), 0 ); // /*, id_term_vt100*/ );
     m_terminalBox->insertItem( tr("VT 102"), 1 );  // /* , id_term_vt102 */);
     m_terminalBox->insertItem( tr("Linux Console"), 2 ); //, id_term_linux );
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
@@ -26,15 +26,15 @@ SenderUI::SenderUI()
     prof.writeEntry("Device",str );
     prof.writeEntry("Baud", 19200 );
 
-    qWarning("prof " + prof.readEntry("Device")  + " " + str);
+    owarn << "prof " + prof.readEntry("Device")  + " " + str << oendl; 
     ser = new IOSerial(prof);
     connect(ser, SIGNAL(received(const QByteArray&) ),
             this, SLOT(got(const QByteArray&) ) );
 
     if ( ser->open() )
-        qWarning("opened!!!");
+        owarn << "opened!!!" << oendl; 
     else
-        qWarning("could not open");
+        owarn << "could not open" << oendl; 
 
 
 }
@@ -52,12 +52,12 @@ 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] );
     }
@@ -66,13 +66,13 @@ void SenderUI::got(const QByteArray& ar) {
 
 void SenderUI::fileTransComplete() {
 
-    qWarning("file transfer complete");
+    owarn << "file transfer complete" << oendl; 
 }
 void SenderUI::send() {
 
 }
 void SenderUI::slotRev(){
-qWarning("Going to receive!");
+owarn << "Going to receive!" << oendl; 
 FileReceive *rev = new FileReceive( FileReceive::SZ, ser );
 rev->receive();
 
diff --git a/noncore/apps/opie-console/widget.cpp b/noncore/apps/opie-console/widget.cpp
index e17dfd4..c51983f 100644
--- a/noncore/apps/opie-console/widget.cpp
+++ b/noncore/apps/opie-console/widget.cpp
@@ -995,7 +995,7 @@ bool Widget::eventFilter( QObject *obj, QEvent *e )
 #ifdef FAKE_CTRL_AND_ALT
     static bool control = FALSE;
     static bool alt = FALSE;
-//    qDebug(" Has a keyboard with no CTRL and ALT keys, but we fake it:");
+//    odebug << " Has a keyboard with no CTRL and ALT keys, but we fake it:" << oendl; 
     bool dele=FALSE;
     if ( e->type() == QEvent::KeyPress || e->type() == QEvent::KeyRelease ) {
         QKeyEvent* ke = (QKeyEvent*)e;
@@ -1034,11 +1034,11 @@ bool Widget::eventFilter( QObject *obj, QEvent *e )
         actSel=0; // Key stroke implies a screen update, so Widget won't
           // know where the current selection is.
 
-//     qDebug("key pressed is 0x%x",ke->key());
+//     odebug << "key pressed is 0x" << ke->key() << "" << oendl; 
 
         if( ke->state() == ShiftButton && ke->key() == Key_Tab) { //lets hardcode this sucker
 
-//     qDebug("key pressed 2 is 0x%x",ke->key());
+//     odebug << "key pressed 2 is 0x" << ke->key() << "" << oendl; 
             emitText("\\"); // expose
         } else
             emit keyPressedSignal(ke); // expose
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
@@ -75,7 +75,7 @@ bool WidgetLayer::eventFilter( QObject *obj, QEvent *e )
 #ifdef FAKE_CTRL_AND_ALT
     static bool control = false;
     static bool alt = false;
-//    qDebug(" Has a keyboard with no CTRL and ALT keys, but we fake it:");
+//    odebug << " Has a keyboard with no CTRL and ALT keys, but we fake it:" << oendl; 
     bool dele = false;
     if ( e->type() == QEvent::KeyPress || e->type() == QEvent::KeyRelease ) {
         QKeyEvent* ke = (QKeyEvent*)e;
@@ -115,7 +115,7 @@ QChar(a,0));
         //actSel=0; // Key stroke implies a screen update, so Widget won't
           // know where the current selection is.
 
-//     qDebug("key pressed is 0x%x",ke->key());
+//     odebug << "key pressed is 0x" << ke->key() << "" << oendl; 
 
         if( ke->state() == ShiftButton && ke->key() == Key_Tab) { //lets hardcode this sucker
             insertText("\\"); // expose
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
@@ -20,12 +20,16 @@
 **********************************************************************/
 
 #include "mainwindow.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
 #include <qpe/fileselector.h>
 #include <qpe/applnk.h>
 #include <qpe/resource.h>
 #include <qpe/fontdatabase.h>
+using namespace Opie::Core;
 
-//#include "qspellchecker.h"
+/* QT */
 #include "qtextedit.h"
 #include <qaction.h>
 #include <qtoolbar.h>
@@ -444,7 +448,7 @@ void MainWindow::fileOpen()
 
 void MainWindow::fileRevert()
 {
-    qDebug( "QMainWindow::fileRevert needs to be done" );
+    odebug << "QMainWindow::fileRevert needs to be done" << oendl; 
 }
 
 void MainWindow::fileNew()
@@ -456,7 +460,7 @@ void MainWindow::fileNew()
 
 void MainWindow::insertTable()
 {
-    qDebug( "MainWindow::insertTable() needs to be done" );
+    odebug << "MainWindow::insertTable() needs to be done" << oendl; 
 }
 
 void MainWindow::newFile( const DocLnk &dl )
@@ -475,7 +479,7 @@ void MainWindow::openFile( const DocLnk &dl )
     FileManager fm;
     QString txt;
     if ( !fm.loadFile( dl, txt ) )
-  qDebug( "couldn't open file" );
+  odebug << "couldn't open file" << oendl; 
     clear();
     editorStack->raiseWidget( editor );
     editor->viewport()->setFocus();
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,6 +1,5 @@
 
-CONFIG        += qt warn on  quick-app
-
+CONFIG        += qt warn on quick-app
 
 HEADERS    =    qcleanuphandler.h \
         qcomplextext_p.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
@@ -106,7 +106,7 @@ 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;
     while( pos > -1 ) {
@@ -124,7 +124,7 @@ static inline const QChar *nextChar( const QString &str, int pos)
     int len = str.length();
     const QChar *ch = str.unicode() + pos;
     while( pos < len ) {
-	//qDebug("rightChar: %d isLetter=%d, joining=%d", pos, ch.isLetter(), ch.joining());
+	//odebug << "rightChar: " << pos << " isLetter=" << ch.isLetter() << ", joining=" << ch.joining() << "" << oendl; 
 	if( !ch->isMark() )
 	    return ch;
 	// assume it's a transparent char, this might not be 100% correct
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
@@ -37,11 +37,17 @@
 
 #include "qrichtext_p.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
+/* QT */
 #include "qdragobject.h"
 #include "qpaintdevicemetrics.h"
 #include "qdrawutil.h"
 #include "qcleanuphandler.h"
 
+/* STD */
 #include <stdlib.h>
 
 using namespace Qt3;
@@ -184,7 +190,7 @@ 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;
     }
 
@@ -212,7 +218,7 @@ 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;
     }
 
@@ -1544,10 +1550,10 @@ void QTextDocument::setRichTextInternal( const QString &text, QTextCursor* curso
 			    QString bg = attr["background"];
 			    const QMimeSource* m = factory_->data( bg, contxt );
 			    if ( !m ) {
-				qWarning("QRichText: no mimesource for %s", bg.latin1() );
+				owarn << "QRichText: no mimesource for " << bg.latin1() << "" << oendl; 
 			    } else {
 				if ( !QImageDrag::decode( m, img ) ) {
-				    qWarning("QTextImage: cannot decode %s", bg.latin1() );
+				    owarn << "QTextImage: cannot decode " << bg.latin1() << "" << oendl; 
 				}
 			    }
 			    if ( !img.isNull() ) {
@@ -2152,7 +2158,7 @@ QString QTextDocument::richText() const
     QStyleSheetItem* item_ol = styleSheet()->item("ol");
     QStyleSheetItem* item_li = styleSheet()->item("li");
     if ( !item_p || !item_ul || !item_ol || !item_li ) {
-	qWarning( "QTextEdit: cannot export HTML due to insufficient stylesheet (lack of p, ul, ol, or li)" );
+	owarn << "QTextEdit: cannot export HTML due to insufficient stylesheet (lack of p, ul, ol, or li)" << oendl; 
 	return QString::null;
     }
     int pastListDepth = 0;
@@ -4096,7 +4102,7 @@ int QTextParagraph::lineHeightOfChar( int i, int *bl, int *y ) const
 	--it;
     }
 
-    qWarning( "QTextParagraph::lineHeightOfChar: couldn't find lh for %d", i );
+    owarn << "QTextParagraph::lineHeightOfChar: couldn't find lh for " << i << "" << oendl; 
     return 15;
 }
 
@@ -4122,7 +4128,7 @@ QTextStringChar *QTextParagraph::lineStartOfChar( int i, int *index, int *line )
 	--l;
     }
 
-    qWarning( "QTextParagraph::lineStartOfChar: couldn't find %d", i );
+    owarn << "QTextParagraph::lineStartOfChar: couldn't find " << i << "" << oendl; 
     return 0;
 }
 
@@ -4149,7 +4155,7 @@ QTextStringChar *QTextParagraph::lineStartOfLine( int line, int *index ) const
 	return &str->at( i );
     }
 
-    qWarning( "QTextParagraph::lineStartOfLine: couldn't find %d", line );
+    owarn << "QTextParagraph::lineStartOfLine: couldn't find " << line << "" << oendl; 
     return 0;
 }
 
@@ -5697,7 +5703,7 @@ QTextFormat *QTextFormatCollection::format( const QFont &f, const QColor &c )
     cachedFormat->collection = this;
     cKey.insert( cachedFormat->key(), cachedFormat );
     if ( cachedFormat->key() != key )
-	qWarning("ASSERT: keys for format not identical: '%s '%s'", cachedFormat->key().latin1(), key.latin1() );
+	owarn << "ASSERT: keys for format not identical: '" << cachedFormat->key().latin1() << " '" << key.latin1() << "'" << oendl; 
     return cachedFormat;
 }
 
@@ -6083,11 +6089,11 @@ QTextImage::QTextImage( QTextDocument *p, const QMap<QString, QString> &attr, co
 	    const QMimeSource* m =
 		factory.data( imageName, context );
 	    if ( !m ) {
-		qWarning("QTextImage: no mimesource for %s", imageName.latin1() );
+		owarn << "QTextImage: no mimesource for " << imageName.latin1() << "" << oendl; 
 	    }
 	    else {
 		if ( !QImageDrag::decode( m, img ) ) {
-		    qWarning("QTextImage: cannot decode %s", imageName.latin1() );
+		    owarn << "QTextImage: cannot decode " << imageName.latin1() << "" << oendl; 
 		}
 	    }
 
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
@@ -35,6 +35,9 @@
 **
 **********************************************************************/
 
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
 #include "qrichtext_p.h"
 
 using namespace Qt3;
@@ -137,7 +140,7 @@ void QTextCursor::gotoPosition( QTextParagraph* p, int index )
     para = p;
     if ( index < 0 || index >= para->length() ) {
 #if defined(QT_CHECK_RANGE)
-	qWarning( "QTextCursor::gotoParagraph Index: %d out of range", index );
+	owarn << "QTextCursor::gotoParagraph Index: " << index << " out of range" << oendl; 
 #endif
 	index = index < 0 ? 0 : para->length() - 1;
     }
@@ -477,7 +480,7 @@ bool QTextParagraph::fullSelected( int id ) const
 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;
     }
 
@@ -493,7 +496,7 @@ int QTextParagraph::lineY( int l ) const
 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;
     }
 
@@ -509,7 +512,7 @@ int QTextParagraph::lineBaseLine( int l ) const
 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;
     }
 
@@ -525,8 +528,8 @@ int QTextParagraph::lineHeight( int l ) const
 void QTextParagraph::lineInfo( int l, int &y, int &h, int &bl ) const
 {
     if ( l > (int)lineStarts.count() - 1 ) {
-	qWarning( "QTextParagraph::lineInfo: line %d out of range!", l );
-	qDebug( "%d %d", (int)lineStarts.count() - 1, l );
+	owarn << "QTextParagraph::lineInfo: line " << l << " out of range!" << oendl; 
+	odebug << "" << (int)lineStarts.count() - 1 << " " << l << "" << oendl; 
 	y = 0;
 	h = 15;
 	bl = 10;
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,12 +1,17 @@
-#include <qmessagebox.h>
-#include <qheader.h>
-
 #include "accountdisplay.h"
 #include "newaccount.h"
 #include "transaction.h"
 #include "transferdialog.h"
 #include "transfer.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
+/* QT */
+#include <qmessagebox.h>
+#include <qheader.h>
+
 extern Account *account;
 extern Transaction *transaction;
 extern Transfer *transfer;
@@ -267,7 +272,7 @@ void AccountDisplay::getTransferAccounts ( QListViewItem * item )
             // set the cleared integer if the checkbox is checked
             if ( td->clearedcheckbox->isChecked() == TRUE )
               cleared = 1;
-            qDebug("Year from transferdialog = %i",td->getYear());
+            odebug << "Year from transferdialog = " << td->getYear() << "" << oendl; 
             // add the transfer with a new date if its been edited or use the default date
             if ( td->getDateEdited () == TRUE )
               transfer->addTransfer ( firstaccountid, account->getParentAccountID ( firstaccountid ), secondaccountid, account->getParentAccountID ( secondaccountid ), td->getDay(), td->getMonth(), td->getYear(), td->amount->text().toFloat(), cleared );
diff --git a/noncore/apps/qashmoney/config.in b/noncore/apps/qashmoney/config.in
index 91739fe..aeed298 100644
--- a/noncore/apps/qashmoney/config.in
+++ b/noncore/apps/qashmoney/config.in
@@ -1,4 +1,4 @@
   config QASHMONEY
     boolean "opie-qashmoney (money manager)" 
     default "n"
-    depends ( LIBQPE || LIBQPE-X11 ) 
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
diff --git a/noncore/apps/qashmoney/qashmoney.pro b/noncore/apps/qashmoney/qashmoney.pro
index 6ad3db3..8a4302f 100755
--- a/noncore/apps/qashmoney/qashmoney.pro
+++ b/noncore/apps/qashmoney/qashmoney.pro
@@ -43,7 +43,7 @@ DEPENDPATH = $(OPIEDIR)/include
 DESTDIR = $(OPIEDIR)/bin
 
 unix:LIBS += -lm
-LIBS += -lqpe -lqte -lsqlite
+LIBS += -lqpe -lopiecore2 -lsqlite
 
 include ( $(OPIEDIR)/include.pro )
 
diff --git a/noncore/apps/tableviewer/db/common.cpp b/noncore/apps/tableviewer/db/common.cpp
index dbf9370..6e544ba 100644
--- a/noncore/apps/tableviewer/db/common.cpp
+++ b/noncore/apps/tableviewer/db/common.cpp
@@ -17,15 +17,23 @@
 ** not clear to you.
 **
 **********************************************************************/ 
-#include <stdlib.h>
+#include "common.h"   
+#include "datacache.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+#include <qpe/timestring.h>
+using namespace Opie::Core;
+
+/* QT */
 #include <qstring.h>
 #include <qheader.h>
 #include <qvector.h>
 #include <qdatetime.h>
-#include <qpe/timestring.h>
-#include "common.h"
-#include "datacache.h"
+
+/* STD */
 #include <assert.h>
+#include <stdlib.h>
 
 static const int del_flag = 0x1;
 static const int new_flag = 0x2;
@@ -312,7 +320,7 @@ void TVVariant::load(QDataStream &s )
             }
       break;
         default:
-      qFatal("Unrecognized data type");
+      ofatal << "Unrecognized data type" << oendl; 
     }
 }
 
@@ -1078,7 +1086,7 @@ 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 */
     }
 
@@ -1377,7 +1385,7 @@ bool DataElem::contains(int i, TVVariant v) const
         case TVVariant::Date:
             break;
         default:
-            qWarning("Tried to compare unknown data type");
+            owarn << "Tried to compare unknown data type" << oendl; 
     }
     return FALSE;
 }
@@ -1403,7 +1411,7 @@ bool DataElem::startsWith(int i, TVVariant v) const
         case TVVariant::Date:
             return FALSE;
         default:
-            qWarning("Tried to compare unknown data type");
+            owarn << "Tried to compare unknown data type" << oendl; 
     }
     return FALSE;
 }
@@ -1429,7 +1437,7 @@ bool DataElem::endsWith(int i, TVVariant v) const
         case TVVariant::Date:
             return FALSE;
         default:
-            qWarning("Tried to compare unknown data type");
+            owarn << "Tried to compare unknown data type" << oendl; 
     }
     return FALSE;
 }
@@ -1461,7 +1469,7 @@ bool DataElem::closer(DataElem*d1, DataElem *d2, TVVariant target, int column)
     if(d2) {
         if (type != d2->getField(column).type()) {
                 /* can't do compare */
-                qWarning("Tried to compare two incompatable types");
+                owarn << "Tried to compare two incompatable types" << oendl; 
                 return FALSE;
         }
         return target.closer(d1->getField(column), d2->getField(column));
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
@@ -26,9 +26,17 @@
 #include "datacache.h"
 #include "xmlsource.h"
 #include "csvsource.h"
-#include <stdlib.h>
+
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
+/* QT */
 #include <qheader.h>
 
+/* STD */
+#include <stdlib.h>
+
 #define INIT_TABLE_SIZE 128
 
 /*!
@@ -150,7 +158,7 @@ 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
@@ -18,12 +18,18 @@
 **
 **********************************************************************/ 
 #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) 
 {
@@ -140,7 +146,7 @@ DBXmlHandler::~DBXmlHandler()
 
 QString DBXmlHandler::errorProtocol()
 {
-    qWarning("Error reading file");
+    owarn << "Error reading file" << oendl; 
 	return errorProt;
 }
 
@@ -172,7 +178,7 @@ bool DBXmlHandler::startElement(const QString&, const QString&,
         last_key_type = TVVariant::String;
         key = atts.value("name");
         if (key.isEmpty()) {
-            qWarning("empty key name");
+            owarn << "empty key name" << oendl; 
             return FALSE;
         }
         if(!atts.value("type").isEmpty())
@@ -190,13 +196,13 @@ bool DBXmlHandler::startElement(const QString&, const QString&,
         /* the qName is the name of a key */
         if (!keyIndexList[qName]) {
             /* invalid key, we failed */
-            qWarning("Invalid key in record");
+            owarn << "Invalid key in record" << oendl; 
             return FALSE;
         }
         keyIndex = *keyIndexList[qName];
 		return TRUE;
 	}
-    qWarning("Unable to determine tag type");
+    owarn << "Unable to determine tag type" << oendl; 
 	return FALSE;
 }
 
@@ -225,7 +231,7 @@ bool DBXmlHandler::endElement(const QString&, const QString&,
 		break;
 	default:
 		// should only get a 'endElement' from one of the above states.
-        qWarning("Invalid end tag");
+        owarn << "Invalid end tag" << oendl; 
 		return FALSE;
 		break;
 	}
@@ -254,7 +260,7 @@ bool DBXmlHandler::characters(const QString& ch)
 		return TRUE;
 	}
 	
-    qWarning("Junk characters found... ignored");
+    owarn << "Junk characters found... ignored" << oendl; 
     return TRUE;
 }
 
@@ -270,7 +276,7 @@ bool DBXmlHandler::warning(const QXmlParseException& exception)
 	.arg(exception.lineNumber())
 	.arg(exception.columnNumber());
 
-    qWarning(errorProt);
+    owarn << errorProt << oendl; 
     return QXmlDefaultHandler::fatalError(exception);
 }
 
@@ -281,7 +287,7 @@ bool DBXmlHandler::error(const QXmlParseException& exception)
 	.arg(exception.lineNumber())
 	.arg(exception.columnNumber());
 
-    qWarning(errorProt);
+    owarn << errorProt << oendl; 
     return QXmlDefaultHandler::fatalError(exception);
 }
 
@@ -292,6 +298,6 @@ bool DBXmlHandler::fatalError(const QXmlParseException& exception)
 	.arg(exception.lineNumber())
 	.arg(exception.columnNumber());
 
-    qWarning(errorProt);
+    owarn << errorProt << oendl; 
     return QXmlDefaultHandler::fatalError(exception);
 }
diff --git a/noncore/apps/tableviewer/tableviewer.cpp b/noncore/apps/tableviewer/tableviewer.cpp
index 102b94c..9538cb3 100644
--- a/noncore/apps/tableviewer/tableviewer.cpp
+++ b/noncore/apps/tableviewer/tableviewer.cpp
@@ -18,7 +18,6 @@
 **
 **********************************************************************/ 
 
-/* local includes */
 #include "tableviewer.h"
 #include "ui/tvbrowseview.h"
 #include "ui/tvfilterview.h"
@@ -27,18 +26,21 @@
 #include "ui/tvkeyedit.h"
 #include "db/datacache.h"
 
-/* QPE includes */
+/* OPIE */
+#include <opie2/odebug.h>
 #include <qpe/fileselector.h>
 #include <qpe/resource.h>
-#include <qtoolbar.h>
+using namespace Opie::Core;
 
-/* QTE includes */
+/* QT */
 #include <qmenubar.h>
+#include <qtoolbar.h>
 #include <qpopupmenu.h>
 #include <qapplication.h>
 #include <qwidgetstack.h>
 #include <qlayout.h>
 #include <qbuffer.h>
+
 /*!
     \class TableViewerWindow
     \brief The main window widget of the application
@@ -201,7 +203,7 @@ void TableViewerWindow::saveDocument()
     QIODevice *dev = fm.saveFile(doc);
 
     if(!ds->saveSource(dev, doc.type())){
-  qWarning("Save unsuccessful");
+  owarn << "Save unsuccessful" << oendl; 
   return;
     }
     dev->close();
@@ -288,7 +290,7 @@ 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,4 +1,4 @@
-CONFIG		= qt warn_on  quick-app
+CONFIG		= qt warn_on quick-app
 SUBDIRS		= db ui
 HEADERS		= tableviewer.h \
 		  xmlencodeattr.h \
@@ -31,8 +31,8 @@ SOURCES		= main.cpp \
 		  db/common.cpp
 INTERFACES	= ui/tvkeyedit_gen.ui
 TARGET		= tableviewer
-INCLUDEPATH += $(OPIEDIR)/include
-DEPENDPATH     += $(OPIEDIR)/include
-LIBS	       += -lqpe -lopiecore2
+INCLUDEPATH	+= $(OPIEDIR)/include
+DEPENDPATH	+= $(OPIEDIR)/include
+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
@@ -17,8 +17,15 @@
 ** not clear to you.
 **
 **********************************************************************/ 
+
 #include "tvlistview.h"
 #include "../db/common.h"
+
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
+/* QT */
 #include <qtoolbutton.h>
 #include <qlistview.h>
 #include <qlayout.h>
@@ -163,7 +170,7 @@ void TVListView::first()
 
 void TVListView::last()
 {
-    qWarning("TVListView::last not yet implemented");
+    owarn << "TVListView::last not yet implemented" << oendl; 
 }
 
 void TVListView::next()
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,78 +1,75 @@
 TEMPLATE    = lib
-CONFIG        = qt warn_on 
-HEADERS        = microkde/kapplication.h \
-          kateconfig.h \
-                  microkde/kdebug.h \
-                  microkde/kdialog.h \
-                  microkde/kdialogbase.h \
-                  microkde/kfiledialog.h \
-                  microkde/kglobal.h \
-                  microkde/kiconloader.h \
-                  microkde/klineedit.h \
-                  microkde/klocale.h \
-                  microkde/kmessagebox.h \
-                  microkde/kprinter.h \
-                  microkde/krestrictedline.h \
-                  microkde/kseparator.h \
-                  microkde/kstandarddirs.h \
-                  microkde/ktempfile.h \
-                  microkde/kunload.h \
-                  microkde/kurlrequester.h \
-                  microkde/kfontdialog.h \
-                  microkde/krun.h \
-                  microkde/knumvalidator.h \
-                  microkde/kstaticdeleter.h \
-                  microkde/klistview.h \
-                  microkde/kglobalsettings.h \
-          microkde/kcolorbtn.h \
-          \
+CONFIG      = qt warn_on 
+HEADERS     = microkde/kapplication.h \
+              kateconfig.h \
+              microkde/kdebug.h \
+              microkde/kdialog.h \
+              microkde/kdialogbase.h \
+              microkde/kfiledialog.h \
+              microkde/kglobal.h \
+              microkde/kiconloader.h \
+              microkde/klineedit.h \ 
+              microkde/klocale.h \
+              microkde/kmessagebox.h \
+              microkde/kprinter.h \
+              microkde/krestrictedline.h \
+              microkde/kseparator.h \
+              microkde/kstandarddirs.h \
+              microkde/ktempfile.h \
+              microkde/kunload.h \
+              microkde/kurlrequester.h \
+              microkde/kfontdialog.h \
+              microkde/krun.h \
+              microkde/knumvalidator.h \
+              microkde/kstaticdeleter.h \
+              microkde/klistview.h \
+              microkde/kglobalsettings.h \
+              microkde/kcolorbtn.h \
               \
-          qt3back/qregexp3.h \
-          microkde/ksharedptr.h \
-          document/katebuffer.h  document/katedialogs.h \
-          document/katetextline.h \
-          document/katecmd.h \
-          document/katehighlight.h \
-          document/katecmds.h    document/katedocument.h  \
-          document/katesyntaxdocument.h \
-          view/kateundohistory.h  \
-          view/kateview.h  \
-          view/kateviewdialog.h \
-          interfaces/view.h \
-          interfaces/document.h \
-          ktexteditor/ktexteditor.h
+              qt3back/qregexp3.h \
+              microkde/ksharedptr.h \
+              document/katebuffer.h  document/katedialogs.h \
+              document/katetextline.h \
+              document/katecmd.h \
+              document/katehighlight.h \
+              document/katecmds.h    document/katedocument.h  \
+              document/katesyntaxdocument.h \
+              view/kateundohistory.h  \
+              view/kateview.h  \
+              view/kateviewdialog.h \
+              interfaces/view.h \
+              interfaces/document.h \
+              ktexteditor/ktexteditor.h
 
-SOURCES        = microkde/kapplication.cpp \
-                  microkde/kdialogbase.cpp \
-          kateconfig.cpp \
-                  microkde/klocale.cpp \
-                  microkde/kmessagebox.cpp \
-                  microkde/kprocess.cpp \
-                  microkde/kstandarddirs.cpp \
-                  microkde/ktempfile.cpp \
-                  microkde/kurlrequester.cpp \
-                  microkde/kfontdialog.cpp \
-                  microkde/krun.cpp \
-                  microkde/knumvalidator.cpp \
-                  microkde/kglobal.cpp \
-                  microkde/kglobalsettings.cpp \
-          microkde/kcolorbtn.cpp \
-          \
-          \
-          qt3back/qregexp3.cpp \
-          ktexteditor/ktexteditor.cpp \
-          document/katebuffer.cpp  document/katedialogs.cpp \
-          document/katehighlight.cpp  \
-          document/katecmd.cpp   \
-          document/katesyntaxdocument.cpp document/katecmds.cpp \
-          document/katedocument.cpp    document/katetextline.cpp \
-          view/kateundohistory.cpp \
-          view/kateview.cpp \
-          view/kateviewdialog.cpp \
-          interfaces/interfaces.cpp
-
-INTERFACES    =
-INCLUDEPATH    += $(OPIEDIR)/include \
+SOURCES     = microkde/kapplication.cpp \
+              microkde/kdialogbase.cpp \
+              kateconfig.cpp \
+              microkde/klocale.cpp \
+              microkde/kmessagebox.cpp \
+              microkde/kprocess.cpp \
+              microkde/kstandarddirs.cpp \
+              microkde/ktempfile.cpp \
+              microkde/kurlrequester.cpp \
+              microkde/kfontdialog.cpp \
+              microkde/krun.cpp \
+              microkde/knumvalidator.cpp \
+              microkde/kglobal.cpp \
+              microkde/kglobalsettings.cpp \
+              microkde/kcolorbtn.cpp \
+              \
+              qt3back/qregexp3.cpp \
+              ktexteditor/ktexteditor.cpp \
+              document/katebuffer.cpp  document/katedialogs.cpp \
+              document/katehighlight.cpp  \
+              document/katecmd.cpp   \
+              document/katesyntaxdocument.cpp document/katecmds.cpp \
+              document/katedocument.cpp    document/katetextline.cpp \
+              view/kateundohistory.cpp \
+              view/kateview.cpp \
+              view/kateviewdialog.cpp \
+              interfaces/interfaces.cpp
+INTERFACES  =
+INCLUDEPATH += $(OPIEDIR)/include \
             $(OPIEDIR)/noncore/apps/tinykate/libkate \
             $(OPIEDIR)/noncore/apps/tinykate/libkate/microkde \
             $(OPIEDIR)/noncore/apps/tinykate/libkate/document \
@@ -80,9 +77,9 @@ INCLUDEPATH    += $(OPIEDIR)/include \
             $(OPIEDIR)/noncore/apps/tinykate/libkate/interfaces \
             $(OPIEDIR)/noncore/apps/tinykate/libkate/ktexteditor \
             $(OPIEDIR)/noncore/apps/tinykate/libkate/qt3back
-DEPENDPATH    += $(OPIEDIR)/include
-LIBS            += -lqpe -lqtaux2 -lopiecore2 -lopieui2
-TARGET        = tinykate
+DEPENDPATH  += $(OPIEDIR)/include
+LIBS        += -lqpe -lqtaux2 -lopiecore2 -lopieui2
+TARGET      = tinykate
 
 INCLUDEPATH += $(OPIEDIR)/include
 DESTDIR      = $(OPIEDIR)/lib$(PROJMAK)
diff --git a/noncore/apps/tinykate/tinykate.pro b/noncore/apps/tinykate/tinykate.pro
index 6f4baa8..d34e519 100644
--- a/noncore/apps/tinykate/tinykate.pro
+++ b/noncore/apps/tinykate/tinykate.pro
@@ -1,21 +1,19 @@
-TEMPLATE    = app
-CONFIG        = qt warn_on  quick-app
+TEMPLATE       = app
+CONFIG         = qt warn_on quick-app
 DESTDIR        = $(OPIEDIR)/bin
 HEADERS        = tinykate.h
 SOURCES        = tinykate.cpp main.cpp
-INTERFACES    =
 INCLUDEPATH    += $(OPIEDIR)/include \
-            $(OPIEDIR)/noncore/apps/tinykate/libkate \
-            $(OPIEDIR)/noncore/apps/tinykate/libkate/microkde \
-                        $(OPIEDIR)/noncore/apps/tinykate/libkate/document \
-                        $(OPIEDIR)/noncore/apps/tinykate/libkate/view \
-                        $(OPIEDIR)/noncore/apps/tinykate/libkate/interfaces \
-                        $(OPIEDIR)/noncore/apps/tinykate/libkate/ktexteditor \
-                        $(OPIEDIR)/noncore/apps/tinykate/libkate/qt3back
-
-DEPENDPATH    += $(OPIEDIR)/include
-LIBS            += -lqpe -ltinykate -lopiecore2 -lopieui2
-TARGET        = kate
+               $(OPIEDIR)/noncore/apps/tinykate/libkate \
+               $(OPIEDIR)/noncore/apps/tinykate/libkate/microkde \
+               $(OPIEDIR)/noncore/apps/tinykate/libkate/document \
+               $(OPIEDIR)/noncore/apps/tinykate/libkate/view \
+               $(OPIEDIR)/noncore/apps/tinykate/libkate/interfaces \
+               $(OPIEDIR)/noncore/apps/tinykate/libkate/ktexteditor \
+               $(OPIEDIR)/noncore/apps/tinykate/libkate/qt3back
+DEPENDPATH     += $(OPIEDIR)/include
+LIBS           += -lqpe -ltinykate -lopiecore2 -lopieui2
+TARGET         = kate
 
 
 
diff --git a/noncore/apps/zsafe/config.in b/noncore/apps/zsafe/config.in
index 6e321f3..b6d3ffe 100644
--- a/noncore/apps/zsafe/config.in
+++ b/noncore/apps/zsafe/config.in
@@ -1,5 +1,5 @@
 config ZSAFE
     boolean "zsafe (Zaurus Password Manager)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI
 
diff --git a/noncore/apps/zsafe/scqtfiledlg.cpp b/noncore/apps/zsafe/scqtfiledlg.cpp
index 52b8d0d..c67bbd5 100644
--- a/noncore/apps/zsafe/scqtfiledlg.cpp
+++ b/noncore/apps/zsafe/scqtfiledlg.cpp
@@ -1,13 +1,10 @@
-/****************************************************************************
-** Form implementation generated from reading ui file 'scqtfiledlg.ui'
-**
-** Created: Sun Jun 8 15:51:12 2003
-**      by:  The User Interface Compiler (uic)
-**
-** WARNING! All changes made in this file will be lost!
-****************************************************************************/
 #include "scqtfiledlg.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
+using namespace Opie::Core;
+
+/* QT */
 #include <qcombobox.h>
 #include <qlineedit.h>
 #include <qlistview.h>
@@ -216,41 +213,41 @@ 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
@@ -29,7 +29,8 @@
 #ifndef DESKTOP
 #ifndef NO_OPIE
 #include <opie2/ofiledialog.h>
-
+#include <opie2/odebug.h>
+using namespace Opie::Core;
 using namespace Opie::Ui;
 #else
 #include "scqtfileedit.h"
@@ -38,8 +39,6 @@ using namespace Opie::Ui;
 
 #include <qclipboard.h>
 
-#include <stdio.h>
-
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -2069,7 +2068,6 @@ int ZSafe::loadInit(const char* _filename, const char *password)
 #ifndef WIN32
     size = read(fileno (fd), (unsigned char *) (charbuf + count), 8);
 #else
-    printf ("LoadInit() read1");
     size = fread ((unsigned char *) (charbuf + count), sizeof(unsigned char), 8, fd);
 #endif
 
@@ -2089,7 +2087,6 @@ int ZSafe::loadInit(const char* _filename, const char *password)
         while (count < 8) {
             count2 = read (fileno (fd), (unsigned char *) (charbuf + count), 8);
 #else
-    printf ("LoadInit() read2");
     while ((count = fread ((unsigned char *) (charbuf), sizeof(unsigned char), 8, fd)) > 0) {
         while (count < 8) {
             count2 = fread ((unsigned char *) (charbuf + count), sizeof(unsigned char), 8, fd);
@@ -2259,7 +2256,7 @@ bool ZSafe::saveDocument(const char* _filename,
        retval = saveEntry(entry);
            for (int z=0; z<i; z++) free(entry[z]);
            if (retval == PWERR_DATA) {
-              qWarning("1: Error writing file, contents not saved");
+              owarn << "1: Error writing file, contents not saved" << oendl; 
               saveFinalize();
               return false;
            }
@@ -2303,7 +2300,7 @@ bool ZSafe::saveDocument(const char* _filename,
                   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;
               }
@@ -2312,7 +2309,7 @@ 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 {
 #ifndef DESKTOP
@@ -3190,7 +3187,7 @@ void ZSafe::editCategory()
 
            if (cat)
            {
-              qWarning("Category found");
+              owarn << "Category found" << oendl; 
 
               // if (!icon.isEmpty() && !icon.isNull())
               if (icon != "predefined.png")
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,5 +1,5 @@
-TEMPLATE        = app
-CONFIG         = qt warn_on 
+TEMPLATE     = app
+CONFIG       = qt warn_on 
 DESTDIR      = $(OPIEDIR)/bin
 HEADERS      = zsafe.h krc2.h category.h categorylist.h zlistview.h \
                scqtfiledlg.h
@@ -7,11 +7,11 @@ SOURCES      = main.cpp zsafe.cpp krc2.cpp category.cpp \
                categorylist.cpp zlistview.cpp shadedlistitem.cpp\
                scqtfileedit.cpp scqtfileedit.moc.cpp \
                scqtfiledlg.cpp
-INTERFACES     = newdialog.ui searchdialog.ui passworddialog.ui categorydialog.ui infoform.ui wait.ui
-INCLUDEPATH    += $(OPIEDIR)/include
-DEPENDPATH    += $(OPIEDIR)/include
-LIBS        += -Wl,-rpath,$(OPIEDIR)/lib -L$(OPIEDIR)/lib -lqpe -lopiecore2 -lopieui2
-TARGET         = zsafe
+INTERFACES   = newdialog.ui searchdialog.ui passworddialog.ui categorydialog.ui infoform.ui wait.ui
+INCLUDEPATH  += $(OPIEDIR)/include
+DEPENDPATH   += $(OPIEDIR)/include
+LIBS         += -lqpe -lopiecore2 -lopieui2
+TARGET       = zsafe
 
 include ( $(OPIEDIR)/include.pro )