feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CPlusPlus: Avoid a few deprecation warnings

Browse Source 
The alternatives have been around since 2012.

Change-Id: I0aa15d59efe8a547e2ad622ffda689746960d48c
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
This commit is contained in:
hjk
2019-06-04 13:37:45 +02:00
parent 761ba941ec
commit 2f7ca2ce44
7 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/libs/cplusplus/CppDocument.cpp
View File

@@ -228,8 +228,7 @@ public:
if (fileName != doc->fileName()) if (fileName != doc->fileName())
return; return;
QString message; const QString message = QString::vasprintf(format, ap);
message.vsprintf(format, ap);
#ifndef DO_NOT_DUMP_ALL_PARSER_ERRORS #ifndef DO_NOT_DUMP_ALL_PARSER_ERRORS
{ {

5
src/tools/cplusplus-ast2png/cplusplus-ast2png.cpp
View File

@@ -423,12 +423,11 @@ public:
static const char *const pretty[] = {"warning", "error", "fatal"}; static const char *const pretty[] = {"warning", "error", "fatal"};
QString str; QString str = QString::asprintf("%s:%d:%d: When parsing as %s: %s: ", fileName->chars(), line, column,
str.sprintf("%s:%d:%d: When parsing as %s: %s: ", fileName->chars(), line, column,
parseModeToString(m_parseMode).toUtf8().constData(), pretty[level]); parseModeToString(m_parseMode).toUtf8().constData(), pretty[level]);
m_errorString->append(str.toUtf8()); m_errorString->append(str.toUtf8());
str.vsprintf(format, ap); str += QString::vasprintf(format, ap);
m_errorString->append(str.toUtf8()); m_errorString->append(str.toUtf8());
m_errorString->append('\n'); m_errorString->append('\n');
} }

2
tests/auto/cplusplus/ast/tst_ast.cpp
View File

@@ -97,7 +97,7 @@ public:
{ {
++errorCount; ++errorCount;
qDebug() << fileName->chars()<<':'<<line<<':'<<column<<' '<<QString().vsprintf(format, ap); qDebug() << fileName->chars()<<':'<<line<<':'<<column<<' ' << QString::vasprintf(format, ap);
} }
}; };

5
tests/auto/cplusplus/c99/tst_c99.cpp
View File

@@ -83,11 +83,10 @@ class tst_c99: public QObject
static const char *const pretty[] = {"warning", "error", "fatal"}; static const char *const pretty[] = {"warning", "error", "fatal"};
QString str; QString str = QString::asprintf("%s:%d:%d: %s: ", fileName->chars(), line, column, pretty[level]);
str.sprintf("%s:%d:%d: %s: ", fileName->chars(), line, column, pretty[level]);
errors->append(str.toUtf8()); errors->append(str.toUtf8());
str.vsprintf(format, ap); str += QString::vasprintf(format, ap);
errors->append(str.toUtf8()); errors->append(str.toUtf8());
errors->append('\n'); errors->append('\n');

5
tests/auto/cplusplus/cxx11/tst_cxx11.cpp
View File

@@ -85,11 +85,10 @@ class tst_cxx11: public QObject
static const char *const pretty[] = {"warning", "error", "fatal"}; static const char *const pretty[] = {"warning", "error", "fatal"};
QString str; QString str = QString::asprintf("%s:%d:%d: %s: ", fileName->chars(), line, column, pretty[level]);
str.sprintf("%s:%d:%d: %s: ", fileName->chars(), line, column, pretty[level]);
errors->append(str.toUtf8()); errors->append(str.toUtf8());
str.vsprintf(format, ap); str += QString::vasprintf(format, ap);
errors->append(str.toUtf8()); errors->append(str.toUtf8());
errors->append('\n'); errors->append('\n');

2
tests/auto/cplusplus/semantic/tst_semantic.cpp
View File

@@ -120,7 +120,7 @@ public:
++errorCount; ++errorCount;
#ifndef NO_PARSER_OR_SEMANTIC_ERROR_MESSAGES #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 #else
Q_UNUSED(fileName); Q_UNUSED(fileName);
Q_UNUSED(line); Q_UNUSED(line);

2
tests/auto/cplusplus/translationunit/tst_translationunit.cpp
View File

@@ -133,7 +133,7 @@ private:
{ {
++errorCount; ++errorCount;
qDebug() << fileName->chars() << ':' << line << ':' << column qDebug() << fileName->chars() << ':' << line << ':' << column
<< ' ' << QString().vsprintf(format, ap); << ' ' << QString::vasprintf(format, ap);
} }
} m_diagnosticClient; } m_diagnosticClient;
}; };