diff options
author | Timo Aarnipuro <timo.aarnipuro@qt.io> | 2017-07-20 16:14:08 +0300 |
---|---|---|
committer | Timo Aarnipuro <timo.aarnipuro@qt.io> | 2017-07-21 06:10:02 +0000 |
commit | 5cae29ffc78f09f27bdb2b0ad1ce90b58bff7b4e (patch) | |
tree | 42b8c34d5f5ea282b495575287667c858f6edf15 /src | |
parent | 8418a6335b3f8a029f48ee9b0a18500ddc760852 (diff) |
Move toString calls after their definition
Move two functions that are using toString(const QString &str) from
qtestcase.h to qtest.h. This fixes compilation on INTEGRITY platform.
Task-number: QTBUG-61702
Change-Id: I5a433126741c7a52621616c5b98203e7d642b330
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Reviewed-by: Samuel Gaist <samuel.gaist@edeltech.ch>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/testlib/qtest.h | 16 | ||||
-rw-r--r-- | src/testlib/qtestcase.h | 14 |
2 files changed, 18 insertions, 12 deletions
diff --git a/src/testlib/qtest.h b/src/testlib/qtest.h index 4abba93721..ca045120d5 100644 --- a/src/testlib/qtest.h +++ b/src/testlib/qtest.h @@ -199,6 +199,22 @@ template<> inline char *toString(const QVariant &v) return qstrdup(vstring.constData()); } +template <typename T1, typename T2> +inline char *toString(const QPair<T1, T2> &pair) +{ + const QScopedArrayPointer<char> first(toString(pair.first)); + const QScopedArrayPointer<char> second(toString(pair.second)); + return toString(QString::asprintf("QPair(%s,%s)", first.data(), second.data())); +} + +template <typename T1, typename T2> +inline char *toString(const std::pair<T1, T2> &pair) +{ + const QScopedArrayPointer<char> first(toString(pair.first)); + const QScopedArrayPointer<char> second(toString(pair.second)); + return toString(QString::asprintf("std::pair(%s,%s)", first.data(), second.data())); +} + inline char *toString(std::nullptr_t) { return toString(QLatin1String("nullptr")); diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h index fafc0eb7d6..b738043cb7 100644 --- a/src/testlib/qtestcase.h +++ b/src/testlib/qtestcase.h @@ -260,20 +260,10 @@ namespace QTest } template <typename T1, typename T2> - inline char *toString(const QPair<T1, T2> &pair) - { - const QScopedArrayPointer<char> first(toString(pair.first)); - const QScopedArrayPointer<char> second(toString(pair.second)); - return toString(QString::asprintf("QPair(%s,%s)", first.data(), second.data())); - } + inline char *toString(const QPair<T1, T2> &pair); template <typename T1, typename T2> - inline char *toString(const std::pair<T1, T2> &pair) - { - const QScopedArrayPointer<char> first(toString(pair.first)); - const QScopedArrayPointer<char> second(toString(pair.second)); - return toString(QString::asprintf("std::pair(%s,%s)", first.data(), second.data())); - } + inline char *toString(const std::pair<T1, T2> &pair); Q_TESTLIB_EXPORT char *toHexRepresentation(const char *ba, int length); Q_TESTLIB_EXPORT char *toPrettyCString(const char *unicode, int length); |