Avoid reserved identifiers

Change-Id: I2217920ced336189a94c0a5d1e3ac0ccd3912881

14 files changed, 97 insertions, 97 deletions

diff --git a/include/connectivity/CommonTools.hxx b/include/connectivity/CommonTools.hxx
index 55471fe83a1b..afd3e71d7d66 100644
--- a/include/connectivity/CommonTools.hxx
+++ b/include/connectivity/CommonTools.hxx
@@ -107,28 +107,28 @@ namespace connectivity
 
     typedef ORefVector< css::uno::Reference< css::beans::XPropertySet> > OSQLColumns;
 
-    // search from __first to __last the column with the name _rVal
-    // when no such column exist __last is returned
+    // search from first to last the column with the name _rVal
+    // when no such column exist last is returned
     OOO_DLLPUBLIC_DBTOOLS
-    OSQLColumns::Vector::const_iterator find(   OSQLColumns::Vector::const_iterator __first,
-                                        OSQLColumns::Vector::const_iterator __last,
+    OSQLColumns::Vector::const_iterator find(   OSQLColumns::Vector::const_iterator first,
+                                        OSQLColumns::Vector::const_iterator last,
                                         const OUString& _rVal,
                                         const ::comphelper::UStringMixEqual& _rCase);
 
-    // search from __first to __last the column with the realname _rVal
-    // when no such column exist __last is returned
+    // search from first to last the column with the realname _rVal
+    // when no such column exist last is returned
     OOO_DLLPUBLIC_DBTOOLS
-    OSQLColumns::Vector::const_iterator findRealName(   OSQLColumns::Vector::const_iterator __first,
-                                                OSQLColumns::Vector::const_iterator __last,
+    OSQLColumns::Vector::const_iterator findRealName(   OSQLColumns::Vector::const_iterator first,
+                                                OSQLColumns::Vector::const_iterator last,
                                                 const OUString& _rVal,
                                                 const ::comphelper::UStringMixEqual& _rCase);
 
     // the first two find methods are much faster than the one below
-    // search from __first to __last the column with the property _rProp equals the value _rVal
-    // when no such column exist __last is returned
+    // search from first to last the column with the property _rProp equals the value _rVal
+    // when no such column exist last is returned
     OOO_DLLPUBLIC_DBTOOLS
-    OSQLColumns::Vector::const_iterator find(   OSQLColumns::Vector::const_iterator __first,
-                                        OSQLColumns::Vector::const_iterator __last,
+    OSQLColumns::Vector::const_iterator find(   OSQLColumns::Vector::const_iterator first,
+                                        OSQLColumns::Vector::const_iterator last,
                                         const OUString& _rProp,
                                         const OUString& _rVal,
                                         const ::comphelper::UStringMixEqual& _rCase);
diff --git a/include/connectivity/PColumn.hxx b/include/connectivity/PColumn.hxx
index 3f70e607fa04..76d61eee986f 100644
--- a/include/connectivity/PColumn.hxx
+++ b/include/connectivity/PColumn.hxx
@@ -58,20 +58,20 @@ namespace connectivity
             virtual ~OParseColumn();
         public:
             OParseColumn(const css::uno::Reference< css::beans::XPropertySet>& _xColumn, bool _bCase);
-            OParseColumn(const OUString& _Name,
-                    const OUString& _TypeName,
-                    const OUString& _DefaultValue,
-                    const OUString& _Description,
-                    sal_Int32       _IsNullable,
-                    sal_Int32       _Precision,
-                    sal_Int32       _Scale,
-                    sal_Int32       _Type,
-                    bool            _IsAutoIncrement,
-                    bool            _IsCurrency,
+            OParseColumn(const OUString& Name,
+                    const OUString& TypeName,
+                    const OUString& DefaultValue,
+                    const OUString& Description,
+                    sal_Int32       IsNullable,
+                    sal_Int32       Precision,
+                    sal_Int32       Scale,
+                    sal_Int32       Type,
+                    bool            IsAutoIncrement,
+                    bool            IsCurrency,
                     bool            _bCase,
-                    const OUString& _CatalogName,
-                    const OUString& _SchemaName,
-                    const OUString& _TableName);
+                    const OUString& CatalogName,
+                    const OUString& SchemaName,
+                    const OUString& TableName);
 
             virtual void construct() override;
 
diff --git a/include/connectivity/TIndex.hxx b/include/connectivity/TIndex.hxx
index d43aa0f0cd1b..7330a718e61b 100644
--- a/include/connectivity/TIndex.hxx
+++ b/include/connectivity/TIndex.hxx
@@ -35,8 +35,8 @@ namespace connectivity
     public:
         OIndexHelper(   OTableHelper* _pTable);
         OIndexHelper(   OTableHelper* _pTable,
-                const OUString& _Name,
-                const OUString& _Catalog,
+                const OUString& Name,
+                const OUString& Catalog,
                 bool _isUnique,
                 bool _isPrimaryKeyIndex,
                 bool _isClustered
diff --git a/include/connectivity/TKey.hxx b/include/connectivity/TKey.hxx
index b5d64489e24e..a7f067a9ede9 100644
--- a/include/connectivity/TKey.hxx
+++ b/include/connectivity/TKey.hxx
@@ -35,7 +35,7 @@ namespace connectivity
     public:
         OTableKeyHelper(    OTableHelper* _pTable);
         OTableKeyHelper(    OTableHelper* _pTable
-                ,const OUString& _Name
+                ,const OUString& Name
                 ,const sdbcx::TKeyProperties& _rProps
             );
         inline OTableHelper* getTable() const { return m_pTable; }
diff --git a/include/connectivity/TTableHelper.hxx b/include/connectivity/TTableHelper.hxx
index 9fab6e60220a..2c37d370d91f 100644
--- a/include/connectivity/TTableHelper.hxx
+++ b/include/connectivity/TTableHelper.hxx
@@ -129,11 +129,11 @@ namespace connectivity
         OTableHelper(   sdbcx::OCollection* _pTables,
                         const css::uno::Reference< css::sdbc::XConnection >& _xConnection,
                         bool _bCase,
-                        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()
             );
 
         virtual css::uno::Reference< css::sdbc::XDatabaseMetaData> getMetaData() const override;
diff --git a/include/connectivity/dbexception.hxx b/include/connectivity/dbexception.hxx
index eb8bee388897..67639abcc065 100644
--- a/include/connectivity/dbexception.hxx
+++ b/include/connectivity/dbexception.hxx
@@ -231,8 +231,8 @@ OOO_DLLPUBLIC_DBTOOLS void throwFunctionNotSupportedRuntimeException(
 /** throws a function sequence (HY010) exception
 */
 OOO_DLLPUBLIC_DBTOOLS void throwFunctionSequenceException(
-        const css::uno::Reference< css::uno::XInterface >& _Context,
-        const css::uno::Any& _Next = css::uno::Any()
+        const css::uno::Reference< css::uno::XInterface >& Context,
+        const css::uno::Any& Next = css::uno::Any()
     )
     throw ( css::sdbc::SQLException );
 
@@ -240,8 +240,8 @@ OOO_DLLPUBLIC_DBTOOLS void throwFunctionSequenceException(
 /** throw a invalid index sqlexception
 */
 OOO_DLLPUBLIC_DBTOOLS void throwInvalidIndexException(
-        const css::uno::Reference< css::uno::XInterface >& _Context,
-        const css::uno::Any& _Next = css::uno::Any()
+        const css::uno::Reference< css::uno::XInterface >& Context,
+        const css::uno::Any& Next = css::uno::Any()
     )
     throw ( css::sdbc::SQLException );
 
diff --git a/include/connectivity/sdbcx/VColumn.hxx b/include/connectivity/sdbcx/VColumn.hxx
index 1a58b55ea97b..25bc310d6a2c 100644
--- a/include/connectivity/sdbcx/VColumn.hxx
+++ b/include/connectivity/sdbcx/VColumn.hxx
@@ -77,21 +77,21 @@ namespace connectivity
             virtual void    SAL_CALL release() throw() override;
 
             OColumn(    bool _bCase);
-            OColumn(    const OUString& _Name,
-                        const OUString& _TypeName,
-                        const OUString& _DefaultValue,
-                        const OUString& _Description,
-                        sal_Int32       _IsNullable,
-                        sal_Int32       _Precision,
-                        sal_Int32       _Scale,
-                        sal_Int32       _Type,
-                        bool            _IsAutoIncrement,
-                        bool            _IsRowVersion,
-                        bool            _IsCurrency,
+            OColumn(    const OUString& Name,
+                        const OUString& TypeName,
+                        const OUString& DefaultValue,
+                        const OUString& Description,
+                        sal_Int32       IsNullable,
+                        sal_Int32       Precision,
+                        sal_Int32       Scale,
+                        sal_Int32       Type,
+                        bool            IsAutoIncrement,
+                        bool            IsRowVersion,
+                        bool            IsCurrency,
                         bool            _bCase,
-                        const OUString& _CatalogName,
-                        const OUString& _SchemaName,
-                        const OUString& _TableName);
+                        const OUString& CatalogName,
+                        const OUString& SchemaName,
+                        const OUString& TableName);
 
             DECLARE_SERVICE_INFO();
             //XInterface
diff --git a/include/connectivity/sdbcx/VGroup.hxx b/include/connectivity/sdbcx/VGroup.hxx
index b800b043cda4..0fceed98af13 100644
--- a/include/connectivity/sdbcx/VGroup.hxx
+++ b/include/connectivity/sdbcx/VGroup.hxx
@@ -65,7 +65,7 @@ namespace connectivity
             virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override;
         public:
             OGroup(bool _bCase);
-            OGroup( const OUString& _Name, bool _bCase);
+            OGroup( const OUString& Name, bool _bCase);
             virtual ~OGroup();
             DECLARE_SERVICE_INFO();
 
diff --git a/include/connectivity/sdbcx/VIndex.hxx b/include/connectivity/sdbcx/VIndex.hxx
index 9018030e2741..61cc4f31269b 100644
--- a/include/connectivity/sdbcx/VIndex.hxx
+++ b/include/connectivity/sdbcx/VIndex.hxx
@@ -66,8 +66,8 @@ namespace connectivity
             virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
         public:
             OIndex(bool _bCase);
-            OIndex( const OUString& _Name,
-                    const OUString& _Catalog,
+            OIndex( const OUString& Name,
+                    const OUString& Catalog,
                     bool _isUnique,
                     bool _isPrimaryKeyIndex,
                     bool _isClustered,
diff --git a/include/connectivity/sdbcx/VIndexColumn.hxx b/include/connectivity/sdbcx/VIndexColumn.hxx
index 49ce0cbcfd33..601bcc39f2ae 100644
--- a/include/connectivity/sdbcx/VIndexColumn.hxx
+++ b/include/connectivity/sdbcx/VIndexColumn.hxx
@@ -39,21 +39,21 @@ namespace connectivity
             virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
         public:
             OIndexColumn(   bool _bCase);
-            OIndexColumn(   bool _IsAscending,
-                            const OUString& _Name,
-                            const OUString& _TypeName,
-                            const OUString& _DefaultValue,
-                            sal_Int32       _IsNullable,
-                            sal_Int32       _Precision,
-                            sal_Int32       _Scale,
-                            sal_Int32       _Type,
-                            bool            _IsAutoIncrement,
-                            bool            _IsRowVersion,
-                            bool            _IsCurrency,
+            OIndexColumn(   bool IsAscending,
+                            const OUString& Name,
+                            const OUString& TypeName,
+                            const OUString& DefaultValue,
+                            sal_Int32       IsNullable,
+                            sal_Int32       Precision,
+                            sal_Int32       Scale,
+                            sal_Int32       Type,
+                            bool            IsAutoIncrement,
+                            bool            IsRowVersion,
+                            bool            IsCurrency,
                             bool            _bCase,
-                            const OUString& _CatalogName,
-                            const OUString& _SchemaName,
-                            const OUString& _TableName);
+                            const OUString& CatalogName,
+                            const OUString& SchemaName,
+                            const OUString& TableName);
 
             virtual void construct() override;
             DECLARE_SERVICE_INFO();
diff --git a/include/connectivity/sdbcx/VKey.hxx b/include/connectivity/sdbcx/VKey.hxx
index 2ef38428b992..80962175ff62 100644
--- a/include/connectivity/sdbcx/VKey.hxx
+++ b/include/connectivity/sdbcx/VKey.hxx
@@ -45,14 +45,14 @@ namespace connectivity
             sal_Int32       m_Type;
             sal_Int32       m_UpdateRule;
             sal_Int32       m_DeleteRule;
-            KeyProperties(const OUString& _ReferencedTable,
-                          sal_Int32     _Type,
-                          sal_Int32     _UpdateRule,
-                          sal_Int32     _DeleteRule)
-                          :m_ReferencedTable(_ReferencedTable),
-                          m_Type(_Type),
-                          m_UpdateRule(_UpdateRule),
-                          m_DeleteRule(_DeleteRule)
+            KeyProperties(const OUString& ReferencedTable,
+                          sal_Int32     Type,
+                          sal_Int32     UpdateRule,
+                          sal_Int32     DeleteRule)
+                          :m_ReferencedTable(ReferencedTable),
+                          m_Type(Type),
+                          m_UpdateRule(UpdateRule),
+                          m_DeleteRule(DeleteRule)
             {}
             KeyProperties():m_Type(0),m_UpdateRule(0),m_DeleteRule(0){}
         };
@@ -79,7 +79,7 @@ namespace connectivity
             virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override;
         public:
             OKey(bool _bCase);
-            OKey(const OUString& _Name,const TKeyProperties& _rProps,bool _bCase);
+            OKey(const OUString& Name,const TKeyProperties& _rProps,bool _bCase);
 
             virtual ~OKey( );
 
diff --git a/include/connectivity/sdbcx/VKeyColumn.hxx b/include/connectivity/sdbcx/VKeyColumn.hxx
index 166778da1496..0db663491105 100644
--- a/include/connectivity/sdbcx/VKeyColumn.hxx
+++ b/include/connectivity/sdbcx/VKeyColumn.hxx
@@ -39,21 +39,21 @@ namespace connectivity
             virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override;
         public:
             OKeyColumn(bool _bCase);
-            OKeyColumn( const OUString& _ReferencedColumn,
-                            const OUString& _Name,
-                            const OUString& _TypeName,
-                            const OUString& _DefaultValue,
-                            sal_Int32       _IsNullable,
-                            sal_Int32       _Precision,
-                            sal_Int32       _Scale,
-                            sal_Int32       _Type,
-                            bool            _IsAutoIncrement,
-                            bool            _IsRowVersion,
-                            bool            _IsCurrency,
+            OKeyColumn( const OUString& ReferencedColumn,
+                            const OUString& Name,
+                            const OUString& TypeName,
+                            const OUString& DefaultValue,
+                            sal_Int32       IsNullable,
+                            sal_Int32       Precision,
+                            sal_Int32       Scale,
+                            sal_Int32       Type,
+                            bool            IsAutoIncrement,
+                            bool            IsRowVersion,
+                            bool            IsCurrency,
                             bool            _bCase,
-                            const OUString& _CatalogName,
-                            const OUString& _SchemaName,
-                            const OUString& _TableName);
+                            const OUString& CatalogName,
+                            const OUString& SchemaName,
+                            const OUString& TableName);
             // just to make it not inline
             virtual ~OKeyColumn();
 
diff --git a/include/connectivity/sdbcx/VTable.hxx b/include/connectivity/sdbcx/VTable.hxx
index ae9414e4a8b1..b855a71779ca 100644
--- a/include/connectivity/sdbcx/VTable.hxx
+++ b/include/connectivity/sdbcx/VTable.hxx
@@ -88,11 +88,11 @@ namespace connectivity
                     bool _bCase);
             OTable( OCollection*    _pTables,
                     bool _bCase,
-                    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());
 
             virtual ~OTable();
 
diff --git a/include/connectivity/sdbcx/VUser.hxx b/include/connectivity/sdbcx/VUser.hxx
index 07c0d54a8a44..b81fed64aba8 100644
--- a/include/connectivity/sdbcx/VUser.hxx
+++ b/include/connectivity/sdbcx/VUser.hxx
@@ -62,7 +62,7 @@ namespace connectivity
             virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override;
         public:
             OUser(bool _bCase);
-            OUser(const OUString& _Name,bool _bCase);
+            OUser(const OUString& Name,bool _bCase);
 
             virtual ~OUser( );