summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/kernel/ntqvariant.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/kernel/ntqvariant.h b/src/kernel/ntqvariant.h
index 1d5206d9d..42a39804c 100644
--- a/src/kernel/ntqvariant.h
+++ b/src/kernel/ntqvariant.h
@@ -42,7 +42,10 @@
#define TQVARIANT_H
#ifndef QT_H
+#include "ntqmap.h"
#include "ntqstring.h"
+#include "ntqstringlist.h"
+#include "ntqvaluelist.h"
#endif // QT_H
#ifndef TQT_NO_VARIANT
@@ -80,6 +83,10 @@ template <class T> class TQValueListConstIterator;
template <class T> class TQValueListNode;
template <class Key, class T> class TQMap;
template <class Key, class T> class TQMapConstIterator;
+
+typedef TQMap<TQString, TQVariant> TQStringVariantMap;
+typedef TQMapIterator<TQString, TQVariant> TQStringVariantMapIterator;
+typedef TQMapConstIterator<TQString, TQVariant> TQStringVariantMapConstIterator;
#endif
class Q_EXPORT TQVariant
@@ -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 "ntqvaluelist.h"
-#include "ntqstringlist.h"
-#include "ntqmap.h"
-#endif // QT_H
-
inline TQVariant::Type TQVariant::type() const
{
return d->typ;