diff options
author | Noel Grandin <noel@peralex.com> | 2015-03-02 10:43:28 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-03-19 10:45:00 +0200 |
commit | 062e40c76bcab664907737feace74f134a25c29c (patch) | |
tree | 83d8e99e62f8183bad31934cceed1c1626285b12 /include/vcl | |
parent | 4e6410ba0155d4c2ac539fd37f75aa72d489e206 (diff) |
loplugin:constantfunction: vcl
Change-Id: I985b781a8d53190505fcb1182749cdaf5cd0f8d0
Diffstat (limited to 'include/vcl')
-rw-r--r-- | include/vcl/button.hxx | 1 | ||||
-rw-r--r-- | include/vcl/debugevent.hxx | 1 | ||||
-rw-r--r-- | include/vcl/dndhelp.hxx | 15 | ||||
-rw-r--r-- | include/vcl/dockwin.hxx | 8 | ||||
-rw-r--r-- | include/vcl/fixed.hxx | 1 | ||||
-rw-r--r-- | include/vcl/settings.hxx | 1 | ||||
-rw-r--r-- | include/vcl/texteng.hxx | 2 | ||||
-rw-r--r-- | include/vcl/toolbox.hxx | 2 | ||||
-rw-r--r-- | include/vcl/window.hxx | 18 |
9 files changed, 17 insertions, 32 deletions
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx index 20f56710828b..1a100c0f83dd 100644 --- a/include/vcl/button.hxx +++ b/include/vcl/button.hxx @@ -167,7 +167,6 @@ public: virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - void UserDraw( const UserDrawEvent& rUDEvt ); void Toggle(); diff --git a/include/vcl/debugevent.hxx b/include/vcl/debugevent.hxx index 41b2a47730da..868fd882567f 100644 --- a/include/vcl/debugevent.hxx +++ b/include/vcl/debugevent.hxx @@ -24,7 +24,6 @@ class VCL_DLLPUBLIC DebugEventInjector : Timer { vcl::Window *ChooseWindow(); void InjectTextEvent(); void InjectMenuEvent(); - void InjectMouseEvent(); void InjectEvent(); void InjectKeyNavEdit(); virtual void Invoke() SAL_OVERRIDE; diff --git a/include/vcl/dndhelp.hxx b/include/vcl/dndhelp.hxx index a4d671214888..f7762d831c71 100644 --- a/include/vcl/dndhelp.hxx +++ b/include/vcl/dndhelp.hxx @@ -64,18 +64,6 @@ public: virtual void dragDropEnd(const ::com::sun::star::datatransfer::dnd::DragSourceDropEvent& dsde ) throw (::com::sun::star::uno::RuntimeException, std::exception); - void dragEnter( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) - throw (::com::sun::star::uno::RuntimeException, - std::exception); - void dragExit( const ::com::sun::star::datatransfer::dnd::DragSourceEvent& dse ) - throw (::com::sun::star::uno::RuntimeException, - std::exception); - void dragOver( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) - throw (::com::sun::star::uno::RuntimeException, - std::exception); - void dropActionChanged( const ::com::sun::star::datatransfer::dnd::DragSourceDragEvent& dsde ) - throw (::com::sun::star::uno::RuntimeException, - std::exception); // ::com::sun::star::datatransfer::dnd::XDropTargetListener virtual void drop( const ::com::sun::star::datatransfer::dnd::DropTargetDropEvent& dtde ) @@ -90,9 +78,6 @@ public: virtual void dragOver( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) throw (::com::sun::star::uno::RuntimeException, std::exception); - void dropActionChanged( const ::com::sun::star::datatransfer::dnd::DropTargetDragEvent& dtde ) - throw (::com::sun::star::uno::RuntimeException, - std::exception); }; class VCL_DLLPUBLIC DragAndDropWrapper : diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx index 9cc9ec927dbc..dac66c731c06 100644 --- a/include/vcl/dockwin.hxx +++ b/include/vcl/dockwin.hxx @@ -147,11 +147,7 @@ public: bool IsInPopupMode() const; void TitleButtonClick( sal_uInt16 nButton ); - void Pin(); - void Roll(); - void PopupModeEnd(); void Resizing( Size& rSize ); - bool Close(); void Tracking( const TrackingEvent& rTEvt ); long Notify( NotifyEvent& rNEvt ); @@ -310,10 +306,6 @@ public: virtual bool PrepareToggleFloatingMode(); virtual void ToggleFloatingMode(); - void TitleButtonClick( sal_uInt16 nButton ); - void Pin(); - void Roll(); - void PopupModeEnd(); virtual void Resizing( Size& rSize ); virtual bool Close(); virtual void Tracking( const TrackingEvent& rTEvt ) SAL_OVERRIDE; diff --git a/include/vcl/fixed.hxx b/include/vcl/fixed.hxx index 0119e9dc0d5f..109cecfe812d 100644 --- a/include/vcl/fixed.hxx +++ b/include/vcl/fixed.hxx @@ -185,7 +185,6 @@ public: virtual void Resize() SAL_OVERRIDE; virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; - void UserDraw( const UserDrawEvent& rUDEvt ); virtual Size GetOptimalSize() const SAL_OVERRIDE; void SetImage( const Image& rImage ); diff --git a/include/vcl/settings.hxx b/include/vcl/settings.hxx index 204a05d7470d..b514296a9ec9 100644 --- a/include/vcl/settings.hxx +++ b/include/vcl/settings.hxx @@ -653,7 +653,6 @@ public: void SetLanguageTag( const LanguageTag& rLanguageTag ); const LanguageTag& GetLanguageTag() const; - void SetUILanguageTag( const LanguageTag& rLanguageTag ); const LanguageTag& GetUILanguageTag() const; bool GetLayoutRTL() const; // returns true if UI language requires right-to-left Text Layout bool GetMathLayoutRTL() const; // returns true if UI language requires right-to-left Math Layout diff --git a/include/vcl/texteng.hxx b/include/vcl/texteng.hxx index 6c52b91040d4..6fae3b56c5a6 100644 --- a/include/vcl/texteng.hxx +++ b/include/vcl/texteng.hxx @@ -192,8 +192,6 @@ protected: void ImpPaint( OutputDevice* pOut, const Point& rStartPos, Rectangle const* pPaintArea, TextSelection const* pPaintRange = 0, TextSelection const* pSelection = 0 ); - void UpdateSelections(); - bool IsFormatted() const { return mbFormatted; } sal_uInt16 GetCharPos( sal_uLong nPara, sal_uInt16 nLine, long nDocPosX, bool bSmart = false ); diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index 6b10c77ecefc..e2bb2b54bfdc 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -289,8 +289,6 @@ public: virtual void Deactivate() SAL_OVERRIDE; void Highlight(); virtual void Select(); - void Customize( const ToolBoxCustomizeEvent& rCEvt ); - void UserDraw( const UserDrawEvent& rUDEvt ); virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; virtual void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index a6309d6ec0af..e98a95bea0f2 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -20,6 +20,7 @@ #ifndef INCLUDED_VCL_WINDOW_HXX #define INCLUDED_VCL_WINDOW_HXX +#include <config_features.h> #include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/outdev.hxx> @@ -317,7 +318,22 @@ enum class StateChangedType : sal_uInt16 const char* ImplDbgCheckWindow( const void* pObj ); #endif -bool ImplDoTiledRendering(); +inline bool ImplDoTiledRendering() +{ +#if !HAVE_FEATURE_DESKTOP && !defined(ANDROID) + // We do tiled rendering only for iOS at the moment, actually, but + // let's see what happens if we assume it for Android, too. + // (That comment doesn't match what the code does, does it?) + return true; +#else + // We need some way to know globally if this process will use + // tiled rendering or not. Or should this be a per-window setting? + // Or what? + return false; +#endif +} + + namespace vcl { class Window; } vcl::Window* ImplFindWindow( const SalFrame* pFrame, Point& rSalFramePos ); |