kbrown / rpms / libreoffice

Forked from rpms/libreoffice 2 years ago
Clone

Blame SOURCES/0248-loplugin-staticmethods.patch

135360
From 0fb26aeb7fb8385ee19b1d79aeaa9dd51ed18071 Mon Sep 17 00:00:00 2001
135360
From: Stephan Bergmann <sbergman@redhat.com>
135360
Date: Fri, 30 Oct 2015 16:54:39 +0100
135360
Subject: [PATCH 248/398] loplugin:staticmethods
135360
135360
Change-Id: I9ac908d0981734e4b2930a79f160ec0462127483
135360
(cherry picked from commit 86585175a607982f0549ddad19851f1ebf52148c)
135360
---
135360
 libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx | 6 +++---
135360
 1 file changed, 3 insertions(+), 3 deletions(-)
135360
135360
diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
135360
index eec80ba0b727..1049c288a14b 100644
135360
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
135360
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
135360
@@ -74,7 +74,7 @@ public:
135360
     GtkWidget* m_pDrawingArea;
135360
     TiledCornerButton();
135360
     static gboolean draw(GtkWidget* pWidget, cairo_t* pCairo, gpointer pData);
135360
-    gboolean drawImpl(GtkWidget* pWidget, cairo_t* pCairo);
135360
+    static gboolean drawImpl(GtkWidget* pWidget, cairo_t* pCairo);
135360
 };
135360
 
135360
 /// Represents all the state that is specific to one GtkWindow of this app.
135360
@@ -264,9 +264,9 @@ TiledCornerButton::TiledCornerButton()
135360
     g_signal_connect(m_pDrawingArea, "draw", G_CALLBACK(TiledCornerButton::draw), this);
135360
 }
135360
 
135360
-gboolean TiledCornerButton::draw(GtkWidget* pWidget, cairo_t* pCairo, gpointer pData)
135360
+gboolean TiledCornerButton::draw(GtkWidget* pWidget, cairo_t* pCairo, gpointer)
135360
 {
135360
-    return static_cast<TiledCornerButton*>(pData)->drawImpl(pWidget, pCairo);
135360
+    return drawImpl(pWidget, pCairo);
135360
 }
135360
 
135360
 gboolean TiledCornerButton::drawImpl(GtkWidget* /*pWidget*/, cairo_t* pCairo)
135360
-- 
135360
2.12.0
135360