[Libreoffice-commits] core.git: 3 commits - include/jvmfwk pyuno/inc ucb/source

[Stephan Bergmann]

 include/jvmfwk/framework.hxx                 |    4 +--
 pyuno/inc/pyuno/pyuno.hxx                    |    4 +--
 ucb/source/ucp/file/shell.cxx                |   32 +++++++++++++--------------
 ucb/source/ucp/webdav-neon/NeonLockStore.hxx |    8 +++---
 4 files changed, 24 insertions(+), 24 deletions(-)

New commits:
commit ccc8aab451ba492dabe017a6f5078ac41d248fcb
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Mar 29 08:05:29 2016 +0200

    Avoid reserved identifier
    
    Change-Id: Icf8858590d0e1563acebc9d55fe6898ce7416dd5

diff --git a/pyuno/inc/pyuno/pyuno.hxx b/pyuno/inc/pyuno/pyuno.hxx
index 30a1bdb..6e3a030 100644
--- a/pyuno/inc/pyuno/pyuno.hxx
+++ b/pyuno/inc/pyuno/pyuno.hxx
@@ -68,7 +68,7 @@ extern "C" LO_DLLPUBLIC_PYUNO
 namespace pyuno
 {
 
-enum __NotNull
+enum NotNull
 {
     /** definition of a no acquire enum for ctors
      */
@@ -95,7 +95,7 @@ public:
 
     PyRef( PyObject * p, __sal_NoAcquire ) : m( p ) {}
 
-    PyRef( PyObject * p, __sal_NoAcquire, __NotNull ) : m( p )
+    PyRef( PyObject * p, __sal_NoAcquire, NotNull ) : m( p )
     {
         if (!m)
             throw std::bad_alloc();
commit 7d67fbd94dccc6ab48045fdae6e0f2db67ae10f3
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Mar 29 08:04:46 2016 +0200

    Avoid reserved identifiers
    
    Change-Id: I210133e82bc72dcb89da5f7700314ddcf6bee269

diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx
index a05559d..a6bdcbd 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 d231009..8a52f18 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;
 
commit f2c2e7a71ea653993ba1349de7b36dfe92c5c62d
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Mar 29 08:04:38 2016 +0200

    Avoid reserved identifier
    
    Change-Id: I77c80c1aec96d520d1c0a3d95a2b91d3bccb3fff

diff --git a/include/jvmfwk/framework.hxx b/include/jvmfwk/framework.hxx
index 9a3b884..3edaaa5 100644
--- a/include/jvmfwk/framework.hxx
+++ b/include/jvmfwk/framework.hxx
@@ -185,7 +185,7 @@
 
 /** error codes which are returned by functions of this API.
  */
-typedef enum _javaFrameworkError
+enum javaFrameworkError
 {
     JFW_E_NONE,
     JFW_E_ERROR,
@@ -201,7 +201,7 @@ typedef enum _javaFrameworkError
     JFW_E_VM_CREATION_FAILED,
     JFW_E_CONFIGURATION,
     JFW_E_DIRECT_MODE
-} javaFrameworkError;
+};
 
 /** an instance of this struct represents an installation of a Java
     Runtime Environment (JRE).