diff options
author | Dominik Holland <dominik.holland@qt.io> | 2022-08-18 14:01:15 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-09-07 19:46:34 +0000 |
commit | 690c5a6ac37561f41ac1036999fcb567282bb8da (patch) | |
tree | 6e776edfcb33dd8a36346a404c40e6bfb7fc73f4 | |
parent | 861290c308495b1994152e14e86dc5eb979b1219 (diff) |
Fix all remaining warnings and mark the module as warning free
... at least compile-time warnings.
Change-Id: Ie14e5eb8ffbd4867f5809b5ebe77945816a50a25
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
(cherry picked from commit fa54076dd50232a9f45b5e52336f77513f26d6ab)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r-- | CMakeLists.txt | 3 | ||||
-rw-r--r-- | src/interfaceframework/qifqmlconversion_helper.cpp | 2 | ||||
-rw-r--r-- | src/interfaceframework/qifservicemanager.cpp | 4 | ||||
-rw-r--r-- | src/interfaceframework/qifsimulationglobalobject.cpp | 2 | ||||
-rw-r--r-- | src/interfaceframework/queryparser/qifqueryparser.g | 2 | ||||
-rw-r--r-- | src/interfaceframework/queryparser/qifqueryparser.l | 4 | ||||
-rw-r--r-- | src/interfaceframework/queryparser/qifqueryparser_flex_p.h | 4 | ||||
-rw-r--r-- | src/interfaceframework/queryparser/qifqueryparser_p.h | 2 |
8 files changed, 10 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 81e353c1..f8548809 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,9 +8,6 @@ project(QtInterfaceFramework LANGUAGES CXX C ) -# TODO: Fix warnings and remove this -set(QT_REPO_NOT_WARNINGS_CLEAN TRUE) - # Make sure we only use latest private CMake API, aka no compatibility wrappers. set(QT_NO_INTERNAL_COMPATIBILITY_FUNCTIONS TRUE) diff --git a/src/interfaceframework/qifqmlconversion_helper.cpp b/src/interfaceframework/qifqmlconversion_helper.cpp index 7f2c3460..09145664 100644 --- a/src/interfaceframework/qifqmlconversion_helper.cpp +++ b/src/interfaceframework/qifqmlconversion_helper.cpp @@ -78,7 +78,7 @@ QVariant qtif_convertFromJSON(const QVariant &value) QString enumValue = value.toString(); const int lastIndex = enumValue.lastIndexOf(QStringLiteral("::")); const QString className = enumValue.left(lastIndex) + QStringLiteral("*"); - enumValue = enumValue.right(enumValue.count() - lastIndex - 2); + enumValue = enumValue.right(enumValue.size() - lastIndex - 2); QMetaType metaType = QMetaType::fromName(className.toLatin1()); const QMetaObject *mo = metaType.metaObject(); if (Q_UNLIKELY(!mo)) { diff --git a/src/interfaceframework/qifservicemanager.cpp b/src/interfaceframework/qifservicemanager.cpp index 7247d8aa..c5cbfa3d 100644 --- a/src/interfaceframework/qifservicemanager.cpp +++ b/src/interfaceframework/qifservicemanager.cpp @@ -48,11 +48,11 @@ namespace qtif_helper { const QFileInfo fi(fileName); //remove the library suffix QString baseName = fileName; - baseName.chop(fi.suffix().count() + 1); + baseName.chop(fi.suffix().size() + 1); //remove the configuration suffix if (baseName.endsWith(debugSuffixLiteral)) - baseName.chop(debugSuffixLiteral.count()); + baseName.chop(debugSuffixLiteral.size()); return baseName; } diff --git a/src/interfaceframework/qifsimulationglobalobject.cpp b/src/interfaceframework/qifsimulationglobalobject.cpp index e12d5d48..64034900 100644 --- a/src/interfaceframework/qifsimulationglobalobject.cpp +++ b/src/interfaceframework/qifsimulationglobalobject.cpp @@ -271,7 +271,7 @@ QVariantMap QIfSimulationGlobalObject::findData(const QVariantMap &data, const Q int index = key.indexOf(QLatin1Char('.')); if (index == -1) break; - key = key.right(key.count() - index - 1); + key = key.right(key.size() - index - 1); } return QVariantMap(); diff --git a/src/interfaceframework/queryparser/qifqueryparser.g b/src/interfaceframework/queryparser/qifqueryparser.g index 0020ed40..5f370598 100644 --- a/src/interfaceframework/queryparser/qifqueryparser.g +++ b/src/interfaceframework/queryparser/qifqueryparser.g @@ -64,7 +64,7 @@ void readQueryBuffer(char *buffer, unsigned int &numBytesRead,int maxBytesToRead } int numBytesToRead = maxBytesToRead; - int bytesRemaining = currentQuery->count()-(*currentOffset); + int bytesRemaining = currentQuery->size()-(*currentOffset); int i; if ( numBytesToRead > bytesRemaining ) numBytesToRead = bytesRemaining; diff --git a/src/interfaceframework/queryparser/qifqueryparser.l b/src/interfaceframework/queryparser/qifqueryparser.l index d8effea4..d6dc6ec4 100644 --- a/src/interfaceframework/queryparser/qifqueryparser.l +++ b/src/interfaceframework/queryparser/qifqueryparser.l @@ -87,7 +87,7 @@ icst [+-]?({dec}|0{oct}*|0[xX]{hex}+) \"(\\.|[^"])*\" { QString text = QLatin1String(yytext); - text.truncate(text.count() - 1); + text.truncate(text.size() - 1); yylval = text.mid(1); return STRING; @@ -95,7 +95,7 @@ icst [+-]?({dec}|0{oct}*|0[xX]{hex}+) \'(\\.|[^'])*\' { QString text = QLatin1String(yytext); - text.truncate(text.count() - 1); + text.truncate(text.size() - 1); yylval = text.mid(1); return STRING; diff --git a/src/interfaceframework/queryparser/qifqueryparser_flex_p.h b/src/interfaceframework/queryparser/qifqueryparser_flex_p.h index cb11194c..33a06718 100644 --- a/src/interfaceframework/queryparser/qifqueryparser_flex_p.h +++ b/src/interfaceframework/queryparser/qifqueryparser_flex_p.h @@ -1133,7 +1133,7 @@ case 21: YY_RULE_SETUP { QString text = QLatin1String(yytext); - text.truncate(text.count() - 1); + text.truncate(text.size() - 1); yylval = text.mid(1); return STRING; @@ -1144,7 +1144,7 @@ case 22: YY_RULE_SETUP { QString text = QLatin1String(yytext); - text.truncate(text.count() - 1); + text.truncate(text.size() - 1); yylval = text.mid(1); return STRING; diff --git a/src/interfaceframework/queryparser/qifqueryparser_p.h b/src/interfaceframework/queryparser/qifqueryparser_p.h index 26b0647c..426f4177 100644 --- a/src/interfaceframework/queryparser/qifqueryparser_p.h +++ b/src/interfaceframework/queryparser/qifqueryparser_p.h @@ -192,7 +192,7 @@ void readQueryBuffer(char *buffer, unsigned int &numBytesRead,int maxBytesToRead } int numBytesToRead = maxBytesToRead; - int bytesRemaining = currentQuery->count()-(*currentOffset); + int bytesRemaining = currentQuery->size()-(*currentOffset); int i; if ( numBytesToRead > bytesRemaining ) numBytesToRead = bytesRemaining; |