From cd2057d407b7e24721252bf6075835ec419018ea Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Wed, 2 Mar 2022 16:27:17 +0200 Subject: [PATCH] libs: save and load group tasks pixmaps in Katie image format Signed-off-by: Ivailo Monev --- libs/taskmanager/groupmanager.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/libs/taskmanager/groupmanager.cpp b/libs/taskmanager/groupmanager.cpp index 3f6ef9aa..a23c5f4a 100644 --- a/libs/taskmanager/groupmanager.cpp +++ b/libs/taskmanager/groupmanager.cpp @@ -29,6 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include #include #include +#include #include #include @@ -52,6 +53,12 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. namespace TaskManager { +#if QT_VERSION >= 0x041200 +static const QByteArray pixmapFormat = QImageWriter::defaultImageFormat(); +#else +static const QByteArray pixmapFormat = "png"; +#endif + class GroupManagerPrivate { public: @@ -806,7 +813,7 @@ void GroupManager::readLauncherConfig(const KConfigGroup &cg) } else if (item.length() >= 5) { QPixmap pixmap; QByteArray bytes = QByteArray::fromBase64(item.at(4).toAscii()); - pixmap.loadFromData(bytes); + pixmap.loadFromData(bytes, pixmapFormat); icon.addPixmap(pixmap); } QString name(item.at(2)); @@ -997,7 +1004,7 @@ bool GroupManagerPrivate::saveLauncher(LauncherItem *launcher, KConfigGroup &cg) QByteArray bytes; QBuffer buffer(&bytes); buffer.open(QIODevice::WriteOnly); - pixmap.save(&buffer, "PNG"); + pixmap.save(&buffer, pixmapFormat); launcherProperties.append(bytes.toBase64()); }