diff options
author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-07-05 12:06:01 (GMT) |
---|---|---|
committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-07-05 17:05:18 (GMT) |
commit | db1c29aaed0730db38f19dfb376fd2c03d08c04e (patch) | |
tree | 40d3f8eedf92b31971fd414226c8b40c2e688503 /tests | |
parent | aaf6ebb3725055035d0d17767b4e155d39828553 (diff) | |
download | Qt-db1c29aaed0730db38f19dfb376fd2c03d08c04e.zip Qt-db1c29aaed0730db38f19dfb376fd2c03d08c04e.tar.gz Qt-db1c29aaed0730db38f19dfb376fd2c03d08c04e.tar.bz2 |
Fix QScopedPointerarray default constructor
Since the compiler cannod find the template argument if there is no
argument passed to the constructor, this effectively means there is
no default constructor.
Add a default constructor
Task-number: QTBUG-20256
Change-Id: I310d5e1f3f94a8fe69fd3a5c46f2f51bca60facd
Reviewed-on: http://codereview.qt.nokia.com/1165
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
(cherry picked from commit d789e40c58c1ce8441d3bb4d6ca8d01fe02ad1a7)
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/qscopedpointer/tst_qscopedpointer.cpp | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/tests/auto/qscopedpointer/tst_qscopedpointer.cpp b/tests/auto/qscopedpointer/tst_qscopedpointer.cpp index 1a6f944..06c0ecb 100644 --- a/tests/auto/qscopedpointer/tst_qscopedpointer.cpp +++ b/tests/auto/qscopedpointer/tst_qscopedpointer.cpp @@ -72,6 +72,7 @@ private Q_SLOTS: void isNullSignature(); void objectSize(); void comparison(); + void array(); // TODO instanciate on const object }; @@ -437,5 +438,26 @@ void tst_QScopedPointer::comparison() QCOMPARE( int(RefCounted::instanceCount), 0 ); } +void tst_QScopedPointer::array() +{ + int instCount = RefCounted::instanceCount; + { + QScopedArrayPointer<RefCounted> array; + array.reset(new RefCounted[42]); + QCOMPARE(instCount + 42, int(RefCounted::instanceCount)); + } + QCOMPARE(instCount, int(RefCounted::instanceCount)); + { + QScopedArrayPointer<RefCounted> array(new RefCounted[42]); + QCOMPARE(instCount + 42, int(RefCounted::instanceCount)); + array.reset(new RefCounted[28]); + QCOMPARE(instCount + 28, int(RefCounted::instanceCount)); + array.reset(0); + QCOMPARE(instCount, int(RefCounted::instanceCount)); + } + QCOMPARE(instCount, int(RefCounted::instanceCount)); +} + + QTEST_MAIN(tst_QScopedPointer) #include "tst_qscopedpointer.moc" |