summaryrefslogtreecommitdiffstats
path: root/src/corelib/kernel/qvariant.cpp
diff options
context:
space:
mode:
authorminiak <milan.burda@gmail.com>2010-08-03 16:33:07 (GMT)
committerOlivier Goffart <olivier.goffart@nokia.com>2010-08-03 16:35:26 (GMT)
commit8435ba93fad9eb799764eb3b66a8a9838db3fea3 (patch)
treef69cbdba60b3a43344e9a518eeddb557606c8186 /src/corelib/kernel/qvariant.cpp
parent794c7c77f28bb530db017cc25a5e33e00933253b (diff)
downloadQt-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/corelib/kernel/qvariant.cpp')
-rw-r--r--src/corelib/kernel/qvariant.cpp8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp
index f5d7c0d..9617e0c 100644
--- a/src/corelib/kernel/qvariant.cpp
+++ b/src/corelib/kernel/qvariant.cpp
@@ -947,11 +947,7 @@ static bool convert(const QVariant::Private *d, QVariant::Type t, void *result,
case QMetaType::UChar:
case QMetaType::UShort:
case QMetaType::ULong:
-#if defined(Q_CC_MSVC) && !defined(Q_CC_MSVC_NET)
- *f = (double)(qlonglong)qMetaTypeUNumber(d);
-#else
*f = double(qMetaTypeUNumber(d));
-#endif
break;
default:
*f = 0.0;
@@ -986,11 +982,7 @@ static bool convert(const QVariant::Private *d, QVariant::Type t, void *result,
case QMetaType::UChar:
case QMetaType::UShort:
case QMetaType::ULong:
-#if defined(Q_CC_MSVC) && !defined(Q_CC_MSVC_NET)
- *f = (float)(qlonglong)qMetaTypeUNumber(d);
-#else
*f = float(qMetaTypeUNumber(d));
-#endif
break;
default:
*f = 0.0f;