| -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 @@ -17,78 +17,76 @@ =_ + =;=|` MERCHANTABILITY or FITNESS FOR A _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU ..}^=.= = ; Library General Public License for more ++= -. .` .: details. : = ...= . :.=- -. .:....=;==+<; You should have received a copy of the GNU -_. . . )=. = Library General Public License along with -- :-=` this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include <opie2/ostorage.h> OStorageInfo::OStorageInfo( QObject *parent ) : StorageInfo( 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" ) { r = (*i)->path(); break; } } 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" ) { r = (*i)->path(); break; } } 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" ) { r = (*i)->path(); break; } } return r; } 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 @@ -20,30 +20,30 @@ ++= -. .` .: details. : = ...= . :.=- -. .:....=;==+<; You should have received a copy of the GNU -_. . . )=. = Library General Public License along with -- :-=` this library; see the file COPYING.LIB. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifndef OSTORAGE_H #define OSTORAGE_H #include <qpe/storage.h> class OStorageInfo : public StorageInfo { Q_OBJECT 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 @@ -49,60 +49,60 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name, WFlags f 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(); 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", "" ); 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. |