author | ar <ar> | 2004-01-07 20:25:01 (UTC) |
---|---|---|
committer | ar <ar> | 2004-01-07 20:25:01 (UTC) |
commit | f1a1b0e56e676c655e9728d97cdf68d63df7f5d5 (patch) (side-by-side diff) | |
tree | 024ccb6f1625aae56dbf2e5b08490ec55177d048 /noncore/settings/backup/backuprestore.cpp | |
parent | dd56d03c7a07ad1cf4f715ba22cbbf6b3d8392e8 (diff) | |
download | opie-f1a1b0e56e676c655e9728d97cdf68d63df7f5d5.zip opie-f1a1b0e56e676c655e9728d97cdf68d63df7f5d5.tar.gz opie-f1a1b0e56e676c655e9728d97cdf68d63df7f5d5.tar.bz2 |
BugFix: #0001238 use get-Path functions from StorageInfo for mountpoints
Diffstat (limited to 'noncore/settings/backup/backuprestore.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/settings/backup/backuprestore.cpp | 17 |
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 @@ -56,32 +56,41 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name, WFlags f 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 ) { |