diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-03-28 09:04:15 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-03-28 09:04:15 +0100 |
| commit | 5dbb3c66aa1b600b21251c5afa4f5d7a2fefa05c (patch) | |
| tree | a9020ab35cddf9f8e5689be6efc820b049fb27f4 /vcl/unx | |
| parent | 5e7aad393c0c3fab20c8298697ca96563caa7afe (diff) | |
SAL_OVERRIDE, vclplug warnings_not_errors redux
Change-Id: I2ada77879dd8795184ad615654d0cf80371cce52
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/gtk/window/gtksalframe.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/kde/fpicker/kdecommandthread.hxx | 5 | ||||
| -rw-r--r-- | vcl/unx/kde/fpicker/kdefilepicker.hxx | 9 | ||||
| -rw-r--r-- | vcl/unx/kde/fpicker/kdemodalityfilter.hxx | 5 |
4 files changed, 15 insertions, 6 deletions
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx b/vcl/unx/gtk/window/gtksalframe.cxx index 9557f7a5a306..a8160ce4ef8e 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 ec7697b8040a..55f45eeeede2 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 173e242f5cf1..b586ae9a4489 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 f173f904d042..029e9e0f7fc1 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 |