6 files changed, 73 insertions, 83 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
@@ -73,3 +73,3 @@ void AdvancedFm::cleanUp() {
 void AdvancedFm::tabChanged(QWidget *) {
-//   qWarning("tab changed");
+//   owarn << "tab changed" << oendl; 
    QString path = CurrentDir()->canonicalPath();
@@ -95,3 +95,3 @@ void AdvancedFm::populateView() {
 
-// qWarning("PopulateView");
+// owarn << "PopulateView" << oendl; 
         QPixmap pm;
@@ -101,3 +101,3 @@ void AdvancedFm::populateView() {
 
-//qWarning("path is "+path);
+//owarn << "path is "+path << oendl; 
         thisView->clear();
@@ -162,3 +162,3 @@ 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" );
@@ -186,3 +186,3 @@ void AdvancedFm::populateView() {
                                 lstat( mydirent->d_name, &buf);
-//        qDebug(mydirent->d_name);
+//        odebug << mydirent->d_name << oendl; 
                                 fileL.sprintf("%s", mydirent->d_name);
@@ -211,3 +211,3 @@ void AdvancedFm::rePopulate() {
 //      int tmpTab = whichTab;
-// //  qDebug("%d", tmpTab);
+// //  odebug << "" << tmpTab << "" << oendl; 
 
@@ -221,6 +221,6 @@ 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);
@@ -269,3 +269,3 @@ 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);
@@ -275,3 +275,3 @@ void AdvancedFm::switchToLocalTab() {
 void AdvancedFm::switchToRemoteTab() {
-//qWarning("switch to local view");
+//owarn << "switch to local view" << oendl; 
    TabWidget->setCurrentWidget(1);
@@ -331,3 +331,3 @@ QStringList AdvancedFm::getPath() {
          strList <<  it.current()->text(0);
-//        qDebug(it.current()->text(0));
+//        odebug << it.current()->text(0) << oendl; 
       }
@@ -382,3 +382,3 @@ void AdvancedFm::doAbout() {
 void AdvancedFm::keyPressEvent( QKeyEvent *e) {
-//   qWarning("key %d", e->key());
+//   owarn << "key " << e->key() << "" << oendl; 
 //   if( CurrentView()->hasFocus()  )
@@ -640,3 +640,3 @@ void AdvancedFm::addToDocs() {
          curFile = thisDir->canonicalPath()+"/"+(*it);
-//                qDebug(curFile);
+//                odebug << curFile << oendl; 
          QFileInfo fi(curFile);
@@ -713,3 +713,3 @@ void AdvancedFm::addCustomDir() {
 void AdvancedFm::removeCustomDir() {
-//  qDebug("remove custom dir");
+//  odebug << "remove custom dir" << oendl; 
    Config cfg("AdvancedFm");
@@ -748,3 +748,3 @@ 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;
@@ -789,6 +789,6 @@ 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;
@@ -805,3 +805,3 @@ QListView * AdvancedFm::OtherView() {
 void AdvancedFm::setOtherTabCurrent() {
-//   qWarning("setOtherTabCurrent() %d", whichTab);
+//   owarn << "setOtherTabCurrent() " << whichTab << "" << oendl; 
    if ( whichTab == 1) {
@@ -816,6 +816,6 @@ 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;
@@ -832,3 +832,3 @@ void AdvancedFm::setDocument(const QString &file) {
 void AdvancedFm::gotoDirectory(const QString &file) {
-//   qWarning("goto dir "+file);
+//   owarn << "goto dir "+file << oendl; 
    QString curDir = file;
@@ -868,3 +868,3 @@ 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
@@ -2,3 +2,2 @@ TEMPLATE  = app
 CONFIG    += qt warn_on  quick-app
-# CONFIG    += qt warn_on 
 HEADERS   = advancedfm.h filePermissions.h output.h
@@ -10,21 +9,2 @@ LIBS            += -lqpe -lopiecore2 -lopieui2
 
-TRANSLATIONS = ../../../i18n/de/advancedfm.ts \
-     ../../../i18n/nl/advancedfm.ts \
-     ../../../i18n/da/advancedfm.ts \
-     ../../../i18n/xx/advancedfm.ts \
-   ../../../i18n/en/advancedfm.ts \
-   ../../../i18n/es/advancedfm.ts \
-   ../../../i18n/fr/advancedfm.ts \
-   ../../../i18n/hu/advancedfm.ts \
-   ../../../i18n/ja/advancedfm.ts \
-   ../../../i18n/ko/advancedfm.ts \
-   ../../../i18n/no/advancedfm.ts \
-   ../../../i18n/pl/advancedfm.ts \
-   ../../../i18n/pt/advancedfm.ts \
-   ../../../i18n/pt_BR/advancedfm.ts \
-   ../../../i18n/sl/advancedfm.ts \
-   ../../../i18n/zh_CN/advancedfm.ts \
-   ../../../i18n/zh_TW/advancedfm.ts
-
-
 !contains(CONFIG,quick-app) {
diff --git a/noncore/apps/advancedfm/advancedfmData.cpp b/noncore/apps/advancedfm/advancedfmData.cpp
index 2997c55..29335f8 100644
--- a/noncore/apps/advancedfm/advancedfmData.cpp
+++ b/noncore/apps/advancedfm/advancedfmData.cpp
@@ -13,2 +13,4 @@
 
+/* OPIE */
+#include <opie2/odebug.h>
 #include <qpe/storage.h>
@@ -17,3 +19,6 @@
 #include <qpe/menubutton.h>
+using namespace Opie::Core;
+using namespace Opie::Ui;
 
+/* QT */
 #include <qlayout.h>
@@ -26,6 +31,5 @@
 
+/* STD */
 #include <sys/utsname.h>
 
-
-using namespace Opie::Ui;
 void AdvancedFm::init() {
@@ -221,3 +225,3 @@ void AdvancedFm::init() {
          if( !StorageInfo::hasSd() || !StorageInfo::hasMmc()) {
-                        qDebug("not have sd");
+                        odebug << "not have sd" << oendl; 
                         sdButton->hide();
@@ -225,3 +229,3 @@ void AdvancedFm::init() {
          if( !StorageInfo::hasCf() ) {
-                        qDebug("not have cf");
+                        odebug << "not have cf" << oendl; 
                         cfButton->hide();
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp
index 81a4318..d34f330 100644
--- a/noncore/apps/advancedfm/advancedfmMenu.cpp
+++ b/noncore/apps/advancedfm/advancedfmMenu.cpp
@@ -11,2 +11,3 @@
     ***************************************************************************/

+
 #include "advancedfm.h"

@@ -15,2 +16,4 @@
 

+/* OPIE */
+#include <opie2/odebug.h>
 #include <qpe/lnkproperties.h>

@@ -18,6 +21,7 @@
 #include <qpe/applnk.h>

+using namespace Opie::Core;
 

-#include <qmessagebox.h>

-

+/* QT*/
 

+#include <qmessagebox.h>
 #include <qpopupmenu.h>

@@ -25,2 +29,4 @@
 

+/* STD */
+
 #include <errno.h>

@@ -33,5 +39,2 @@
 

-

-using namespace Opie::Core;

-using namespace Opie::Core;

 void AdvancedFm::doDirChange() {

@@ -43,3 +46,3 @@ void AdvancedFm::doDirChange() {
          pathItem = dealWithSymName((const QString&)pathItem)+"/";

-//      qWarning(pathItem);

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

@@ -94,3 +97,3 @@ void AdvancedFm::runThis() {
       QFileInfo fileInfo( path  + "/" + curFile);

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

+//      odebug << fileInfo.owner() << oendl; 
 

@@ -106,3 +109,3 @@ void AdvancedFm::runThis() {
           QString execStr = nf.exec();

-//          qDebug( execStr);

+//          odebug << execStr << oendl; 
           if( execStr.isEmpty() ) {

@@ -204,3 +207,3 @@ void AdvancedFm::doDelete() {
             if( fi.fileName().find("../",0,TRUE)==-1) {

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

+//               odebug << "remove link files "+myFile << oendl; 
 

@@ -209,3 +212,3 @@ void AdvancedFm::doDelete() {
                  lnk = new DocLnk(f);

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

+//                 odebug << "Deleting doclnk " + lnk->linkFile() << oendl; 
                  if(lnk->isValid())

@@ -245,6 +248,6 @@ void AdvancedFm::doProperties() {
 

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

+//   odebug << "" << curFileList.count() << "" << oendl; 
 

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

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

+//      odebug << (filePath+*it) << oendl; 
       DocLnk lnk( (filePath+*it));

@@ -304,4 +307,4 @@ void AdvancedFm::copy() {
 

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

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

+//          odebug << "Destination file is "+destFile << oendl; 
+//          odebug << "CurrentFile file is " + curFile << oendl; 
 

@@ -422,3 +425,3 @@ void AdvancedFm::copySameDir() {
 

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

+//          odebug << "copy "+curFile+" as "+destFile << oendl; 
         }

@@ -445,3 +448,3 @@ void AdvancedFm::move() {
           destFile += item;

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

+//          odebug << "Destination file is "+destFile << oendl; 
 

@@ -451,3 +454,3 @@ void AdvancedFm::move() {
           curFile+= item;

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

+//          odebug << "CurrentFile file is " + curFile << oendl; 
 

@@ -491,3 +494,3 @@ bool AdvancedFm::copyDirectory( const QString & src, const QString & dest ) {
         QString    cmd = "/bin/cp -fpR " + src + " " + dest;

-    qWarning(cmd);

+    owarn << cmd << oendl; 
         int    err = system( (const char *) cmd );

@@ -527,3 +530,3 @@ bool AdvancedFm::copyFile( const QString & src, const QString & dest ) {
       if(!srcFile.open( IO_ReadOnly|IO_Raw)) {

-//         qWarning("open failed");

+//         owarn << "open failed" << oendl; 
          return success = false;

@@ -534,3 +537,3 @@ bool AdvancedFm::copyFile( const QString & src, const QString & dest ) {
       if( !destFile.open( IO_WriteOnly|IO_Raw ) ) {

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

+//       owarn << "destfile open failed" << oendl; 
        return success = false;

@@ -549,3 +552,3 @@ bool AdvancedFm::copyFile( const QString & src, const QString & dest ) {
               success = false;

-//              qWarning(msg);

+//              owarn << msg << oendl; 
          }

@@ -581,3 +584,3 @@ void AdvancedFm::runCommand() {
    if( fileDlg->result() == 1 ) {

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

+//      odebug << fileDlg->LineEdit1->text() << oendl; 
       QStringList command;

@@ -664,3 +667,3 @@ void AdvancedFm::mkSym() {
           cmd = "ln -s "+curFile+" "+destName;

-//          qDebug(cmd);

+//          odebug << cmd << oendl; 
           startProcess( (const QString)cmd );

@@ -717,3 +720,3 @@ void AdvancedFm::startProcess(const QString & cmd) {
   if(!process->start(OProcess::NotifyOnExit, OProcess::All) )

-    qDebug("could not start process");

+    odebug << "could not start process" << oendl; 
 }

@@ -725,3 +728,3 @@ void AdvancedFm::processEnded(OProcess *) {
 void AdvancedFm::oprocessStderr(OProcess*, char *buffer, int ) {

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

+//    owarn << "received stderrt " << buflen << " bytes" << oendl; 
 

@@ -767,3 +770,3 @@ bool AdvancedFm::eventFilter( QObject * o, QEvent * e ) {
 void AdvancedFm::cancelRename() {

-//  qDebug("cancel rename");

+//  odebug << "cancel rename" << oendl; 
   QListView * view;

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
@@ -34,3 +34,3 @@ filePermissions::filePermissions( QWidget* parent,  const char* name, bool modal
   setName( tr("filePermissions") );
-//    qDebug("FilePermissions "+fileName);
+//    odebug << "FilePermissions "+fileName << oendl; 
 /*    resize( 236, 210 );
diff --git a/noncore/apps/advancedfm/output.cpp b/noncore/apps/advancedfm/output.cpp
index 6906298..8c585f4 100644
--- a/noncore/apps/advancedfm/output.cpp
+++ b/noncore/apps/advancedfm/output.cpp
@@ -7,5 +7,9 @@
 
+/* OPIE */
+#include <opie2/odebug.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/applnk.h>
+using namespace Opie::Core;
 
+/* QT */
 #include <qfile.h>
@@ -15,2 +19,3 @@
 
+/* STD */
 #include <errno.h>
@@ -18,4 +23,2 @@
 /* XPM */
-using namespace Opie::Core;
-using namespace Opie::Core;
 static char * filesave_xpm[] = {
@@ -123,3 +126,3 @@ Output::Output( const QStringList commands, QWidget* parent,  const char* name,
    cmmds=commands;
-//   qDebug("count %d", cmmds.count());
+//   odebug << "count " << cmmds.count() << "" << oendl; 
    if ( !name )
@@ -159,3 +162,3 @@ Output::Output( const QStringList commands, QWidget* parent,  const char* name,
       for ( QStringList::Iterator it = cmmds.begin(); it != cmmds.end(); ++it ) {
-         qDebug( "%s", (*it).latin1() );
+         odebug << "" << (*it).latin1() << "" << oendl; 
          * proc << (*it).latin1();
@@ -188,3 +191,3 @@ void Output::saveOutput() {
       filename+="text/plain/"+name;
-      qDebug(filename);
+      odebug << filename << oendl; 
 
@@ -198,6 +201,6 @@ void Output::saveOutput() {
           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();
@@ -207,3 +210,3 @@ void Output::saveOutput() {
 void Output::commandStdout(OProcess*, char *buffer, int buflen) {
-    qWarning("received stdout %d bytes", buflen);
+    owarn << "received stdout " << buflen << " bytes" << oendl; 
 
@@ -224,3 +227,3 @@ 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
@@ -230,3 +233,3 @@ void Output::commandStdin( const QByteArray &data) {
 void Output::commandStderr(OProcess*, char *buffer, int buflen) {
-    qWarning("received stderrt %d bytes", buflen);
+    owarn << "received stderrt " << buflen << " bytes" << oendl;