diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-01-23 15:16:37 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-01-31 09:34:46 +0100 |
commit | 84b396a235671ea77f1a9fa0d131cb56d7662737 (patch) | |
tree | 13d9de3d2b31424e785780864e084bd2d9315ff1 /connectivity | |
parent | c81d766dd4ff7d8b580b7fdc79db6e68c5f14204 (diff) |
new loplugin:namespaceindentation
check indentation of braces in namespace decls,
and the comments that often appear with them.
This is my penance for messing up the indentation with
clang-tidy-modernize-namespaces.
As such I have limited it to new-style namespaces for now,
and the check is off by default.
Change-Id: I4db7f10a81c79bc0eece8f8e3ee564da8bc7f168
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87723
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'connectivity')
16 files changed, 26 insertions, 28 deletions
diff --git a/connectivity/source/commontools/paramwrapper.cxx b/connectivity/source/commontools/paramwrapper.cxx index e56cf9e24f01..d0d36cdadbf9 100644 --- a/connectivity/source/commontools/paramwrapper.cxx +++ b/connectivity/source/commontools/paramwrapper.cxx @@ -347,7 +347,7 @@ namespace dbtools::param } -} // namespace dbtools::param +} // namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx index 6045b0f3123c..a5efdd2a0e6a 100644 --- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx +++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx @@ -45,7 +45,7 @@ namespace } namespace connectivity::evoab - { +{ static sal_Int32 const s_nCOLUMN_SIZE = 256; static sal_Int32 const s_nDECIMAL_DIGITS = 0; static sal_Int32 const s_nNULLABLE = 1; @@ -236,7 +236,7 @@ namespace connectivity::evoab } - } +} OEvoabDatabaseMetaData::OEvoabDatabaseMetaData(OEvoabConnection* _pCon) diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx index a3fd14970b22..daacdbf7aac8 100644 --- a/connectivity/source/drivers/file/FStatement.cxx +++ b/connectivity/source/drivers/file/FStatement.cxx @@ -39,7 +39,7 @@ #include <algorithm> namespace connectivity::file - { +{ using namespace dbtools; @@ -704,7 +704,7 @@ void OStatement_Base::parseParamterElem(const OUString& /*_sColumnName*/,OSQLPar // do nothing here } - }// namespace connectivity +}// namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/firebird/Driver.cxx b/connectivity/source/drivers/firebird/Driver.cxx index 823c76ef3f6e..aa6f0d9d5c57 100644 --- a/connectivity/source/drivers/firebird/Driver.cxx +++ b/connectivity/source/drivers/firebird/Driver.cxx @@ -45,14 +45,14 @@ using namespace ::osl; using namespace connectivity::firebird; namespace connectivity::firebird - { +{ Reference< XInterface > FirebirdDriver_CreateInstance( const Reference< XMultiServiceFactory >& _rxFactory) { SAL_INFO("connectivity.firebird", "FirebirdDriver_CreateInstance()" ); return *(new FirebirdDriver(comphelper::getComponentContext(_rxFactory))); } - } +} // Static const variables namespace { @@ -228,7 +228,7 @@ uno::Reference< XTablesSupplier > SAL_CALL FirebirdDriver::getDataDefinitionByUR } namespace connectivity::firebird - { +{ void checkDisposed(bool _bThrow) { if (_bThrow) @@ -236,7 +236,7 @@ namespace connectivity::firebird } - } // namespace connectivity +} // namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/connectivity/source/drivers/hsqldb/HStorageMap.cxx index 0d49ce333575..598ef060bc4c 100644 --- a/connectivity/source/drivers/hsqldb/HStorageMap.cxx +++ b/connectivity/source/drivers/hsqldb/HStorageMap.cxx @@ -29,7 +29,7 @@ #include <algorithm> namespace connectivity::hsqldb - { +{ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; @@ -354,8 +354,7 @@ namespace connectivity::hsqldb env->ThrowNew(env->FindClass("java/io/IOException"), cstr.getStr()); } - } -// namespace connectivity +} // namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx index 4ecf06640096..7858230b07f6 100644 --- a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx +++ b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx @@ -25,12 +25,12 @@ using namespace com::sun::star::sdbc; namespace connectivity::mork - { +{ static sal_Int32 const s_nCOLUMN_SIZE = 256; static sal_Int32 const s_nDECIMAL_DIGITS = 0; static sal_Int32 const s_nNULLABLE = 1; static sal_Int32 const s_nCHAR_OCTET_LENGTH = 65535; - } +} ODatabaseMetaData::ODatabaseMetaData(OConnection* _pCon) : ::connectivity::ODatabaseMetaDataBase(_pCon,_pCon->getConnectionInfo()) diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx index ab9f370989e0..4dd9110a6f0f 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx @@ -23,7 +23,7 @@ #include "MNSINIParser.hxx" namespace connectivity::mozab - { +{ ProfileStruct::ProfileStruct() { } @@ -203,7 +203,7 @@ namespace connectivity::mozab ProductStruct &rProduct = m_ProductProfileList[index]; return rProduct.mProfileList.find(profileName) != rProduct.mProfileList.end(); } - } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/mysqlc/mysqlc_driver.cxx b/connectivity/source/drivers/mysqlc/mysqlc_driver.cxx index d58ac07d55ca..c7c88d03ebe6 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_driver.cxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_driver.cxx @@ -134,7 +134,6 @@ void checkDisposed(bool _bThrow) throw DisposedException(); } } - -} /* connectivity */ +} /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/connectivity/source/drivers/odbc/ORealDriver.cxx b/connectivity/source/drivers/odbc/ORealDriver.cxx index f6432dbf57cf..47576954a8f2 100644 --- a/connectivity/source/drivers/odbc/ORealDriver.cxx +++ b/connectivity/source/drivers/odbc/ORealDriver.cxx @@ -23,7 +23,7 @@ #include <odbc/OFunctions.hxx> namespace connectivity::odbc - { +{ namespace { class ORealOdbcDriver : public ODBCDriver @@ -287,6 +287,6 @@ SQLHANDLE ORealOdbcDriver::EnvironmentHandle(OUString &_rPath) } - } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/writer/WCatalog.cxx b/connectivity/source/drivers/writer/WCatalog.cxx index 5f9ba6b36f75..8671af7bd5d9 100644 --- a/connectivity/source/drivers/writer/WCatalog.cxx +++ b/connectivity/source/drivers/writer/WCatalog.cxx @@ -55,6 +55,6 @@ void OWriterCatalog::refreshTables() m_pTables = std::make_unique<OWriterTables>(m_xMetaData, *this, m_aMutex, aVector); } -} // namespace connectivity +} // namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/writer/WConnection.cxx b/connectivity/source/drivers/writer/WConnection.cxx index 7940d231bbf7..c4cc699e4ad2 100644 --- a/connectivity/source/drivers/writer/WConnection.cxx +++ b/connectivity/source/drivers/writer/WConnection.cxx @@ -243,6 +243,6 @@ uno::Reference<sdbc::XPreparedStatement> return nullptr; } -} // namespace connectivity +} // namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/writer/WDatabaseMetaData.cxx b/connectivity/source/drivers/writer/WDatabaseMetaData.cxx index 32bec31e5ec4..0c2e7129ed5c 100644 --- a/connectivity/source/drivers/writer/WDatabaseMetaData.cxx +++ b/connectivity/source/drivers/writer/WDatabaseMetaData.cxx @@ -106,6 +106,6 @@ uno::Reference<sdbc::XResultSet> SAL_CALL OWriterDatabaseMetaData::getTables( return xRef; } -} // namespace connectivity +} // namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/writer/WDriver.cxx b/connectivity/source/drivers/writer/WDriver.cxx index fd285ff9bff2..63dc1f3f483d 100644 --- a/connectivity/source/drivers/writer/WDriver.cxx +++ b/connectivity/source/drivers/writer/WDriver.cxx @@ -75,6 +75,6 @@ ODriver::getPropertyInfo(const OUString& url, const uno::Sequence<beans::Propert return uno::Sequence<sdbc::DriverPropertyInfo>(); } -} // namespace connectivity +} // namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/writer/WTable.cxx b/connectivity/source/drivers/writer/WTable.cxx index 1c0b5d501699..118a098f9619 100644 --- a/connectivity/source/drivers/writer/WTable.cxx +++ b/connectivity/source/drivers/writer/WTable.cxx @@ -251,6 +251,6 @@ bool OWriterTable::fetchRow(OValueRefRow& _rRow, const OSQLColumns& _rCols, bool return true; } -} // namespace connectivity +} // namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/writer/WTables.cxx b/connectivity/source/drivers/writer/WTables.cxx index bfbe6f82c134..15dc9e0c1941 100644 --- a/connectivity/source/drivers/writer/WTables.cxx +++ b/connectivity/source/drivers/writer/WTables.cxx @@ -40,6 +40,6 @@ sdbcx::ObjectType OWriterTables::createObject(const OUString& rName) return xRet; } -} // namespace connectivity +} // namespace /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/sdbcx/VDescriptor.cxx b/connectivity/source/sdbcx/VDescriptor.cxx index a8c409f6081f..8a32a1b58b39 100644 --- a/connectivity/source/sdbcx/VDescriptor.cxx +++ b/connectivity/source/sdbcx/VDescriptor.cxx @@ -26,7 +26,7 @@ #include <algorithm> namespace connectivity::sdbcx - { +{ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; @@ -122,7 +122,7 @@ namespace connectivity::sdbcx return aTypes.getTypes(); } - } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |