diff options
| author | miniak <milan.burda@gmail.com> | 2010-08-03 16:33:07 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-08-03 16:35:26 (GMT) |
| commit | 8435ba93fad9eb799764eb3b66a8a9838db3fea3 (patch) | |
| tree | f69cbdba60b3a43344e9a518eeddb557606c8186 /src/script/api/qscriptengine.h | |
| parent | 794c7c77f28bb530db017cc25a5e33e00933253b (diff) | |
| download | Qt-8435ba93fad9eb799764eb3b66a8a9838db3fea3.zip Qt-8435ba93fad9eb799764eb3b66a8a9838db3fea3.tar.gz Qt-8435ba93fad9eb799764eb3b66a8a9838db3fea3.tar.bz2 | |
Remove obsolete code & workarounds for unsupported versions of MS Visual C++
The minimum supported version of MS Visual C++ 2003, which is _MSC_VER 1310.
Merge-request: 756
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
Diffstat (limited to 'src/script/api/qscriptengine.h')
| -rw-r--r-- | src/script/api/qscriptengine.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/script/api/qscriptengine.h b/src/script/api/qscriptengine.h index 3212ed5..1fe65db 100644 --- a/src/script/api/qscriptengine.h +++ b/src/script/api/qscriptengine.h @@ -349,11 +349,7 @@ inline bool qscriptvalue_cast_helper(const QScriptValue &value, int type, void * } template<typename T> -T qscriptvalue_cast(const QScriptValue &value -#if !defined qdoc && defined Q_CC_MSVC && _MSC_VER < 1300 -, T * = 0 -#endif - ) +T qscriptvalue_cast(const QScriptValue &value) { T t; const int id = qMetaTypeId<T>(); @@ -366,13 +362,11 @@ T qscriptvalue_cast(const QScriptValue &value return T(); } -#if !defined Q_CC_MSVC || _MSC_VER >= 1300 template <> inline QVariant qscriptvalue_cast<QVariant>(const QScriptValue &value) { return value.toVariant(); } -#endif template <typename T> inline T qScriptValueToValue(const QScriptValue &value) @@ -428,11 +422,7 @@ void qScriptValueToSequence(const QScriptValue &value, Container &cont) quint32 len = value.property(QLatin1String("length")).toUInt32(); for (quint32 i = 0; i < len; ++i) { QScriptValue item = value.property(i); -#if defined Q_CC_MSVC && !defined Q_CC_MSVC_NET - cont.push_back(qscriptvalue_cast<Container::value_type>(item)); -#else cont.push_back(qscriptvalue_cast<typename Container::value_type>(item)); -#endif } } |