vcl/inc/unx/gtk/gtkgdi.hxx | 8 ++++---- vcl/unx/gtk/window/gtksalframe.cxx | 2 +- vcl/unx/kde/fpicker/kdecommandthread.hxx | 5 ++++- vcl/unx/kde/fpicker/kdefilepicker.hxx | 9 ++++++--- vcl/unx/kde/fpicker/kdemodalityfilter.hxx | 5 ++++- 5 files changed, 19 insertions(+), 10 deletions(-)
New commits: commit 5dbb3c66aa1b600b21251c5afa4f5d7a2fefa05c Author: Stephan Bergmann <[email protected]> Date: Fri Mar 28 09:04:15 2014 +0100 SAL_OVERRIDE, vclplug warnings_not_errors redux Change-Id: I2ada77879dd8795184ad615654d0cf80371cce52 diff --git a/vcl/inc/unx/gtk/gtkgdi.hxx b/vcl/inc/unx/gtk/gtkgdi.hxx index d13ad94..006e298 100644 --- a/vcl/inc/unx/gtk/gtkgdi.hxx +++ b/vcl/inc/unx/gtk/gtkgdi.hxx @@ -41,19 +41,19 @@ public: virtual void copyArea( long nDestX, long nDestY, long nSrcX, long nSrcY, long nSrcWidth, long nSrcHeight, - sal_uInt16 /*nFlags*/ ); + sal_uInt16 /*nFlags*/ ) SAL_OVERRIDE; virtual bool drawNativeControl( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, - const OUString& rCaption ); - virtual bool IsNativeControlSupported( ControlType nType, ControlPart nPart ); + const OUString& rCaption ) SAL_OVERRIDE; + virtual bool IsNativeControlSupported( ControlType nType, ControlPart nPart ) SAL_OVERRIDE; virtual bool getNativeControlRegion( ControlType nType, ControlPart nPart, const Rectangle& rControlRegion, ControlState nState, const ImplControlValue& aValue, const OUString& rCaption, Rectangle &rNativeBoundingRegion, - Rectangle &rNativeContentRegion ); + Rectangle &rNativeContentRegion ) SAL_OVERRIDE; void updateSettings( AllSettings& rSettings ); static void refreshFontconfig( GtkSettings *pSettings ); static void signalSettingsNotify( GObject*, GParamSpec *pSpec, gpointer ); diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx index 9557f7a..a8160ce 100644 --- a/vcl/unx/gtk/window/gtksalframe.cxx +++ b/vcl/unx/gtk/window/gtksalframe.cxx @@ -382,7 +382,7 @@ struct DamageTracker : public basebmp::IBitmapDeviceDamageTracker virtual ~DamageTracker() {} - virtual void damaged(const basegfx::B2IBox& rDamageRect) const + virtual void damaged(const basegfx::B2IBox& rDamageRect) const SAL_OVERRIDE { m_rFrame.damaged(rDamageRect); } diff --git a/vcl/unx/kde/fpicker/kdecommandthread.hxx b/vcl/unx/kde/fpicker/kdecommandthread.hxx index ec7697b..55f45ee 100644 --- a/vcl/unx/kde/fpicker/kdecommandthread.hxx +++ b/vcl/unx/kde/fpicker/kdecommandthread.hxx @@ -20,7 +20,10 @@ #ifndef INCLUDED_VCL_UNX_KDE_FPICKER_KDECOMMANDTHREAD_HXX #define INCLUDED_VCL_UNX_KDE_FPICKER_KDECOMMANDTHREAD_HXX +#include <sal/config.h> + #include <config_vclplug.h> +#include <sal/types.h> #if ENABLE_TDE #include <shell/tde_defines.h> @@ -88,7 +91,7 @@ public: KDECommandThread( QWidget *pObject ); virtual ~KDECommandThread(); - virtual void run(); + virtual void run() SAL_OVERRIDE; protected: void handleCommand( const QString &rString, bool &bQuit ); diff --git a/vcl/unx/kde/fpicker/kdefilepicker.hxx b/vcl/unx/kde/fpicker/kdefilepicker.hxx index 173e242..b586ae9 100644 --- a/vcl/unx/kde/fpicker/kdefilepicker.hxx +++ b/vcl/unx/kde/fpicker/kdefilepicker.hxx @@ -20,7 +20,10 @@ #ifndef INCLUDED_VCL_UNX_KDE_FPICKER_KDEFILEPICKER_HXX #define INCLUDED_VCL_UNX_KDE_FPICKER_KDEFILEPICKER_HXX +#include <sal/config.h> + #include <config_vclplug.h> +#include <sal/types.h> #if ENABLE_TDE #include <shell/tde_defines.h> @@ -81,11 +84,11 @@ public: virtual ~KDEFileDialog(); protected: - virtual void resizeEvent( QResizeEvent *pEvent ); - virtual void showEvent( QShowEvent *pEvent ); + virtual void resizeEvent( QResizeEvent *pEvent ) SAL_OVERRIDE; + virtual void showEvent( QShowEvent *pEvent ) SAL_OVERRIDE; void updateCustomWidgetLayout(); - virtual void customEvent( QCustomEvent *pEvent ); + virtual void customEvent( QCustomEvent *pEvent ) SAL_OVERRIDE; protected: void appendControl( const QString &rId, const QString &rType, const QString &rTitle ); diff --git a/vcl/unx/kde/fpicker/kdemodalityfilter.hxx b/vcl/unx/kde/fpicker/kdemodalityfilter.hxx index f173f90..029e9e0 100644 --- a/vcl/unx/kde/fpicker/kdemodalityfilter.hxx +++ b/vcl/unx/kde/fpicker/kdemodalityfilter.hxx @@ -20,7 +20,10 @@ #ifndef INCLUDED_VCL_UNX_KDE_FPICKER_KDEMODALITYFILTER_HXX #define INCLUDED_VCL_UNX_KDE_FPICKER_KDEMODALITYFILTER_HXX +#include <sal/config.h> + #include <config_vclplug.h> +#include <sal/types.h> #if ENABLE_TDE #include <shell/tde_defines.h> @@ -41,7 +44,7 @@ public: KDEModalityFilter( WId nWinId ); virtual ~KDEModalityFilter(); - virtual bool eventFilter( QObject *pObject, QEvent *pEvent ); + virtual bool eventFilter( QObject *pObject, QEvent *pEvent ) SAL_OVERRIDE; }; #endif // INCLUDED_VCL_UNX_KDE_FPICKER_KDEMODALITYFILTER_HXX _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
