| -rw-r--r-- | libopie2/opiecore/ostorageinfo.cpp | 8 | ||||
| -rw-r--r-- | libopie2/opiecore/ostorageinfo.h | 6 | ||||
| -rw-r--r-- | noncore/settings/backup/backuprestore.cpp | 12 |
3 files changed, 12 insertions, 14 deletions
diff --git a/libopie2/opiecore/ostorageinfo.cpp b/libopie2/opiecore/ostorageinfo.cpp index cf9dc6c..6712282 100644 --- a/libopie2/opiecore/ostorageinfo.cpp +++ b/libopie2/opiecore/ostorageinfo.cpp @@ -35,13 +35,13 @@ OStorageInfo::OStorageInfo( QObject *parent ) } OStorageInfo::~OStorageInfo() { } -QString OStorageInfo::getCfPath() +QString OStorageInfo::cfPath()const { QString r = ""; for (QListIterator<FileSystem> i( fileSystems() ); i.current(); ++i) { if ( (*i)->disk().left( 8 ) == "/dev/hda" ) @@ -51,17 +51,16 @@ QString OStorageInfo::getCfPath() } } return r; } /*! -* @fn QString StorageInfo::getSdPath() * @brief returns the Mount-Path of Sd Card * */ -QString OStorageInfo::getSdPath() +QString OStorageInfo::sdPath()const { QString r = ""; for (QListIterator<FileSystem> i( fileSystems() ); i.current(); ++i) { if ( (*i)->disk().left( 9 ) == "/dev/mmcd" ) @@ -71,17 +70,16 @@ QString OStorageInfo::getSdPath() } } return r; } /*! -* @fn QString StorageInfo::getMmcPath() * @brief returns the Mount-Path of Mmc Card * */ -QString OStorageInfo::getMmcPath() +QString OStorageInfo::mmcPath()const { QString r = ""; for (QListIterator<FileSystem> i( fileSystems() ); i.current(); ++i) { if ( (*i)->disk().left( 14 ) == "/dev/mmc/part1" ) diff --git a/libopie2/opiecore/ostorageinfo.h b/libopie2/opiecore/ostorageinfo.h index ba87ff4..9b61a2e 100644 --- a/libopie2/opiecore/ostorageinfo.h +++ b/libopie2/opiecore/ostorageinfo.h @@ -38,12 +38,12 @@ class OStorageInfo : public StorageInfo public: public: OStorageInfo( QObject *parent=0 ); ~OStorageInfo(); - QString getCfPath(); - QString getSdPath(); - QString getMmcPath(); + QString cfPath()const; + QString sdPath()const; + QString mmcPath()const; }; #endif // OSTORAGE_H diff --git a/noncore/settings/backup/backuprestore.cpp b/noncore/settings/backup/backuprestore.cpp index eb69a70..2d79384 100644 --- a/noncore/settings/backup/backuprestore.cpp +++ b/noncore/settings/backup/backuprestore.cpp @@ -67,24 +67,24 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name, WFlags f OStorageInfo storage; backupLocations.insert( "Documents", QDir::homeDirPath() + "/Documents" ); if ( storage.hasCf() ) { - backupLocations.insert( "CF", storage.getCfPath() ); - qDebug( "Cf Path: " + storage.getCfPath() ); + backupLocations.insert( "CF", storage.cfPath() ); + qDebug( "Cf Path: " + storage.cfPath() ); } if ( storage.hasSd() ) { - backupLocations.insert( "SD", storage.getSdPath() ); - qDebug( " Sd Path: " + storage.getSdPath() ); + backupLocations.insert( "SD", storage.sdPath() ); + qDebug( " Sd Path: " + storage.sdPath() ); } if ( storage.hasMmc() ) { - backupLocations.insert( "MMC", storage.getMmcPath() ); - qDebug( "Mmc Path: " + storage.getMmcPath() ); + backupLocations.insert( "MMC", storage.mmcPath() ); + qDebug( "Mmc Path: " + storage.mmcPath() ); } Config config("BackupAndRestore"); //read last locations config.setGroup("LastLocation"); QString lastStoreLocation = config.readEntry( "LastStoreLocation", "" ); |