1 files changed, 79 insertions, 82 deletions

diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp
index 78f9da2..18bbd43 100644
--- a/noncore/apps/advancedfm/advancedfmMenu.cpp
+++ b/noncore/apps/advancedfm/advancedfmMenu.cpp
@@ -15,5 +15,2 @@
 

-#include <opie/otabwidget.h>

-#include <opie/oprocess.h>

-

 #include <qpe/lnkproperties.h>

@@ -71,3 +68,3 @@ void AdvancedFm::showMenuHidden() {
      b = !b;

-                 populateView();

+         populateView();

 }

@@ -82,3 +79,3 @@ void AdvancedFm::showHidden() {
     }

-                 populateView();

+         populateView();

 }

@@ -148,3 +145,3 @@ void AdvancedFm::makeDir() {
   }

-        populateView();

+    populateView();

 }

@@ -185,3 +182,3 @@ void AdvancedFm::doDelete() {
 

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

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

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

@@ -193,3 +190,3 @@ void AdvancedFm::doDelete() {
                startProcess( (const QString)cmd.latin1() );

-                                                         populateView();

+                             populateView();

             }

@@ -211,3 +208,3 @@ void AdvancedFm::doDelete() {
             }

-      

+

             QString cmd="rm "+f;

@@ -217,3 +214,3 @@ void AdvancedFm::doDelete() {
 //               qDebug("remove link files "+myFile);

-               

+

 //               DocLnk lnk(f);

@@ -230,3 +227,3 @@ void AdvancedFm::doDelete() {
    }

-        populateView();

+    populateView();

 }

@@ -246,3 +243,3 @@ void AdvancedFm::filePerms() {
    }

-        populateView();

+    populateView();

 }

@@ -278,3 +275,3 @@ void AdvancedFm::upDir() {
 

-        populateView();

+    populateView();

   update();

@@ -339,4 +336,4 @@ void AdvancedFm::copy() {
       }

-                        setOtherTabCurrent();

-                        rePopulate();

+            setOtherTabCurrent();

+            rePopulate();

    }

@@ -389,4 +386,4 @@ void AdvancedFm::copyAs() {
    }

-                        rePopulate();

-                        setOtherTabCurrent();

+            rePopulate();

+            setOtherTabCurrent();

 }

@@ -438,3 +435,3 @@ void AdvancedFm::copySameDir() {
     }

-                        rePopulate();

+            rePopulate();

 }

@@ -461,3 +458,3 @@ void AdvancedFm::move() {
           if(curFile.right(1).find("/",0,TRUE) == -1)

-                                                        curFile +="/";

+                            curFile +="/";

           curFile+= item;

@@ -466,20 +463,20 @@ void AdvancedFm::move() {
           if(QFileInfo(curFile).isDir()) {

-                                                        moveDirectory( curFile, destFile );

-                                                        rePopulate();

-                                                        return;

+                            moveDirectory( curFile, destFile );

+                            rePopulate();

+                            return;

           }

 

-                                        QFile f( curFile);

+                    QFile f( curFile);

           if( f.exists()) {

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

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

-                                                                        return;

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

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

+                                    return;

               } else

-                                                                        QFile::remove(curFile);

+                                    QFile::remove(curFile);

           }

-                        }

+            }

 

   }

-                        rePopulate();

-                        setOtherTabCurrent();

+            rePopulate();

+            setOtherTabCurrent();

 }

@@ -487,13 +484,13 @@ void AdvancedFm::move() {
 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;

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

 }

@@ -502,14 +499,14 @@ bool AdvancedFm::copyDirectory( const QString & src, const QString & dest ) {
 

-                        QStringcmd = "/bin/cp -fpR " + src + " " + dest;

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

     qWarning(cmd);

-                        interr = 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;

-                }

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

+        return true;

 }

- 

+

 

@@ -517,20 +514,20 @@ 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;

+

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

@@ -549,3 +546,3 @@ bool AdvancedFm::copyFile( const QString & src, const QString & dest ) {
       }

-      write_fd = destFile.handle(); 

+      write_fd = destFile.handle();

       if(write_fd != -1) {

@@ -679,5 +676,5 @@ void AdvancedFm::mkSym() {
         }

-                        rePopulate();

-                        setOtherTabCurrent();

-        }

+            rePopulate();

+            setOtherTabCurrent();

+    }

 }

@@ -733,3 +730,3 @@ void AdvancedFm::startProcess(const QString & cmd) {
 void AdvancedFm::processEnded(OProcess *) {

-                        rePopulate();

+            rePopulate();

 }

@@ -799,3 +796,3 @@ void AdvancedFm::doRename(QListView * view) {
 

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

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

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

@@ -812,7 +809,7 @@ void AdvancedFm::doRename(QListView * view) {
 

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

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

 

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

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

 

-                renameBox->setFocus();

+        renameBox->setFocus();

     renameBox->show();

@@ -822,5 +819,5 @@ void AdvancedFm::doRename(QListView * view) {
 void AdvancedFm::renameIt() {

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

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

 

-                QListView *thisView = CurrentView();

+        QListView *thisView = CurrentView();

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

@@ -833,4 +830,4 @@ void AdvancedFm::okRename() {
    QString newName = renameBox->text();

-         cancelRename();

-         QListView * view = CurrentView();

+     cancelRename();

+     QListView * view = CurrentView();

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

@@ -844,3 +841,3 @@ void AdvancedFm::okRename() {
    delete view->currentItem();

-         rePopulate();

+     rePopulate();

 }