rename DBMySQLNativeSettings back to MySQLNativeSettings

Change-Id: I00d6de729a1d650d479663b6e1d05f8087e7fe9a
Reviewed-on: https://gerrit.libreoffice.org/76846
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

5 files changed, 22 insertions, 22 deletions

diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index 2287be7a8934..dab449091e36 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -298,7 +298,7 @@ using namespace ::com::sun::star;
         : OGenericAdministrationPage(pParent, "dbaccess/ui/dbwizmysqlnativepage.ui", "DBWizMysqlNativePage", rCoreAttrs)
         , m_xHelpText(m_xBuilder->weld_label("helptext"))
         , m_xSettingsContainer(m_xBuilder->weld_container("MySQLSettingsContainer"))
-        , m_xMySQLSettings(new DBMySQLNativeSettings(m_xSettingsContainer.get(), LINK(this, OGenericAdministrationPage, OnControlModified)))
+        , m_xMySQLSettings(new MySQLNativeSettings(m_xSettingsContainer.get(), LINK(this, OGenericAdministrationPage, OnControlModified)))
     {
         SetRoadmapStateValue(false);
     }
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
index dd0717f47a54..8cbe44c1297f 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
@@ -105,7 +105,7 @@ namespace dbaui
     private:
         std::unique_ptr<weld::Label> m_xHelpText;
         std::unique_ptr<weld::Container> m_xSettingsContainer;
-        std::unique_ptr<DBMySQLNativeSettings> m_xMySQLSettings;
+        std::unique_ptr<MySQLNativeSettings> m_xMySQLSettings;
 
     public:
         MySQLNativeSetupPage(TabPageParent pParent, const SfxItemSet& rCoreAttrs);
diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx
index 33bd77cb27c4..6f16870a3158 100644
--- a/dbaccess/source/ui/dlg/admincontrols.cxx
+++ b/dbaccess/source/ui/dlg/admincontrols.cxx
@@ -30,7 +30,7 @@ namespace dbaui
 {
 
     // MySQLNativeSettings
-    DBMySQLNativeSettings::DBMySQLNativeSettings(weld::Widget* pParent, const Link<void*,void>& rControlModificationLink)
+    MySQLNativeSettings::MySQLNativeSettings(weld::Widget* pParent, const Link<void*,void>& rControlModificationLink)
         : m_xBuilder(Application::CreateBuilder(pParent, "dbaccess/ui/mysqlnativesettings.ui"))
         , m_xContainer(m_xBuilder->weld_widget("MysqlNativeSettings"))
         , m_xDatabaseNameLabel(m_xBuilder->weld_label("dbnamelabel"))
@@ -47,14 +47,14 @@ namespace dbaui
         , m_xNamedPipe(m_xBuilder->weld_entry("namedpipe"))
         , m_aControlModificationLink(rControlModificationLink)
     {
-        m_xDatabaseName->connect_changed( LINK(this, DBMySQLNativeSettings, EditModifyHdl) );
-        m_xHostName->connect_changed( LINK(this, DBMySQLNativeSettings, EditModifyHdl) );
-        m_xPort->connect_value_changed( LINK(this, DBMySQLNativeSettings, SpinModifyHdl) );
-        m_xSocket->connect_changed( LINK(this, DBMySQLNativeSettings, EditModifyHdl) );
-        m_xNamedPipe->connect_changed( LINK(this, DBMySQLNativeSettings, EditModifyHdl) );
-        m_xSocketRadio->connect_toggled( LINK(this, DBMySQLNativeSettings, RadioToggleHdl) );
-        m_xNamedPipeRadio->connect_toggled( LINK(this, DBMySQLNativeSettings, RadioToggleHdl) );
-        m_xHostPortRadio->connect_toggled( LINK(this, DBMySQLNativeSettings, RadioToggleHdl) );
+        m_xDatabaseName->connect_changed( LINK(this, MySQLNativeSettings, EditModifyHdl) );
+        m_xHostName->connect_changed( LINK(this, MySQLNativeSettings, EditModifyHdl) );
+        m_xPort->connect_value_changed( LINK(this, MySQLNativeSettings, SpinModifyHdl) );
+        m_xSocket->connect_changed( LINK(this, MySQLNativeSettings, EditModifyHdl) );
+        m_xNamedPipe->connect_changed( LINK(this, MySQLNativeSettings, EditModifyHdl) );
+        m_xSocketRadio->connect_toggled( LINK(this, MySQLNativeSettings, RadioToggleHdl) );
+        m_xNamedPipeRadio->connect_toggled( LINK(this, MySQLNativeSettings, RadioToggleHdl) );
+        m_xHostPortRadio->connect_toggled( LINK(this, MySQLNativeSettings, RadioToggleHdl) );
 
         // sockets are available on Unix systems only, named pipes only on Windows
 #ifdef UNX
@@ -67,7 +67,7 @@ namespace dbaui
         m_xContainer->show();
     }
 
-    IMPL_LINK(DBMySQLNativeSettings, RadioToggleHdl, weld::ToggleButton&, rRadioButton, void)
+    IMPL_LINK(MySQLNativeSettings, RadioToggleHdl, weld::ToggleButton&, rRadioButton, void)
     {
         m_aControlModificationLink.Call(&rRadioButton);
 
@@ -82,17 +82,17 @@ namespace dbaui
         m_xNamedPipe->set_sensitive(m_xNamedPipeRadio->get_active());
     }
 
-    IMPL_LINK(DBMySQLNativeSettings, EditModifyHdl, weld::Entry&, rEdit, void)
+    IMPL_LINK(MySQLNativeSettings, EditModifyHdl, weld::Entry&, rEdit, void)
     {
         m_aControlModificationLink.Call(&rEdit);
     }
 
-    IMPL_LINK(DBMySQLNativeSettings, SpinModifyHdl, weld::SpinButton&, rEdit, void)
+    IMPL_LINK(MySQLNativeSettings, SpinModifyHdl, weld::SpinButton&, rEdit, void)
     {
         m_aControlModificationLink.Call(&rEdit);
     }
 
-    void DBMySQLNativeSettings::fillControls( std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList )
+    void MySQLNativeSettings::fillControls( std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList )
     {
         _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::Entry>(m_xDatabaseName.get()));
         _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::Entry>(m_xHostName.get()));
@@ -101,7 +101,7 @@ namespace dbaui
         _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::Entry>(m_xNamedPipe.get()));
     }
 
-    void DBMySQLNativeSettings::fillWindows( std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList )
+    void MySQLNativeSettings::fillWindows( std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList )
     {
         _rControlList.emplace_back( new ODisableWidgetWrapper<weld::Label>( m_xDatabaseNameLabel.get() ) );
         _rControlList.emplace_back( new ODisableWidgetWrapper<weld::Label>( m_xHostNameLabel.get() ) );
@@ -111,7 +111,7 @@ namespace dbaui
         _rControlList.emplace_back( new ODisableWidgetWrapper<weld::RadioButton>( m_xNamedPipeRadio.get() ) );
     }
 
-    bool DBMySQLNativeSettings::FillItemSet( SfxItemSet* _rSet )
+    bool MySQLNativeSettings::FillItemSet( SfxItemSet* _rSet )
     {
         bool bChangedSomething = false;
 
@@ -127,7 +127,7 @@ namespace dbaui
         return bChangedSomething;
     }
 
-    void DBMySQLNativeSettings::implInitControls(const SfxItemSet& _rSet )
+    void MySQLNativeSettings::implInitControls(const SfxItemSet& _rSet )
     {
         const SfxBoolItem* pInvalid = _rSet.GetItem<SfxBoolItem>(DSID_INVALID_SELECTION);
         bool bValid = !pInvalid || !pInvalid->GetValue();
@@ -171,7 +171,7 @@ namespace dbaui
             m_xHostPortRadio->set_active(true);
     }
 
-    bool DBMySQLNativeSettings::canAdvance() const
+    bool MySQLNativeSettings::canAdvance() const
     {
         if (m_xDatabaseName->get_text().isEmpty())
             return false;
diff --git a/dbaccess/source/ui/dlg/admincontrols.hxx b/dbaccess/source/ui/dlg/admincontrols.hxx
index 0c406498e5dc..5b675d77cc13 100644
--- a/dbaccess/source/ui/dlg/admincontrols.hxx
+++ b/dbaccess/source/ui/dlg/admincontrols.hxx
@@ -28,7 +28,7 @@ namespace dbaui
 {
 
     // MySQLNativeSettings
-    class DBMySQLNativeSettings
+    class MySQLNativeSettings
     {
     private:
         std::unique_ptr<weld::Builder> m_xBuilder;
@@ -51,7 +51,7 @@ namespace dbaui
         DECL_LINK(EditModifyHdl, weld::Entry&, void);
 
     public:
-        DBMySQLNativeSettings(weld::Widget* pParent, const Link<void*,void>& rControlModificationLink);
+        MySQLNativeSettings(weld::Widget* pParent, const Link<void*,void>& rControlModificationLink);
         void fillControls( std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList );
         void fillWindows( std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList );
 
diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx
index 8de9f2f3e757..2e895d1fb412 100644
--- a/dbaccess/source/ui/dlg/detailpages.hxx
+++ b/dbaccess/source/ui/dlg/detailpages.hxx
@@ -198,7 +198,7 @@ namespace dbaui
 
     private:
         std::unique_ptr<weld::Widget> m_xMySQLSettingsContainer;
-        DBMySQLNativeSettings m_aMySQLSettings;
+        MySQLNativeSettings m_aMySQLSettings;
         std::unique_ptr<weld::Label> m_xSeparator1;
         std::unique_ptr<weld::Label> m_xSeparator2;
         std::unique_ptr<weld::Label> m_xUserNameLabel;