From d58a29430615a531ece6434033c8dc0fb26539d1 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
(cherry picked from commit 6bb20609a2fd1d591cedc7fa2b9cabb589c346c7)
(cherry picked from commit 03bfafb36107d18c0cccf53efdd550c0b7a81b8f)
---
 fpicker/source/office/PlacesListBox.cxx     | 4 ++--
 fpicker/source/office/PlacesListBox.hxx     | 2 +-
 fpicker/source/office/RemoteFilesDialog.cxx | 4 ++--
 fpicker/source/office/iodlg.cxx             | 8 ++++----
 fpicker/source/office/iodlg.hxx             | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'fpicker')

diff --git a/fpicker/source/office/PlacesListBox.cxx b/fpicker/source/office/PlacesListBox.cxx
index e3a832bc7a09..eb77e55d548a 100644
--- a/fpicker/source/office/PlacesListBox.cxx
+++ b/fpicker/source/office/PlacesListBox.cxx
@@ -167,7 +167,7 @@ void PlacesListBox::SetSizePixel( const Size& rNewSize )
     mpDelBtn->SetPosPixel( Point( 6 + 24, nBtnY ) );
 }
 
-bool PlacesListBox::Notify( NotifyEvent& rNEvt )
+bool PlacesListBox::EventNotify( NotifyEvent& rNEvt )
 {
     if( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
     {
@@ -181,7 +181,7 @@ bool PlacesListBox::Notify( NotifyEvent& rNEvt )
             return true;
         }
     }
-    return Control::Notify( rNEvt );
+    return Control::EventNotify(rNEvt);
 }
 
 Image PlacesListBox::getEntryIcon( const PlacePtr& pPlace )
diff --git a/fpicker/source/office/PlacesListBox.hxx b/fpicker/source/office/PlacesListBox.hxx
index d4c10de5601e..ddc92d85243f 100644
--- a/fpicker/source/office/PlacesListBox.hxx
+++ b/fpicker/source/office/PlacesListBox.hxx
@@ -70,7 +70,7 @@ class PlacesListBox : public Control
         const VclPtr<PushButton>& GetDeleteButton() const { return mpDelBtn; }
         const VclPtr<PlacesListBox_Impl>& GetPlacesListBox() const { return mpImpl; }
 
-        virtual bool Notify( NotifyEvent& rNEvt ) override;
+        virtual bool EventNotify( NotifyEvent& rNEvt ) override;
 
     private:
 
diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx
index 3fb79e53d3db..f598eaee7d51 100644
--- a/fpicker/source/office/RemoteFilesDialog.cxx
+++ b/fpicker/source/office/RemoteFilesDialog.cxx
@@ -135,7 +135,7 @@ class FileViewContainer : public vcl::Window
         }
     }
 
-    virtual bool Notify( NotifyEvent& rNEvt ) override
+    virtual bool EventNotify( NotifyEvent& rNEvt ) override
     {
         if( rNEvt.GetType() == MouseNotifyEvent::GETFOCUS )
         {
@@ -164,7 +164,7 @@ class FileViewContainer : public vcl::Window
                 return true;
             }
         }
-        return Window::Notify( rNEvt );
+        return Window::EventNotify(rNEvt);
     }
 };
 
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index 70ee9c822d3d..1aefa0b81acc 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -444,7 +444,7 @@ public:
         }
     }
 
-    virtual bool Notify( NotifyEvent& rNEvt ) override
+    virtual bool EventNotify( NotifyEvent& rNEvt ) override
     {
         if( rNEvt.GetType() == MouseNotifyEvent::GETFOCUS )
         {
@@ -473,7 +473,7 @@ public:
                 return true;
             }
         }
-        return Window::Notify( rNEvt );
+        return Window::EventNotify(rNEvt);
     }
 };
 
@@ -1561,7 +1561,7 @@ IMPL_LINK_NOARG(SvtFileDialog, PlayButtonHdl_Impl, Button*, void)
 }
 
 
-bool SvtFileDialog::Notify( NotifyEvent& rNEvt )
+bool SvtFileDialog::EventNotify( NotifyEvent& rNEvt )
 
 /*  [Description]
 
@@ -1589,7 +1589,7 @@ bool SvtFileDialog::Notify( NotifyEvent& rNEvt )
             }
         }
     }
-    return bRet || ModalDialog::Notify( rNEvt );
+    return bRet || ModalDialog::EventNotify(rNEvt);
 }
 
 namespace
diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx
index c76956bcb138..49c43e2c9aa1 100644
--- a/fpicker/source/office/iodlg.hxx
+++ b/fpicker/source/office/iodlg.hxx
@@ -134,7 +134,7 @@ private:
     void    implUpdateImages( );
 
 protected:
-    virtual bool                Notify( NotifyEvent& rNEvt ) override;
+    virtual bool                EventNotify( NotifyEvent& rNEvt ) override;
 
     OUString                    _aPath;
     OUString                    _aDefExt;
-- 
cgit v1.2.3