author | ar <ar> | 2004-01-10 13:55:30 (UTC) |
---|---|---|
committer | ar <ar> | 2004-01-10 13:55:30 (UTC) |
commit | f4cd001fb21509caff3b83fc620ac092cb5f3913 (patch) (unidiff) | |
tree | 4046ba24a4cd31f8afe13e7e9b74b5d1f806e077 /noncore/settings | |
parent | bf9988d771a03bc6a1d97a11ce3794d8b429b534 (diff) | |
download | opie-f4cd001fb21509caff3b83fc620ac092cb5f3913.zip opie-f4cd001fb21509caff3b83fc620ac092cb5f3913.tar.gz opie-f4cd001fb21509caff3b83fc620ac092cb5f3913.tar.bz2 |
- use the new OStorageInfo instead of StorageInfo
-rw-r--r-- | noncore/settings/backup/backup.pro | 2 | ||||
-rw-r--r-- | noncore/settings/backup/backuprestore.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/noncore/settings/backup/backup.pro b/noncore/settings/backup/backup.pro index 7a8ad6d..4ef3e46 100644 --- a/noncore/settings/backup/backup.pro +++ b/noncore/settings/backup/backup.pro | |||
@@ -1,10 +1,10 @@ | |||
1 | CONFIG = qt warn_on release quick-app | 1 | CONFIG = qt warn_on release quick-app |
2 | HEADERS = backuprestore.h | 2 | HEADERS = backuprestore.h |
3 | SOURCES = main.cpp backuprestore.cpp | 3 | SOURCES = main.cpp backuprestore.cpp |
4 | INCLUDEPATH+= $(OPIEDIR)/include | 4 | INCLUDEPATH+= $(OPIEDIR)/include |
5 | DEPENDPATH+= $(OPIEDIR)/include | 5 | DEPENDPATH+= $(OPIEDIR)/include |
6 | LIBS += -lqpe | 6 | LIBS += -lqpe -lopiecore2 |
7 | INTERFACES= backuprestorebase.ui errordialog.ui | 7 | INTERFACES= backuprestorebase.ui errordialog.ui |
8 | TARGET = backup | 8 | TARGET = backup |
9 | 9 | ||
10 | include ( $(OPIEDIR)/include.pro ) | 10 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/settings/backup/backuprestore.cpp b/noncore/settings/backup/backuprestore.cpp index 1b34105..eb69a70 100644 --- a/noncore/settings/backup/backuprestore.cpp +++ b/noncore/settings/backup/backuprestore.cpp | |||
@@ -18,13 +18,13 @@ | |||
18 | #include <qcombobox.h> | 18 | #include <qcombobox.h> |
19 | #include <qlist.h> | 19 | #include <qlist.h> |
20 | #include <stdlib.h> | 20 | #include <stdlib.h> |
21 | #include <qregexp.h> | 21 | #include <qregexp.h> |
22 | #include <qtextstream.h> | 22 | #include <qtextstream.h> |
23 | #include <qtextview.h> | 23 | #include <qtextview.h> |
24 | #include <qpe/storage.h> | 24 | #include <opie2/ostorage.h> |
25 | 25 | ||
26 | #include <errno.h> | 26 | #include <errno.h> |
27 | #include <stdlib.h> | 27 | #include <stdlib.h> |
28 | #include <unistd.h> | 28 | #include <unistd.h> |
29 | #include <sys/stat.h> | 29 | #include <sys/stat.h> |
30 | #include <dirent.h> | 30 | #include <dirent.h> |
@@ -62,13 +62,13 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name, WFlags f | |||
62 | selectItem(applicationSettings); | 62 | selectItem(applicationSettings); |
63 | documents= new QListViewItem(backupList, "Documents", "", "Documents/"); | 63 | documents= new QListViewItem(backupList, "Documents", "", "Documents/"); |
64 | selectItem(documents); | 64 | selectItem(documents); |
65 | 65 | ||
66 | scanForApplicationSettings(); | 66 | scanForApplicationSettings(); |
67 | 67 | ||
68 | StorageInfo storage; | 68 | OStorageInfo storage; |
69 | 69 | ||
70 | backupLocations.insert( "Documents", QDir::homeDirPath() + "/Documents" ); | 70 | backupLocations.insert( "Documents", QDir::homeDirPath() + "/Documents" ); |
71 | if ( storage.hasCf() ) | 71 | if ( storage.hasCf() ) |
72 | { | 72 | { |
73 | backupLocations.insert( "CF", storage.getCfPath() ); | 73 | backupLocations.insert( "CF", storage.getCfPath() ); |
74 | qDebug( "Cf Path: " + storage.getCfPath() ); | 74 | qDebug( "Cf Path: " + storage.getCfPath() ); |