-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,3 +1,3 @@ /********************************************************************** -** Copyright (C) 2000 Trolltech AS. All rights reserved. +** Copyright (C) 2000, 2004 Trolltech AS. All rights reserved. ** @@ -25,2 +25,4 @@ +#include <qpe/qpeglobal.h> + #include <qmap.h> @@ -28,2 +30,5 @@ +typedef QMap< QString, QString > ConfigGroup; +typedef QMap< QString, ConfigGroup> ConfigGroupMap; + class ConfigPrivate; @@ -32,3 +37,2 @@ class Config public: - typedef QMap< QString, QString > ConfigGroup; @@ -38,2 +42,4 @@ public: + QTOPIA_MERGED_METHOD(static long timeStamp( const QString &name, Domain domain=User ), "2.1"); + bool operator == ( const Config & other ) const { return (filename == other.filename); } @@ -45,4 +51,4 @@ public: // inline for better SharpROM BC - inline bool hasGroup ( const QString &gname ) const { return ( groups. find ( gname ) != groups. end ( )); }; - inline QStringList groupList ( ) const { QStringList sl; for ( QMap< QString, ConfigGroup >::ConstIterator it = groups. begin ( ); it != groups. end ( ); ++it ) { sl << it.key(); } return sl; }; + NOT_IN_QPE(bool hasGroup ( const QString &gname ) const); + NOT_IN_QPE(QStringList groupList ( ) const); @@ -57,2 +63,4 @@ public: void writeEntry( const QString &key, const QStringList &lst, const QChar &sep ); + QTOPIA_MERGED_METHOD(void writeEntry( const QString &key, const QStringList &lst ), "2.1.0"); + void removeEntry( const QString &key ); @@ -65,2 +73,3 @@ public: QStringList readListEntry( const QString &key, const QChar &sep ) const; + QTOPIA_MERGED_METHOD(QStringList readListEntry( const QString &key ) const, "2.1.0"); @@ -75,2 +84,5 @@ public: void clearGroup(); + QTOPIA_MERGED_METHOD(void removeGroup(), "2.1.0"); + QTOPIA_MERGED_METHOD(void removeGroup(const QString&), "2.1.0"); + QTOPIA_MERGED_METHOD(QStringList allGroups() const, "2.1.0"); @@ -95,15 +107,2 @@ private: // Sharp ROM compatibility -inline QString Config::readEntry( const QString &key, const QString &deflt ) const -{ return ((Config*)this)->readEntry(key,deflt); } -inline QString Config::readEntryCrypt( const QString &key, const QString &deflt ) const -{ return ((Config*)this)->readEntryCrypt(key,deflt); } -inline QString Config::readEntryDirect( const QString &key, const QString &deflt ) const -{ return ((Config*)this)->readEntryDirect(key,deflt); } -inline int Config::readNumEntry( const QString &key, int deflt ) const -{ return ((Config*)this)->readNumEntry(key,deflt); } -inline bool Config::readBoolEntry( const QString &key, bool deflt ) const -{ return ((Config*)this)->readBoolEntry(key,deflt); } -inline QStringList Config::readListEntry( const QString &key, const QChar &sep ) const -{ return ((Config*)this)->readListEntry(key,sep); } - #endif |