summaryrefslogtreecommitdiff
path: root/connectivity
diff options
context:
space:
mode:
Diffstat (limited to 'connectivity')
-rw-r--r--connectivity/Library_firebird_sdbc.mk16
-rw-r--r--connectivity/source/drivers/firebird/Blob.cxx2
-rw-r--r--connectivity/source/drivers/firebird/Connection.cxx (renamed from connectivity/source/drivers/firebird/FConnection.cxx)10
-rw-r--r--connectivity/source/drivers/firebird/Connection.hxx (renamed from connectivity/source/drivers/firebird/FConnection.hxx)24
-rw-r--r--connectivity/source/drivers/firebird/DatabaseMetaData.cxx (renamed from connectivity/source/drivers/firebird/FDatabaseMetaData.cxx)4
-rw-r--r--connectivity/source/drivers/firebird/DatabaseMetaData.hxx (renamed from connectivity/source/drivers/firebird/FDatabaseMetaData.hxx)3
-rw-r--r--connectivity/source/drivers/firebird/Driver.cxx (renamed from connectivity/source/drivers/firebird/FDriver.cxx)5
-rw-r--r--connectivity/source/drivers/firebird/Driver.hxx (renamed from connectivity/source/drivers/firebird/FDriver.hxx)3
-rw-r--r--connectivity/source/drivers/firebird/PreparedStatement.cxx (renamed from connectivity/source/drivers/firebird/FPreparedStatement.cxx)8
-rw-r--r--connectivity/source/drivers/firebird/PreparedStatement.hxx (renamed from connectivity/source/drivers/firebird/FPreparedStatement.hxx)2
-rw-r--r--connectivity/source/drivers/firebird/ResultSet.cxx (renamed from connectivity/source/drivers/firebird/FResultSet.cxx)11
-rw-r--r--connectivity/source/drivers/firebird/ResultSet.hxx (renamed from connectivity/source/drivers/firebird/FResultSet.hxx)2
-rw-r--r--connectivity/source/drivers/firebird/ResultSetMetaData.cxx (renamed from connectivity/source/drivers/firebird/FResultSetMetaData.cxx)2
-rw-r--r--connectivity/source/drivers/firebird/ResultSetMetaData.hxx (renamed from connectivity/source/drivers/firebird/FResultSetMetaData.hxx)2
-rw-r--r--connectivity/source/drivers/firebird/Services.cxx (renamed from connectivity/source/drivers/firebird/FServices.cxx)5
-rw-r--r--connectivity/source/drivers/firebird/Statement.cxx (renamed from connectivity/source/drivers/firebird/FStatement.cxx)10
-rw-r--r--connectivity/source/drivers/firebird/Statement.hxx (renamed from connectivity/source/drivers/firebird/FStatement.hxx)0
-rw-r--r--connectivity/source/drivers/firebird/StatementCommonBase.cxx4
-rw-r--r--connectivity/source/drivers/firebird/StatementCommonBase.hxx2
-rw-r--r--connectivity/source/drivers/firebird/SubComponent.hxx (renamed from connectivity/source/drivers/firebird/FSubComponent.hxx)7
20 files changed, 63 insertions, 59 deletions
diff --git a/connectivity/Library_firebird_sdbc.mk b/connectivity/Library_firebird_sdbc.mk
index 6030fec9f45b..18937186fa4f 100644
--- a/connectivity/Library_firebird_sdbc.mk
+++ b/connectivity/Library_firebird_sdbc.mk
@@ -38,14 +38,14 @@ $(eval $(call gb_Library_set_componentfile,firebird_sdbc,connectivity/source/dri
$(eval $(call gb_Library_add_exception_objects,firebird_sdbc,\
connectivity/source/drivers/firebird/Blob \
- connectivity/source/drivers/firebird/FConnection \
- connectivity/source/drivers/firebird/FDatabaseMetaData \
- connectivity/source/drivers/firebird/FDriver \
- connectivity/source/drivers/firebird/FPreparedStatement \
- connectivity/source/drivers/firebird/FResultSet \
- connectivity/source/drivers/firebird/FResultSetMetaData \
- connectivity/source/drivers/firebird/FServices \
- connectivity/source/drivers/firebird/FStatement \
+ connectivity/source/drivers/firebird/Connection \
+ connectivity/source/drivers/firebird/DatabaseMetaData \
+ connectivity/source/drivers/firebird/Driver \
+ connectivity/source/drivers/firebird/PreparedStatement \
+ connectivity/source/drivers/firebird/ResultSet \
+ connectivity/source/drivers/firebird/ResultSetMetaData \
+ connectivity/source/drivers/firebird/Services \
+ connectivity/source/drivers/firebird/Statement \
connectivity/source/drivers/firebird/StatementCommonBase \
connectivity/source/drivers/firebird/Util \
))
diff --git a/connectivity/source/drivers/firebird/Blob.cxx b/connectivity/source/drivers/firebird/Blob.cxx
index 8423b2851b00..f27835d5d12c 100644
--- a/connectivity/source/drivers/firebird/Blob.cxx
+++ b/connectivity/source/drivers/firebird/Blob.cxx
@@ -8,7 +8,7 @@
*/
#include "Blob.hxx"
-#include "FConnection.hxx"
+#include "Connection.hxx"
#include "Util.hxx"
#include "connectivity/dbexception.hxx"
diff --git a/connectivity/source/drivers/firebird/FConnection.cxx b/connectivity/source/drivers/firebird/Connection.cxx
index 6fb85789d288..96ed57c62d0c 100644
--- a/connectivity/source/drivers/firebird/FConnection.cxx
+++ b/connectivity/source/drivers/firebird/Connection.cxx
@@ -17,11 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "FConnection.hxx"
-#include "FDatabaseMetaData.hxx"
-#include "FDriver.hxx"
-#include "FPreparedStatement.hxx"
-#include "FStatement.hxx"
+#include "Connection.hxx"
+#include "DatabaseMetaData.hxx"
+#include "Driver.hxx"
+#include "PreparedStatement.hxx"
+#include "Statement.hxx"
#include "Util.hxx"
diff --git a/connectivity/source/drivers/firebird/FConnection.hxx b/connectivity/source/drivers/firebird/Connection.hxx
index 96b97ec9fe5e..559bba9dafc4 100644
--- a/connectivity/source/drivers/firebird/FConnection.hxx
+++ b/connectivity/source/drivers/firebird/Connection.hxx
@@ -21,27 +21,27 @@
#define CONNECTIVITY_FIREBIRD_CONNECTION_HXX
#include "Blob.hxx"
+#include "SubComponent.hxx"
+
+#include <ibase.h>
+
+#include <connectivity/CommonTools.hxx>
+#include <connectivity/OSubComponent.hxx>
+#include <cppuhelper/compbase4.hxx>
+#include <cppuhelper/weakref.hxx>
+#include <map>
+#include <OTypeInfo.hxx>
-#include <com/sun/star/sdbc/SQLWarning.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/document/DocumentEvent.hpp>
#include <com/sun/star/document/XDocumentEventListener.hpp>
#include <com/sun/star/embed/XStorage.hpp>
-#include "connectivity/OSubComponent.hxx"
-#include "connectivity/CommonTools.hxx"
-#include "FSubComponent.hxx"
-
-#include "OTypeInfo.hxx"
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <com/sun/star/sdbc/XWarningsSupplier.hpp>
+#include <com/sun/star/sdbc/SQLWarning.hpp>
#include <com/sun/star/sdbc/XConnection.hpp>
-#include <cppuhelper/compbase4.hxx>
-#include <cppuhelper/weakref.hxx>
-#include <map>
-
-#include <ibase.h>
+#include <com/sun/star/sdbc/XWarningsSupplier.hpp>
namespace connectivity
{
diff --git a/connectivity/source/drivers/firebird/FDatabaseMetaData.cxx b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
index bf7fadc7ab23..943bb8273629 100644
--- a/connectivity/source/drivers/firebird/FDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
@@ -17,12 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "FDatabaseMetaData.hxx"
-#include "FDatabaseMetaDataResultSet.hxx"
+#include "DatabaseMetaData.hxx"
#include "Util.hxx"
#include <ibase.h>
#include <rtl/ustrbuf.hxx>
+#include <FDatabaseMetaDataResultSet.hxx>
#include <com/sun/star/sdbc/ColumnValue.hpp>
#include <com/sun/star/sdbc/DataType.hpp>
diff --git a/connectivity/source/drivers/firebird/FDatabaseMetaData.hxx b/connectivity/source/drivers/firebird/DatabaseMetaData.hxx
index 3b2da61bd8e2..54ef0db7a8f6 100644
--- a/connectivity/source/drivers/firebird/FDatabaseMetaData.hxx
+++ b/connectivity/source/drivers/firebird/DatabaseMetaData.hxx
@@ -20,7 +20,8 @@
#ifndef CONNECTIVITY_FIREBIRD_DATABASEMETADATA_HXX
#define CONNECTIVITY_FIREBIRD_DATABASEMETADATA_HXX
-#include "FConnection.hxx"
+#include "Connection.hxx"
+
#include <com/sun/star/sdbc/XDatabaseMetaData.hpp>
#include <cppuhelper/implbase1.hxx>
diff --git a/connectivity/source/drivers/firebird/FDriver.cxx b/connectivity/source/drivers/firebird/Driver.cxx
index 4ddab75f600d..21afe46576c9 100644
--- a/connectivity/source/drivers/firebird/FDriver.cxx
+++ b/connectivity/source/drivers/firebird/Driver.cxx
@@ -17,8 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "FDriver.hxx"
-#include "FConnection.hxx"
+#include "Connection.hxx"
+#include "Driver.hxx"
+
#include "connectivity/dbexception.hxx"
#include "resource/common_res.hrc"
#include "resource/hsqldb_res.hrc"
diff --git a/connectivity/source/drivers/firebird/FDriver.hxx b/connectivity/source/drivers/firebird/Driver.hxx
index 442d520b0270..fcb0f5750b62 100644
--- a/connectivity/source/drivers/firebird/FDriver.hxx
+++ b/connectivity/source/drivers/firebird/Driver.hxx
@@ -20,10 +20,11 @@
#ifndef CONNECTIVITY_FIREBIRD_DRIVER_HXX
#define CONNECTIVITY_FIREBIRD_DRIVER_HXX
+#include "Connection.hxx"
+
#include <com/sun/star/sdbc/XDriver.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <cppuhelper/compbase2.hxx>
-#include "FConnection.hxx"
namespace connectivity
{
diff --git a/connectivity/source/drivers/firebird/FPreparedStatement.cxx b/connectivity/source/drivers/firebird/PreparedStatement.cxx
index 441b86bcf66c..aeddb14ed88f 100644
--- a/connectivity/source/drivers/firebird/FPreparedStatement.cxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx
@@ -17,10 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "FConnection.hxx"
-#include "FPreparedStatement.hxx"
-#include "FResultSetMetaData.hxx"
-#include "FResultSet.hxx"
+#include "Connection.hxx"
+#include "PreparedStatement.hxx"
+#include "ResultSet.hxx"
+#include "ResultSetMetaData.hxx"
#include "Util.hxx"
#include <comphelper/sequence.hxx>
diff --git a/connectivity/source/drivers/firebird/FPreparedStatement.hxx b/connectivity/source/drivers/firebird/PreparedStatement.hxx
index 0399d6a4bf6e..60d5c662a827 100644
--- a/connectivity/source/drivers/firebird/FPreparedStatement.hxx
+++ b/connectivity/source/drivers/firebird/PreparedStatement.hxx
@@ -20,7 +20,7 @@
#ifndef CONNECTIVITY_FIREBIRD_PREPAREDSTATEMENT_HXX
#define CONNECTIVITY_FIREBIRD_PREPAREDSTATEMENT_HXX
-#include "FStatement.hxx"
+#include "Statement.hxx"
#include <cppuhelper/implbase5.hxx>
diff --git a/connectivity/source/drivers/firebird/FResultSet.cxx b/connectivity/source/drivers/firebird/ResultSet.cxx
index ca0ded148373..36c59afbbbfb 100644
--- a/connectivity/source/drivers/firebird/FResultSet.cxx
+++ b/connectivity/source/drivers/firebird/ResultSet.cxx
@@ -17,18 +17,17 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "FResultSet.hxx"
-#include "FResultSetMetaData.hxx"
+#include "ResultSet.hxx"
+#include "ResultSetMetaData.hxx"
#include "Util.hxx"
-#include <propertyids.hxx>
-#include <TConnection.hxx>
-
-#include <connectivity/dbexception.hxx>
#include <comphelper/sequence.hxx>
#include <cppuhelper/typeprovider.hxx>
+#include <connectivity/dbexception.hxx>
+#include <propertyids.hxx>
#include <rtl/string.hxx>
#include <rtl/ustrbuf.hxx>
+#include <TConnection.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
diff --git a/connectivity/source/drivers/firebird/FResultSet.hxx b/connectivity/source/drivers/firebird/ResultSet.hxx
index cd0ee5ac183f..a741295ed8cf 100644
--- a/connectivity/source/drivers/firebird/FResultSet.hxx
+++ b/connectivity/source/drivers/firebird/ResultSet.hxx
@@ -20,7 +20,7 @@
#ifndef CONNECTIVITY_FIREBIRD_RESULTSET_HXX
#define CONNECTIVITY_FIREBIRD_RESULTSET_HXX
-#include "FStatement.hxx"
+#include "Statement.hxx"
#include <ibase.h>
diff --git a/connectivity/source/drivers/firebird/FResultSetMetaData.cxx b/connectivity/source/drivers/firebird/ResultSetMetaData.cxx
index f699b8ff00eb..9bcc6b3592d1 100644
--- a/connectivity/source/drivers/firebird/FResultSetMetaData.cxx
+++ b/connectivity/source/drivers/firebird/ResultSetMetaData.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "FResultSetMetaData.hxx"
+#include "ResultSetMetaData.hxx"
#include "Util.hxx"
#include <com/sun/star/sdbc/ColumnValue.hpp>
diff --git a/connectivity/source/drivers/firebird/FResultSetMetaData.hxx b/connectivity/source/drivers/firebird/ResultSetMetaData.hxx
index 4aa4f9abd66e..23a737787f06 100644
--- a/connectivity/source/drivers/firebird/FResultSetMetaData.hxx
+++ b/connectivity/source/drivers/firebird/ResultSetMetaData.hxx
@@ -20,7 +20,7 @@
#ifndef CONNECTIVITY_FIREBIRD_RESULTSETMETADATA_HXX
#define CONNECTIVITY_FIREBIRD_RESULTSETMETADATA_HXX
-#include "FConnection.hxx"
+#include "Connection.hxx"
#include <ibase.h>
diff --git a/connectivity/source/drivers/firebird/FServices.cxx b/connectivity/source/drivers/firebird/Services.cxx
index 65068a700aa4..a60aad05df3a 100644
--- a/connectivity/source/drivers/firebird/FServices.cxx
+++ b/connectivity/source/drivers/firebird/Services.cxx
@@ -17,10 +17,11 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <sal/types.h>
-#include "FDriver.hxx"
+#include "Driver.hxx"
+
#include <cppuhelper/factory.hxx>
#include <osl/diagnose.h>
+#include <sal/types.h>
using namespace connectivity::firebird;
using ::rtl::OUString;
diff --git a/connectivity/source/drivers/firebird/FStatement.cxx b/connectivity/source/drivers/firebird/Statement.cxx
index 36d2704c610c..7378e5c707ef 100644
--- a/connectivity/source/drivers/firebird/FStatement.cxx
+++ b/connectivity/source/drivers/firebird/Statement.cxx
@@ -17,10 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "FDriver.hxx"
-#include "FStatement.hxx"
-#include "FConnection.hxx"
-#include "FResultSet.hxx"
+#include "Connection.hxx"
+#include "Driver.hxx"
+#include "ResultSet.hxx"
+#include "Statement.hxx"
#include "Util.hxx"
#include <comphelper/sequence.hxx>
@@ -28,10 +28,10 @@
#include <osl/thread.h>
#include <rtl/ustrbuf.hxx>
+#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/sdbc/ResultSetConcurrency.hpp>
#include <com/sun/star/sdbc/ResultSetType.hpp>
#include <com/sun/star/sdbc/FetchDirection.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
using namespace connectivity::firebird;
diff --git a/connectivity/source/drivers/firebird/FStatement.hxx b/connectivity/source/drivers/firebird/Statement.hxx
index 7f68aadfac0a..7f68aadfac0a 100644
--- a/connectivity/source/drivers/firebird/FStatement.hxx
+++ b/connectivity/source/drivers/firebird/Statement.hxx
diff --git a/connectivity/source/drivers/firebird/StatementCommonBase.cxx b/connectivity/source/drivers/firebird/StatementCommonBase.cxx
index e562c870c6dc..eba79de6e41b 100644
--- a/connectivity/source/drivers/firebird/StatementCommonBase.cxx
+++ b/connectivity/source/drivers/firebird/StatementCommonBase.cxx
@@ -17,8 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "FDriver.hxx"
-#include "FResultSet.hxx"
+#include "Driver.hxx"
+#include "ResultSet.hxx"
#include "StatementCommonBase.hxx"
#include "Util.hxx"
diff --git a/connectivity/source/drivers/firebird/StatementCommonBase.hxx b/connectivity/source/drivers/firebird/StatementCommonBase.hxx
index 97c72c908993..99f456361c34 100644
--- a/connectivity/source/drivers/firebird/StatementCommonBase.hxx
+++ b/connectivity/source/drivers/firebird/StatementCommonBase.hxx
@@ -20,7 +20,7 @@
#ifndef CONNECTIVITY_FIREBIRD_STATEMENT_BASE_HXX
#define CONNECTIVITY_FIREBIRD_STATEMENT_BASE_HXX
-#include "FConnection.hxx"
+#include "Connection.hxx"
#include <ibase.h>
diff --git a/connectivity/source/drivers/firebird/FSubComponent.hxx b/connectivity/source/drivers/firebird/SubComponent.hxx
index 929d3180e9fb..241742747760 100644
--- a/connectivity/source/drivers/firebird/FSubComponent.hxx
+++ b/connectivity/source/drivers/firebird/SubComponent.hxx
@@ -20,12 +20,13 @@
#ifndef CONNECTIVITY_FIREBIRD_SUBCOMPONENT_HXX
#define CONNECTIVITY_FIREBIRD_SUBCOMPONENT_HXX
-#include <cppuhelper/weak.hxx>
#include <cppuhelper/interfacecontainer.h>
-#include <com/sun/star/lang/DisposedException.hpp>
#include <cppuhelper/propshlp.hxx>
-#include <osl/mutex.hxx>
+#include <cppuhelper/weak.hxx>
#include <osl/diagnose.h>
+#include <osl/mutex.hxx>
+
+#include <com/sun/star/lang/DisposedException.hpp>
namespace cppu {
class IPropertyArrayHelper;
generated by cgit (git 2.34.1) at 2024-07-25 00:20:41 +0000