connectivity/source/drivers/evoab2/NTable.cxx | 20 ++++++++++---------- connectivity/source/drivers/evoab2/NTable.hxx | 10 +++++----- mysqlc/source/mysqlc_databasemetadata.cxx | 24 ++++++++++++------------ mysqlc/source/mysqlc_databasemetadata.hxx | 12 ++++++------ mysqlc/source/mysqlc_preparedstatement.cxx | 8 ++++---- sal/osl/unx/socket.cxx | 10 +++++----- vcl/inc/unx/XIM.h | 16 ++++++++-------- vcl/inc/unx/gtk/gloactiongroup.h | 8 +++----- vcl/inc/unx/gtk/glomenu.h | 2 +- vcl/unx/generic/app/saldata.cxx | 10 +++++----- vcl/unx/gtk/a11y/atkwrapper.hxx | 7 ++----- vcl/unx/gtk/gloactiongroup.cxx | 5 ++--- vcl/unx/gtk/glomenu.cxx | 2 +- vcl/unx/gtk3/gtk3gtkinst.cxx | 7 ++----- 14 files changed, 66 insertions(+), 75 deletions(-)
New commits: commit 48810db0e690ade1b4eba55ddbb302d375cc613e Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Apr 22 16:35:15 2016 +0200 Avoid reserved identifiers Change-Id: I544ccc79ac0ddc2e5800bc4bd863ff86b4ec8f6a diff --git a/vcl/inc/unx/XIM.h b/vcl/inc/unx/XIM.h index 62c127e..7c2a224d 100644 --- a/vcl/inc/unx/XIM.h +++ b/vcl/inc/unx/XIM.h @@ -30,7 +30,7 @@ typedef struct { } XIMCallback1; #endif -typedef struct _XIMAnnotation { +typedef struct { int start_position; int end_position; XPointer data; @@ -39,7 +39,7 @@ typedef struct _XIMAnnotation { /* XIMUText: XIMText extension for UTF16 */ -typedef struct _XIMUnicodeText { +typedef struct { unsigned short length; XIMFeedback *feedback; Bool encoding_is_wchar; @@ -58,7 +58,7 @@ typedef enum { XIMDrawUpVertically = 1 } XIMDrawUpDirection ; -typedef struct _XIMLookupStartCallbackStruct { +typedef struct { int choice_per_window; /* Number of choices can be display * in the region */ @@ -67,12 +67,12 @@ typedef struct _XIMLookupStartCallbackStruct { XIMDrawUpDirection draw_up_direction; } XIMLookupStartCallbackStruct; -typedef struct _XIMUnicodeChoiceObject { +typedef struct { XIMUnicodeText *label; XIMUnicodeText *value; } XIMUnicodeChoiceObject; -typedef struct _XIMLookupDrawCallbackStruct { +typedef struct { XIMUnicodeChoiceObject *choices; /* the lookup choices */ int n_choices; /* Total number of lookup choices */ int first_index; @@ -86,19 +86,19 @@ typedef enum { XIMKatakana, XIMHanzi } XIMUnicodeCharacterSubsetID; -typedef struct _XIMUncodeSubset { +typedef struct { XIMUnicodeCharacterSubsetID index; XIMUnicodeCharacterSubsetID subset_id; char *name; Bool is_active; } XIMUnicodeCharacterSubset; -typedef struct _XIMUncodeSubsets { +typedef struct { unsigned short count_subsets; XIMUnicodeCharacterSubset *supported_subsets; } XIMUnicodeCharacterSubsets; -typedef struct _XIMSwitchIMNotifyCallbackStruct { +typedef struct { XIMUnicodeCharacterSubset *from; XIMUnicodeCharacterSubset *to; } XIMSwitchIMNotifyCallbackStruct; diff --git a/vcl/inc/unx/gtk/gloactiongroup.h b/vcl/inc/unx/gtk/gloactiongroup.h index ec6bd39..4fbab01 100644 --- a/vcl/inc/unx/gtk/gloactiongroup.h +++ b/vcl/inc/unx/gtk/gloactiongroup.h @@ -21,11 +21,9 @@ G_BEGIN_DECLS #define G_IS_LO_ACTION_GROUP(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \ G_TYPE_LO_ACTION_GROUP)) -typedef struct _GLOActionGroupPrivate GLOActionGroupPrivate; -typedef struct _GLOActionGroupClass GLOActionGroupClass; -typedef struct _GLOActionGroup GLOActionGroup; +struct GLOActionGroupPrivate; -struct _GLOActionGroup +struct GLOActionGroup { /*< private >*/ GObject parent_instance; @@ -33,7 +31,7 @@ struct _GLOActionGroup GLOActionGroupPrivate *priv; }; -struct _GLOActionGroupClass +struct GLOActionGroupClass { /*< private >*/ GObjectClass parent_class; diff --git a/vcl/inc/unx/gtk/glomenu.h b/vcl/inc/unx/gtk/glomenu.h index 0e3ce64..b2ed606 100644 --- a/vcl/inc/unx/gtk/glomenu.h +++ b/vcl/inc/unx/gtk/glomenu.h @@ -25,7 +25,7 @@ G_BEGIN_DECLS #define G_IS_LO_MENU(inst) (G_TYPE_CHECK_INSTANCE_TYPE ((inst), \ G_TYPE_LO_MENU)) -typedef struct _GLOMenu GLOMenu; +struct GLOMenu; class GtkSalMenuItem; diff --git a/vcl/unx/generic/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx index 316ac56..d33af9d 100644 --- a/vcl/unx/generic/app/saldata.cxx +++ b/vcl/unx/generic/app/saldata.cxx @@ -109,8 +109,8 @@ static int XIOErrorHdl( Display * ) } -static const struct timeval noyield__ = { 0, 0 }; -static const struct timeval yield__ = { 0, 10000 }; +static const struct timeval noyield_ = { 0, 0 }; +static const struct timeval yield_ = { 0, 10000 }; static const char* XRequest[] = { // see /usr/lib/X11/XErrorDB, /usr/openwin/lib/XErrorDB ... @@ -698,7 +698,7 @@ SalXLib::Yield( bool bWait, bool bHandleAllCurrentEvents ) fd_set ExceptionFDS = aExceptionFDS_; int nFound = 0; - timeval Timeout = noyield__; + timeval Timeout = noyield_; timeval *pTimeout = &Timeout; bool bHandledEvent = false; @@ -711,10 +711,10 @@ SalXLib::Yield( bool bWait, bool bHandleAllCurrentEvents ) // determine remaining timeout. gettimeofday (&Timeout, nullptr); Timeout = m_aTimeout - Timeout; - if (yield__ >= Timeout) + if (yield_ >= Timeout) { // guard against micro timeout. - Timeout = yield__; + Timeout = yield_; } pTimeout = &Timeout; } diff --git a/vcl/unx/gtk/a11y/atkwrapper.hxx b/vcl/unx/gtk/a11y/atkwrapper.hxx index 4a023fa..e8ab83b 100644 --- a/vcl/unx/gtk/a11y/atkwrapper.hxx +++ b/vcl/unx/gtk/a11y/atkwrapper.hxx @@ -25,9 +25,6 @@ extern "C" { -typedef struct _AtkObjectWrapper AtkObjectWrapper; -typedef struct _AtkObjectWrapperClass AtkObjectWrapperClass; - namespace com { namespace sun { namespace star { namespace accessibility { class XAccessibleAction; class XAccessibleComponent; @@ -43,7 +40,7 @@ namespace com { namespace sun { namespace star { namespace accessibility { class XAccessibleValue; } } } } -struct _AtkObjectWrapper +struct AtkObjectWrapper { AtkObject aParent; @@ -70,7 +67,7 @@ struct _AtkObjectWrapper // OString * m_pKeyBindings }; -struct _AtkObjectWrapperClass +struct AtkObjectWrapperClass { AtkObjectClass aParentClass; }; diff --git a/vcl/unx/gtk/gloactiongroup.cxx b/vcl/unx/gtk/gloactiongroup.cxx index f7b7bb0..04d3a4c 100644 --- a/vcl/unx/gtk/gloactiongroup.cxx +++ b/vcl/unx/gtk/gloactiongroup.cxx @@ -23,7 +23,7 @@ #define G_LO_ACTION(inst) (G_TYPE_CHECK_INSTANCE_CAST ((inst), \ G_TYPE_LO_ACTION, GLOAction)) -struct _GLOAction +struct GLOAction { GObject parent_instance; @@ -37,7 +37,6 @@ struct _GLOAction }; typedef GObjectClass GLOActionClass; -typedef struct _GLOAction GLOAction; #ifdef __GNUC__ #pragma GCC diagnostic push @@ -98,7 +97,7 @@ g_lo_action_class_init (GLOActionClass *klass) * GLOActionGroup */ -struct _GLOActionGroupPrivate +struct GLOActionGroupPrivate { GHashTable *table; /* string -> GLOAction */ GtkSalFrame *frame; /* Frame to which GActionGroup is associated. */ diff --git a/vcl/unx/gtk/glomenu.cxx b/vcl/unx/gtk/glomenu.cxx index e8529e0..bf2b701 100644 --- a/vcl/unx/gtk/glomenu.cxx +++ b/vcl/unx/gtk/glomenu.cxx @@ -15,7 +15,7 @@ #include <unx/gtk/glomenu.h> -struct _GLOMenu +struct GLOMenu { GMenuModel parent_instance; diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx index 296c145..9c33c40 100644 --- a/vcl/unx/gtk3/gtk3gtkinst.cxx +++ b/vcl/unx/gtk3/gtk3gtkinst.cxx @@ -244,10 +244,7 @@ public: //one here for that purpose and just give it a VclGtkClipboard* member class VclGtkClipboard; -typedef struct _ClipboardOwner ClipboardOwner; -typedef struct _ClipboardOwnerClass ClipboardOwnerClass; - -struct _ClipboardOwner +struct ClipboardOwner { GObject parent_instance; @@ -255,7 +252,7 @@ struct _ClipboardOwner VclGtkClipboard* m_pThis; }; -struct _ClipboardOwnerClass +struct ClipboardOwnerClass { GObjectClass parent_class; commit ea4c7f05a5f6fa6fd4f688556f84279c3038adda Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Apr 22 16:34:50 2016 +0200 Avoid reserved identifiers Change-Id: I0164df28e2d05f4f73bd640d3ca3cc3220b57df6 diff --git a/sal/osl/unx/socket.cxx b/sal/osl/unx/socket.cxx index 49b8a25..02fb6c9 100644 --- a/sal/osl/unx/socket.cxx +++ b/sal/osl/unx/socket.cxx @@ -709,11 +709,11 @@ static struct hostent* osl_gethostbyname_r ( char *buffer, int buflen, int *h_errnop) { #if defined(LINUX) || defined(ANDROID) || defined(FREEBSD) || defined(DRAGONFLY) || defined(EMSCRIPTEN) - struct hostent *__result; /* will be the same as result */ - int __error; - __error = gethostbyname_r (name, result, buffer, buflen, - &__result, h_errnop); - return __error ? nullptr : __result ; + struct hostent *result_; /* will be the same as result */ + int e; + e = gethostbyname_r (name, result, buffer, buflen, + &result_, h_errnop); + return e ? nullptr : result_ ; #elif defined(AIX) *h_errnop = gethostbyname_r (name, result, (struct hostent_data *)buffer); (void)buflen; commit 235b1f3dfdee3e765e43105342dac69eeb8fb5fe Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Apr 22 16:34:33 2016 +0200 Avoid reserved identifiers Change-Id: Id2ef8fb53207be64d0f7342734f0d9fab832b674 diff --git a/mysqlc/source/mysqlc_databasemetadata.cxx b/mysqlc/source/mysqlc_databasemetadata.cxx index 5be0de8..b83674b 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 531ba50..0406793 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 b385292..a0d3f8f 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<INTTYPE>(nValue) ); + (_rxParam.get()->*Setter)( _parameterIndex, static_cast<INTTYPE>(nValue) ); } } commit ff5021927dbd63e9675593a6896b36b05ef40b5f Author: Stephan Bergmann <sberg...@redhat.com> Date: Fri Apr 22 16:34:08 2016 +0200 Avoid reserved identifiers Change-Id: I4654278f9a718042efde46755ee25e62494e3fb6 diff --git a/connectivity/source/drivers/evoab2/NTable.cxx b/connectivity/source/drivers/evoab2/NTable.cxx index 939bb1f..160dfd7 100644 --- a/connectivity/source/drivers/evoab2/NTable.cxx +++ b/connectivity/source/drivers/evoab2/NTable.cxx @@ -35,17 +35,17 @@ using namespace connectivity::evoab; OEvoabTable::OEvoabTable( sdbcx::OCollection* _pTables, OEvoabConnection* _pConnection, - const OUString& _Name, - const OUString& _Type, - const OUString& _Description , - const OUString& _SchemaName, - const OUString& _CatalogName + const OUString& Name, + const OUString& Type, + const OUString& Description , + const OUString& SchemaName, + const OUString& CatalogName ) : OEvoabTable_TYPEDEF(_pTables,true, - _Name, - _Type, - _Description, - _SchemaName, - _CatalogName), + Name, + Type, + Description, + SchemaName, + CatalogName), m_pConnection(_pConnection) { construct(); diff --git a/connectivity/source/drivers/evoab2/NTable.hxx b/connectivity/source/drivers/evoab2/NTable.hxx index bf3c32a..27e2c86 100644 --- a/connectivity/source/drivers/evoab2/NTable.hxx +++ b/connectivity/source/drivers/evoab2/NTable.hxx @@ -37,11 +37,11 @@ namespace connectivity public: OEvoabTable( sdbcx::OCollection* _pTables, OEvoabConnection* _pConnection, - const OUString& _Name, - const OUString& _Type, - const OUString& _Description = OUString(), - const OUString& _SchemaName = OUString(), - const OUString& _CatalogName = OUString() + const OUString& Name, + const OUString& Type, + const OUString& Description = OUString(), + const OUString& SchemaName = OUString(), + const OUString& CatalogName = OUString() ); OEvoabConnection* getConnection() { return m_pConnection;} _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits