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
@@ -1,108 +1,110 @@
 /**********************************************************************
 ** Copyright (C) 2000, 2004 Trolltech AS.  All rights reserved.
 **
 ** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #ifndef CONFIG_H
 #define CONFIG_H
 
 // ##### could use QSettings with Qt 3.0
 
 #include <qpe/qpeglobal.h>
 
 #include <qmap.h>
 #include <qstringlist.h>
 
 typedef QMap< QString, QString > ConfigGroup;
 typedef QMap< QString, ConfigGroup> ConfigGroupMap;
 
+class QTextStream;
 class ConfigPrivate;
 class Config
 {
 public:
 
     enum Domain { File, User };
     Config( const QString &name, Domain domain=User );
     ~Config();
 
     QTOPIA_MERGED_METHOD(static long timeStamp( const QString &name, Domain domain=User ), "2.1");
 
     bool operator == ( const Config & other ) const { return (filename == other.filename); }
     bool operator != ( const Config & other ) const { return (filename != other.filename); }
 
     bool isValid() const;
     bool hasKey( const QString &key ) const;
 
         // inline for better SharpROM BC
     NOT_IN_QPE(bool hasGroup ( const QString &gname ) const);
     NOT_IN_QPE(QStringList groupList ( ) const);
 
     void setGroup( const QString &gname );
     void writeEntry( const QString &key, const char* value );
     void writeEntry( const QString &key, const QString &value );
     void writeEntryCrypt( const QString &key, const QString &value );
     void writeEntry( const QString &key, int num );
 #ifdef Q_HAS_BOOL_TYPE
     void writeEntry( const QString &key, bool b );
 #endif
     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 );
 
     QString readEntry( const QString &key, const QString &deflt = QString::null ) const;
     QString readEntryCrypt( const QString &key, const QString &deflt = QString::null ) const;
     QString readEntryDirect( const QString &key, const QString &deflt = QString::null ) const;
     int readNumEntry( const QString &key, int deflt = -1 ) const;
     bool readBoolEntry( const QString &key, bool deflt = FALSE ) const;
     QStringList readListEntry( const QString &key, const QChar &sep ) const;
     QTOPIA_MERGED_METHOD(QStringList readListEntry( const QString &key ) const, "2.1.0");
 
     // For compatibility, non-const versions.
     QString readEntry( const QString &key, const QString &deflt );
     QString readEntryCrypt( const QString &key, const QString &deflt );
     QString readEntryDirect( const QString &key, const QString &deflt );
     int readNumEntry( const QString &key, int deflt );
     bool readBoolEntry( const QString &key, bool deflt );
     QStringList readListEntry( const QString &key, const QChar &sep );
 
     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");
 
     void write( const QString &fn = QString::null );
 
 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;
     ConfigPrivate *d;
     static QString configFilename(const QString& name, Domain);
 
 private: // Sharp ROM compatibility
     Config( const QString &name, bool what );
+    void read( QTextStream &s);
 };
 
 #endif