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
@@ -12,11 +12,8 @@
 #include "advancedfm.h"

 #include "output.h"

 #include "filePermissions.h"

 

-#include <opie/otabwidget.h>

-#include <opie/oprocess.h>

-

 #include <qpe/lnkproperties.h>

 #include <qpe/qpeapplication.h>

 #include <qpe/resource.h>

 #include <qpe/qcopenvelope_qws.h>

@@ -68,9 +65,9 @@ void AdvancedFm::showMenuHidden() {
       OtherDir()->setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);

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

     }

      b = !b;

-                 populateView();

+         populateView();

 }

 

 void AdvancedFm::showHidden() {

   if (b) {

@@ -79,9 +76,9 @@ void AdvancedFm::showHidden() {
     }  else {

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

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

     }

-                 populateView();

+         populateView();

 }

 

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

    QString strItem = fileName;

@@ -145,9 +142,9 @@ void AdvancedFm::makeDir() {
       QDir *thisDir = CurrentDir();

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

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

   }

-        populateView();

+    populateView();

 }

 

 void AdvancedFm::doDelete() {

    QStringList curFileList = getPath();

@@ -182,17 +179,17 @@ void AdvancedFm::doDelete() {
          f += myFile;

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

             //if file is a directory

 

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

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

+                             populateView();

             }

             break;

             case 1:

                // exit

@@ -208,15 +205,15 @@ void AdvancedFm::doDelete() {
                   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());

@@ -227,9 +224,9 @@ void AdvancedFm::doDelete() {
             }

          }

       }

    }

-        populateView();

+    populateView();

 }

 

 void AdvancedFm::filePerms() {

    QStringList curFileList = getPath();

@@ -243,9 +240,9 @@ void AdvancedFm::filePerms() {
       QPEApplication::execDialog( filePerm );

       if( filePerm )

          delete  filePerm;

    }

-        populateView();

+    populateView();

 }

 

 void AdvancedFm::doProperties() {

 #if defined(QT_QWS_OPIE)

@@ -275,9 +272,9 @@ void AdvancedFm::upDir() {
   current = dir.canonicalPath();

   chdir( current.latin1() );

   thisDir->cd(  current, TRUE);

 

-        populateView();

+    populateView();

   update();

 }

 

 void AdvancedFm::copy() {

@@ -336,10 +333,10 @@ void AdvancedFm::copy() {
                                  tr( "Could not copy %1 to %2").arg( curFile ).arg( destFile ) );

             return;

          }

       }

-                        setOtherTabCurrent();

-                        rePopulate();

+            setOtherTabCurrent();

+            rePopulate();

    }

 }

 

 void AdvancedFm::copyAs() {

@@ -386,10 +383,10 @@ void AdvancedFm::copyAs() {
       }

       delete fileDlg;

 

    }

-                        rePopulate();

-                        setOtherTabCurrent();

+            rePopulate();

+            setOtherTabCurrent();

 }

 

 void AdvancedFm::copySameDir() {

   qApp->processEvents();

@@ -435,9 +432,9 @@ void AdvancedFm::copySameDir() {
 //          qDebug("copy "+curFile+" as "+destFile);

         }

       delete fileDlg;

     }

-                        rePopulate();

+            rePopulate();

 }

 

 void AdvancedFm::move() {

   qApp->processEvents();

@@ -458,82 +455,82 @@ void AdvancedFm::move() {
 //          qDebug("Destination file is "+destFile);

 

           curFile = thisDir->canonicalPath();

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

-                                                        curFile +="/";

+                            curFile +="/";

           curFile+= item;

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

 

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

 }

 

 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;

 }

 

 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;

 }

- 

+

 

 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;

    struct stat stat_buf;

    off_t offset = 0;

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

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

 //       qWarning("destfile open failed");

        return success = false;

       }

-      write_fd = destFile.handle(); 

+      write_fd = destFile.handle();

       if(write_fd != -1) {

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

            if( err == -1) {

               QString msg;

@@ -676,11 +673,11 @@ void AdvancedFm::mkSym() {
           cmd = "ln -s "+curFile+" "+destName;

 //          qDebug(cmd);

           startProcess( (const QString)cmd );

         }

-                        rePopulate();

-                        setOtherTabCurrent();

-        }

+            rePopulate();

+            setOtherTabCurrent();

+    }

 }

 

 void AdvancedFm::doBeam() {

    Ir ir;

@@ -730,9 +727,9 @@ void AdvancedFm::startProcess(const QString & cmd) {
     qDebug("could not start process");

 }

 

 void AdvancedFm::processEnded(OProcess *) {

-                        rePopulate();

+            rePopulate();

 }

 

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

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

@@ -796,9 +793,9 @@ void AdvancedFm::doRename(QListView * view) {
     QRect r = view->itemRect( view->currentItem( ));

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

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

 

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

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

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

 

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

     renameBox->setFrame(true);

@@ -809,31 +806,31 @@ void AdvancedFm::doRename(QListView * view) {
     renameBox->installEventFilter( this );

 

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

 

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

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

 

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

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

 

-                renameBox->setFocus();

+        renameBox->setFocus();

     renameBox->show();

 }

 

 

 void AdvancedFm::renameIt() {

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

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

 

-                QListView *thisView = CurrentView();

+        QListView *thisView = CurrentView();

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

     doRename( thisView );

 }

 

 void AdvancedFm::okRename() {

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

 

    QString newName = renameBox->text();

-         cancelRename();

-         QListView * view = CurrentView();

+     cancelRename();

+     QListView * view = CurrentView();

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

    oldName = path + oldName;

    newName = path + newName;

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

@@ -841,9 +838,9 @@ void AdvancedFm::okRename() {
    else

       oldName = "";

    view->takeItem( view->currentItem() );

    delete view->currentItem();

-         rePopulate();

+     rePopulate();

 }

 

 void AdvancedFm::openSearch() {

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