diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-03-26 15:28:40 -0300 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-07 05:19:42 +0200 |
| commit | 6f51fee995cf6f4a746077209f4dbb729c463769 (patch) | |
| tree | 573a0868cbf18b0c2c6bc9bb3d2d034a6a95b4c8 /tests/benchmarks/corelib/tools | |
| parent | 1241a02a01183541ed4e3a3367e275c9094f84a1 (diff) | |
Remove references to QT_NO_STL from QtCore
QT_NO_STL is now no longer defined, so remove the conditionals and
select the STL side.
Change-Id: Ieedd248ae16e5a128b4ac287f850b3ebc8fb6181
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Diffstat (limited to 'tests/benchmarks/corelib/tools')
| -rw-r--r-- | tests/benchmarks/corelib/tools/qstringlist/main.cpp | 4 | ||||
| -rw-r--r-- | tests/benchmarks/corelib/tools/qvector/qrawvector.h | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/tests/benchmarks/corelib/tools/qstringlist/main.cpp b/tests/benchmarks/corelib/tools/qstringlist/main.cpp index 48bf7f1fc5..b4c1be29d9 100644 --- a/tests/benchmarks/corelib/tools/qstringlist/main.cpp +++ b/tests/benchmarks/corelib/tools/qstringlist/main.cpp @@ -163,7 +163,6 @@ void tst_QStringList::split_qlist_qstring() const void tst_QStringList::split_stdvector_stdstring() const { -#ifndef QT_NO_STL QFETCH(QString, input); const char split_char = ':'; std::string stdinput = input.toStdString(); @@ -176,12 +175,10 @@ void tst_QStringList::split_stdvector_stdstring() const token.push_back(each)) ; } -#endif } void tst_QStringList::split_stdvector_stdwstring() const { -#ifndef QT_NO_STL QFETCH(QString, input); const wchar_t split_char = ':'; std::wstring stdinput = input.toStdWString(); @@ -194,7 +191,6 @@ void tst_QStringList::split_stdvector_stdwstring() const token.push_back(each)) ; } -#endif } void tst_QStringList::split_stdlist_stdstring() const diff --git a/tests/benchmarks/corelib/tools/qvector/qrawvector.h b/tests/benchmarks/corelib/tools/qvector/qrawvector.h index 0fdfa86f1d..8c2d014a41 100644 --- a/tests/benchmarks/corelib/tools/qvector/qrawvector.h +++ b/tests/benchmarks/corelib/tools/qvector/qrawvector.h @@ -48,10 +48,8 @@ #include <QtCore/qalgorithms.h> #include <QtCore/qlist.h> -#ifndef QT_NO_STL #include <iterator> #include <vector> -#endif #include <stddef.h> #include <stdlib.h> #include <string.h> @@ -253,12 +251,10 @@ public: //static QRawVector<T> fromList(const QList<T> &list); -#ifndef QT_NO_STL static inline QRawVector<T> fromStdVector(const std::vector<T> &vector) { QRawVector<T> tmp; qCopy(vector.begin(), vector.end(), std::back_inserter(tmp)); return tmp; } inline std::vector<T> toStdVector() const { std::vector<T> tmp; qCopy(constBegin(), constEnd(), std::back_inserter(tmp)); return tmp; } -#endif private: T *allocate(int alloc); |