summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@qt.io>2019-03-15 08:50:25 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2019-03-15 08:32:32 +0000
commit62e4e2021bc1e68ae9bd2e9b49556282cfe816b9 (patch)
treec375f200c8eb526fe79509e6c2caa84804c87ddb
parent14793483aab76f1ac559d83cd0846ffee54fddc5 (diff)
downloadqttools-62e4e2021bc1e68ae9bd2e9b49556282cfe816b9.tar.gz
Replace deprecated QString::sprintf
QString::sprintf got deprecated in qtbase commit f8f592d5c22c378ac94. Use QString::asprintf instead. Fixes: QTBUG-74449 Change-Id: I1a635551be4f021e5da1145c03b4d0aaf4ebda8c Reviewed-by: Liang Qi <liang.qi@qt.io>
-rw-r--r--src/kmap2qmap/main.cpp8
-rw-r--r--src/linguist/linguist/messagemodel.cpp4
-rw-r--r--src/linguist/shared/qmakebuiltins.cpp3
-rw-r--r--src/linguist/shared/xliff.cpp7
-rw-r--r--src/pixeltool/qpixeltool.cpp24
5 files changed, 18 insertions, 28 deletions
diff --git a/src/kmap2qmap/main.cpp b/src/kmap2qmap/main.cpp
index 84125497e..b03df4aff 100644
--- a/src/kmap2qmap/main.cpp
+++ b/src/kmap2qmap/main.cpp
@@ -503,9 +503,7 @@ bool KeymapParser::generateHeader(QFile *f)
for (int i = 0; i < m_keymap.size(); ++i) {
const QEvdevKeyboardMap::Mapping &m = m_keymap.at(i);
- QString s;
- s.sprintf(" { %3d, 0x%04x, 0x%08x, 0x%02x, 0x%02x, 0x%04x },\n", m.keycode, m.unicode, m.qtcode, m.modifiers, m.flags, m.special);
- ts << s;
+ ts << QString::asprintf(" { %3d, 0x%04x, 0x%08x, 0x%02x, 0x%02x, 0x%04x },\n", m.keycode, m.unicode, m.qtcode, m.modifiers, m.flags, m.special);
}
ts << "};" << endl << endl;
@@ -514,9 +512,7 @@ bool KeymapParser::generateHeader(QFile *f)
for (int i = 0; i < m_keycompose.size(); ++i) {
const QEvdevKeyboardMap::Composing &c = m_keycompose.at(i);
- QString s;
- s.sprintf(" { 0x%04x, 0x%04x, 0x%04x },\n", c.first, c.second, c.result);
- ts << s;
+ ts << QString::asprintf(" { 0x%04x, 0x%04x, 0x%04x },\n", c.first, c.second, c.result);
}
ts << "};" << endl << endl;
diff --git a/src/linguist/linguist/messagemodel.cpp b/src/linguist/linguist/messagemodel.cpp
index 1033940e7..74c49cf83 100644
--- a/src/linguist/linguist/messagemodel.cpp
+++ b/src/linguist/linguist/messagemodel.cpp
@@ -1367,9 +1367,7 @@ QVariant MessageModel::data(const QModelIndex &index, int role) const
return tr("%n unfinished message(s) left.", 0,
mci->getNumEditable() - mci->getNumFinished());
}
- QString s;
- s.sprintf("%d/%d", mci->getNumFinished(), mci->getNumEditable());
- return s;
+ return QString::asprintf("%d/%d", mci->getNumFinished(), mci->getNumEditable());
}
default:
return QVariant(); // Status => no text
diff --git a/src/linguist/shared/qmakebuiltins.cpp b/src/linguist/shared/qmakebuiltins.cpp
index b8eafa0b3..5200695b1 100644
--- a/src/linguist/shared/qmakebuiltins.cpp
+++ b/src/linguist/shared/qmakebuiltins.cpp
@@ -878,8 +878,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinExpand(
ret += values(map(args.at(0)));
break;
case E_LIST: {
- QString tmp;
- tmp.sprintf(".QMAKE_INTERNAL_TMP_variableName_%d", m_listCount++);
+ QString tmp = QString::asprintf(".QMAKE_INTERNAL_TMP_variableName_%d", m_listCount++);
ret = ProStringList(ProString(tmp));
ProStringList lst;
for (const ProString &arg : args)
diff --git a/src/linguist/shared/xliff.cpp b/src/linguist/shared/xliff.cpp
index 338768875..c499e9ea5 100644
--- a/src/linguist/shared/xliff.cpp
+++ b/src/linguist/shared/xliff.cpp
@@ -732,10 +732,9 @@ bool XLIFFHandler::finalizeMessage(bool isPlural)
bool XLIFFHandler::fatalError(const QXmlParseException &exception)
{
- QString msg;
- msg.sprintf("XML error: Parse error at line %d, column %d (%s).\n",
- exception.lineNumber(), exception.columnNumber(),
- exception.message().toLatin1().data() );
+ QString msg = QString::asprintf("XML error: Parse error at line %d, column %d (%s).\n",
+ exception.lineNumber(), exception.columnNumber(),
+ exception.message().toLatin1().data());
m_cd.appendError(msg);
return false;
}
diff --git a/src/pixeltool/qpixeltool.cpp b/src/pixeltool/qpixeltool.cpp
index 7a73e3655..4abc45325 100644
--- a/src/pixeltool/qpixeltool.cpp
+++ b/src/pixeltool/qpixeltool.cpp
@@ -255,13 +255,12 @@ void QPixelTool::paintEvent(QPaintEvent *)
}
if (m_freeze) {
- QString str;
- str.sprintf("%8X (%3d,%3d,%3d,%3d)",
- m_currentColor,
- (0xff000000 & m_currentColor) >> 24,
- (0x00ff0000 & m_currentColor) >> 16,
- (0x0000ff00 & m_currentColor) >> 8,
- (0x000000ff & m_currentColor));
+ QString str = QString::asprintf("%8X (%3d,%3d,%3d,%3d)",
+ m_currentColor,
+ (0xff000000 & m_currentColor) >> 24,
+ (0x00ff0000 & m_currentColor) >> 16,
+ (0x0000ff00 & m_currentColor) >> 8,
+ (0x000000ff & m_currentColor));
render_string(&p, w, h,
str,
Qt::AlignBottom | Qt::AlignRight);
@@ -279,12 +278,11 @@ void QPixelTool::paintEvent(QPaintEvent *)
p.setPen(QPen(Qt::black, 1, Qt::SolidLine));
p.drawRect(r);
- QString str;
- str.sprintf("Rect: x=%d, y=%d, w=%d, h=%d",
- r.x() / m_zoom,
- r.y() / m_zoom,
- r.width() / m_zoom,
- r.height() / m_zoom);
+ QString str = QString::asprintf("Rect: x=%d, y=%d, w=%d, h=%d",
+ r.x() / m_zoom,
+ r.y() / m_zoom,
+ r.width() / m_zoom,
+ r.height() / m_zoom);
render_string(&p, w, h, str, Qt::AlignBottom | Qt::AlignLeft);
}