diff options
author | hjk <hjk@qt.io> | 2019-06-04 13:37:45 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2019-06-05 05:43:34 +0000 |
commit | 2f7ca2ce44a1f0131dd99105315df8ba7e3623a0 (patch) | |
tree | af5592f38ff4d8757c7d249d70833964ed9ad2d3 | |
parent | 761ba941eca4536c75700633d34cb9d0359fa1e9 (diff) | |
download | qt-creator-2f7ca2ce44a1f0131dd99105315df8ba7e3623a0.tar.gz |
CPlusPlus: Avoid a few deprecation warnings
The alternatives have been around since 2012.
Change-Id: I0aa15d59efe8a547e2ad622ffda689746960d48c
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
-rw-r--r-- | src/libs/cplusplus/CppDocument.cpp | 3 | ||||
-rw-r--r-- | src/tools/cplusplus-ast2png/cplusplus-ast2png.cpp | 5 | ||||
-rw-r--r-- | tests/auto/cplusplus/ast/tst_ast.cpp | 2 | ||||
-rw-r--r-- | tests/auto/cplusplus/c99/tst_c99.cpp | 5 | ||||
-rw-r--r-- | tests/auto/cplusplus/cxx11/tst_cxx11.cpp | 5 | ||||
-rw-r--r-- | tests/auto/cplusplus/semantic/tst_semantic.cpp | 2 | ||||
-rw-r--r-- | tests/auto/cplusplus/translationunit/tst_translationunit.cpp | 2 |
7 files changed, 10 insertions, 14 deletions
diff --git a/src/libs/cplusplus/CppDocument.cpp b/src/libs/cplusplus/CppDocument.cpp index c029c60dca..73cc06f26a 100644 --- a/src/libs/cplusplus/CppDocument.cpp +++ b/src/libs/cplusplus/CppDocument.cpp @@ -228,8 +228,7 @@ public: if (fileName != doc->fileName()) return; - QString message; - message.vsprintf(format, ap); + const QString message = QString::vasprintf(format, ap); #ifndef DO_NOT_DUMP_ALL_PARSER_ERRORS { diff --git a/src/tools/cplusplus-ast2png/cplusplus-ast2png.cpp b/src/tools/cplusplus-ast2png/cplusplus-ast2png.cpp index 59aab237ec..ad69adae56 100644 --- a/src/tools/cplusplus-ast2png/cplusplus-ast2png.cpp +++ b/src/tools/cplusplus-ast2png/cplusplus-ast2png.cpp @@ -423,12 +423,11 @@ public: static const char *const pretty[] = {"warning", "error", "fatal"}; - QString str; - str.sprintf("%s:%d:%d: When parsing as %s: %s: ", fileName->chars(), line, column, + QString str = QString::asprintf("%s:%d:%d: When parsing as %s: %s: ", fileName->chars(), line, column, parseModeToString(m_parseMode).toUtf8().constData(), pretty[level]); m_errorString->append(str.toUtf8()); - str.vsprintf(format, ap); + str += QString::vasprintf(format, ap); m_errorString->append(str.toUtf8()); m_errorString->append('\n'); } diff --git a/tests/auto/cplusplus/ast/tst_ast.cpp b/tests/auto/cplusplus/ast/tst_ast.cpp index 0cf9c7a560..e444a4b8e5 100644 --- a/tests/auto/cplusplus/ast/tst_ast.cpp +++ b/tests/auto/cplusplus/ast/tst_ast.cpp @@ -97,7 +97,7 @@ public: { ++errorCount; - qDebug() << fileName->chars()<<':'<<line<<':'<<column<<' '<<QString().vsprintf(format, ap); + qDebug() << fileName->chars()<<':'<<line<<':'<<column<<' ' << QString::vasprintf(format, ap); } }; diff --git a/tests/auto/cplusplus/c99/tst_c99.cpp b/tests/auto/cplusplus/c99/tst_c99.cpp index df33671907..edcb5f955f 100644 --- a/tests/auto/cplusplus/c99/tst_c99.cpp +++ b/tests/auto/cplusplus/c99/tst_c99.cpp @@ -83,11 +83,10 @@ class tst_c99: public QObject static const char *const pretty[] = {"warning", "error", "fatal"}; - QString str; - str.sprintf("%s:%d:%d: %s: ", fileName->chars(), line, column, pretty[level]); + QString str = QString::asprintf("%s:%d:%d: %s: ", fileName->chars(), line, column, pretty[level]); errors->append(str.toUtf8()); - str.vsprintf(format, ap); + str += QString::vasprintf(format, ap); errors->append(str.toUtf8()); errors->append('\n'); diff --git a/tests/auto/cplusplus/cxx11/tst_cxx11.cpp b/tests/auto/cplusplus/cxx11/tst_cxx11.cpp index 108d93f18f..abef7cc1e1 100644 --- a/tests/auto/cplusplus/cxx11/tst_cxx11.cpp +++ b/tests/auto/cplusplus/cxx11/tst_cxx11.cpp @@ -85,11 +85,10 @@ class tst_cxx11: public QObject static const char *const pretty[] = {"warning", "error", "fatal"}; - QString str; - str.sprintf("%s:%d:%d: %s: ", fileName->chars(), line, column, pretty[level]); + QString str = QString::asprintf("%s:%d:%d: %s: ", fileName->chars(), line, column, pretty[level]); errors->append(str.toUtf8()); - str.vsprintf(format, ap); + str += QString::vasprintf(format, ap); errors->append(str.toUtf8()); errors->append('\n'); diff --git a/tests/auto/cplusplus/semantic/tst_semantic.cpp b/tests/auto/cplusplus/semantic/tst_semantic.cpp index 3904558efc..e13795154b 100644 --- a/tests/auto/cplusplus/semantic/tst_semantic.cpp +++ b/tests/auto/cplusplus/semantic/tst_semantic.cpp @@ -120,7 +120,7 @@ public: ++errorCount; #ifndef NO_PARSER_OR_SEMANTIC_ERROR_MESSAGES - qDebug() << fileName->chars()<<':'<<line<<':'<<column<<' '<<QString().vsprintf(format, ap); + qDebug() << fileName->chars()<<':'<<line<<':'<<column<<' ' << QString::vasprintf(format, ap); #else Q_UNUSED(fileName); Q_UNUSED(line); diff --git a/tests/auto/cplusplus/translationunit/tst_translationunit.cpp b/tests/auto/cplusplus/translationunit/tst_translationunit.cpp index 4a2159bf04..2c651676bc 100644 --- a/tests/auto/cplusplus/translationunit/tst_translationunit.cpp +++ b/tests/auto/cplusplus/translationunit/tst_translationunit.cpp @@ -133,7 +133,7 @@ private: { ++errorCount; qDebug() << fileName->chars() << ':' << line << ':' << column - << ' ' << QString().vsprintf(format, ap); + << ' ' << QString::vasprintf(format, ap); } } m_diagnosticClient; }; |