3 files changed, 7 insertions, 37 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index ec7a08a..f1be471 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -10,12 +10,15 @@
     *   (at your option) any later version.                                   *
     ***************************************************************************/
 #define DEVELOPERS_VERSION
 #include "advancedfm.h"
 
 #include <opie2/odebug.h>
+
+#include <opie2/ostorageinfo.h>
+
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 #include <qpe/mimetype.h>
 #include <qpe/applnk.h>
 #include <qpe/resource.h>
 #include <qpe/menubutton.h>
@@ -207,30 +210,15 @@ void AdvancedFm::populateView() {
 
 void AdvancedFm::rePopulate() {
 //		qDebug("repopulate views");
 		populateView();
 		setOtherTabCurrent();
 		populateView();
-
-//      int tmpTab = whichTab;
-// //  odebug << "" << tmpTab << "" << oendl;
-
-//    for(int i =1; i < 3; i++) {
-//       TabWidget->setCurrentWidget(i - 1);
-//       populateView();
-//    }
-//    TabWidget->setCurrentWidget( tmpTab - 1);
 }
 
 void AdvancedFm::ListClicked(QListViewItem *selectedItem) {
-// 		if ( TabWidget->currentWidget() == tab)
-// 				qDebug("XXXXXXXXXXXXXXXXXXXXXXXX ListClicked local");
-// 		else
-// 				qDebug("XXXXXXXXXXXXXXXXXXXXXXXX ListClicked remote");
-			 
-
 		if(selectedItem) {
 				QString strItem=selectedItem->text(0);
 //      owarn << strItem << oendl;
 				QString strSize=selectedItem->text(1);
 				strSize=strSize.stripWhiteSpace();
 				bool isDirectory = false;
@@ -274,13 +262,12 @@ void AdvancedFm::ListPressed( int mouse, QListViewItem *item, const QPoint& , in
 }
 
 
 void AdvancedFm::refreshCurrentTab() {
      populateView();
 //	 if ( TabWidget->currentWidget() == tab) {
-		
 }
 
 void AdvancedFm::switchToLocalTab() {
 		TabWidget->setCurrentWidget(0);
 //		Local_View->setFocus();
 		whichTab = 1;
@@ -349,20 +336,19 @@ void AdvancedFm::homeButtonPushed() {
 
 void AdvancedFm::docButtonPushed() {
    changeTo(QPEApplication::documentDir());
 }
 
 void AdvancedFm::SDButtonPushed() {
-   changeTo("/mnt/card");// this can change so fix
+		Opie::Core::OStorageInfo info;
+   changeTo(info.sdPath());
 }
 
 void AdvancedFm::CFButtonPushed() {
-   if(zaurusDevice)
-			 changeTo("/mnt/cf"); //zaurus
-   else
-			 changeTo("/mnt/hda"); //ipaq
+		Opie::Core::OStorageInfo info;
+   changeTo(info.cfPath());
 }
 
 void AdvancedFm::QPEButtonPushed() {
 		changeTo(QPEApplication::qpeDir());
 }
 
@@ -767,28 +753,15 @@ void AdvancedFm::qcopReceive(const QCString &msg, const QByteArray &data) {
       changeTo( (const QString &) file);
    }
 }
 
 void AdvancedFm::setDocument(const QString &file) {
    changeTo( 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);
 }
 
diff --git a/noncore/apps/advancedfm/advancedfm.h b/noncore/apps/advancedfm/advancedfm.h
index 6f7eb96..42f3bc6 100644
--- a/noncore/apps/advancedfm/advancedfm.h
+++ b/noncore/apps/advancedfm/advancedfm.h
@@ -174,13 +174,12 @@ private:
    void doRename(QListView *);
    void okRename();
    void customDirsToMenu();
    void addCustomDir();
    void removeCustomDir();
    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&);
diff --git a/noncore/apps/advancedfm/advancedfmData.cpp b/noncore/apps/advancedfm/advancedfmData.cpp
index 1047c5a..9be0ceb 100644
--- a/noncore/apps/advancedfm/advancedfmData.cpp
+++ b/noncore/apps/advancedfm/advancedfmData.cpp
@@ -53,14 +53,12 @@ void AdvancedFm::init() {
 
 	 cdUpButton = new QToolButton( 0,"cdUpButton");
 	 cdUpButton->setPixmap(Resource::loadPixmap("up"));
 	 cdUpButton->setAutoRaise( true );
 	 menuBar->insertItem( cdUpButton );
 
-
-
 	 qpeDirButton= new QToolButton( 0,"QPEButton");
 	 qpeDirButton->setPixmap( Resource::loadPixmap("launcher/opielogo16x16"));//,"",this,"QPEButton");
 	 qpeDirButton->setAutoRaise( true );
 	 menuBar->insertItem( qpeDirButton );
 
 	 cfButton = new QToolButton( 0, "CFButton");