summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2019-06-01 13:20:49 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2019-06-01 13:20:49 +0900
commit8e3ec3023bdb4e1c61f0b5db945a09628e4fbae2 (patch)
tree9f78ffd236eebaeea3fdafc5b24a111ec3087f04
parenta2fa7ca9838e204ec41c39fcb80ee82ec93d084f (diff)
downloadqt3-8e3ec3023bdb4e1c61f0b5db945a09628e4fbae2.tar.gz
qt3-8e3ec3023bdb4e1c61f0b5db945a09628e4fbae2.zip
Added convenient QStringVariantMap type and iterators.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rw-r--r--src/kernel/qvariant.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/kernel/qvariant.h b/src/kernel/qvariant.h
index d4b49df..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
@@ -316,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;