diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-02-05 15:34:44 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-02-06 09:35:24 +0000 |
| commit | e186166f292fbaf8fa8af3fbffdf4f08e9cb7009 (patch) | |
| tree | f187a623794e0849f8ec7aabf5c3a50ac7155674 /sources/shiboken2/ApiExtractor | |
| parent | 81f128c5f09a7cae9e549458bcf23943b0b9a351 (diff) | |
Replace QString::null/isNull() by QString()/isEmpty()
Fix warnings appearing in Qt 5.13:
sources/shiboken2/generator/shiboken2/shibokengenerator.cpp:873:25: warning: ‘QString::null’ is deprecated: use QString() [-Wdeprecated-declarations]
sources/shiboken2/generator/shiboken2/shibokengenerator.cpp:873:25: warning: ‘QString::null’ is deprecated: use QString() [-Wdeprecated-declarations]
sources/shiboken2/generator/shiboken2/shibokengenerator.cpp:880:25: warning: ‘QString::null’ is deprecated: use QString() [-Wdeprecated-declarations]
sources/shiboken2/generator/shiboken2/shibokengenerator.cpp:880:25: warning: ‘QString::null’ is deprecated: use QString() [-Wdeprecated-declarations]
sources/shiboken2/generator/shiboken2/cppgenerator.cpp:5060:34: warning: ‘QString::null’ is deprecated: use QString() [-Wdeprecated-declarations]
sources/shiboken2/generator/shiboken2/cppgenerator.cpp:5060:34: warning: ‘QString::null’ is deprecated: use QString() [-Wdeprecated-declarations]
Change-Id: I7c938df64babf824b58bf5c785b281a88d5111db
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'sources/shiboken2/ApiExtractor')
| -rw-r--r-- | sources/shiboken2/ApiExtractor/abstractmetalang.cpp | 2 | ||||
| -rw-r--r-- | sources/shiboken2/ApiExtractor/tests/testtemplates.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sources/shiboken2/ApiExtractor/abstractmetalang.cpp b/sources/shiboken2/ApiExtractor/abstractmetalang.cpp index c3063aaa1..73f1bf621 100644 --- a/sources/shiboken2/ApiExtractor/abstractmetalang.cpp +++ b/sources/shiboken2/ApiExtractor/abstractmetalang.cpp @@ -156,7 +156,7 @@ static QString lastNameSegment(QString name) QString AbstractMetaType::name() const { - if (m_name.isNull()) + if (m_name.isEmpty()) m_name = lastNameSegment(m_typeEntry->targetLangName()); return m_name; } diff --git a/sources/shiboken2/ApiExtractor/tests/testtemplates.cpp b/sources/shiboken2/ApiExtractor/tests/testtemplates.cpp index b1b171bae..59b601f3b 100644 --- a/sources/shiboken2/ApiExtractor/tests/testtemplates.cpp +++ b/sources/shiboken2/ApiExtractor/tests/testtemplates.cpp @@ -111,7 +111,7 @@ namespace Namespace { AbstractMetaClass* classB = AbstractMetaClass::findClass(classes, QLatin1String("B")); QVERIFY(classB); QVERIFY(!classB->baseClass()); - QVERIFY(classB->baseClassName().isNull()); + QVERIFY(classB->baseClassName().isEmpty()); const AbstractMetaFunction* func = classB->findFunction(QLatin1String("foo")); AbstractMetaType* argType = func->arguments().first()->type(); QCOMPARE(argType->instantiations().count(), 1); @@ -300,7 +300,7 @@ template<SomeEnum type> struct Future {}; AbstractMetaClass* classB = AbstractMetaClass::findClass(classes, QLatin1String("B")); QVERIFY(classB); QVERIFY(!classB->baseClass()); - QVERIFY(classB->baseClassName().isNull()); + QVERIFY(classB->baseClassName().isEmpty()); // 3 functions: simple constructor, copy constructor and "method()". QCOMPARE(classB->functions().count(), 3); } @@ -338,7 +338,7 @@ template<SomeEnum type> struct Future {}; AbstractMetaClass* classB = AbstractMetaClass::findClass(classes, QLatin1String("Namespace::B")); QVERIFY(classB); QVERIFY(!classB->baseClass()); - QVERIFY(classB->baseClassName().isNull()); + QVERIFY(classB->baseClassName().isEmpty()); // 3 functions: simple constructor, copy constructor and "method()". QCOMPARE(classB->functions().count(), 3); } |