code cleanup

2 files changed, 3 insertions, 106 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index d0ccc3f..96a2d0a 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -76,5 +76,4 @@ AdvancedFm::AdvancedFm( )
 {
     setCaption( tr( "AdvancedFm" ) );
-//      menuTimer( this );
 
     QGridLayout *layout = new QGridLayout( this );
@@ -85,5 +84,4 @@ AdvancedFm::AdvancedFm( )
 
     QPEMenuBar *menuBar = new QPEMenuBar(this);
-//    fileMenu  = new QPopupMenu( this );
     fileMenu = new QPopupMenu( this );
     viewMenu  = new QPopupMenu( this );
@@ -96,52 +94,37 @@ AdvancedFm::AdvancedFm( )
     qpeDirButton= new QToolButton(this,"QPEButton");
   qpeDirButton->setPixmap( Resource::loadPixmap("launcher/opielogo16x16"));//,"",this,"QPEButton");
-//    qpeDirButton= new QPushButton(Resource::loadIconSet("launcher/opielogo16x16"),"",this,"QPEButton");
     qpeDirButton ->setFixedSize( QSize( 20, 20 ) );
     connect( qpeDirButton ,SIGNAL(released()),this,SLOT( QPEButtonPushed()) );
-    //qpeDirButton->setFlat(TRUE);
     layout->addMultiCellWidget( qpeDirButton , 0, 0, 2, 2);
 
     cfButton = new QToolButton( this,"CFButton");
   cfButton->setPixmap(Resource::loadPixmap("cardmon/pcmcia"));
-//    cfButton = new QPushButton(Resource::loadIconSet("cardmon/pcmcia"),"",this,"CFButton");
     cfButton ->setFixedSize( QSize( 20, 20 ) );
     connect( cfButton ,SIGNAL(released()),this,SLOT( CFButtonPushed()) );
-    //cfButton->setFlat(TRUE);
     layout->addMultiCellWidget( cfButton , 0, 0, 3, 3);
 
     sdButton = new QToolButton( this,"SDButton");
   sdButton->setPixmap(Resource::loadPixmap("sdmon/sdcard"));
-//    sdButton = new QPushButton(Resource::loadIconSet("sdmon/sdcard"),"",this,"SDButton");
     sdButton->setFixedSize( QSize( 20, 20 ) );
     connect( sdButton ,SIGNAL(released()),this,SLOT( SDButtonPushed()) );
-//    sdButton->setFlat(TRUE);
     layout->addMultiCellWidget( sdButton , 0, 0, 4, 4);
 
     cdUpButton = new QToolButton( this,"cdUpButton");
   cdUpButton->setPixmap(Resource::loadPixmap("up"));
-//    cdUpButton = new QPushButton(Resource::loadIconSet("up"),"",this,"cdUpButton");
     cdUpButton ->setFixedSize( QSize( 20, 20 ) );
     connect( cdUpButton ,SIGNAL(released()),this,SLOT( upDir()) );
-    //cdUpButton ->setFlat(TRUE);
     layout->addMultiCellWidget( cdUpButton , 0, 0, 5, 5);
 
     docButton = new QToolButton( this,"docsButton");
   docButton->setPixmap(Resource::loadPixmap("DocsIcon"));
-//    docButton = new QPushButton(Resource::loadIconSet("DocsIcon"),"",this,"docsButton");
     docButton->setFixedSize( QSize( 20, 20 ) );
     connect( docButton,SIGNAL(released()),this,SLOT( docButtonPushed()) );
-//    docButton->setFlat(TRUE);
     layout->addMultiCellWidget( docButton, 0, 0, 6, 6);
 
     homeButton = new QToolButton( this,"homeButton");
   homeButton->setPixmap(Resource::loadPixmap("home"));
-//    homeButton = new QPushButton( Resource::loadIconSet("home"),"",this,"homeButton");
     homeButton->setFixedSize( QSize( 20, 20 ) );
     connect(homeButton,SIGNAL(released()),this,SLOT(homeButtonPushed()) );
-//    homeButton->setFlat(TRUE);
     layout->addMultiCellWidget( homeButton, 0, 0, 7, 7);
-//     fileMenu->insertItem( tr( "New" ), this,  SLOT( newConnection() ));
-//     fileMenu->insertItem( tr( "Connect" ), this,  SLOT( connector() ));
-//     fileMenu->insertItem( tr( "Disconnect" ), this,  SLOT( disConnector() ));
 
     fileMenu->insertItem( tr( "Show Hidden Files" ), this,  SLOT( showHidden() ));
@@ -188,5 +171,4 @@ AdvancedFm::AdvancedFm( )
 
     Local_View = new QListView( tab, "Local_View" );
-//    Local_View->setResizePolicy( QListView::AutoOneFit );
     Local_View->addColumn( tr("File"),130);
     Local_View->addColumn( tr("Size"),-1);
@@ -200,6 +182,4 @@ AdvancedFm::AdvancedFm( )
      QPEApplication::setStylusOperation( Local_View->viewport(),QPEApplication::RightOnHold);
 
-
-
     tabLayout->addWidget( Local_View, 0, 0 );
 
@@ -235,5 +215,4 @@ AdvancedFm::AdvancedFm( )
     connect( Remote_View, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
              this,SLOT( remoteListPressed(int, QListViewItem *, const QPoint&, int)) );
-//    connect( Remote_View, SIGNAL( selectionChanged() ), SLOT( cancelMenuTimer() ) );
 
     tabLayout_2->addWidget( Remote_View, 0, 0 );
@@ -268,7 +247,4 @@ QListView *fileTree;
 ///////////////
 
-////////////////////     
-
-     
     currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
     currentDir.setPath( QDir::currentDirPath());
@@ -328,7 +304,4 @@ void AdvancedFm::populateLocalView()
     currentDir.setNameFilter(filterStr);
     QString fileL, fileS, fileDate;
-//    qDebug(currentDir.canonicalPath());
-//     struct stat buf;
-//     mode_t mode;
     QString fs= getFileSystemType((const QString &) currentDir.canonicalPath());
     setCaption("AdvancedFm :: "+fs);
@@ -340,5 +313,4 @@ void AdvancedFm::populateLocalView()
         if (fi->isSymLink() ) {
             QString symLink=fi->readLink();
-//         qDebug("Symlink detected "+symLink);
             QFileInfo sym( symLink);
             fileS.sprintf( "%10li", sym.size() );
@@ -352,5 +324,4 @@ void AdvancedFm::populateLocalView()
                 fileL+="/";
                 isDir=TRUE;
-//     qDebug( fileL);
             }
         }
@@ -365,5 +336,4 @@ void AdvancedFm::populateLocalView()
                 else
                     pm= Resource::loadPixmap( "folder" );
-//                 item->setPixmap( 0,pm );
             } else if ( fs == "vfat" && fileInfo.filePath().contains("/bin") ) {
                 pm = Resource::loadPixmap( "exec");
@@ -372,11 +342,6 @@ void AdvancedFm::populateLocalView()
                         | fileInfo.permission( QFileInfo::ExeOther)) && fs != "vfat" ) {
                 pm = Resource::loadPixmap( "exec");
-//                 else { //is exec
-//                  pm = Resource::loadPixmap( "exec");
-//                 }
-// //                 item->setPixmap( 0,pm);
         } else if( !fi->isReadable() ) {
             pm = Resource::loadPixmap( "locked" );
-//                 item->setPixmap( 0,pm);
             } else { //everything else goes by mimetype
                 MimeType mt(fi->filePath());
@@ -384,5 +349,4 @@ void AdvancedFm::populateLocalView()
                 if(pm.isNull())
                     pm =  Resource::loadPixmap( "UnknownDocument-14" );
-//                 item->setPixmap( 0,pm);
             }
             item->setPixmap( 0,pm);
@@ -403,21 +367,14 @@ void AdvancedFm::populateLocalView()
     if(currentDir.canonicalPath().find("dev",0,TRUE) != -1) {
         struct stat buf;
-//         struct stat st;
         dev_t devT;
-//         mode_t mode;
         DIR *dir;
-//         int fd = 0;
         struct dirent *mydirent;
-//         int i = 1;
         if((dir = opendir( currentDir.canonicalPath().latin1())) != NULL)
             while ((mydirent = readdir(dir)) != NULL) {
                 lstat( mydirent->d_name, &buf);
                 qDebug(mydirent->d_name);
-//                 mode = buf.st_mode;
                 fileL.sprintf("%s", mydirent->d_name);
-//                fileS.sprintf("%d, %d",  ); //this isn't correct
                 devT = buf.st_dev;
                 fileS.sprintf("%d, %d", (int) ( devT >>8) &0xFF, (int)devT &0xFF);
-//                fileS.sprintf("%d,%d", devT,  devT);
                 fileDate.sprintf("%s", ctime( &buf.st_mtime));
                 if( fileL.find(".") == -1 ){
@@ -438,13 +395,4 @@ void AdvancedFm::populateLocalView()
 void AdvancedFm::populateRemoteView()
 {
-//     QList<QListViewItem> * getSelectedItems( QListView * Local_View );
-//     QListViewItemIterator it( Remote_View );
-//     for ( ; it.current(); ++it ) {
-//         if ( it.current()->isSelected() ) {
-//             QString strItem = it.current()->text(0);
-//             QString localFile = currentRemoteDir.canonicalPath()+"/"+strItem;
-//             QFileInfo fi(localFile);
-//         }
-//     }
     QPixmap pm;
     Remote_View->clear();
@@ -489,5 +437,4 @@ void AdvancedFm::populateRemoteView()
                 else
                     pm= Resource::loadPixmap( "folder" );
-//                 item->setPixmap( 0,pm );
             } else if ( fs == "vfat" && fileInfo.filePath().contains("/bin") ) {
                 pm = Resource::loadPixmap( "exec");
@@ -496,8 +443,6 @@ void AdvancedFm::populateRemoteView()
                         | fileInfo.permission( QFileInfo::ExeOther)) && fs != "vfat" ) {
                 pm = Resource::loadPixmap( "exec");
-//                     item->setPixmap( 0,pm);
             } else if( !fi->isReadable() ) {
                 pm = Resource::loadPixmap( "locked" );
-//                     item->setPixmap( 0,pm);
             } else {
                 MimeType mt(fi->filePath());
@@ -505,5 +450,4 @@ void AdvancedFm::populateRemoteView()
                 if(pm.isNull())
                     pm =  Resource::loadPixmap( "UnknownDocument-14" );
-//                     item->setPixmap( 0,pm);
             }
         if(  fi->isSymLink() && fileL.find("->",0,TRUE) != -1) {
@@ -514,5 +458,4 @@ void AdvancedFm::populateRemoteView()
             painter.drawPixmap( pm.width()-lnk.width(), pm.height()-lnk.height(), lnk );
             pm.setMask( pm.createHeuristicMask( FALSE ) );
-//                 item->setPixmap( 0, pm);
         }
         item->setPixmap( 0, pm);
@@ -524,17 +467,11 @@ void AdvancedFm::populateRemoteView()
     if(currentRemoteDir.canonicalPath().find("dev",0,TRUE) != -1) {
         struct stat buf;
-//         struct stat st;
-//         mode_t mode;
         DIR *dir;
-//         int fd = 0;
         struct dirent *mydirent;
-//         int i = 1;
         if((dir = opendir( currentRemoteDir.canonicalPath().latin1())) != NULL)
             while ((mydirent = readdir(dir)) != NULL) {
                 lstat( mydirent->d_name, &buf);
                 qDebug(mydirent->d_name);
-//                 mode = buf.st_mode;
                 fileL.sprintf("%s", mydirent->d_name);
-//                fileS.sprintf("%d, %d",  ); //this isn't correct
                 fileS.sprintf("%d,%d", (int) (buf.st_dev>>8)&0xFF, (int) buf.st_dev &0xFF);
                 fileDate.sprintf("%s", ctime( &buf.st_mtime));
@@ -650,6 +587,4 @@ void AdvancedFm::showHidden()
     currentDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
     fileMenu->setItemChecked( fileMenu->idAt(0),TRUE);
-//     localMenu->setItemChecked(localMenu->idAt(0),TRUE);
-//    currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
     b=FALSE;
 
@@ -657,6 +592,4 @@ void AdvancedFm::showHidden()
     currentDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
     fileMenu->setItemChecked( fileMenu->idAt(0),FALSE);
-//     localMenu->setItemChecked(localMenu->idAt(0),FALSE);
-//    currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
     b=TRUE;
     }
@@ -669,12 +602,8 @@ void AdvancedFm::showRemoteHidden()
     if (b) {
     currentRemoteDir.setFilter( QDir::Files | QDir::Dirs | QDir::Hidden | QDir::All);
-//     viewMenu->setItemChecked(localMenu->idAt(0),TRUE);
-//    currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
     b=TRUE;
 
     }  else {
     currentRemoteDir.setFilter( QDir::Files | QDir::Dirs/* | QDir::Hidden*/ | QDir::All);
-//     localMenu->setItemChecked(localMenu->idAt(0),FALSE);
-//    currentDir.setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
     b=FALSE;
     }
@@ -709,5 +638,4 @@ void AdvancedFm::remoteListPressed( int mouse, QListViewItem *item, const QPoint
 
 void AdvancedFm::runThis() {
-//    QFileInfo *fi;
     QString fs;
     if (TabWidget->currentPageIndex() == 0) {
@@ -722,5 +650,4 @@ void AdvancedFm::runThis() {
                  | fileInfo.permission( QFileInfo::ExeOther)) // & fs.find("vfat",0,TRUE) == -1) {
                 | fs == "vfat" && fileInfo.filePath().contains("/bin") ) {
-//        if( fileInfo.isExecutable() |
                 QCopEnvelope e("QPE/System", "execute(QString)" );
                 e << curFile;
@@ -736,5 +663,4 @@ void AdvancedFm::runThis() {
             }
         }
-//         MimeType mt( curFile);
     } else {
         QString curFile = Remote_View->currentItem()->text(0);
@@ -761,5 +687,4 @@ void AdvancedFm::runThis() {
             }
         }
-//         MimeType mt( curFile);
     }
 }
@@ -1059,5 +984,4 @@ void AdvancedFm::doProperties() {
         DocLnk lnk( (filePath+*it));
         LnkProperties prop( &lnk );
-//  connect(&prop, SIGNAL(select(const AppLnk *)), this, SLOT(externalSelected(const AppLnk *)));
         prop.showMaximized();
         prop.exec();
@@ -1176,13 +1100,5 @@ void AdvancedFm::copy()
 
             QString destFile = currentRemoteDir.canonicalPath()+"/"+(*it);
-//             if(destFile.right(1).find("/",0,TRUE) == -1)
-//                 destFile+="/";
-//             destFile +=(*it);
-
             curFile = currentDir.canonicalPath()+"/"+(*it);
-//             if(curFile.right(1).find("/",0,TRUE) == -1)
-//                 curFile +="/";
-//             curFile +=(*it);
-
             QFile f(destFile);
             if( f.exists()) {
@@ -1249,6 +1165,4 @@ void AdvancedFm::copyAs()
                 QString destFile;
                 curFile = currentDir.canonicalPath()+"/"+(*it);
-//             InputDialog *fileDlg;
-//             fileDlg = new InputDialog(this,tr("Copy As"),TRUE, 0);
                 fileDlg->setInputText((const QString &) destFile );
                 fileDlg->exec();
@@ -1329,6 +1243,4 @@ void AdvancedFm::copySameDir() {
                 curFile = currentDir.canonicalPath()+"/"+(*it);
                 fileDlg = new InputDialog(this,tr("Copy ")+curFile+tr(" As"),TRUE, 0);
-//             InputDialog *fileDlg;
-//             fileDlg = new InputDialog(this,tr("Copy As"),TRUE, 0);
                 fileDlg->setInputText((const QString &) destFile );
                 fileDlg->exec();
@@ -1532,5 +1444,4 @@ void AdvancedFm::runCommand() {
         command = fileDlg->LineEdit1->text();
 
-//         int err=0;
         Output *outDlg;
         outDlg = new Output(this, tr("AdvancedFm Output"),FALSE);
@@ -1541,5 +1452,4 @@ void AdvancedFm::runCommand() {
         char line[130];
         sleep(1);
-//         if(command.find("2>",0,TRUE) != -1)
             command +=" 2>&1";
         fp = popen(  (const char *) command, "r");
@@ -1590,5 +1500,4 @@ void AdvancedFm::fileStatus() {
     }
     QString command = " stat -l "+ curFile +" 2>&1";
-//     int err=0;
     Output *outDlg;
     outDlg = new Output(this, tr("AdvancedFm Output"),FALSE);
@@ -1765,5 +1674,4 @@ void AdvancedFm::parsetab(const QString &fileName) {
      fsList.clear();
     struct mntent *me;
-//     if(fileName == "/etc/mtab") {
     FILE *mntfp = setmntent( fileName.latin1(), "r" );
     if ( mntfp ) {
@@ -1778,6 +1686,4 @@ void AdvancedFm::parsetab(const QString &fileName) {
                     & filesystemType.find("auto",0,TRUE) == -1)
                  fsList << filesystemType;
-//                 deviceList << deviceName;
-//                qDebug(mountDir+"::"+filesystemType);
                 fileSystemTypeList << mountDir+"::"+filesystemType;
             }
@@ -1846,15 +1752,4 @@ void AdvancedFm::fileBeamFinished( Ir *ir) {
 }
 
-
-//     QList<QListViewItem> * getSelectedItems( QListView * Local_View );
-//     QListViewItemIterator it( Local_View );
-//     for ( ; it.current(); ++it ) {
-//         if ( it.current()->isSelected() ) {
-//             QString strItem = it.current()->text(0);
-//             QString localFile = currentDir.canonicalPath()+"/"+strItem;
-//             QFileInfo fi(localFile);
-//         }
-//     }
-
 void AdvancedFm::showFileMenu() {
 
@@ -1872,5 +1767,4 @@ void AdvancedFm::showFileMenu() {
   QFile fi(curApp);
 
-  //  QPopupMenu m;
   QPopupMenu *m = new QPopupMenu(0);
 
diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h
index 7665fe9..45f00ad 100644
--- a/noncore/apps/advancedfm/advancedfm.h
+++ b/noncore/apps/advancedfm/advancedfm.h
@@ -111,4 +111,6 @@ protected:
   void keyReleaseEvent( QKeyEvent *);
   QString getFileSystemType(const QString &);
+  QString getDiskSpace(const QString &);
+
   void parsetab(const QString &fileName);
   
@@ -134,4 +136,5 @@ protected slots:
   void doBeam();
   void fileBeamFinished( Ir *);
+
 private:
       QTimer menuTimer;