diff options
author | Povilas Kanapickas <povilas@radix.lt> | 2022-09-02 00:04:42 +0300 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2022-09-05 16:22:31 +0200 |
commit | d752cb42473547872741c74a70809f28f9fe789c (patch) | |
tree | b967cd9446feec9cadb57c408b825a6dab14945c /sd | |
parent | 35319adcc28f197b73e146f9ba233e20616fd11f (diff) |
vcl: Rename LongPress event to GestureLongPress
We have 5 gesture types: GestureZoom, GestureRotate, GesturePan,
GestureSwipe and LongPress. For consistency all of these will use
Gesture as a prefix to reduce confusion and for easier grepping
throughout the codebase.
Change-Id: I8b9e245d011203a19c1172f9833c172f65382cab
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139244
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd')
-rw-r--r-- | sd/source/ui/inc/slideshow.hxx | 4 | ||||
-rw-r--r-- | sd/source/ui/slideshow/slideshow.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/slideshow/slideshowimpl.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/slideshow/slideshowimpl.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/view/viewshel.cxx | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx index 2f127f4610a3..afbfee68469b 100644 --- a/sd/source/ui/inc/slideshow.hxx +++ b/sd/source/ui/inc/slideshow.hxx @@ -49,7 +49,7 @@ namespace vcl { class Window; } class SfxRequest; class WorkWindow; class CommandGestureSwipeData; -class CommandLongPressData; +class CommandGestureLongPressData; struct ImplSVEvent; // TODO: Remove @@ -146,7 +146,7 @@ public: !!!! This should only be called by the SdShowWindow !!!!*/ void pause( bool bPause ); bool swipe(const CommandGestureSwipeData &rSwipeData); - bool longpress(const CommandLongPressData& rLongPressData); + bool longpress(const CommandGestureLongPressData& rLongPressData); // settings bool isFullScreen() const; // a.k.a. FuSlideShow::IsFullScreen() diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index 00702d422631..aeee4ca7cae0 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -1020,7 +1020,7 @@ bool SlideShow::swipe(const CommandGestureSwipeData& rSwipeData) return mxController.is() && mxController->swipe(rSwipeData); } -bool SlideShow::longpress(const CommandLongPressData& rLongPressData) +bool SlideShow::longpress(const CommandGestureLongPressData& rLongPressData) { return mxController.is() && mxController->longpress(rLongPressData); } diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index b13ced3c128f..210a367b5007 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -1175,7 +1175,7 @@ bool SlideshowImpl::swipe(const CommandGestureSwipeData &rSwipeData) return true; } -bool SlideshowImpl::longpress(const CommandLongPressData &rLongPressData) +bool SlideshowImpl::longpress(const CommandGestureLongPressData &rLongPressData) { if (mnContextMenuEvent) return false; diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index b6cd778d8763..748a1898cff8 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -186,7 +186,7 @@ public: void hyperLinkClicked(const OUString & hyperLink); void click(const css::uno::Reference< css::drawing::XShape > & xShape); bool swipe(const CommandGestureSwipeData &rSwipeData); - bool longpress(const CommandLongPressData& rLongPressData); + bool longpress(const CommandGestureLongPressData& rLongPressData); /// ends the presentation async void endPresentation(); diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx index 5df0bf11d00a..153a0c52a804 100644 --- a/sd/source/ui/view/viewshel.cxx +++ b/sd/source/ui/view/viewshel.cxx @@ -671,12 +671,12 @@ bool ViewShell::HandleScrollCommand(const CommandEvent& rCEvt, ::sd::Window* pWi } } break; - case CommandEventId::LongPress: + case CommandEventId::GestureLongPress: { rtl::Reference< SlideShow > xSlideShow( SlideShow::GetSlideShow( GetViewShellBase() ) ); if (xSlideShow.is()) { - const CommandLongPressData* pLongPressData = rCEvt.GetLongPressData(); + const CommandGestureLongPressData* pLongPressData = rCEvt.GetLongPressData(); bDone = xSlideShow->longpress(*pLongPressData); } } |