1 files changed, 29 insertions, 26 deletions

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;