summaryrefslogtreecommitdiff
authorzecke <zecke>2004-01-10 15:12:11 (UTC)
committer zecke <zecke>2004-01-10 15:12:11 (UTC)
commit68376661758627c300aa54eee7573953134b2143 (patch) (unidiff)
treed8a4254470373efd863d768b01f96a481a4d8a2a
parentf4cd001fb21509caff3b83fc620ac092cb5f3913 (diff)
downloadopie-68376661758627c300aa54eee7573953134b2143.zip
opie-68376661758627c300aa54eee7573953134b2143.tar.gz
opie-68376661758627c300aa54eee7573953134b2143.tar.bz2
-First follow Qt naming style
-use const -Fix Doxygen comment. If above a method better skip the @fn -Update backuprestore to use the new names TODO: Alter filename to ostorageinfo
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opiecore/ostorageinfo.cpp8
-rw-r--r--libopie2/opiecore/ostorageinfo.h6
-rw-r--r--noncore/settings/backup/backuprestore.cpp12
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 )
35} 35}
36 36
37OStorageInfo::~OStorageInfo() 37OStorageInfo::~OStorageInfo()
38{ 38{
39} 39}
40 40
41QString OStorageInfo::getCfPath() 41QString OStorageInfo::cfPath()const
42{ 42{
43 QString r = ""; 43 QString r = "";
44 44
45 for (QListIterator<FileSystem> i( fileSystems() ); i.current(); ++i) 45 for (QListIterator<FileSystem> i( fileSystems() ); i.current(); ++i)
46 { 46 {
47 if ( (*i)->disk().left( 8 ) == "/dev/hda" ) 47 if ( (*i)->disk().left( 8 ) == "/dev/hda" )
@@ -51,17 +51,16 @@ QString OStorageInfo::getCfPath()
51 } 51 }
52 } 52 }
53 return r; 53 return r;
54} 54}
55 55
56/*! 56/*!
57* @fn QString StorageInfo::getSdPath()
58* @brief returns the Mount-Path of Sd Card 57* @brief returns the Mount-Path of Sd Card
59* 58*
60*/ 59*/
61QString OStorageInfo::getSdPath() 60QString OStorageInfo::sdPath()const
62{ 61{
63 QString r = ""; 62 QString r = "";
64 63
65 for (QListIterator<FileSystem> i( fileSystems() ); i.current(); ++i) 64 for (QListIterator<FileSystem> i( fileSystems() ); i.current(); ++i)
66 { 65 {
67 if ( (*i)->disk().left( 9 ) == "/dev/mmcd" ) 66 if ( (*i)->disk().left( 9 ) == "/dev/mmcd" )
@@ -71,17 +70,16 @@ QString OStorageInfo::getSdPath()
71 } 70 }
72 } 71 }
73 return r; 72 return r;
74} 73}
75 74
76/*! 75/*!
77* @fn QString StorageInfo::getMmcPath()
78* @brief returns the Mount-Path of Mmc Card 76* @brief returns the Mount-Path of Mmc Card
79* 77*
80*/ 78*/
81QString OStorageInfo::getMmcPath() 79QString OStorageInfo::mmcPath()const
82{ 80{
83 QString r = ""; 81 QString r = "";
84 82
85 for (QListIterator<FileSystem> i( fileSystems() ); i.current(); ++i) 83 for (QListIterator<FileSystem> i( fileSystems() ); i.current(); ++i)
86 { 84 {
87 if ( (*i)->disk().left( 14 ) == "/dev/mmc/part1" ) 85 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
38 38
39 public: 39 public:
40public: 40public:
41 OStorageInfo( QObject *parent=0 ); 41 OStorageInfo( QObject *parent=0 );
42 ~OStorageInfo(); 42 ~OStorageInfo();
43 43
44 QString getCfPath(); 44 QString cfPath()const;
45 QString getSdPath(); 45 QString sdPath()const;
46 QString getMmcPath(); 46 QString mmcPath()const;
47}; 47};
48 48
49#endif // OSTORAGE_H 49#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
67 67
68 OStorageInfo 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.cfPath() );
74 qDebug( "Cf Path: " + storage.getCfPath() ); 74 qDebug( "Cf Path: " + storage.cfPath() );
75 } 75 }
76 if ( storage.hasSd() ) 76 if ( storage.hasSd() )
77 { 77 {
78 backupLocations.insert( "SD", storage.getSdPath() ); 78 backupLocations.insert( "SD", storage.sdPath() );
79 qDebug( " Sd Path: " + storage.getSdPath() ); 79 qDebug( " Sd Path: " + storage.sdPath() );
80 } 80 }
81 if ( storage.hasMmc() ) 81 if ( storage.hasMmc() )
82 { 82 {
83 backupLocations.insert( "MMC", storage.getMmcPath() ); 83 backupLocations.insert( "MMC", storage.mmcPath() );
84 qDebug( "Mmc Path: " + storage.getMmcPath() ); 84 qDebug( "Mmc Path: " + storage.mmcPath() );
85 } 85 }
86 86
87 Config config("BackupAndRestore"); 87 Config config("BackupAndRestore");
88 //read last locations 88 //read last locations
89 config.setGroup("LastLocation"); 89 config.setGroup("LastLocation");
90 QString lastStoreLocation = config.readEntry( "LastStoreLocation", "" ); 90 QString lastStoreLocation = config.readEntry( "LastStoreLocation", "" );