-rw-r--r-- | library/config.h | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/library/config.h b/library/config.h index a2f9b2d..29ba0d6 100644 --- a/library/config.h +++ b/library/config.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000, 2004 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
@@ -24,12 +24,16 @@ | |||
24 | // ##### could use QSettings with Qt 3.0 | 24 | // ##### could use QSettings with Qt 3.0 |
25 | 25 | ||
26 | #include <qpe/qpeglobal.h> | ||
27 | |||
26 | #include <qmap.h> | 28 | #include <qmap.h> |
27 | #include <qstringlist.h> | 29 | #include <qstringlist.h> |
28 | 30 | ||
31 | typedef QMap< QString, QString > ConfigGroup; | ||
32 | typedef QMap< QString, ConfigGroup> ConfigGroupMap; | ||
33 | |||
29 | class ConfigPrivate; | 34 | class ConfigPrivate; |
30 | class Config | 35 | class Config |
31 | { | 36 | { |
32 | public: | 37 | public: |
33 | typedef QMap< QString, QString > ConfigGroup; | ||
34 | 38 | ||
35 | enum Domain { File, User }; | 39 | enum Domain { File, User }; |
@@ -37,4 +41,6 @@ public: | |||
37 | ~Config(); | 41 | ~Config(); |
38 | 42 | ||
43 | QTOPIA_MERGED_METHOD(static long timeStamp( const QString &name, Domain domain=User ), "2.1"); | ||
44 | |||
39 | bool operator == ( const Config & other ) const { return (filename == other.filename); } | 45 | bool operator == ( const Config & other ) const { return (filename == other.filename); } |
40 | bool operator != ( const Config & other ) const { return (filename != other.filename); } | 46 | bool operator != ( const Config & other ) const { return (filename != other.filename); } |
@@ -44,6 +50,6 @@ public: | |||
44 | 50 | ||
45 | // inline for better SharpROM BC | 51 | // inline for better SharpROM BC |
46 | inline bool hasGroup ( const QString &gname ) const { return ( groups. find ( gname ) != groups. end ( )); }; | 52 | NOT_IN_QPE(bool hasGroup ( const QString &gname ) const); |
47 | inline QStringList groupList ( ) const { QStringList sl; for ( QMap< QString, ConfigGroup >::ConstIterator it = groups. begin ( ); it != groups. end ( ); ++it ) { sl << it.key(); } return sl; }; | 53 | NOT_IN_QPE(QStringList groupList ( ) const); |
48 | 54 | ||
49 | void setGroup( const QString &gname ); | 55 | void setGroup( const QString &gname ); |
@@ -56,4 +62,6 @@ public: | |||
56 | #endif | 62 | #endif |
57 | void writeEntry( const QString &key, const QStringList &lst, const QChar &sep ); | 63 | void writeEntry( const QString &key, const QStringList &lst, const QChar &sep ); |
64 | QTOPIA_MERGED_METHOD(void writeEntry( const QString &key, const QStringList &lst ), "2.1.0"); | ||
65 | |||
58 | void removeEntry( const QString &key ); | 66 | void removeEntry( const QString &key ); |
59 | 67 | ||
@@ -64,4 +72,5 @@ public: | |||
64 | bool readBoolEntry( const QString &key, bool deflt = FALSE ) const; | 72 | bool readBoolEntry( const QString &key, bool deflt = FALSE ) const; |
65 | QStringList readListEntry( const QString &key, const QChar &sep ) const; | 73 | QStringList readListEntry( const QString &key, const QChar &sep ) const; |
74 | QTOPIA_MERGED_METHOD(QStringList readListEntry( const QString &key ) const, "2.1.0"); | ||
66 | 75 | ||
67 | // For compatibility, non-const versions. | 76 | // For compatibility, non-const versions. |
@@ -74,4 +83,7 @@ public: | |||
74 | 83 | ||
75 | void clearGroup(); | 84 | void clearGroup(); |
85 | QTOPIA_MERGED_METHOD(void removeGroup(), "2.1.0"); | ||
86 | QTOPIA_MERGED_METHOD(void removeGroup(const QString&), "2.1.0"); | ||
87 | QTOPIA_MERGED_METHOD(QStringList allGroups() const, "2.1.0"); | ||
76 | 88 | ||
77 | void write( const QString &fn = QString::null ); | 89 | void write( const QString &fn = QString::null ); |
@@ -94,16 +106,3 @@ private: // Sharp ROM compatibility | |||
94 | }; | 106 | }; |
95 | 107 | ||
96 | inline QString Config::readEntry( const QString &key, const QString &deflt ) const | ||
97 | { return ((Config*)this)->readEntry(key,deflt); } | ||
98 | inline QString Config::readEntryCrypt( const QString &key, const QString &deflt ) const | ||
99 | { return ((Config*)this)->readEntryCrypt(key,deflt); } | ||
100 | inline QString Config::readEntryDirect( const QString &key, const QString &deflt ) const | ||
101 | { return ((Config*)this)->readEntryDirect(key,deflt); } | ||
102 | inline int Config::readNumEntry( const QString &key, int deflt ) const | ||
103 | { return ((Config*)this)->readNumEntry(key,deflt); } | ||
104 | inline bool Config::readBoolEntry( const QString &key, bool deflt ) const | ||
105 | { return ((Config*)this)->readBoolEntry(key,deflt); } | ||
106 | inline QStringList Config::readListEntry( const QString &key, const QChar &sep ) const | ||
107 | { return ((Config*)this)->readListEntry(key,sep); } | ||
108 | |||
109 | #endif | 108 | #endif |