summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@kdab.com>2015-01-23 12:07:18 +0100
committerMarc Mutz <marc.mutz@kdab.com>2015-02-12 19:39:54 +0000
commit09205f662e13cc9e636ec896c7ea8e1bf28a88aa (patch)
treefaf3e773835c036e094af3cef45335ea3b223a76 /src/gui
parent08a8a6a842d0bd925ff31acfe2d47286ef393a83 (diff)
QtGui: assorted migrations to QString::asprintf
Change-Id: Ibb177b22064efcad56ace60935e9c8759a87a3c9 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/image/qxpmhandler.cpp14
-rw-r--r--src/gui/painting/qcolor.cpp9
2 files changed, 10 insertions, 13 deletions
diff --git a/src/gui/image/qxpmhandler.cpp b/src/gui/image/qxpmhandler.cpp
index 1a68a819c7..e9ac4a9cc2 100644
--- a/src/gui/image/qxpmhandler.cpp
+++ b/src/gui/image/qxpmhandler.cpp
@@ -1129,14 +1129,14 @@ static bool write_xpm_image(const QImage &sourceImage, QIODevice *device, const
while (c != colorMap.end()) {
QRgb color = c.key();
if (image.format() != QImage::Format_RGB32 && !qAlpha(color))
- line.sprintf("\"%s c None\"",
- xpm_color_name(cpp, *c));
+ line = QString::asprintf("\"%s c None\"",
+ xpm_color_name(cpp, *c));
else
- line.sprintf("\"%s c #%02x%02x%02x\"",
- xpm_color_name(cpp, *c),
- qRed(color),
- qGreen(color),
- qBlue(color));
+ line = QString::asprintf("\"%s c #%02x%02x%02x\"",
+ xpm_color_name(cpp, *c),
+ qRed(color),
+ qGreen(color),
+ qBlue(color));
++c;
s << ',' << endl << line;
}
diff --git a/src/gui/painting/qcolor.cpp b/src/gui/painting/qcolor.cpp
index 7a5a5ec528..945b150375 100644
--- a/src/gui/painting/qcolor.cpp
+++ b/src/gui/painting/qcolor.cpp
@@ -505,16 +505,13 @@ QString QColor::name() const
QString QColor::name(NameFormat format) const
{
- QString s;
switch (format) {
case HexRgb:
- s.sprintf("#%02x%02x%02x", red(), green(), blue());
- break;
+ return QString::asprintf("#%02x%02x%02x", red(), green(), blue());
case HexArgb:
- s.sprintf("#%02x%02x%02x%02x", alpha(), red(), green(), blue());
- break;
+ return QString::asprintf("#%02x%02x%02x%02x", alpha(), red(), green(), blue());
}
- return s;
+ return QString();
}
/*!