diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-08-04 23:57:51 -0300 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-08-09 09:05:43 +0200 |
| commit | dcf9883dffc88355402e5697f0572e5241e1c062 (patch) | |
| tree | e7a9d1d2edfd7f9c3210f8dbe8ac2697a3397125 /tests | |
| parent | 2431bf1b20e2815e0da3d294cce129de775b8f39 (diff) | |
Move the special QByteArrayList methods into QList
and make QByteArrayList be a simple typedef.
As a side-effect, the constructor taking a QByteArray is no longer
available since I couldn't find a way to add it to QList<T> when T is
QByteArray. My template-foo failed me. I tried:
- QEnableIf<is_same<T, QByteArray>::value, QByteArray>::type
=> makes QList fail to compile for any T that isn't QByteArray
- make the constructor a template member
=> it compiles if the parameter is a QByteArray, but not a const
char[4] like the test was
- inheriting constructors
=> runs into ICC and Clang bugs that I could not work around
Besides, the constructor with std::initializer_list is a superior
solution anyway.
Change-Id: Ic86fbadc1104142bfd907a5c4147199bf839fb89
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/corelib/tools/qbytearraylist/tst_qbytearraylist.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/corelib/tools/qbytearraylist/tst_qbytearraylist.cpp b/tests/auto/corelib/tools/qbytearraylist/tst_qbytearraylist.cpp index 7d409ca1b8..c17f75f561 100644 --- a/tests/auto/corelib/tools/qbytearraylist/tst_qbytearraylist.cpp +++ b/tests/auto/corelib/tools/qbytearraylist/tst_qbytearraylist.cpp @@ -81,7 +81,7 @@ void tst_QByteArrayList::join_data() const QTest::newRow("data1") << QByteArrayList() << QByteArray(); - QTest::newRow("data2") << QByteArrayList("one") + QTest::newRow("data2") << (QByteArrayList() << "one") << QByteArray("one"); QTest::newRow("data3") << (QByteArrayList() << "a" << "b") @@ -114,7 +114,7 @@ void tst_QByteArrayList::joinByteArray_data() const << QByteArray("separator") << QByteArray(); - QTest::newRow("data3") << QByteArrayList("one") + QTest::newRow("data3") << (QByteArrayList() << "one") << QByteArray("separator") << QByteArray("one"); |