[Libreoffice-commits] core.git: 2 commits - include/vcl vcl/osx

[Stephan Bergmann]

 include/vcl/opengl/OpenGLContext.hxx |    4 ++--
 vcl/osx/salobj.cxx                   |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit beeb71085036d09494e44f43670d6d26f30c6277
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sun May 22 21:10:38 2016 +0200

    loplugin:staticmethods
    
    Change-Id: I5cc2c15f49c8ed4f43dcddb5684e933b94d362ec

diff --git a/include/vcl/opengl/OpenGLContext.hxx b/include/vcl/opengl/OpenGLContext.hxx
index 7b91620..6863467 100644
--- a/include/vcl/opengl/OpenGLContext.hxx
+++ b/include/vcl/opengl/OpenGLContext.hxx
@@ -146,8 +146,8 @@ private:
 protected:
     bool InitGLEW();
     void InitGLEWDebugging();
-    void InitChildWindow(SystemChildWindow *pChildWindow);
-    void BuffersSwapped();
+    static void InitChildWindow(SystemChildWindow *pChildWindow);
+    static void BuffersSwapped();
     virtual GLWindow& getModifiableOpenGLWindow() = 0;
     virtual bool ImplInit();
 
commit 568828c3489ee8b9e7f32035eabc41fbb6b2c1fe
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Sun May 22 21:06:31 2016 +0200

    -Werror,-Winconsistent-missing-override
    
    Change-Id: I1938ffb82038d90bd34ba14148663ef8a1494d96

diff --git a/vcl/osx/salobj.cxx b/vcl/osx/salobj.cxx
index e25c1a1..c75f2a7 100644
--- a/vcl/osx/salobj.cxx
+++ b/vcl/osx/salobj.cxx
@@ -237,8 +237,8 @@ public:
     virtual bool initWindow() override;
 private:
     GLWindow m_aGLWin;
-    virtual const GLWindow& getOpenGLWindow() const { return m_aGLWin; }
-    virtual GLWindow& getModifiableOpenGLWindow() { return m_aGLWin; }
+    virtual const GLWindow& getOpenGLWindow() const override { return m_aGLWin; }
+    virtual GLWindow& getModifiableOpenGLWindow() override { return m_aGLWin; }
     NSOpenGLView* getOpenGLView();
     virtual bool ImplInit() override;
     virtual SystemWindowData generateWinData(vcl::Window* pParent, bool bRequestLegacyContext) override;