1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make the default ctor of QVarLengthArray implicit

Browse Source 
Otherwise "QVarLengthArray<Foo> x = {};" gives a warning. Also, some
compilers get confused about "QVarLengthArray()" this way.

Task-number: QTBUG-76199
Change-Id: I4296586c0181d3e6e82ca8b7b79aeb9a21645d1f
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
This commit is contained in:
Ulf Hermann 2019-07-01 14:10:43 +02:00
parent fdef9c8039
commit c34242c679
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/tools/qvarlengtharray.h
View File

@ -61,7 +61,9 @@ template<class T, int Prealloc>
class QVarLengthArray class QVarLengthArray
{ {
public: public:
inline explicit QVarLengthArray(int size = 0); QVarLengthArray() : QVarLengthArray(0) {}
inline explicit QVarLengthArray(int size);
inline QVarLengthArray(const QVarLengthArray<T, Prealloc> &other) inline QVarLengthArray(const QVarLengthArray<T, Prealloc> &other)
: a(Prealloc), s(0), ptr(reinterpret_cast<T *>(array)) : a(Prealloc), s(0), ptr(reinterpret_cast<T *>(array))

7
tests/auto/corelib/tools/qvarlengtharray/tst_qvarlengtharray.cpp
View File

@ -57,6 +57,7 @@ private slots:
void initializeListComplex(); void initializeListComplex();
void insertMove(); void insertMove();
void nonCopyable(); void nonCopyable();
void implicitDefaultCtor();
private: private:
template<typename T> template<typename T>
@ -1078,5 +1079,11 @@ void tst_QVarLengthArray::nonCopyable()
QVERIFY(ptr6 == vec.at(5).get()); QVERIFY(ptr6 == vec.at(5).get());
} }
void tst_QVarLengthArray::implicitDefaultCtor()
{
QVarLengthArray<int> def = {};
QCOMPARE(def.size(), 0);
}
QTEST_APPLESS_MAIN(tst_QVarLengthArray) QTEST_APPLESS_MAIN(tst_QVarLengthArray)
#include "tst_qvarlengtharray.moc" #include "tst_qvarlengtharray.moc"