From 4e7f9ab523f277dbc4df930b943a3b72da11ba40 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sat, 22 Oct 2016 16:54:30 +0000 Subject: [PATCH] replace deprecated gdk_pixbuf_unref with g_object_unref Signed-off-by: Ivailo Monev --- src/gui/styles/qgtkpainter.cpp | 6 +++--- src/gui/styles/qgtkpainter_p.h | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/gui/styles/qgtkpainter.cpp b/src/gui/styles/qgtkpainter.cpp index 68958aa7c..279bbf0c3 100644 --- a/src/gui/styles/qgtkpainter.cpp +++ b/src/gui/styles/qgtkpainter.cpp @@ -134,12 +134,12 @@ QPixmap QGtkPainter::renderTheme(uchar *bdata, uchar *wdata, const QRect &rect) rect.width(), rect.height()); \ uchar* wdata = (uchar*)gdk_pixbuf_get_pixels(imgw); \ cache = renderTheme(bdata, wdata, rect); \ - gdk_pixbuf_unref(imgw); \ + g_object_unref(imgw); \ } else { \ cache = renderTheme(bdata, 0, rect); \ } \ gdk_drawable_unref(pixmap); \ - gdk_pixbuf_unref(imgb); \ + g_object_unref(imgb); \ } QGtkPainter::QGtkPainter(QPainter *_painter) @@ -213,7 +213,7 @@ QPixmap QGtkPainter::getIcon(const char* iconName, GtkIconSize size) tdata[index + QT_ALPHA] = data[index + GTK_ALPHA]; } - gdk_pixbuf_unref(icon); + g_object_unref(icon); // should we free iconset? return QPixmap::fromImage(converted); diff --git a/src/gui/styles/qgtkpainter_p.h b/src/gui/styles/qgtkpainter_p.h index e6fa93071..547c99810 100644 --- a/src/gui/styles/qgtkpainter_p.h +++ b/src/gui/styles/qgtkpainter_p.h @@ -66,7 +66,6 @@ QT_BEGIN_NAMESPACE class QGtkPainter { - public: QGtkPainter(QPainter *painter); GtkStyle *getStyle(GtkWidget *gtkWidget); -- 2.11.0