move redundant code into one function

2 files changed, 19 insertions, 50 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index 02898de..fec320d 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -39,28 +39,19 @@ using namespace Opie::Ui;
 AdvancedFm::AdvancedFm(QWidget *,const char*, WFlags )
    : QMainWindow( ) {
    init();
    renameBox = 0;
 
    unknownXpm = Resource::loadImage("UnknownDocument").smoothScale(AppLnk::smallIconSize(),AppLnk::smallIconSize() );
 
 	 initConnections();
-
-	 whichTab = 1;
-		 populateView();
-//	 rePopulate();
-//	 currentPathCombo->setFocus();
+	 populateView();
 	 channel = new QCopChannel( "QPE/Application/advancedfm", this );
 	 connect(channel,SIGNAL(received(const QCString&,const QByteArray&)),this,SLOT(qcopReceive(const QCString&,const QByteArray&)));
-
-// 	 if( CurrentView() == Local_View)
-// 			 qDebug("LOCAL VIEW");
-// 					 else
-// 							 qDebug("REMOTE VIEW");
 	 switchToLocalTab();	 
 }
 
 AdvancedFm::~AdvancedFm() {
 }
 
 
 void AdvancedFm::cleanUp() {
@@ -285,36 +276,25 @@ void AdvancedFm::ListPressed( int mouse, QListViewItem *item, const QPoint& , in
 
 void AdvancedFm::refreshCurrentTab() {
      populateView();
 //	 if ( TabWidget->currentWidget() == tab) {
 		
 }
 
 void AdvancedFm::switchToLocalTab() {
-		qDebug("switchToLocal ");
-   TabWidget->setCurrentWidget(0);
-   Local_View->setFocus();
-	 whichTab = 1;
-	 
+		TabWidget->setCurrentWidget(0);
+		Local_View->setFocus();
+		whichTab = 1;
 }
 
 void AdvancedFm::switchToRemoteTab() {
-		qDebug("switchToRemoteTab() ");
-   TabWidget->setCurrentWidget(1);
-   Remote_View->setFocus();
-	 whichTab = 2;
-}
-
-void AdvancedFm::readConfig() {
-   Config cfg("AdvancedFm");
-}
-
-void AdvancedFm::writeConfig() {
-   Config cfg("AdvancedFm");
+		TabWidget->setCurrentWidget(1);
+		Remote_View->setFocus();
+		whichTab = 2;
 }
 
 void  AdvancedFm::currentPathComboChanged() {
    if(QDir( currentPathCombo->lineEdit()->text()).exists()) {
       CurrentDir()->setPath( currentPathCombo->lineEdit()->text() );
       populateView();
    } else {
       QMessageBox::message(tr("Note"),tr("That directory does not exist"));
@@ -357,50 +337,40 @@ QStringList AdvancedFm::getPath() {
       if ( it.current()->isSelected() ) {
          strList <<  it.current()->text(0);
 //        odebug << it.current()->text(0) << oendl;
       }
    }
    return strList;
 }
 
-void AdvancedFm::homeButtonPushed() {
-   QString current = QDir::homeDirPath();
-   chdir( current.latin1() );
-   CurrentDir()->cd(  current, TRUE);
+void AdvancedFm::changeTo(QString dir) {
+   chdir( dir.latin1());
+   CurrentDir()->cd(dir, TRUE);
    populateView();
    update();
 }
 
+void AdvancedFm::homeButtonPushed() {
+ changeTo(QDir::homeDirPath());
+}
+
 void AdvancedFm::docButtonPushed() {
-   QString current = QPEApplication::documentDir();
-   chdir( current.latin1() );
-   CurrentDir()->cd( current, TRUE);
-   populateView();
-   update();
+   changeTo(QPEApplication::documentDir());
 }
 
 void AdvancedFm::SDButtonPushed() {
-   QString current = "/mnt/card";// this can change so fix
-   chdir( current.latin1() );
-   CurrentDir()->cd( current, TRUE);
-   populateView();
-   update();
+   changeTo("/mnt/card");// this can change so fix
 }
 
 void AdvancedFm::CFButtonPushed() {
-   QString current;
    if(zaurusDevice)
-      current= "/mnt/cf"; //zaurus
+			 changeTo("/mnt/cf"); //zaurus
    else
-      current = "/mnt/hda"; //ipaq
-   chdir( current.latin1() );
-   CurrentDir()->cd( current, TRUE);
-   populateView();
-   update();
+			 changeTo("/mnt/hda"); //ipaq
 }
 
 
 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>"));
 }
 
 void AdvancedFm::keyPressEvent( QKeyEvent *e) {
diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h
index 2234b3c..c52b853 100644
--- a/noncore/apps/advancedfm/advancedfm.h
+++ b/noncore/apps/advancedfm/advancedfm.h
@@ -92,34 +92,33 @@ protected:
    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(QString & dir);
 
 //protected signals:
 //		void newPath(QString);
     
 protected slots:
    void slotSwitchMenu(int);
    void selectAll();
    void addToDocs();
    void doDirChange();
    void mkDir();
    void del();
    void rn();
    void populateView();
    void rePopulate();
    void showHidden();
    void showMenuHidden();
-   void writeConfig();
-   void readConfig();
    void ListClicked(QListViewItem *);
    void ListPressed( int, QListViewItem *, const QPoint&, int);
    void makeDir();
    void doDelete();
    void tabChanged(QWidget*);
    void cleanUp();
    void renameIt();
    void runThis();