diff options
author | Michael Stahl <mstahl@redhat.com> | 2016-11-24 22:40:33 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2016-11-24 22:56:34 +0100 |
commit | 6bb20609a2fd1d591cedc7fa2b9cabb589c346c7 (patch) | |
tree | 8faf98099786b0c7b6520075d376c55bbd3cddd6 /include/svtools | |
parent | 502f0cde77bd45979ba3562e80b59a7d5fd8dc56 (diff) |
vcl: rename Window::Notify to EventNotify
There is annoying overloading between Window::Notify and
SfxListener::Notify, and the Window one has apparently fewer
implementations, so rename that and remove lots of disambiguating
"using Notify" in multiply inheriting classes.
Change-Id: I8b597fd9e70cf2e7103b9dfa7cc666e79e7aff49
Diffstat (limited to 'include/svtools')
-rw-r--r-- | include/svtools/editbrowsebox.hxx | 2 | ||||
-rw-r--r-- | include/svtools/fileurlbox.hxx | 2 | ||||
-rw-r--r-- | include/svtools/fmtfield.hxx | 2 | ||||
-rw-r--r-- | include/svtools/inettbc.hxx | 2 | ||||
-rw-r--r-- | include/svtools/prnsetup.hxx | 2 | ||||
-rw-r--r-- | include/svtools/urlcontrol.hxx | 2 | ||||
-rw-r--r-- | include/svtools/wizdlg.hxx | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index ab2679cba27e..e31bcf0d5f8b 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -524,7 +524,7 @@ namespace svt using BrowseBox::MouseButtonDown; virtual bool PreNotify(NotifyEvent& rNEvt ) override; - virtual bool Notify(NotifyEvent& rNEvt) override; + virtual bool EventNotify(NotifyEvent& rNEvt) override; virtual void EndScroll() override; diff --git a/include/svtools/fileurlbox.hxx b/include/svtools/fileurlbox.hxx index 5c9cc0dbf0fc..584b1daeebd2 100644 --- a/include/svtools/fileurlbox.hxx +++ b/include/svtools/fileurlbox.hxx @@ -40,7 +40,7 @@ namespace svt protected: virtual bool PreNotify( NotifyEvent& rNEvt ) override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; public: /** transforms the given URL content into a system-dependent notation, if possible, and diff --git a/include/svtools/fmtfield.hxx b/include/svtools/fmtfield.hxx index bce4e6397467..f59389c2de35 100644 --- a/include/svtools/fmtfield.hxx +++ b/include/svtools/fmtfield.hxx @@ -226,7 +226,7 @@ public: bool IsUsingInputStringForFormatting() const { return m_bUseInputStringForFormatting;} protected: - virtual bool Notify(NotifyEvent& rNEvt) override; + virtual bool EventNotify(NotifyEvent& rNEvt) override; void impl_Modify(bool makeValueDirty = true); virtual void Modify() override; diff --git a/include/svtools/inettbc.hxx b/include/svtools/inettbc.hxx index 46b22333bb7a..0954185138ba 100644 --- a/include/svtools/inettbc.hxx +++ b/include/svtools/inettbc.hxx @@ -52,7 +52,7 @@ friend class SvtURLBox_Impl; SVT_DLLPRIVATE void Init(bool bSetDefaultHelpID); protected: - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; virtual void Select() override; virtual bool PreNotify( NotifyEvent& rNEvt ) override; diff --git a/include/svtools/prnsetup.hxx b/include/svtools/prnsetup.hxx index 33b8cff77206..383c718bd97a 100644 --- a/include/svtools/prnsetup.hxx +++ b/include/svtools/prnsetup.hxx @@ -62,7 +62,7 @@ public: Printer* GetPrinter() const { return mpPrinter; } virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; virtual short Execute() override; diff --git a/include/svtools/urlcontrol.hxx b/include/svtools/urlcontrol.hxx index e97d6d8fba04..cdc830b2ef8b 100644 --- a/include/svtools/urlcontrol.hxx +++ b/include/svtools/urlcontrol.hxx @@ -40,7 +40,7 @@ namespace svt protected: virtual bool PreNotify( NotifyEvent& rNEvt ) override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; }; diff --git a/include/svtools/wizdlg.hxx b/include/svtools/wizdlg.hxx index 39b9d3f1dee0..9f9ffe177738 100644 --- a/include/svtools/wizdlg.hxx +++ b/include/svtools/wizdlg.hxx @@ -235,7 +235,7 @@ public: virtual void Resize() override; virtual void StateChanged( StateChangedType nStateChange ) override; - virtual bool Notify( NotifyEvent& rNEvt ) override; + virtual bool EventNotify( NotifyEvent& rNEvt ) override; virtual void ActivatePage(); virtual bool DeactivatePage(); |