2 files changed, 4 insertions, 28 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index 3bfec7d..3cd2067 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -313,65 +313,65 @@ void  AdvancedFm::fillCombo(const QString &currentPath) {
       }
    } else {
       currentPathCombo->lineEdit()->setText( currentPath);
       if( remoteDirPathStringList.grep( currentPath,TRUE).isEmpty() ) {
          currentPathCombo->clear();
          remoteDirPathStringList.prepend( currentPath );
          currentPathCombo->insertStringList( remoteDirPathStringList,-1);
       }
    }
 }
 
 void AdvancedFm::currentPathComboActivated(const QString & currentPath) {
    chdir( currentPath.latin1() );
    CurrentDir()->cd( currentPath, TRUE);
    populateView();
    update();
 }
 
 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(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() {
    changeTo("/mnt/card");// this can change so fix
 }
 
 void AdvancedFm::CFButtonPushed() {
    if(zaurusDevice)
                          changeTo("/mnt/cf"); //zaurus
    else
                          changeTo("/mnt/hda"); //ipaq
 }
 
 void AdvancedFm::QPEButtonPushed() {
                 changeTo(QPEApplication::qpeDir());
 }
 
 void AdvancedFm::doAbout() {
    QMessageBox::message("AdvancedFm",tr("<P>Advanced FileManager is copyright 2002-2003 by L.J.Potter<llornkcor@handhelds.org> and is licensed by the GPL</P>"));
 }
@@ -670,65 +670,65 @@ void AdvancedFm::removeCustomDir() {
       for ( QStringList::Iterator it = list.begin(); it != list.end(); ++it ) {
          if((*it) != dir) {
 //current item is not our current dir, so add it to temp list
             list2 <<(*it);
          } else {
 //              customDirMenu->removeItem( ramble);
             menuButton->remove( ramble);
 
          }
          ramble++;
 //        ramble--;
       }
 
       cfg.writeEntry("CustomDir", list2, ',');
       cfg.write();
    }
 //    customDirsToMenu();
 
 }
 
 void AdvancedFm::gotoCustomDir(const QString &dir) {
 //     odebug << "gotoCustomDir(const QString &dir) " +dir << oendl;
 //  QString curDir = dir;
 //  QDir *thisDir = CurrentDir();
 //     if( curDir.isEmpty()) {
 //     }
    if( dir == s_addBookmark) {
       addCustomDir();
    }
    if( dir == s_removeBookmark) {
       removeCustomDir( );
    } else {
-      gotoDirectory( dir);
+      changeTo( dir);
 //       if(QDir( curDir).exists() )
 //         {
 //           thisDir->setPath( curDir );
 //           chdir( curDir.latin1() );
 //           thisDir->cd( curDir, TRUE);
 //           populateView();
 //         }
    }
 }
 
 QDir *AdvancedFm::CurrentDir() {
    if ( whichTab == 1) {
         //               qDebug("CurrentTab is Local");
       return &currentDir;
    } else {
         //               qDebug("CurrentTab is Remote");
       return &currentRemoteDir;
    }
 }
 
 QDir *AdvancedFm::OtherDir() {
         // if ( TabWidget->currentWidget() == tab) {
    if ( whichTab == 1) {
       return &currentRemoteDir;
    } else {
       return &currentDir;
    }
 }
 
 QListView * AdvancedFm::CurrentView() {
         // if ( TabWidget->currentWidget() == tab) {
    if ( whichTab == 1) {
@@ -737,87 +737,64 @@ QListView * AdvancedFm::CurrentView() {
    } else {
 //      owarn << "CurrentView Tab 2" << oendl;
         //                      qDebug("CurrentView: remote");
       return Remote_View;
    }
 }
 
 QListView * AdvancedFm::OtherView() {
    if ( whichTab == 1)
       return Remote_View;
    else
       return Local_View;
 }
 
 void AdvancedFm::setOtherTabCurrent() {
         //      qDebug("setOtherTabCurrent() %d",whichTab);
    if ( whichTab == 1) {
       TabWidget->setCurrentWidget(1);
    } else {
       TabWidget->setCurrentWidget(0);
    }
     OtherView()->setFocus();
     OtherView()->setSelected( CurrentView()->firstChild(), true);
 }
 
 void AdvancedFm::qcopReceive(const QCString &msg, const QByteArray &data) {
 //   odebug << "qcop message "+msg << oendl;
    QDataStream stream ( data, IO_ReadOnly );
    if ( msg == "openDirectory(QString)" ) {
 //      odebug << "received" << oendl;
       QString file;
       stream >> file;
-      gotoDirectory( (const QString &) file);
+      changeTo( (const QString &) file);
    }
 }
 
 void AdvancedFm::setDocument(const QString &file) {
-   gotoDirectory( file);
+   changeTo( file);
 
 }
 
-void AdvancedFm::gotoDirectory(const QString &file) {
-//   qDebug("goto dir "+file);
-   QString curDir = file;
-   QDir *thisDir = CurrentDir();
-   if(QDir( curDir).exists() )  {
-      thisDir->setPath( curDir );
-      chdir( curDir.latin1() );
-      thisDir->cd( curDir, TRUE);
-      populateView();
-   }
-   else if(QFileInfo(curDir).exists()) {
-      QFileInfo fileInfo(curDir);
-      curDir=fileInfo.dirPath();
-      if(QDir( curDir).exists() )  {
-         thisDir->setPath( curDir );
-         chdir( curDir.latin1() );
-         thisDir->cd( curDir, TRUE);
-         populateView();
-      }
-      findFile(file);
-   }
-
-}
 
 void AdvancedFm::findFile(const QString &fileName) {
    QFileInfo fi(fileName);
    QListView *thisView = CurrentView();
    QListViewItemIterator it( thisView );
    for ( ; it.current(); ++it ) {
       if(it.current()->text(0) == fi.fileName()) {
          it.current()->setSelected(true);
          thisView->ensureItemVisible(it.current());
       }
    }
 }
 
 void AdvancedFm::slotSwitchMenu(int item) {
                 Q_UNUSED(item);
         //      qDebug( "Switch %d",item);
    //   viewMenu->setItemChecked(item, true);
 }
 
 void AdvancedFm::navigateToSelected() {
    if( !CurrentView()->currentItem()) return;
    doDirChange();
 }
diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h
index 9dbdc70..00ab909 100644
--- a/noncore/apps/advancedfm/advancedfm.h
+++ b/noncore/apps/advancedfm/advancedfm.h
@@ -148,47 +148,46 @@ protected slots:
    void copyTimer();
    void copyAs();
    void copyAsTimer();
    void copySameDir();
    void copySameDirTimer();
    void move();
    void moveTimer();
 
          void currentPathComboActivated(const QString &);
    void fillCombo(const QString &);
    bool copyFile( const QString & , const QString & );
    void fileStatus();
    void doAbout();
    void doBeam();
    void fileBeamFinished( Ir *);
    bool copyDirectory( const QString & , const QString & );
 //   void navigateToSelected();
    bool moveDirectory( const QString & , const QString & );
          
 //   void slotSwitchtoLocal(int);
 
 private:
    MenuButton *menuButton;
    QString oldName, localViewDir, remoteViewDir;
    void startProcess(const QString &);
    bool eventFilter( QObject * , QEvent * );
    void cancelRename();
    void doRename(QListView *);
    void okRename();
    void customDirsToMenu();
    void addCustomDir();
    void removeCustomDir();
-   void gotoDirectory(const QString &);
    void navigateToSelected();
    void findFile(const QString &);
 
 private slots:
    void processEnded(Opie::Core::OProcess *);
    void oprocessStderr(Opie::Core::OProcess *, char *, int);
    void gotoCustomDir(const QString &);
    void qcopReceive(const QCString&, const QByteArray&);
    void setDocument(const QString &);
         // void doMenu(int
 
 };
 
 #endif // ADVANCEDFM_H