From 23bdf47e68c5b86e811e6f3dc27ed3e49788f674 Mon Sep 17 00:00:00 2001
From: Jan-Marek Glogowski <glogow@fbihome.de>
Date: Fri, 24 Feb 2017 20:01:23 +0100
Subject: KDE fix various clang plugin complains

Fixes clang plugin reported problems in the KDE and KDE4 backend.

Change-Id: I0280beae9dd6f33ee59bdbe89cd38222f33fdc68
---
 vcl/inc/unx/kde/kdedata.hxx          | 12 +++++-------
 vcl/unx/kde/salnativewidgets-kde.cxx | 13 +++----------
 vcl/unx/kde4/KDESalFrame.cxx         | 14 +++-----------
 vcl/unx/kde4/KDESalFrame.hxx         |  7 +++----
 4 files changed, 14 insertions(+), 32 deletions(-)

(limited to 'vcl')

diff --git a/vcl/inc/unx/kde/kdedata.hxx b/vcl/inc/unx/kde/kdedata.hxx
index cc238dc95aa9..926909aac910 100644
--- a/vcl/inc/unx/kde/kdedata.hxx
+++ b/vcl/inc/unx/kde/kdedata.hxx
@@ -23,6 +23,9 @@
 #include <unx/saldisp.hxx>
 #include <unx/saldata.hxx>
 #include <unx/salframe.h>
+#include <unx/salgdi.h>
+
+#include <memory>
 
 class KDEData : public X11SalData
 {
@@ -48,13 +51,9 @@ class KDESalFrame : public X11SalFrame
 
     struct GraphicsHolder
     {
-        X11SalGraphics*     pGraphics;
+        std::unique_ptr<X11SalGraphics> pGraphics;
         bool                bInUse;
-        GraphicsHolder()
-                : pGraphics( nullptr ),
-                  bInUse( false )
-        {}
-        ~GraphicsHolder();
+        GraphicsHolder() : bInUse( false ) {}
     };
     GraphicsHolder m_aGraphics[ nMaxGraphics ];
 
@@ -77,7 +76,6 @@ protected:
 public:
     KDESalInstance( SalYieldMutex* pMutex )
             : X11SalInstance( pMutex ) {}
-    virtual ~KDESalInstance() override {}
     virtual SalFrame* CreateFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) override;
 
     virtual bool hasNativeFileSelection() const override { return true; }
diff --git a/vcl/unx/kde/salnativewidgets-kde.cxx b/vcl/unx/kde/salnativewidgets-kde.cxx
index b4d15c8a676e..c4e9d1030919 100644
--- a/vcl/unx/kde/salnativewidgets-kde.cxx
+++ b/vcl/unx/kde/salnativewidgets-kde.cxx
@@ -129,7 +129,6 @@ class KDEX11Pixmap : public X11Pixmap
 {
 public:
     KDEX11Pixmap( int nWidth, int nHeight );
-    virtual ~KDEX11Pixmap() override {};
 
     virtual int          GetDepth() const override;
     virtual SalX11Screen GetScreen() const override;
@@ -1238,7 +1237,6 @@ class KDESalGraphics : public X11SalGraphics
 {
   public:
     KDESalGraphics() {}
-    virtual ~KDESalGraphics() override {}
     virtual bool IsNativeControlSupported( ControlType nType, ControlPart nPart ) override;
     virtual bool hitTestNativeControl( ControlType nType, ControlPart nPart,
                                        const Rectangle& rControlRegion, const Point& aPos,
@@ -2017,10 +2015,10 @@ SalGraphics* KDESalFrame::AcquireGraphics()
                 m_aGraphics[i].bInUse = true;
                 if( ! m_aGraphics[i].pGraphics )
                 {
-                    m_aGraphics[i].pGraphics = new KDESalGraphics();
+                    m_aGraphics[i].pGraphics.reset (new KDESalGraphics() );
                     m_aGraphics[i].pGraphics->Init( this, GetWindow(), GetScreenNumber() );
                 }
-                return m_aGraphics[i].pGraphics;
+                return m_aGraphics[i].pGraphics.get();
             }
         }
     }
@@ -2032,7 +2030,7 @@ void KDESalFrame::ReleaseGraphics( SalGraphics *pGraphics )
 {
     for( int i = 0; i < nMaxGraphics; i++ )
     {
-        if( m_aGraphics[i].pGraphics == pGraphics )
+        if( m_aGraphics[i].pGraphics.get() == pGraphics )
         {
             m_aGraphics[i].bInUse = false;
             break;
@@ -2054,11 +2052,6 @@ KDESalFrame::~KDESalFrame()
 {
 }
 
-KDESalFrame::GraphicsHolder::~GraphicsHolder()
-{
-    delete pGraphics;
-}
-
 // KDESalInstance implementation
 
 SalFrame * KDESalInstance::CreateFrame( SalFrame *pParent, SalFrameStyleFlags nStyle )
diff --git a/vcl/unx/kde4/KDESalFrame.cxx b/vcl/unx/kde4/KDESalFrame.cxx
index 2d4b1eb24470..9ff22c93fe46 100644
--- a/vcl/unx/kde4/KDESalFrame.cxx
+++ b/vcl/unx/kde4/KDESalFrame.cxx
@@ -345,7 +345,7 @@ void KDESalFrame::ReleaseGraphics( SalGraphics *pGraphics )
 {
     for( int i = 0; i < nMaxGraphics; i++ )
     {
-        if( m_aGraphics[i].pGraphics == pGraphics )
+        if( m_aGraphics[i].pGraphics.get() == pGraphics )
         {
             m_aGraphics[i].bInUse = false;
             break;
@@ -363,14 +363,6 @@ void KDESalFrame::updateGraphics( bool bClear )
     }
 }
 
-KDESalFrame::~KDESalFrame()
-{
-}
-
-KDESalFrame::GraphicsHolder::~GraphicsHolder()
-{
-}
-
 SalGraphics* KDESalFrame::AcquireGraphics()
 {
     if( GetWindow() )
@@ -382,10 +374,10 @@ SalGraphics* KDESalFrame::AcquireGraphics()
                 m_aGraphics[i].bInUse = true;
                 if( ! m_aGraphics[i].pGraphics )
                 {
-                    m_aGraphics[i].pGraphics = new KDESalGraphics;
+                    m_aGraphics[i].pGraphics.reset( new KDESalGraphics );
                     m_aGraphics[i].pGraphics->Init( this, GetWindow(), GetScreenNumber() );
                 }
-                return m_aGraphics[i].pGraphics;
+                return m_aGraphics[i].pGraphics.get();
             }
         }
     }
diff --git a/vcl/unx/kde4/KDESalFrame.hxx b/vcl/unx/kde4/KDESalFrame.hxx
index d6a92cead186..114cd49bd8d2 100644
--- a/vcl/unx/kde4/KDESalFrame.hxx
+++ b/vcl/unx/kde4/KDESalFrame.hxx
@@ -23,6 +23,7 @@
 
 #include <unx/saldisp.hxx>
 #include <unx/salframe.h>
+#include <unx/salgdi.h>
 
 class KDESalFrame : public X11SalFrame
 {
@@ -31,18 +32,16 @@ class KDESalFrame : public X11SalFrame
 
         struct GraphicsHolder
         {
-            X11SalGraphics* pGraphics;
+            std::unique_ptr<X11SalGraphics> pGraphics;
             bool bInUse;
 
-            GraphicsHolder() : pGraphics(nullptr),bInUse( false ) {}
-            ~GraphicsHolder();
+            GraphicsHolder() : bInUse( false ) {}
         };
 
         GraphicsHolder m_aGraphics[ nMaxGraphics ];
 
     public:
         KDESalFrame( SalFrame* pParent, SalFrameStyleFlags nStyle );
-        virtual ~KDESalFrame() override;
 
         virtual SalGraphics* AcquireGraphics() override;
         virtual void ReleaseGraphics( SalGraphics *pGraphics ) override;
-- 
cgit