fix

4 files changed, 6 insertions, 9 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
@@ -30,33 +30,33 @@
 #include <qlineedit.h>
 
 
 #include <sys/stat.h>
 #include <time.h>
 #include <dirent.h>
 #include <fcntl.h>
 #include <sys/vfs.h>
 #include <mntent.h>
 
 using namespace Opie::Ui;
 
 AdvancedFm::AdvancedFm(QWidget *,const char*, WFlags )
    : QMainWindow( ) {
    init();
    renameBox = 0;
-
+	 whichTab = 1;
    unknownXpm = Resource::loadImage("UnknownDocument").smoothScale(AppLnk::smallIconSize(),AppLnk::smallIconSize() );
 
 	 initConnections();
 	 rePopulate();
 	 channel = new QCopChannel( "QPE/Application/advancedfm", this );
 	 connect(channel,SIGNAL(received(const QCString&,const QByteArray&)),this,SLOT(qcopReceive(const QCString&,const QByteArray&)));
 	 switchToLocalTab();
 }
 
 AdvancedFm::~AdvancedFm() {
 }
 
 
 void AdvancedFm::cleanUp() {
    QString sfile=QDir::homeDirPath();
    if(sfile.right(1) != "/")
@@ -76,57 +76,55 @@ void AdvancedFm::tabChanged(QWidget *wd) {
 		}
  		else if(wd == tab_2) {
 				whichTab = 2;
 // 				qDebug("tabchanged: REMOTE VIEW SHOWN");
 		}
 		qApp->processEvents();
  		QString path = CurrentDir()->canonicalPath();
 //		qDebug(path);
  		if ( TabWidget->currentWidget() == tab) {
  				viewMenu->setItemChecked(viewMenu->idAt(0), true);
  				viewMenu->setItemChecked(viewMenu->idAt(1), false);
  		} else {
  				viewMenu->setItemChecked(viewMenu->idAt(0), false);
  				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);
 }
 
 
 void AdvancedFm::populateView() {
 
 		QPixmap pm;
 		QListView *thisView = CurrentView();
 		QDir *thisDir = CurrentDir();
 		QString path = thisDir->canonicalPath();
 
 		thisView->clear();
 		thisDir->setSorting(/* QDir::Size*/ /*| QDir::Reversed | */QDir::DirsFirst);
 		thisDir->setMatchAllDirs(TRUE);
 		thisDir->setNameFilter(filterStr);
 		QString fileL, fileS, fileDate;
+
 		QString fs= getFileSystemType((const QString &) path);
 		setCaption(tr("AdvancedFm :: ")+fs+" :: "
 							 +checkDiskSpace((const QString &) path)+ tr(" kB free") );
 		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();
 						QFileInfo sym( symLink);
 						fileS.sprintf( "%10i", sym.size() );
 						fileL =  fi->fileName() +" ->  " + sym.filePath().data();
 						fileDate = sym.lastModified().toString();
 				}  else  {
 						fileS.sprintf( "%10i", fi->size() );
 						fileL = fi->fileName();
 						fileDate= fi->lastModified().toString();
 						if( QDir(QDir::cleanDirPath( path +"/"+fileL)).exists() ) {
 //           if(fileL == "..")
@@ -310,33 +308,33 @@ void  AdvancedFm::fillCombo(const QString &currentPath) {
 }
 
 QStringList AdvancedFm::getPath() {
    QStringList strList;
    QListView *thisView=CurrentView();
    QList<QListViewItem> * getSelectedItems( QListView * thisView );
    QListViewItemIterator it( thisView );
    for ( ; it.current(); ++it ) {
       if ( it.current()->isSelected() ) {
          strList <<  it.current()->text(0);
 //        odebug << it.current()->text(0) << oendl;
       }
    }
    return strList;
 }
 
-void AdvancedFm::changeTo(const QString dir) {
+void AdvancedFm::changeTo(const QString &dir) {
    chdir( dir.latin1());
    CurrentDir()->cd(dir, TRUE);
    populateView();
    update();
 }
 
 void AdvancedFm::homeButtonPushed() {
  changeTo(QDir::homeDirPath());
 }
 
 void AdvancedFm::docButtonPushed() {
    changeTo(QPEApplication::documentDir());
 }
 
 void AdvancedFm::SDButtonPushed() {
 		Opie::Core::OStorageInfo info;
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
@@ -83,38 +83,38 @@ protected:
    QLineEdit *renameBox;
 
    void init();
    void initConnections();
    void keyReleaseEvent( QKeyEvent *);
    void keyPressEvent( QKeyEvent *);
    QString getFileSystemType(const QString &);
    QString getDiskSpace(const QString &);
    void parsetab(const QString &fileName);
    QString checkDiskSpace(const QString &);
    QString dealWithSymName(const QString &);
    QDir *CurrentDir();
    QDir *OtherDir();
    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();
    void doDirChange();
    void mkDir();
    void del();
    void rn();
    void populateView();
    void rePopulate();
    void showHidden();
    void showMenuHidden();
    void ListClicked(QListViewItem *);
    void ListPressed( int, QListViewItem *, const QPoint&, int);
    void makeDir();
    void doDelete();
    void tabChanged(QWidget*);
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,15 +1,15 @@
 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
 INCLUDEPATH += $(OPIEDIR)/include
 DEPENDPATH  += $(OPIEDIR)/include
 LIBS        += -lqpe -lqte -lopiecore2 -lopieui2
 
 !contains(CONFIG,quick-app) {
  DESTDIR = $(OPIEDIR)/bin
  DEFINES += NOQUICKLAUNCH
 }
 
 include ( $(OPIEDIR)/include.pro )
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
@@ -704,33 +704,32 @@ void AdvancedFm::doBeam() {
 
 void AdvancedFm::fileBeamFinished( Ir *) {
   QMessageBox::message( tr("Advancedfm Beam out"), tr("Ir sent.") ,tr("Ok") );
 }
 
 void AdvancedFm::selectAll() {
   QListView *thisView = CurrentView();
   thisView->selectAll(true);
   thisView->setSelected( thisView->firstChild(),false);
 }
 
 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)));
 
   command << "/bin/sh";
   command << "-c";
   command << cmd.latin1();
   *process << command;
   if(!process->start(OProcess::NotifyOnExit, OProcess::All) )
     odebug << "could not start process" << oendl; 
 }
 
 void AdvancedFm::processEnded(OProcess *) {
             rePopulate();
 }
 
 void AdvancedFm::oprocessStderr(OProcess*, char *buffer, int ) {
 //    owarn << "received stderrt " << buflen << " bytes" << oendl;