diff options
author | Noel Grandin <noel@peralex.com> | 2015-01-20 12:38:10 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-01-26 08:42:28 +0200 |
commit | b44cbb26efe1d0b0950b1e1613e131b506dc3876 (patch) | |
tree | 9b4d5d99e5dad0971079b997a02a6d96536709ca /vcl/inc | |
parent | 26ad60aec69310fecd918f1c2e09056aa4782320 (diff) |
new loplugin: change virtual methods to non-virtual
Where we can prove that the virtual method is never overriden.
In the case of pure-virtual methods, we remove the method entirely.
Sometimes this leads to entire methods and fields being
eliminated.
Change-Id: I138ef81c95f115dbd8c023a83cfc7e9d5d6d14ae
Diffstat (limited to 'vcl/inc')
-rw-r--r-- | vcl/inc/PhysicalFontFace.hxx | 4 | ||||
-rw-r--r-- | vcl/inc/canvasbitmap.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/generic/glyphcache.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/graphite_layout.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/headless/svpframe.hxx | 4 | ||||
-rw-r--r-- | vcl/inc/ilstbox.hxx | 4 | ||||
-rw-r--r-- | vcl/inc/openglgdiimpl.hxx | 8 | ||||
-rw-r--r-- | vcl/inc/salgdi.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/sallayout.hxx | 12 | ||||
-rw-r--r-- | vcl/inc/salobj.hxx | 6 | ||||
-rw-r--r-- | vcl/inc/unx/gtk/gtkdata.hxx | 8 | ||||
-rw-r--r-- | vcl/inc/unx/gtk/gtkframe.hxx | 4 | ||||
-rw-r--r-- | vcl/inc/unx/gtk/gtksalmenu.hxx | 22 | ||||
-rw-r--r-- | vcl/inc/unx/saldisp.hxx | 2 | ||||
-rw-r--r-- | vcl/inc/unx/salgdi.h | 2 | ||||
-rw-r--r-- | vcl/inc/unx/wmadaptor.hxx | 6 |
16 files changed, 45 insertions, 45 deletions
diff --git a/vcl/inc/PhysicalFontFace.hxx b/vcl/inc/PhysicalFontFace.hxx index f36b6a76f67f..6932bac8facb 100644 --- a/vcl/inc/PhysicalFontFace.hxx +++ b/vcl/inc/PhysicalFontFace.hxx @@ -54,8 +54,8 @@ public: // font instance specific data virtual ImplFontEntry* CreateFontInstance( FontSelectPattern& ) const = 0; - virtual int GetHeight() const { return mnHeight; } - virtual int GetWidth() const { return mnWidth; } + int GetHeight() const { return mnHeight; } + int GetWidth() const { return mnWidth; } virtual sal_IntPtr GetFontId() const = 0; int GetFontMagic() const { return mnMagic; } bool IsScalable() const { return (mnHeight == 0); } diff --git a/vcl/inc/canvasbitmap.hxx b/vcl/inc/canvasbitmap.hxx index e28e51169af7..1a6300cbba04 100644 --- a/vcl/inc/canvasbitmap.hxx +++ b/vcl/inc/canvasbitmap.hxx @@ -70,7 +70,7 @@ namespace unotools // XIntegerReadOnlyBitmap virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL getData( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, const ::com::sun::star::geometry::IntegerRectangle2D& rect ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::rendering::VolatileContentDestroyedException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; virtual ::com::sun::star::uno::Sequence< ::sal_Int8 > SAL_CALL getPixel( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, const ::com::sun::star::geometry::IntegerPoint2D& pos ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::rendering::VolatileContentDestroyedException, ::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; - virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapPalette > SAL_CALL getPalette( ) throw (::com::sun::star::uno::RuntimeException); + ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapPalette > SAL_CALL getPalette( ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::rendering::IntegerBitmapLayout SAL_CALL getMemoryLayout( ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; // XBitmapPalette diff --git a/vcl/inc/generic/glyphcache.hxx b/vcl/inc/generic/glyphcache.hxx index d5378594264d..a47b25feea37 100644 --- a/vcl/inc/generic/glyphcache.hxx +++ b/vcl/inc/generic/glyphcache.hxx @@ -195,7 +195,7 @@ public: { return GetGlyphData( aGlyphId ).GetMetric(); } #if ENABLE_GRAPHITE - virtual GraphiteFaceWrapper* GetGraphiteFace() const; + GraphiteFaceWrapper* GetGraphiteFace() const; #endif sal_GlyphId GetGlyphIndex( sal_UCS4 ) const; diff --git a/vcl/inc/graphite_layout.hxx b/vcl/inc/graphite_layout.hxx index 7356bd52827a..f8abb791c4ae 100644 --- a/vcl/inc/graphite_layout.hxx +++ b/vcl/inc/graphite_layout.hxx @@ -119,7 +119,7 @@ public: // methods using string indexing virtual sal_Int32 GetTextBreak(DeviceCoordinate nMaxWidth, DeviceCoordinate nCharExtra=0, int nFactor=1) const SAL_OVERRIDE; virtual DeviceCoordinate FillDXArray( DeviceCoordinate* pDXArray ) const SAL_OVERRIDE; - virtual void ApplyDXArray(ImplLayoutArgs &rArgs, std::vector<int> & rDeltaWidth); + void ApplyDXArray(ImplLayoutArgs &rArgs, std::vector<int> & rDeltaWidth); virtual void GetCaretPositions( int nArraySize, long* pCaretXArray ) const SAL_OVERRIDE; diff --git a/vcl/inc/headless/svpframe.hxx b/vcl/inc/headless/svpframe.hxx index 85e5f6bb4c97..b3819e27093f 100644 --- a/vcl/inc/headless/svpframe.hxx +++ b/vcl/inc/headless/svpframe.hxx @@ -128,8 +128,8 @@ public: #ifndef IOS // If enabled we can get damage notifications for regions immediately rendered to ... - virtual void enableDamageTracker( bool bOn = true ); - virtual void damaged( const basegfx::B2IBox& /* rDamageRect */) {} + void enableDamageTracker( bool bOn = true ); + void damaged( const basegfx::B2IBox& /* rDamageRect */) {} #endif /*TODO: functional implementation */ diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx index 0f142a5e524e..a49962ee127b 100644 --- a/vcl/inc/ilstbox.hxx +++ b/vcl/inc/ilstbox.hxx @@ -583,7 +583,7 @@ public: const Image& GetImage() const { return maImage; } void SetImage( const Image& rImg ) { maImage = rImg; } - virtual void MBDown(); + void MBDown(); boost::signals2::signal< void ( ImplWin* ) > buttonDownSignal; boost::signals2::signal< void ( UserDrawEvent* ) > userDrawSignal; @@ -610,7 +610,7 @@ public: virtual ~ImplBtn() {}; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; - virtual void MBDown(); + void MBDown(); boost::signals2::signal< void ( ImplBtn* ) > buttonDownSignal; }; diff --git a/vcl/inc/openglgdiimpl.hxx b/vcl/inc/openglgdiimpl.hxx index 7bb4532a3205..5ae6ab8668b3 100644 --- a/vcl/inc/openglgdiimpl.hxx +++ b/vcl/inc/openglgdiimpl.hxx @@ -118,17 +118,17 @@ public: bool IsOffscreen() const { return mpProvider ? mpProvider->IsOffScreen() : true; } // operations to do before painting - virtual void PreDraw(); + void PreDraw(); // operations to do after painting - virtual void PostDraw(); + void PostDraw(); protected: bool AcquireContext(); bool ReleaseContext(); // retrieve the default context for offscreen rendering - virtual OpenGLContext* GetDefaultContext(); + OpenGLContext* GetDefaultContext(); // create a new context for window rendering virtual OpenGLContext* CreateWinContext() = 0; @@ -146,7 +146,7 @@ public: virtual void freeResources() SAL_OVERRIDE; - virtual const vcl::Region& getClipRegion() const; + const vcl::Region& getClipRegion() const; virtual bool setClipRegion( const vcl::Region& ) SAL_OVERRIDE; // diff --git a/vcl/inc/salgdi.hxx b/vcl/inc/salgdi.hxx index ff6271c8d88c..d5ec8272ab4a 100644 --- a/vcl/inc/salgdi.hxx +++ b/vcl/inc/salgdi.hxx @@ -87,7 +87,7 @@ public: virtual SalGraphicsImpl* GetImpl() const = 0; /// Check that our mpImpl is OpenGL and return the context, otherwise NULL. - virtual OpenGLContext* GetOpenGLContext() const; + OpenGLContext* GetOpenGLContext() const; void setAntiAliasB2DDraw(bool bNew) { m_bAntiAliasB2DDraw = bNew; } bool getAntiAliasB2DDraw() const { return m_bAntiAliasB2DDraw; } diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx index 3a2061b6391c..ae1fe9dda55c 100644 --- a/vcl/inc/sallayout.hxx +++ b/vcl/inc/sallayout.hxx @@ -175,7 +175,7 @@ public: virtual DeviceCoordinate FillDXArray( DeviceCoordinate* pDXArray ) const = 0; virtual DeviceCoordinate GetTextWidth() const { return FillDXArray( NULL ); } virtual void GetCaretPositions( int nArraySize, long* pCaretXArray ) const = 0; - virtual bool IsKashidaPosValid ( int /*nCharPos*/ ) const { return true; } // i60594 + bool IsKashidaPosValid ( int /*nCharPos*/ ) const { return true; } // i60594 // methods using glyph indexing virtual int GetNextGlyphs( int nLen, sal_GlyphId* pGlyphIdAry, Point& rPos, int&, @@ -184,7 +184,7 @@ public: virtual bool GetOutline( SalGraphics&, ::basegfx::B2DPolyPolygonVector& ) const; virtual bool GetBoundRect( SalGraphics&, Rectangle& ) const; - virtual bool IsSpacingGlyph( sal_GlyphId ) const; + bool IsSpacingGlyph( sal_GlyphId ) const; // reference counting void Release() const; @@ -193,7 +193,7 @@ public: virtual void MoveGlyph( int nStart, long nNewXPos ) = 0; virtual void DropGlyph( int nStart ) = 0; virtual void Simplify( bool bIsBase ) = 0; - virtual void DisableGlyphInjection( bool /*bDisable*/ ) {} + void DisableGlyphInjection( bool /*bDisable*/ ) {} protected: // used by layout engines @@ -240,7 +240,7 @@ public: // used only by OutputDevice::ImplLayout, TODO: make friend explicit MultiSalLayout( SalLayout& rBaseLayout, const PhysicalFontFace* pBaseFont = NULL ); - virtual bool AddFallback( SalLayout& rFallbackLayout, + bool AddFallback( SalLayout& rFallbackLayout, ImplLayoutRuns&, const PhysicalFontFace* pFallbackFont ); virtual bool LayoutText( ImplLayoutArgs& ) SAL_OVERRIDE; virtual void AdjustLayout( ImplLayoutArgs& ) SAL_OVERRIDE; @@ -322,8 +322,8 @@ public: void AppendGlyph( const GlyphItem& ); void Reserve(int size) { m_GlyphItems.reserve(size + 1); } virtual void AdjustLayout( ImplLayoutArgs& ) SAL_OVERRIDE; - virtual void ApplyDXArray( ImplLayoutArgs& ); - virtual void Justify( DeviceCoordinate nNewWidth ); + void ApplyDXArray( ImplLayoutArgs& ); + void Justify( DeviceCoordinate nNewWidth ); void KashidaJustify( long nIndex, int nWidth ); void ApplyAsianKerning( const sal_Unicode*, int nLength ); void SortGlyphItems(); diff --git a/vcl/inc/salobj.hxx b/vcl/inc/salobj.hxx index 915502deedf1..f09c19fe1a5a 100644 --- a/vcl/inc/salobj.hxx +++ b/vcl/inc/salobj.hxx @@ -51,11 +51,11 @@ public: virtual void SetPosSize( long nX, long nY, long nWidth, long nHeight ) = 0; virtual void Show( bool bVisible ) = 0; - virtual void Enable( bool /* nEnable */ ) {} + void Enable( bool /* nEnable */ ) {} virtual void GrabFocus() {} - virtual void SetBackground() {} - virtual void SetBackground( SalColor /* nSalColor */ ) {} + void SetBackground() {} + void SetBackground( SalColor /* nSalColor */ ) {} virtual void SetForwardKey( bool /* bEnable */ ) {} diff --git a/vcl/inc/unx/gtk/gtkdata.hxx b/vcl/inc/unx/gtk/gtkdata.hxx index e890580b6544..9c2c76eaa4d3 100644 --- a/vcl/inc/unx/gtk/gtkdata.hxx +++ b/vcl/inc/unx/gtk/gtkdata.hxx @@ -104,15 +104,15 @@ public: GtkData( SalInstance *pInstance ); virtual ~GtkData(); - virtual void Init(); + void Init(); virtual void Dispose() SAL_OVERRIDE; - virtual void initNWF(); - virtual void deInitNWF(); + void initNWF(); + void deInitNWF(); static gboolean userEventFn( gpointer data ); - virtual void PostUserEvent(); + void PostUserEvent(); void Yield( bool bWait, bool bHandleAllCurrentEvents ); inline GdkDisplay *GetGdkDisplay(); diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index ad4a5f0c7e85..af530f867e0b 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -360,7 +360,7 @@ public: virtual void SetTitle( const OUString& rTitle ) SAL_OVERRIDE; virtual void SetIcon( sal_uInt16 nIcon ) SAL_OVERRIDE; virtual void SetMenu( SalMenu *pSalMenu ) SAL_OVERRIDE; - virtual SalMenu* GetMenu( void ); + SalMenu* GetMenu( void ); virtual void DrawMenuBar() SAL_OVERRIDE; void EnsureAppMenuWatch(); @@ -445,7 +445,7 @@ public: static GtkSalFrame *getFromWindow( GtkWindow *pWindow ); - virtual void damaged (const basegfx::B2IBox& rDamageRect); + void damaged (const basegfx::B2IBox& rDamageRect); virtual Window GetX11Window() SAL_OVERRIDE; }; diff --git a/vcl/inc/unx/gtk/gtksalmenu.hxx b/vcl/inc/unx/gtk/gtksalmenu.hxx index 8a3d77e963af..7659321f38b3 100644 --- a/vcl/inc/unx/gtk/gtksalmenu.hxx +++ b/vcl/inc/unx/gtk/gtksalmenu.hxx @@ -65,7 +65,7 @@ public: virtual void RemoveItem( unsigned nPos ) SAL_OVERRIDE; virtual void SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsigned nPos ) SAL_OVERRIDE; virtual void SetFrame( const SalFrame* pFrame ) SAL_OVERRIDE; - virtual const GtkSalFrame* GetFrame() const; + const GtkSalFrame* GetFrame() const; virtual void CheckItem( unsigned nPos, bool bCheck ) SAL_OVERRIDE; virtual void EnableItem( unsigned nPos, bool bEnable ) SAL_OVERRIDE; virtual void ShowItem( unsigned nPos, bool bShow ) SAL_OVERRIDE; @@ -74,16 +74,16 @@ public: virtual void SetAccelerator( unsigned nPos, SalMenuItem* pSalMenuItem, const vcl::KeyCode& rKeyCode, const OUString& rKeyName ) SAL_OVERRIDE; virtual void GetSystemMenuData( SystemMenuData* pData ) SAL_OVERRIDE; - virtual void SetMenu( Menu* pMenu ) { mpVCLMenu = pMenu; } - virtual Menu* GetMenu() { return mpVCLMenu; } - virtual GtkSalMenu* GetParentSalMenu() { return mpParentSalMenu; } - virtual void SetMenuModel( GMenuModel* pMenuModel ) { mpMenuModel = pMenuModel; } - virtual GMenuModel* GetMenuModel() { return mpMenuModel; } - virtual unsigned GetItemCount() { return maItems.size(); } - virtual GtkSalMenuItem* GetItemAtPos( unsigned nPos ) { return maItems[ nPos ]; } - virtual void SetActionGroup( GActionGroup* pActionGroup ) { mpActionGroup = pActionGroup; } - virtual GActionGroup* GetActionGroup() { return mpActionGroup; } - virtual bool IsItemVisible( unsigned nPos ); + void SetMenu( Menu* pMenu ) { mpVCLMenu = pMenu; } + Menu* GetMenu() { return mpVCLMenu; } + GtkSalMenu* GetParentSalMenu() { return mpParentSalMenu; } + void SetMenuModel( GMenuModel* pMenuModel ) { mpMenuModel = pMenuModel; } + GMenuModel* GetMenuModel() { return mpMenuModel; } + unsigned GetItemCount() { return maItems.size(); } + GtkSalMenuItem* GetItemAtPos( unsigned nPos ) { return maItems[ nPos ]; } + void SetActionGroup( GActionGroup* pActionGroup ) { mpActionGroup = pActionGroup; } + GActionGroup* GetActionGroup() { return mpActionGroup; } + bool IsItemVisible( unsigned nPos ); void NativeSetItemText( unsigned nSection, unsigned nItemPos, const OUString& rText ); void NativeSetItemCommand( unsigned nSection, diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx index 358a77946e9a..26bb5e9ec63e 100644 --- a/vcl/inc/unx/saldisp.hxx +++ b/vcl/inc/unx/saldisp.hxx @@ -395,7 +395,7 @@ public: virtual ~SalX11Display(); virtual bool Dispatch( XEvent *pEvent ) SAL_OVERRIDE; - virtual void Yield(); + void Yield(); virtual void PostUserEvent() SAL_OVERRIDE; bool IsEvent(); diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h index 69ec2da6dfeb..af894caef2c4 100644 --- a/vcl/inc/unx/salgdi.h +++ b/vcl/inc/unx/salgdi.h @@ -250,7 +250,7 @@ public: const SalBitmap& rSourceBitmap, const SalBitmap& rAlphaBitmap ) SAL_OVERRIDE; - virtual bool drawAlphaBitmap( + bool drawAlphaBitmap( const SalTwoRect&, const SalBitmap& rBitmap ); diff --git a/vcl/inc/unx/wmadaptor.hxx b/vcl/inc/unx/wmadaptor.hxx index 091f4c196446..35fb4590b508 100644 --- a/vcl/inc/unx/wmadaptor.hxx +++ b/vcl/inc/unx/wmadaptor.hxx @@ -219,14 +219,14 @@ public: /* * set NET_WM_PID */ - virtual void setPID( X11SalFrame* pFrame ) const; + void setPID( X11SalFrame* pFrame ) const; /* * set WM_CLIENT_MACHINE */ - virtual void setClientMachine( X11SalFrame* pFrame ) const; + void setClientMachine( X11SalFrame* pFrame ) const; - virtual void answerPing( X11SalFrame*, XClientMessageEvent* ) const; + void answerPing( X11SalFrame*, XClientMessageEvent* ) const; /* * maximizes frame |