Rename MouseNotifyEvent to NotifyEventType

Also contains keyboard and focus events, not only mouse events

Change-Id: Iec1d6c341b01a489ba80fe9634ea3579afb02ea9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139970
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: Samuel Mehrbrodt <samuel.mehrbrodt@allotropia.de>

12 files changed, 20 insertions, 20 deletions

diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx
index df0b94dd60f5..e6536beecfb8 100644
--- a/dbaccess/source/ui/app/AppView.cxx
+++ b/dbaccess/source/ui/app/AppView.cxx
@@ -174,7 +174,7 @@ bool OApplicationView::PreNotify( NotifyEvent& rNEvt )
 {
     switch(rNEvt.GetType())
     {
-        case MouseNotifyEvent::KEYINPUT:
+        case NotifyEventType::KEYINPUT:
         {
             const KeyEvent* pKeyEvent = rNEvt.GetKeyEvent();
             // give the pane the chance to intercept mnemonic accelerators
diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx
index b68819d6740a..9d6d3c95d67d 100644
--- a/dbaccess/source/ui/browser/brwview.cxx
+++ b/dbaccess/source/ui/browser/brwview.cxx
@@ -292,7 +292,7 @@ void UnoDataBrowserView::_disposing( const css::lang::EventObject& /*_rSource*/
 bool UnoDataBrowserView::PreNotify( NotifyEvent& rNEvt )
 {
     bool bDone = false;
-    if(rNEvt.GetType() == MouseNotifyEvent::KEYINPUT)
+    if(rNEvt.GetType() == NotifyEventType::KEYINPUT)
     {
         bool bGrabAllowed = isGrabVclControlFocusAllowed(this);
         if ( bGrabAllowed )
diff --git a/dbaccess/source/ui/browser/dataview.cxx b/dbaccess/source/ui/browser/dataview.cxx
index 1dd920e1575b..383a2c3f0a76 100644
--- a/dbaccess/source/ui/browser/dataview.cxx
+++ b/dbaccess/source/ui/browser/dataview.cxx
@@ -98,7 +98,7 @@ namespace dbaui
         bool bHandled = false;
         switch ( _rNEvt.GetType() )
         {
-            case MouseNotifyEvent::KEYINPUT:
+            case NotifyEventType::KEYINPUT:
             {
                 const KeyEvent* pKeyEvent = _rNEvt.GetKeyEvent();
                 const vcl::KeyCode& aKeyCode = pKeyEvent->GetKeyCode();
@@ -107,9 +107,9 @@ namespace dbaui
                     return true;
                 [[fallthrough]];
             }
-            case MouseNotifyEvent::KEYUP:
-            case MouseNotifyEvent::MOUSEBUTTONDOWN:
-            case MouseNotifyEvent::MOUSEBUTTONUP:
+            case NotifyEventType::KEYUP:
+            case NotifyEventType::MOUSEBUTTONDOWN:
+            case NotifyEventType::MOUSEBUTTONUP:
                 bHandled = m_xController->interceptUserInput( _rNEvt );
                 break;
             default:
diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx
index 096e620da665..d033aebf7e1a 100644
--- a/dbaccess/source/ui/control/RelationControl.cxx
+++ b/dbaccess/source/ui/control/RelationControl.cxx
@@ -184,9 +184,9 @@ namespace dbaui
 
     bool ORelationControl::PreNotify(NotifyEvent& rNEvt)
     {
-        if (rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS && !HasChildPathFocus() && !ControlHasFocus())
+        if (rNEvt.GetType() == NotifyEventType::LOSEFOCUS && !HasChildPathFocus() && !ControlHasFocus())
             PostUserEvent(LINK(this, ORelationControl, AsynchDeactivate), nullptr, true);
-        else if (rNEvt.GetType() == MouseNotifyEvent::GETFOCUS)
+        else if (rNEvt.GetType() == NotifyEventType::GETFOCUS)
             PostUserEvent(LINK(this, ORelationControl, AsynchActivate), nullptr, true);
 
         return EditBrowseBox::PreNotify(rNEvt);
diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx
index f4826e96d281..607c0199729a 100644
--- a/dbaccess/source/ui/control/TableGrantCtrl.cxx
+++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx
@@ -151,14 +151,14 @@ void OTableGrantControl::Init()
 
 bool OTableGrantControl::PreNotify(NotifyEvent& rNEvt)
 {
-    if (rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS)
+    if (rNEvt.GetType() == NotifyEventType::LOSEFOCUS)
         if (!HasChildPathFocus())
         {
             if (m_nDeactivateEvent)
                 Application::RemoveUserEvent(m_nDeactivateEvent);
             m_nDeactivateEvent = Application::PostUserEvent(LINK(this, OTableGrantControl, AsynchDeactivate), nullptr, true);
         }
-    if (rNEvt.GetType() == MouseNotifyEvent::GETFOCUS)
+    if (rNEvt.GetType() == NotifyEventType::GETFOCUS)
     {
         if (m_nDeactivateEvent)
             Application::RemoveUserEvent(m_nDeactivateEvent);
diff --git a/dbaccess/source/ui/querydesign/JoinTableView.cxx b/dbaccess/source/ui/querydesign/JoinTableView.cxx
index 4c9a323dbe4e..87cf5b8aea5b 100644
--- a/dbaccess/source/ui/querydesign/JoinTableView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinTableView.cxx
@@ -1218,7 +1218,7 @@ bool OJoinTableView::PreNotify(NotifyEvent& rNEvt)
     bool bHandled = false;
     switch (rNEvt.GetType())
     {
-        case MouseNotifyEvent::COMMAND:
+        case NotifyEventType::COMMAND:
         {
             const CommandEvent* pCommand = rNEvt.GetCommandEvent();
             if (pCommand->GetCommand() == CommandEventId::Wheel)
@@ -1235,7 +1235,7 @@ bool OJoinTableView::PreNotify(NotifyEvent& rNEvt)
             }
         }
         break;
-        case MouseNotifyEvent::KEYINPUT:
+        case NotifyEventType::KEYINPUT:
         {
             if (m_aTableMap.empty())
                 // no tab wins -> no conns -> no traveling
@@ -1363,7 +1363,7 @@ bool OJoinTableView::PreNotify(NotifyEvent& rNEvt)
             }
         }
         break;
-        case MouseNotifyEvent::GETFOCUS:
+        case NotifyEventType::GETFOCUS:
         {
             if (m_aTableMap.empty())
                 // no tab wins -> no conns -> no focus change
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 9946a7554393..c081012ddf2a 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -2681,7 +2681,7 @@ void OQueryDesignView::fillValidFields(std::u16string_view sAliasName, weld::Com
 
 bool OQueryDesignView::PreNotify(NotifyEvent& rNEvt)
 {
-    if (rNEvt.GetType() == MouseNotifyEvent::GETFOCUS)
+    if (rNEvt.GetType() == NotifyEventType::GETFOCUS)
     {
         if ( m_pSelectionBox && m_pSelectionBox->HasChildPathFocus() )
             m_eChildFocus = SELECTION;
diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx b/dbaccess/source/ui/querydesign/TableWindow.cxx
index 4dc6751741b7..fe5310ea6592 100644
--- a/dbaccess/source/ui/querydesign/TableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindow.cxx
@@ -564,7 +564,7 @@ bool OTableWindow::PreNotify(NotifyEvent& rNEvt)
     bool bHandled = false;
     switch (rNEvt.GetType())
     {
-        case MouseNotifyEvent::KEYINPUT:
+        case NotifyEventType::KEYINPUT:
         {
             if ( getDesignView()->getController().isReadOnly() )
                 break;
@@ -674,7 +674,7 @@ bool OTableWindow::PreNotify(NotifyEvent& rNEvt)
             }
             break;
         }
-        case MouseNotifyEvent::KEYUP:
+        case NotifyEventType::KEYUP:
         {
             const KeyEvent* pKeyEvent = rNEvt.GetKeyEvent();
             const vcl::KeyCode& rCode = pKeyEvent->GetKeyCode();
diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
index 68b4c5c86865..7a14b7e3c4da 100644
--- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
+++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
@@ -157,7 +157,7 @@ namespace dbaui
     }
     bool OQueryContainerWindow::PreNotify( NotifyEvent& rNEvt )
     {
-        if (rNEvt.GetType() == MouseNotifyEvent::GETFOCUS && m_pViewSwitch)
+        if (rNEvt.GetType() == NotifyEventType::GETFOCUS && m_pViewSwitch)
         {
             OJoinController& rController = m_pViewSwitch->getDesignView()->getController();
             rController.InvalidateFeature(SID_CUT);
diff --git a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
index 014579cf7c7f..cc333accdec8 100644
--- a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
+++ b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx
@@ -51,7 +51,7 @@ void ORelationDesignView::initialize()
 bool ORelationDesignView::PreNotify( NotifyEvent& rNEvt )
 {
     bool bDone = false;
-    if(rNEvt.GetType() == MouseNotifyEvent::GETFOCUS)
+    if(rNEvt.GetType() == NotifyEventType::GETFOCUS)
     {
         if(m_pTableView && !m_pTableView->HasChildPathFocus())
         {
diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx
index 5f7809882cc6..db33d26fcd81 100644
--- a/dbaccess/source/ui/tabledesign/TEditControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx
@@ -1661,7 +1661,7 @@ void OTableEditorCtrl::DeactivateCell(bool bUpdate)
 
 bool OTableEditorCtrl::PreNotify( NotifyEvent& rNEvt )
 {
-    if (rNEvt.GetType() == MouseNotifyEvent::GETFOCUS)
+    if (rNEvt.GetType() == NotifyEventType::GETFOCUS)
     {
         if( pHelpTextCell && pHelpTextCell->HasChildPathFocus() )
             m_eChildFocus = HELPTEXT;
diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
index 6287c907ce0c..627951fd2e4c 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx
@@ -165,7 +165,7 @@ IMPL_LINK_NOARG(OTableDesignView, FieldDescFocusIn, weld::Widget&, void)
 
 bool OTableDesignView::PreNotify( NotifyEvent& rNEvt )
 {
-    if (rNEvt.GetType() == MouseNotifyEvent::GETFOCUS)
+    if (rNEvt.GetType() == NotifyEventType::GETFOCUS)
     {
         if( GetDescWin() && GetDescWin()->HasChildPathFocus() )
             m_eChildFocus = DESCRIPTION;