-rw-r--r-- | noncore/apps/advancedfm/advancedfm.cpp | 20 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfm.h | 2 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfm.pro | 2 | ||||
-rw-r--r-- | noncore/apps/advancedfm/advancedfmMenu.cpp | 5 |
4 files changed, 13 insertions, 16 deletions
diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp index f1be471..0dc822d 100644 --- a/noncore/apps/advancedfm/advancedfm.cpp +++ b/noncore/apps/advancedfm/advancedfm.cpp @@ -43,7 +43,7 @@ AdvancedFm::AdvancedFm(QWidget *,const char*, WFlags ) : QMainWindow( ) { init(); renameBox = 0; - + whichTab = 1; unknownXpm = Resource::loadImage("UnknownDocument").smoothScale(AppLnk::smallIconSize(),AppLnk::smallIconSize() ); initConnections(); @@ -89,10 +89,6 @@ void AdvancedFm::tabChanged(QWidget *wd) { viewMenu->setItemChecked(viewMenu->idAt(1), true); } - QString fs= getFileSystemType( (const QString &) path); - - setCaption(tr("AdvancedFm :: ")+fs+" :: " - +checkDiskSpace( (const QString &) path )+ tr(" kB free") ); chdir( path.latin1()); currentPathCombo->lineEdit()->setText(path); } @@ -110,16 +106,18 @@ void AdvancedFm::populateView() { thisDir->setMatchAllDirs(TRUE); thisDir->setNameFilter(filterStr); QString fileL, fileS, fileDate; - QString fs= getFileSystemType((const QString &) path); + + QString fs = getFileSystemType((const QString &) path); setCaption(tr("AdvancedFm :: ")+fs+" :: " +checkDiskSpace((const QString &) path)+ tr(" kB free") ); - bool isDir=FALSE; + bool isDir = FALSE; + const QFileInfoList *list = thisDir->entryInfoList( /*QDir::All*/ /*, QDir::SortByMask*/); QFileInfoListIterator it(*list); QFileInfo *fi; while ( (fi=it.current()) ) { if (fi->isSymLink() ) { - QString symLink=fi->readLink(); + QString symLink = fi->readLink(); QFileInfo sym( symLink); fileS.sprintf( "%10i", sym.size() ); fileL = fi->fileName() +" -> " + sym.filePath().data(); @@ -323,7 +321,7 @@ QStringList AdvancedFm::getPath() { return strList; } -void AdvancedFm::changeTo(const QString dir) { +void AdvancedFm::changeTo(const QString &dir) { chdir( dir.latin1()); CurrentDir()->cd(dir, TRUE); populateView(); @@ -340,12 +338,12 @@ void AdvancedFm::docButtonPushed() { void AdvancedFm::SDButtonPushed() { Opie::Core::OStorageInfo info; - changeTo(info.sdPath()); + changeTo(info.sdPath()); } void AdvancedFm::CFButtonPushed() { Opie::Core::OStorageInfo info; - changeTo(info.cfPath()); + changeTo(info.cfPath()); } void AdvancedFm::QPEButtonPushed() { diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h index c25bce2..a4f2510 100644 --- a/noncore/apps/advancedfm/advancedfm.h +++ b/noncore/apps/advancedfm/advancedfm.h @@ -96,12 +96,12 @@ protected: QListView *CurrentView(); QListView *OtherView(); void setOtherTabCurrent(); - void changeTo(const QString dir); //protected signals: // void newPath(QString); protected slots: + void changeTo(const QString &); void slotSwitchMenu(int); void selectAll(); void addToDocs(); diff --git a/noncore/apps/advancedfm/advancedfm.pro b/noncore/apps/advancedfm/advancedfm.pro index 713f61c..01ea8f4 100644 --- a/noncore/apps/advancedfm/advancedfm.pro +++ b/noncore/apps/advancedfm/advancedfm.pro @@ -1,5 +1,5 @@ TEMPLATE = app -CONFIG += qte warn_on quick-app +CONFIG += qte warn_on quick-app debug HEADERS = advancedfm.h filePermissions.h output.h SOURCES = advancedfm.cpp advancedfmData.cpp advancedfmMenu.cpp filePermissions.cpp output.cpp main.cpp TARGET = advancedfm diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp index 7b3dcf6..171e7c4 100644 --- a/noncore/apps/advancedfm/advancedfmMenu.cpp +++ b/noncore/apps/advancedfm/advancedfmMenu.cpp @@ -716,9 +716,8 @@ void AdvancedFm::startProcess(const QString & cmd) { QStringList command; OProcess *process; process = new OProcess(); - connect(process, SIGNAL(processExited(Opie::Core::OProcess*)), this, SLOT( processEnded(Opie::Core::OProcess*))); - - connect(process, SIGNAL( receivedStderr(Opie::Core::OProcess*,char*,int)), this, SLOT( oprocessStderr(Opie::Core::OProcess*,char*,int))); + connect(process,SIGNAL(processExited(Opie::Core::OProcess*)),this,SLOT(processEnded(Opie::Core::OProcess*))); + connect(process,SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)),this,SLOT(oprocessStderr(Opie::Core::OProcess*,char*,int))); command << "/bin/sh"; command << "-c"; |