summaryrefslogtreecommitdiff
path: root/library/config.h
authorzecke <zecke>2004-12-26 13:19:44 (UTC)
committer zecke <zecke>2004-12-26 13:19:44 (UTC)
commit4f5d6b7aff824a8a0f692cbab98b5cfe933de933 (patch) (side-by-side diff)
tree3f61fb1b7f4228abc6453fa090acf2ccd35d620e /library/config.h
parenteb16a7b3d17b0659a7d83900843cef8efb510ceb (diff)
downloadopie-4f5d6b7aff824a8a0f692cbab98b5cfe933de933.zip
opie-4f5d6b7aff824a8a0f692cbab98b5cfe933de933.tar.gz
opie-4f5d6b7aff824a8a0f692cbab98b5cfe933de933.tar.bz2
Merge different read/write/readEntry methods with Qtopia2.1 from
Trolltech to prepare the ConfigCache merge
Diffstat (limited to 'library/config.h') (more/less context) (ignore whitespace changes)
-rw-r--r--library/config.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/library/config.h b/library/config.h
index 29ba0d6..f8d3bf7 100644
--- a/library/config.h
+++ b/library/config.h
@@ -30,8 +30,9 @@
typedef QMap< QString, QString > ConfigGroup;
typedef QMap< QString, ConfigGroup> ConfigGroupMap;
+class QTextStream;
class ConfigPrivate;
class Config
{
public:
@@ -91,10 +92,10 @@ public:
protected:
void read();
bool parse( const QString &line );
- QMap< QString, ConfigGroup > groups;
- QMap< QString, ConfigGroup >::Iterator git;
+ ConfigGroupMap groups;
+ ConfigGroupMap::Iterator git;
QString filename;
QString lang;
QString glang;
bool changed;
@@ -102,7 +103,8 @@ protected:
static QString configFilename(const QString& name, Domain);
private: // Sharp ROM compatibility
Config( const QString &name, bool what );
+ void read( QTextStream &s);
};
#endif