diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-03-29 08:04:46 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-03-29 08:04:46 +0200 |
| commit | 7d67fbd94dccc6ab48045fdae6e0f2db67ae10f3 (patch) | |
| tree | 7d5e37e88e10454254d200879ad78cbe9e647d6d /ucb | |
| parent | f2c2e7a71ea653993ba1349de7b36dfe92c5c62d (diff) | |
Avoid reserved identifiers
Change-Id: I210133e82bc72dcb89da5f7700314ddcf6bee269
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/ucp/file/shell.cxx | 32 | ||||
| -rw-r--r-- | ucb/source/ucp/webdav-neon/NeonLockStore.hxx | 8 |
2 files changed, 20 insertions, 20 deletions
diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx index a05559d5cfd3..a6bdcbd2d4b5 100644 --- a/ucb/source/ucp/file/shell.cxx +++ b/ucb/source/ucp/file/shell.cxx @@ -111,8 +111,8 @@ shell::UnqPathData::~UnqPathData() delete notifier; } -shell::MyProperty::MyProperty( const OUString& __PropertyName ) - : PropertyName( __PropertyName ) +shell::MyProperty::MyProperty( const OUString& thePropertyName ) + : PropertyName( thePropertyName ) , Handle(-1) , isNative(false) , State(beans::PropertyState_AMBIGUOUS_VALUE) @@ -121,20 +121,20 @@ shell::MyProperty::MyProperty( const OUString& __Propert // empty } -shell::MyProperty::MyProperty( const bool& __isNative, - const OUString& __PropertyName, - const sal_Int32& __Handle, - const css::uno::Type& __Typ, - const css::uno::Any& __Value, - const css::beans::PropertyState& __State, - const sal_Int16& __Attributes ) - : PropertyName( __PropertyName ), - Handle( __Handle ), - isNative( __isNative ), - Typ( __Typ ), - Value( __Value ), - State( __State ), - Attributes( __Attributes ) +shell::MyProperty::MyProperty( const bool& theisNative, + const OUString& thePropertyName, + const sal_Int32& theHandle, + const css::uno::Type& theTyp, + const css::uno::Any& theValue, + const css::beans::PropertyState& theState, + const sal_Int16& theAttributes ) + : PropertyName( thePropertyName ), + Handle( theHandle ), + isNative( theisNative ), + Typ( theTyp ), + Value( theValue ), + State( theState ), + Attributes( theAttributes ) { // empty } diff --git a/ucb/source/ucp/webdav-neon/NeonLockStore.hxx b/ucb/source/ucp/webdav-neon/NeonLockStore.hxx index d231009e2f2e..8a52f1872f49 100644 --- a/ucb/source/ucp/webdav-neon/NeonLockStore.hxx +++ b/ucb/source/ucp/webdav-neon/NeonLockStore.hxx @@ -51,20 +51,20 @@ struct ltptr } }; -typedef struct _LockInfo +struct LockInfo { rtl::Reference< NeonSession > xSession; sal_Int32 nLastChanceToSendRefreshRequest; - _LockInfo() + LockInfo() : nLastChanceToSendRefreshRequest( -1 ) {} - _LockInfo( rtl::Reference< NeonSession > const & _xSession, + LockInfo( rtl::Reference< NeonSession > const & _xSession, sal_Int32 _nLastChanceToSendRefreshRequest ) : xSession( _xSession ), nLastChanceToSendRefreshRequest( _nLastChanceToSendRefreshRequest ) {} -} LockInfo; +}; typedef std::map< NeonLock *, LockInfo, ltptr > LockInfoMap; |