diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/image/qxpmhandler.cpp | 14 | ||||
| -rw-r--r-- | src/gui/painting/qcolor.cpp | 9 |
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(); } /*! |