OSDN Git Service

replace deprecated gdk_pixbuf_unref with g_object_unref
authorIvailo Monev <xakepa10@laimg.moc>
Sat, 22 Oct 2016 16:54:30 +0000 (16:54 +0000)
committerIvailo Monev <xakepa10@laimg.moc>
Sat, 22 Oct 2016 16:54:30 +0000 (16:54 +0000)
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
src/gui/styles/qgtkpainter.cpp
src/gui/styles/qgtkpainter_p.h

index 68958aa..279bbf0 100644 (file)
@@ -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);
index e6fa930..547c998 100644 (file)
@@ -66,7 +66,6 @@ QT_BEGIN_NAMESPACE
 
 class QGtkPainter
 {
-
 public:
     QGtkPainter(QPainter *painter);
     GtkStyle *getStyle(GtkWidget *gtkWidget);