From 8c1f919823e4386d3e2744a8b4732a5bcc1a2280 Mon Sep 17 00:00:00 2001
From: Julien Nabet <serval2412@yahoo.fr>
Date: Sat, 22 Jan 2022 10:40:42 +0100
Subject: Mysql/MariaDB: Clean mysqlc_catalog + remove using

Change-Id: Ia9cd6dc9a6389ea1764a85c5f35a65f7d6ac40a3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128755
Tested-by: Julien Nabet <serval2412@yahoo.fr>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
---
 .../source/drivers/mysqlc/mysqlc_catalog.cxx       | 25 +++++++++-------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/connectivity/source/drivers/mysqlc/mysqlc_catalog.cxx b/connectivity/source/drivers/mysqlc/mysqlc_catalog.cxx
index 035c7761f5e3..d8b9db7422d0 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_catalog.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_catalog.cxx
@@ -10,25 +10,19 @@
 #include "mysqlc_catalog.hxx"
 #include "mysqlc_tables.hxx"
 #include "mysqlc_views.hxx"
-#include "mysqlc_users.hxx"
 
-#include <com/sun/star/sdbc/XRow.hpp>
-
-using namespace ::connectivity::mysqlc;
-using namespace ::com::sun::star;
-using namespace ::com::sun::star::sdbc;
-using namespace ::com::sun::star::uno;
-
-Catalog::Catalog(const uno::Reference<XConnection>& rConnection)
+connectivity::mysqlc::Catalog::Catalog(
+    const css::uno::Reference<css::sdbc::XConnection>& rConnection)
     : OCatalog(rConnection)
     , m_xConnection(rConnection)
 {
 }
 
 //----- OCatalog -------------------------------------------------------------
-void Catalog::refreshTables()
+void connectivity::mysqlc::Catalog::refreshTables()
 {
-    uno::Reference<XResultSet> xTables = m_xMetaData->getTables(Any(), "%", "%", {});
+    css::uno::Reference<css::sdbc::XResultSet> xTables
+        = m_xMetaData->getTables(css::uno::Any(), "%", "%", {});
 
     if (!xTables.is())
         return;
@@ -43,9 +37,10 @@ void Catalog::refreshTables()
         m_pTables->reFill(aTableNames);
 }
 
-void Catalog::refreshViews()
+void connectivity::mysqlc::Catalog::refreshViews()
 {
-    uno::Reference<XResultSet> xViews = m_xMetaData->getTables(Any(), "%", "%", { "VIEW" });
+    css::uno::Reference<css::sdbc::XResultSet> xViews
+        = m_xMetaData->getTables(css::uno::Any(), "%", "%", { "VIEW" });
 
     if (!xViews.is())
         return;
@@ -61,13 +56,13 @@ void Catalog::refreshViews()
 }
 
 //----- IRefreshableGroups ---------------------------------------------------
-void Catalog::refreshGroups()
+void connectivity::mysqlc::Catalog::refreshGroups()
 {
     // TODO: implement me
 }
 
 //----- IRefreshableUsers ----------------------------------------------------
-void Catalog::refreshUsers()
+void connectivity::mysqlc::Catalog::refreshUsers()
 {
     // TODO: implement me
 }
-- 
cgit