1 files changed, 8 insertions, 9 deletions
diff --git a/src/kernel/qvariant.h b/src/kernel/qvariant.h
index b2cab8d..3c60295 100644
--- a/src/kernel/qvariant.h
+++ b/src/kernel/qvariant.h
@@ -42,7 +42,10 @@
 #define QVARIANT_H
 
 #ifndef QT_H
+#include "qmap.h"
 #include "qstring.h"
+#include "qstringlist.h"
+#include "qvaluelist.h"
 #endif // QT_H
 
 #ifndef QT_NO_VARIANT
@@ -80,6 +83,10 @@ template <class T> class QValueListConstIterator;
 template <class T> class QValueListNode;
 template <class Key, class T> class QMap;
 template <class Key, class T> class QMapConstIterator;
+
+typedef QMap<QString, QVariant> QStringVariantMap;
+typedef QMapIterator<QString, QVariant> QStringVariantMapIterator;
+typedef QMapConstIterator<QString, QVariant> QStringVariantMapConstIterator;
 #endif
 
 class Q_EXPORT QVariant
@@ -167,8 +174,7 @@ public:
     QVariant( uint );
     QVariant( Q_LLONG );
     QVariant( Q_ULLONG );
-    // ### Problems on some compilers ?
-    QVariant( bool, int );
+    QVariant( bool );
     QVariant( double );
     QVariant( QSizePolicy );
 
@@ -317,13 +323,6 @@ public:
     void* rawAccess( void* ptr = 0, Type typ = Invalid, bool deepCopy = FALSE );
 };
 
-// down here for GCC 2.7.* compatibility
-#ifndef QT_H
-#include "qvaluelist.h"
-#include "qstringlist.h"
-#include "qmap.h"
-#endif // QT_H
-
 inline QVariant::Type QVariant::type() const
 {
     return d->typ;