BugFix: #0001238 use get-Path functions from StorageInfo for mountpoints

1 files changed, 13 insertions, 4 deletions

diff --git a/noncore/settings/backup/backuprestore.cpp b/noncore/settings/backup/backuprestore.cpp
index 93bedf6..1b34105 100644
--- a/noncore/settings/backup/backuprestore.cpp
+++ b/noncore/settings/backup/backuprestore.cpp
@@ -20,104 +20,113 @@
 #include <stdlib.h>
 #include <qregexp.h>
 #include <qtextstream.h>
 #include <qtextview.h>
 #include <qpe/storage.h>
 
 #include <errno.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <dirent.h>
 
 #define HEADER_NAME 0
 #define HEADER_BACKUP 1
 #define BACKUP_LOCATION 2
 
 #define EXTENSION ".bck"
 
 const QString tempFileName = "/tmp/backup.err";
 
 
 BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name,  WFlags fl)
         : BackupAndRestoreBase(parent, name,  fl)
 {
     this->showMaximized();
     backupList->header()->hide();
     restoreList->header()->hide();
     connect(backupButton, SIGNAL(clicked()),
             this, SLOT(backup()));
     connect(restoreButton, SIGNAL(clicked()),
             this, SLOT(restore()));
     connect(backupList, SIGNAL(clicked( QListViewItem * )),
             this, SLOT(selectItem(QListViewItem*)));
     connect(restoreSource, SIGNAL(activated( int  )),
             this, SLOT(sourceDirChanged(int)));
     connect(updateList, SIGNAL(clicked()),
             this, SLOT( fileListUpdate()));
 
     //add directorys for backing up
     applicationSettings = new QListViewItem(backupList, "Application Settings", "", "Settings/");
     selectItem(applicationSettings);
     applicationSettings = new QListViewItem(backupList, "Application Data", "", "Applications/");
     selectItem(applicationSettings);
     documents= new QListViewItem(backupList, "Documents", "", "Documents/");
     selectItem(documents);
 
     scanForApplicationSettings();
 
+    StorageInfo storage;
+
     backupLocations.insert( "Documents", QDir::homeDirPath() + "/Documents" );
-    if (StorageInfo::hasCf())
+    if ( storage.hasCf() )
+    {
+        backupLocations.insert( "CF", storage.getCfPath() );
+        qDebug( "Cf Path: " + storage.getCfPath() );
+    }
+    if ( storage.hasSd() )
     {
-        backupLocations.insert("CF", "/mnt/cf");
+        backupLocations.insert( "SD", storage.getSdPath() );
+        qDebug( " Sd Path: " + storage.getSdPath() );
     }
-    if (StorageInfo::hasSd() || StorageInfo::hasMmc())
+    if ( storage.hasMmc() )
     {
-        backupLocations.insert("SD", "/mnt/card");
+        backupLocations.insert( "MMC", storage.getMmcPath() );
+        qDebug( "Mmc Path: " + storage.getMmcPath() );
     }
 
     Config config("BackupAndRestore");
     //read last locations
     config.setGroup("LastLocation");
     QString lastStoreLocation   = config.readEntry( "LastStoreLocation", "" );
     QString lastRestoreLocation = config.readEntry( "LastRestoreLocation", "" );
     int locationIndex    = 0;
 
     QMap<QString, QString>::Iterator it;
     for( it = backupLocations.begin(); it != backupLocations.end(); ++it )
     {
         storeToLocation->insertItem(it.key());
         restoreSource->insertItem(it.key());
 
         //check for last locations
         if ( it.key() == lastStoreLocation )
             storeToLocation->setCurrentItem( locationIndex );
         if ( it.key() == lastRestoreLocation )
             restoreSource->setCurrentItem( locationIndex );
         locationIndex++;
     }
 
     // Read the list of items to ignore.
     QList<QString> dontBackupList;
     dontBackupList.setAutoDelete(true);
     config.setGroup("DontBackup");
     int total = config.readNumEntry("Total", 0);
     for(int i = 0; i < total; i++)
     {
         dontBackupList.append(new QString(config.readEntry(QString("%1").arg(i), "")));
     }
 
     QList<QListViewItem> list;
     getAllItems(backupList->firstChild(), list);
 
     for(uint i = 0; i < list.count(); i++)
     {
         QString text = list.at(i)->text(HEADER_NAME);
         for(uint i2 = 0;  i2 < dontBackupList.count(); i2++)
         {
             if(*dontBackupList.at(i2) == text)
             {
                 selectItem(list.at(i));
                 break;
             }
         }
     }