From 235b1f3dfdee3e765e43105342dac69eeb8fb5fe Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 22 Apr 2016 16:34:33 +0200 Subject: Avoid reserved identifiers Change-Id: Id2ef8fb53207be64d0f7342734f0d9fab832b674 --- mysqlc/source/mysqlc_databasemetadata.cxx | 24 ++++++++++++------------ mysqlc/source/mysqlc_databasemetadata.hxx | 12 ++++++------ mysqlc/source/mysqlc_preparedstatement.cxx | 8 ++++---- 3 files changed, 22 insertions(+), 22 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() diff --git a/mysqlc/source/mysqlc_databasemetadata.hxx b/mysqlc/source/mysqlc_databasemetadata.hxx index 531ba50ff283..0406793732fe 100644 --- a/mysqlc/source/mysqlc_databasemetadata.hxx +++ b/mysqlc/source/mysqlc_databasemetadata.hxx @@ -49,12 +49,12 @@ namespace connectivity bool identifier_quote_string_set; private: - rtl::OUString impl_getStringMetaData( const sal_Char* _methodName, const sql::SQLString& (sql::DatabaseMetaData::*_Method)() ); - rtl::OUString impl_getStringMetaData( const sal_Char* _methodName, sql::SQLString (sql::DatabaseMetaData::*_Method)() ); - sal_Int32 impl_getInt32MetaData( const sal_Char* _methodName, unsigned int (sql::DatabaseMetaData::*_Method)() ); - bool impl_getBoolMetaData( const sal_Char* _methodName, bool (sql::DatabaseMetaData::*_Method)() ); - bool impl_getBoolMetaData( const sal_Char* _methodName, bool (sql::DatabaseMetaData::*_Method)(int), sal_Int32 _arg ); - bool impl_getRSTypeMetaData( const sal_Char* _methodName, bool (sql::DatabaseMetaData::*_Method)(int), sal_Int32 _resultSetType ); + rtl::OUString impl_getStringMetaData( const sal_Char* _methodName, const sql::SQLString& (sql::DatabaseMetaData::*Method)() ); + rtl::OUString impl_getStringMetaData( const sal_Char* _methodName, sql::SQLString (sql::DatabaseMetaData::*Method)() ); + sal_Int32 impl_getInt32MetaData( const sal_Char* _methodName, unsigned int (sql::DatabaseMetaData::*Method)() ); + bool impl_getBoolMetaData( const sal_Char* _methodName, bool (sql::DatabaseMetaData::*Method)() ); + bool impl_getBoolMetaData( const sal_Char* _methodName, bool (sql::DatabaseMetaData::*Method)(int), sal_Int32 _arg ); + bool impl_getRSTypeMetaData( const sal_Char* _methodName, bool (sql::DatabaseMetaData::*Method)(int), sal_Int32 _resultSetType ); public: inline const OConnection& getOwnConnection() const { return m_rConnection; } diff --git a/mysqlc/source/mysqlc_preparedstatement.cxx b/mysqlc/source/mysqlc_preparedstatement.cxx index b38529293bf9..a0d3f8ff5625 100644 --- a/mysqlc/source/mysqlc_preparedstatement.cxx +++ b/mysqlc/source/mysqlc_preparedstatement.cxx @@ -514,12 +514,12 @@ namespace { template < class COMPLEXTYPE > bool impl_setObject( const Reference< XParameters >& _rxParam, sal_Int32 _parameterIndex, const Any& _value, - void ( SAL_CALL XParameters::*_Setter )( sal_Int32, const COMPLEXTYPE& ), bool _throwIfNotExtractable ) + void ( SAL_CALL XParameters::*Setter )( sal_Int32, const COMPLEXTYPE& ), bool _throwIfNotExtractable ) { COMPLEXTYPE aValue; if ( _value >>= aValue ) { - (_rxParam.get()->*_Setter)( _parameterIndex, aValue ); + (_rxParam.get()->*Setter)( _parameterIndex, aValue ); return true; } @@ -530,12 +530,12 @@ namespace template < class INTTYPE > void impl_setObject( const Reference< XParameters >& _rxParam, sal_Int32 _parameterIndex, const Any& _value, - void ( SAL_CALL XParameters::*_Setter )( sal_Int32, INTTYPE ) ) + void ( SAL_CALL XParameters::*Setter )( sal_Int32, INTTYPE ) ) { sal_Int32 nValue(0); if ( !( _value >>= nValue ) ) mysqlc_sdbc_driver::throwInvalidArgumentException( "OPreparedStatement::setObjectWithInfo", _rxParam ); - (_rxParam.get()->*_Setter)( _parameterIndex, static_cast(nValue) ); + (_rxParam.get()->*Setter)( _parameterIndex, static_cast(nValue) ); } } -- cgit v1.2.3