From 2c1b7e8d6a7fa22cb91919238418816671c3a497 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 19 Oct 2018 08:12:17 +0200 Subject: clang-tidy readability-container-size-empty Change-Id: I1df70b7dff5ebb6048f7fc618789faa15ca5d422 Reviewed-on: https://gerrit.libreoffice.org/61967 Tested-by: Jenkins Reviewed-by: Noel Grandin --- .../FDatabaseMetaDataResultSetMetaData.cxx | 26 +++++++++++----------- .../source/commontools/RowFunctionParser.cxx | 2 +- connectivity/source/commontools/TTableHelper.cxx | 2 +- connectivity/source/commontools/parameters.cxx | 2 +- .../source/drivers/mork/MPreparedStatement.cxx | 2 +- connectivity/source/drivers/mork/MorkParser.cxx | 4 ++-- connectivity/source/drivers/odbc/OResultSet.cxx | 2 +- .../source/drivers/postgresql/pq_statement.cxx | 6 ++--- .../drivers/postgresql/pq_updateableresultset.cxx | 2 +- connectivity/source/sdbcx/VCollection.cxx | 2 +- 10 files changed, 25 insertions(+), 25 deletions(-) (limited to 'connectivity/source') diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx index 3a034b45d9a3..3b17ce8f54c9 100644 --- a/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx +++ b/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx @@ -36,7 +36,7 @@ ODatabaseMetaDataResultSetMetaData::~ODatabaseMetaDataResultSetMetaData() sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) { - if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) + if(!m_mColumns.empty() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.getColumnDisplaySize(); return 0; @@ -44,7 +44,7 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnDisplaySize( sal sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnType( sal_Int32 column ) { - if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) + if(!m_mColumns.empty() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.getColumnType(); return 1; } @@ -56,7 +56,7 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnCount( ) sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCaseSensitive( sal_Int32 column ) { - if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) + if(!m_mColumns.empty() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.isCaseSensitive(); return true; } @@ -68,14 +68,14 @@ OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getSchemaName( sal_Int32 / OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnName( sal_Int32 column ) { - if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) + if(!m_mColumns.empty() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.getColumnName(); return OUString(); } OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getTableName( sal_Int32 column ) { - if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) + if(!m_mColumns.empty() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.getTableName(); return OUString(); } @@ -92,7 +92,7 @@ OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnTypeName( sal_Int OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnLabel( sal_Int32 column ) { - if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) + if(!m_mColumns.empty() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.getColumnLabel(); return getColumnName(column); } @@ -104,35 +104,35 @@ OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnServiceName( sal_ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCurrency( sal_Int32 column ) { - if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) + if(!m_mColumns.empty() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.isCurrency(); return false; } sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isAutoIncrement( sal_Int32 column ) { - if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) + if(!m_mColumns.empty() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.isAutoIncrement(); return false; } sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isSigned( sal_Int32 column ) { - if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) + if(!m_mColumns.empty() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.isSigned(); return false; } sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getPrecision( sal_Int32 column ) { - if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) + if(!m_mColumns.empty() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.getPrecision(); return 0; } sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getScale( sal_Int32 column ) { - if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) + if(!m_mColumns.empty() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.getScale(); return 0; @@ -140,7 +140,7 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getScale( sal_Int32 colum sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::isNullable( sal_Int32 column ) { - if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) + if(!m_mColumns.empty() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.isNullable(); return sal_Int32(false); @@ -148,7 +148,7 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::isNullable( sal_Int32 col sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isSearchable( sal_Int32 column ) { - if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) + if(!m_mColumns.empty() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.isSearchable(); return true; } diff --git a/connectivity/source/commontools/RowFunctionParser.cxx b/connectivity/source/commontools/RowFunctionParser.cxx index f5942c8f7b0f..0bf991deabd1 100644 --- a/connectivity/source/commontools/RowFunctionParser.cxx +++ b/connectivity/source/commontools/RowFunctionParser.cxx @@ -253,7 +253,7 @@ public: ParserContext::OperandStack& rNodeStack( mpContext->maOperandStack ); - if( rNodeStack.size() < 1 ) + if( rNodeStack.empty() ) throw ParseError( "Not enough arguments for unary operator" ); // retrieve arguments diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx index 7b9bb2e52984..a52bb4e97642 100644 --- a/connectivity/source/commontools/TTableHelper.cxx +++ b/connectivity/source/commontools/TTableHelper.cxx @@ -348,7 +348,7 @@ void OTableHelper::refreshPrimaryKeys(::std::vector< OUString>& _rNames) if(bAlreadyFetched) { SAL_WARN_IF(aPkName.isEmpty(),"connectivity.commontools", "empty Primary Key name"); - SAL_WARN_IF(pKeyProps->m_aKeyColumnNames.size() == 0,"connectivity.commontools", "Primary Key has no columns"); + SAL_WARN_IF(pKeyProps->m_aKeyColumnNames.empty(),"connectivity.commontools", "Primary Key has no columns"); m_pImpl->m_aKeys.emplace(aPkName,pKeyProps); _rNames.push_back(aPkName); } diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx index e1184f3d69ee..ffa43f04644a 100644 --- a/connectivity/source/commontools/parameters.cxx +++ b/connectivity/source/commontools/parameters.cxx @@ -735,7 +735,7 @@ namespace dbtools // fill the parameters from the master-detail relationship Reference< XNameAccess > xParentColumns; - if ( getParentColumns( xParentColumns, false ) && xParentColumns->hasElements() && m_aMasterFields.size() ) + if ( getParentColumns( xParentColumns, false ) && xParentColumns->hasElements() && !m_aMasterFields.empty() ) fillLinkedParameters( xParentColumns ); // let the user (via the interaction handler) fill all remaining parameters diff --git a/connectivity/source/drivers/mork/MPreparedStatement.cxx b/connectivity/source/drivers/mork/MPreparedStatement.cxx index 442dc9060822..b252a02b070b 100644 --- a/connectivity/source/drivers/mork/MPreparedStatement.cxx +++ b/connectivity/source/drivers/mork/MPreparedStatement.cxx @@ -436,7 +436,7 @@ void OPreparedStatement::describeParameter() { m_xParamColumns = new OSQLColumns(); const OSQLTables& rTabs = m_pSQLIterator->getTables(); - if(rTabs.size()) + if(!rTabs.empty()) { OSQLTable xTable = rTabs.begin()->second; for (auto const& parseNode : aParseNodes) diff --git a/connectivity/source/drivers/mork/MorkParser.cxx b/connectivity/source/drivers/mork/MorkParser.cxx index 0b31c3e0e4cc..989455c37593 100644 --- a/connectivity/source/drivers/mork/MorkParser.cxx +++ b/connectivity/source/drivers/mork/MorkParser.cxx @@ -324,7 +324,7 @@ bool MorkParser::parseCell() if ( NP::Rows != nowParsing_ ) { // Dicts - if ( "" != Text ) + if ( !Text.empty() ) { if ( nowParsing_ == NP::Columns ) { @@ -338,7 +338,7 @@ bool MorkParser::parseCell() } else { - if ( "" != Text ) + if ( !Text.empty() ) { // Rows //int ValueId = string( Text.c_str() ).toInt( 0, 16 ); diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx index a35a52182760..ec48bf8db798 100644 --- a/connectivity/source/drivers/odbc/OResultSet.cxx +++ b/connectivity/source/drivers/odbc/OResultSet.cxx @@ -190,7 +190,7 @@ SQLRETURN OResultSet::unbind(bool _bUnbindHandle) if ( _bUnbindHandle ) nRet = N3SQLFreeStmt(m_aStatementHandle,SQL_UNBIND); - if ( m_aBindVector.size() > 0 ) + if ( !m_aBindVector.empty() ) { TVoidVector::iterator pValue = m_aBindVector.begin(); TVoidVector::const_iterator pEnd = m_aBindVector.end(); diff --git a/connectivity/source/drivers/postgresql/pq_statement.cxx b/connectivity/source/drivers/postgresql/pq_statement.cxx index d22e2b7a0433..17276c94925f 100644 --- a/connectivity/source/drivers/postgresql/pq_statement.cxx +++ b/connectivity/source/drivers/postgresql/pq_statement.cxx @@ -389,7 +389,7 @@ static std::vector< OUString > lookupKeys( // printf( "\n" ); } } - if( ! ret.size() ) + if( ret.empty() ) { if (isLog(pSettings, LogLevel::Info)) { @@ -498,7 +498,7 @@ bool executePostgresCommand( const OString & cmd, struct CommandData *data ) } } - if( sourceTableKeys.size() && i == static_cast(sourceTableKeys.size()) ) + if( !sourceTableKeys.empty() && i == static_cast(sourceTableKeys.size()) ) { *(data->pLastResultset) = UpdateableResultSet::createFromPGResultSet( @@ -514,7 +514,7 @@ bool executePostgresCommand( const OString & cmd, struct CommandData *data ) buf.append( "." ); aReason = buf.makeStringAndClear(); } - else if( sourceTableKeys.size() ) + else if( !sourceTableKeys.empty() ) { OStringBuffer buf( 128 ); buf.append( "can't support updateable resultset for table " ); diff --git a/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx b/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx index 0d503693f5b3..fa4b8b5c1de8 100644 --- a/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx +++ b/connectivity/source/drivers/postgresql/pq_updateableresultset.cxx @@ -164,7 +164,7 @@ css::uno::Sequence< sal_Int8> UpdateableResultSet::getImplementationId() OUString UpdateableResultSet::buildWhereClause() { OUString ret; - if( m_primaryKey.size() ) + if( !m_primaryKey.empty() ) { OUStringBuffer buf( 128 ); buf.append( " WHERE " ); diff --git a/connectivity/source/sdbcx/VCollection.cxx b/connectivity/source/sdbcx/VCollection.cxx index 70f15dc4bd9d..f620f5ebdf50 100644 --- a/connectivity/source/sdbcx/VCollection.cxx +++ b/connectivity/source/sdbcx/VCollection.cxx @@ -104,7 +104,7 @@ namespace virtual void reFill(const ::std::vector< OUString> &_rVector) override { - OSL_ENSURE(!m_aNameMap.size(),"OCollection::reFill: collection isn't empty"); + OSL_ENSURE(m_aNameMap.empty(),"OCollection::reFill: collection isn't empty"); m_aElements.reserve(_rVector.size()); for (auto const& elem : _rVector) -- cgit