From 6bb20609a2fd1d591cedc7fa2b9cabb589c346c7 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Thu, 24 Nov 2016 22:40:33 +0100
Subject: 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
---
 svtools/source/brwbox/editbrowsebox.cxx  | 4 ++--
 svtools/source/contnr/simptabl.cxx       | 2 +-
 svtools/source/control/calendar.cxx      | 6 +++---
 svtools/source/control/fileurlbox.cxx    | 6 +++---
 svtools/source/control/fmtfield.cxx      | 4 ++--
 svtools/source/control/inettbc.cxx       | 4 ++--
 svtools/source/control/urlcontrol.cxx    | 6 +++---
 svtools/source/dialogs/prnsetup.cxx      | 4 ++--
 svtools/source/dialogs/wizdlg.cxx        | 4 ++--
 svtools/source/hatchwindow/ipwin.cxx     | 4 ++--
 svtools/source/hatchwindow/ipwin.hxx     | 2 +-
 svtools/source/table/tabledatawindow.cxx | 4 ++--
 svtools/source/table/tabledatawindow.hxx | 2 +-
 13 files changed, 26 insertions(+), 26 deletions(-)

(limited to 'svtools')

diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx
index df1df0806497..bf46a5adf108 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -688,7 +688,7 @@ namespace svt
     }
 
 
-    bool EditBrowseBox::Notify(NotifyEvent& rEvt)
+    bool EditBrowseBox::EventNotify(NotifyEvent& rEvt)
     {
         switch (rEvt.GetType())
         {
@@ -703,7 +703,7 @@ namespace svt
             default:
                 break;
         }
-        return BrowseBox::Notify(rEvt);
+        return BrowseBox::EventNotify(rEvt);
     }
 
 
diff --git a/svtools/source/contnr/simptabl.cxx b/svtools/source/contnr/simptabl.cxx
index 95725e692df1..aa1c614a231d 100644
--- a/svtools/source/contnr/simptabl.cxx
+++ b/svtools/source/contnr/simptabl.cxx
@@ -64,7 +64,7 @@ bool SvSimpleTableContainer::PreNotify( NotifyEvent& rNEvt )
         const vcl::KeyCode& aKeyCode = rNEvt.GetKeyEvent()->GetKeyCode();
         sal_uInt16 nKey = aKeyCode.GetCode();
         if (nKey == KEY_TAB)
-            GetParent()->Notify( rNEvt );
+            GetParent()->EventNotify( rNEvt );
         else if (m_pTable && m_pTable->IsFocusOnCellEnabled() && ( nKey == KEY_LEFT || nKey == KEY_RIGHT))
             return false;
         else
diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx
index 9865781c1a6c..80b9b507bd55 100644
--- a/svtools/source/control/calendar.cxx
+++ b/svtools/source/control/calendar.cxx
@@ -1989,7 +1989,7 @@ public:
     PushButton*     EnableNoneBtn( bool bEnable );
     void            ArrangeButtons();
 
-    virtual bool    Notify( NotifyEvent& rNEvt ) override;
+    virtual bool    EventNotify( NotifyEvent& rNEvt ) override;
 };
 
 ImplCFieldFloatWin::ImplCFieldFloatWin( vcl::Window* pParent ) :
@@ -2127,7 +2127,7 @@ void ImplCFieldFloatWin::ArrangeButtons()
     }
 }
 
-bool ImplCFieldFloatWin::Notify( NotifyEvent& rNEvt )
+bool ImplCFieldFloatWin::EventNotify( NotifyEvent& rNEvt )
 {
     if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
     {
@@ -2136,7 +2136,7 @@ bool ImplCFieldFloatWin::Notify( NotifyEvent& rNEvt )
             mpCalendar->Select();
     }
 
-    return FloatingWindow::Notify( rNEvt );
+    return FloatingWindow::EventNotify( rNEvt );
 }
 
 CalendarField::CalendarField(vcl::Window* pParent, WinBits nWinStyle)
diff --git a/svtools/source/control/fileurlbox.cxx b/svtools/source/control/fileurlbox.cxx
index c4cc63cc4a7c..6033efad980b 100644
--- a/svtools/source/control/fileurlbox.cxx
+++ b/svtools/source/control/fileurlbox.cxx
@@ -75,7 +75,7 @@ namespace svt
         return SvtURLBox::PreNotify(_rNEvt);
     }
 
-    bool FileURLBox::Notify( NotifyEvent& _rNEvt )
+    bool FileURLBox::EventNotify( NotifyEvent& _rNEvt )
     {
         if (_rNEvt.GetType() == MouseNotifyEvent::KEYINPUT)
         {
@@ -84,13 +84,13 @@ namespace svt
                 &&  ( IsInDropDown()                                             )
                 )
             {
-                bool bReturn = SvtURLBox::Notify(_rNEvt);
+                bool bReturn = SvtURLBox::EventNotify(_rNEvt);
                 DisplayURL( m_sPreservedText );
                 return bReturn;
             }
         }
 
-        return SvtURLBox::Notify(_rNEvt);
+        return SvtURLBox::EventNotify(_rNEvt);
     }
 
 }   // namespace svt
diff --git a/svtools/source/control/fmtfield.cxx b/svtools/source/control/fmtfield.cxx
index 910ed3df4a75..90d79269eafc 100644
--- a/svtools/source/control/fmtfield.cxx
+++ b/svtools/source/control/fmtfield.cxx
@@ -745,7 +745,7 @@ void FormattedField::ReFormat()
     }
 }
 
-bool FormattedField::Notify(NotifyEvent& rNEvt)
+bool FormattedField::EventNotify(NotifyEvent& rNEvt)
 {
 
     if ((rNEvt.GetType() == MouseNotifyEvent::KEYINPUT) && !IsReadOnly())
@@ -813,7 +813,7 @@ bool FormattedField::Notify(NotifyEvent& rNEvt)
         }
     }
 
-    return SpinField::Notify( rNEvt );
+    return SpinField::EventNotify( rNEvt );
 }
 
 void FormattedField::SetMinValue(double dMin)
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index c2218b123b37..38ddaccce972 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -1098,7 +1098,7 @@ IMPL_LINK_NOARG(SvtURLBox, AutoCompleteHdl_Impl, Edit&, void)
     TryAutoComplete();
 }
 
-bool SvtURLBox::Notify( NotifyEvent &rEvt )
+bool SvtURLBox::EventNotify( NotifyEvent &rEvt )
 {
     if ( MouseNotifyEvent::GETFOCUS == rEvt.GetType() )
     {
@@ -1119,7 +1119,7 @@ bool SvtURLBox::Notify( NotifyEvent &rEvt )
         }
     }
 
-    return ComboBox::Notify( rEvt );
+    return ComboBox::EventNotify( rEvt );
 }
 
 
diff --git a/svtools/source/control/urlcontrol.cxx b/svtools/source/control/urlcontrol.cxx
index 9a5334fa3ed4..75dbf99815e8 100644
--- a/svtools/source/control/urlcontrol.cxx
+++ b/svtools/source/control/urlcontrol.cxx
@@ -52,14 +52,14 @@ namespace svt
         return SvtURLBox::PreNotify(_rNEvt);
     }
 
-    bool OFileURLControl::Notify( NotifyEvent& _rNEvt )
+    bool OFileURLControl::EventNotify( NotifyEvent& _rNEvt )
     {
         if (GetSubEdit() == _rNEvt.GetWindow())
             if (MouseNotifyEvent::KEYINPUT == _rNEvt.GetType())
                 if (KEY_RETURN == _rNEvt.GetKeyEvent()->GetKeyCode().GetCode())
                     if (IsInDropDown())
                     {
-                        bool bReturn = SvtURLBox::Notify(_rNEvt);
+                        bool bReturn = SvtURLBox::EventNotify(_rNEvt);
 
                         // build a system dependent (thus more user readable) file name
                         OFileNotation aTransformer(m_sPreservedText, OFileNotation::N_URL);
@@ -72,7 +72,7 @@ namespace svt
                         return bReturn;
                     }
 
-        return SvtURLBox::Notify(_rNEvt);
+        return SvtURLBox::EventNotify(_rNEvt);
     }
 }   // namespace svt
 
diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx
index 11075849cf3a..d5cba5f396f6 100644
--- a/svtools/source/dialogs/prnsetup.cxx
+++ b/svtools/source/dialogs/prnsetup.cxx
@@ -305,12 +305,12 @@ IMPL_LINK_NOARG(PrinterSetupDialog, ImplChangePrinterHdl, ListBox&, void)
 }
 
 
-bool PrinterSetupDialog::Notify( NotifyEvent& rNEvt )
+bool PrinterSetupDialog::EventNotify( NotifyEvent& rNEvt )
 {
     if ( (rNEvt.GetType() == MouseNotifyEvent::GETFOCUS) && IsReallyVisible() )
         ImplStatusHdl( &maStatusTimer );
 
-    return ModalDialog::Notify( rNEvt );
+    return ModalDialog::EventNotify( rNEvt );
 }
 
 
diff --git a/svtools/source/dialogs/wizdlg.cxx b/svtools/source/dialogs/wizdlg.cxx
index 2829ce2044ae..7ff932ea60e8 100644
--- a/svtools/source/dialogs/wizdlg.cxx
+++ b/svtools/source/dialogs/wizdlg.cxx
@@ -418,7 +418,7 @@ void WizardDialog::StateChanged( StateChangedType nType )
 }
 
 
-bool WizardDialog::Notify( NotifyEvent& rNEvt )
+bool WizardDialog::EventNotify( NotifyEvent& rNEvt )
 {
     if ( (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT) && mpPrevBtn && mpNextBtn )
     {
@@ -459,7 +459,7 @@ bool WizardDialog::Notify( NotifyEvent& rNEvt )
         }
     }
 
-    return Dialog::Notify( rNEvt );
+    return Dialog::EventNotify( rNEvt );
 }
 
 
diff --git a/svtools/source/hatchwindow/ipwin.cxx b/svtools/source/hatchwindow/ipwin.cxx
index c4014ba31e5f..8ec5c97fa338 100644
--- a/svtools/source/hatchwindow/ipwin.cxx
+++ b/svtools/source/hatchwindow/ipwin.cxx
@@ -599,7 +599,7 @@ bool SvResizeWindow::PreNotify( NotifyEvent& rEvt )
     return Window::PreNotify(rEvt);
 }
 
-bool SvResizeWindow::Notify( NotifyEvent& rEvt )
+bool SvResizeWindow::EventNotify( NotifyEvent& rEvt )
 {
     if ( rEvt.GetType() == MouseNotifyEvent::LOSEFOCUS && m_bActive )
     {
@@ -611,7 +611,7 @@ bool SvResizeWindow::Notify( NotifyEvent& rEvt )
         }
     }
 
-    return Window::Notify(rEvt);
+    return Window::EventNotify(rEvt);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/hatchwindow/ipwin.hxx b/svtools/source/hatchwindow/ipwin.hxx
index bc612974b25d..07da60607b2c 100644
--- a/svtools/source/hatchwindow/ipwin.hxx
+++ b/svtools/source/hatchwindow/ipwin.hxx
@@ -84,7 +84,7 @@ public:
     virtual void    KeyInput( const KeyEvent & rEvt ) override;
     virtual void    Resize() override;
     virtual void    Paint( vcl::RenderContext& /*rRenderContext*/, const Rectangle & ) override;
-    virtual bool    Notify( NotifyEvent& rNEvt ) override;
+    virtual bool    EventNotify( NotifyEvent& rNEvt ) override;
     virtual bool    PreNotify( NotifyEvent& rNEvt ) override;
 };
 
diff --git a/svtools/source/table/tabledatawindow.cxx b/svtools/source/table/tabledatawindow.cxx
index d4fd7cd3becd..a295b2e3241b 100644
--- a/svtools/source/table/tabledatawindow.cxx
+++ b/svtools/source/table/tabledatawindow.cxx
@@ -175,7 +175,7 @@ namespace svt { namespace table
     }
 
 
-    bool TableDataWindow::Notify(NotifyEvent& rNEvt )
+    bool TableDataWindow::EventNotify(NotifyEvent& rNEvt )
     {
         bool bDone = false;
         if ( rNEvt.GetType() == MouseNotifyEvent::COMMAND )
@@ -190,7 +190,7 @@ namespace svt { namespace table
                 }
             }
         }
-        return bDone || Window::Notify( rNEvt );
+        return bDone || Window::EventNotify( rNEvt );
     }
 
 }} // namespace svt::table
diff --git a/svtools/source/table/tabledatawindow.hxx b/svtools/source/table/tabledatawindow.hxx
index a3e2273e3985..99def264e3b8 100644
--- a/svtools/source/table/tabledatawindow.hxx
+++ b/svtools/source/table/tabledatawindow.hxx
@@ -54,7 +54,7 @@ namespace svt { namespace table
         virtual void        MouseMove( const MouseEvent& rMEvt) override;
         virtual void        MouseButtonDown( const MouseEvent& rMEvt) override;
         virtual void        MouseButtonUp( const MouseEvent& rMEvt) override;
-        virtual bool        Notify(NotifyEvent& rNEvt) override;
+        virtual bool        EventNotify(NotifyEvent& rNEvt) override;
         virtual void        RequestHelp( const HelpEvent& rHEvt ) override;
 
     private:
-- 
cgit