summaryrefslogtreecommitdiff
path: root/mysqlc/source/mysqlc_databasemetadata.cxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-04-22 16:34:33 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-04-22 16:34:33 +0200
commit235b1f3dfdee3e765e43105342dac69eeb8fb5fe (patch)
tree8c0855d955f2a13e5ea0c2d43d4881343d8ca514 /mysqlc/source/mysqlc_databasemetadata.cxx
parentff5021927dbd63e9675593a6896b36b05ef40b5f (diff)
Avoid reserved identifiers
Change-Id: Id2ef8fb53207be64d0f7342734f0d9fab832b674
Diffstat (limited to 'mysqlc/source/mysqlc_databasemetadata.cxx')
-rw-r--r--mysqlc/source/mysqlc_databasemetadata.cxx24
1 files changed, 12 insertions, 12 deletions
diff --git a/mysqlc/source/mysqlc_databasemetadata.cxx b/mysqlc/source/mysqlc_databasemetadata.cxx
index 5be0de8ece2e..b83674b57143 100644
--- a/mysqlc/source/mysqlc_databasemetadata.cxx
+++ b/mysqlc/source/mysqlc_databasemetadata.cxx
@@ -96,12 +96,12 @@ ODatabaseMetaData::~ODatabaseMetaData()
OSL_TRACE("ODatabaseMetaData::~ODatabaseMetaData");
}
-rtl::OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodName, const sql::SQLString& (sql::DatabaseMetaData::*_Method)() )
+rtl::OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodName, const sql::SQLString& (sql::DatabaseMetaData::*Method)() )
{
OSL_TRACE( "mysqlc::ODatabaseMetaData::%s", _methodName);
rtl::OUString stringMetaData;
try {
- stringMetaData = mysqlc_sdbc_driver::convert((meta->*_Method)(), m_rConnection.getConnectionEncoding());
+ stringMetaData = mysqlc_sdbc_driver::convert((meta->*Method)(), m_rConnection.getConnectionEncoding());
} catch (const sql::MethodNotImplementedException &) {
mysqlc_sdbc_driver::throwFeatureNotImplementedException(_methodName, *this);
} catch (const sql::InvalidArgumentException &) {
@@ -112,12 +112,12 @@ rtl::OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodN
return stringMetaData;
}
-rtl::OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodName, sql::SQLString (sql::DatabaseMetaData::*_Method)() )
+rtl::OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodName, sql::SQLString (sql::DatabaseMetaData::*Method)() )
{
OSL_TRACE( "mysqlc::ODatabaseMetaData::%s", _methodName);
rtl::OUString stringMetaData;
try {
- stringMetaData = mysqlc_sdbc_driver::convert((meta->*_Method)(), m_rConnection.getConnectionEncoding());
+ stringMetaData = mysqlc_sdbc_driver::convert((meta->*Method)(), m_rConnection.getConnectionEncoding());
} catch (const sql::MethodNotImplementedException &) {
mysqlc_sdbc_driver::throwFeatureNotImplementedException(_methodName, *this);
} catch (const sql::InvalidArgumentException &) {
@@ -128,12 +128,12 @@ rtl::OUString ODatabaseMetaData::impl_getStringMetaData(const sal_Char* _methodN
return stringMetaData;
}
-sal_Int32 ODatabaseMetaData::impl_getInt32MetaData(const sal_Char* _methodName, unsigned int (sql::DatabaseMetaData::*_Method)() )
+sal_Int32 ODatabaseMetaData::impl_getInt32MetaData(const sal_Char* _methodName, unsigned int (sql::DatabaseMetaData::*Method)() )
{
OSL_TRACE( "mysqlc::ODatabaseMetaData::%s", _methodName);
sal_Int32 int32MetaData(0);
try {
- int32MetaData = (meta->*_Method)();
+ int32MetaData = (meta->*Method)();
} catch (const sql::MethodNotImplementedException &) {
mysqlc_sdbc_driver::throwFeatureNotImplementedException(_methodName, *this);
} catch (const sql::InvalidArgumentException &) {
@@ -144,12 +144,12 @@ sal_Int32 ODatabaseMetaData::impl_getInt32MetaData(const sal_Char* _methodName,
return int32MetaData;
}
-bool ODatabaseMetaData::impl_getBoolMetaData(const sal_Char* _methodName, bool (sql::DatabaseMetaData::*_Method)() )
+bool ODatabaseMetaData::impl_getBoolMetaData(const sal_Char* _methodName, bool (sql::DatabaseMetaData::*Method)() )
{
OSL_TRACE( "mysqlc::ODatabaseMetaData::%s", _methodName);
bool boolMetaData(false);
try {
- boolMetaData = (meta->*_Method)();
+ boolMetaData = (meta->*Method)();
} catch (const sql::MethodNotImplementedException &) {
mysqlc_sdbc_driver::throwFeatureNotImplementedException(_methodName, *this);
} catch (const sql::InvalidArgumentException &) {
@@ -160,12 +160,12 @@ bool ODatabaseMetaData::impl_getBoolMetaData(const sal_Char* _methodName, bool (
return boolMetaData;
}
-bool ODatabaseMetaData::impl_getBoolMetaData(const sal_Char* _methodName, bool (sql::DatabaseMetaData::*_Method)(int), sal_Int32 _arg )
+bool ODatabaseMetaData::impl_getBoolMetaData(const sal_Char* _methodName, bool (sql::DatabaseMetaData::*Method)(int), sal_Int32 _arg )
{
OSL_TRACE( "mysqlc::ODatabaseMetaData::%s", _methodName);
bool boolMetaData(false);
try {
- boolMetaData = (meta->*_Method)( _arg );
+ boolMetaData = (meta->*Method)( _arg );
} catch (const sql::MethodNotImplementedException &) {
mysqlc_sdbc_driver::throwFeatureNotImplementedException(_methodName, *this);
} catch (const sql::InvalidArgumentException &) {
@@ -176,7 +176,7 @@ bool ODatabaseMetaData::impl_getBoolMetaData(const sal_Char* _methodName, bool (
return boolMetaData;
}
-bool ODatabaseMetaData::impl_getRSTypeMetaData(const sal_Char* _methodName, bool (sql::DatabaseMetaData::*_Method)(int), sal_Int32 _resultSetType )
+bool ODatabaseMetaData::impl_getRSTypeMetaData(const sal_Char* _methodName, bool (sql::DatabaseMetaData::*Method)(int), sal_Int32 _resultSetType )
{
int resultSetType(sql::ResultSet::TYPE_FORWARD_ONLY);
switch ( _resultSetType ) {
@@ -184,7 +184,7 @@ bool ODatabaseMetaData::impl_getRSTypeMetaData(const sal_Char* _methodName, bool
case ResultSetType::SCROLL_SENSITIVE: resultSetType = sql::ResultSet::TYPE_SCROLL_SENSITIVE; break;
}
- return impl_getBoolMetaData(_methodName, _Method, resultSetType);
+ return impl_getBoolMetaData(_methodName, Method, resultSetType);
}
rtl::OUString SAL_CALL ODatabaseMetaData::getCatalogSeparator()