From 227f6998d5a66ff46123832ee6e2415382ae1e8d Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 20 Apr 2016 17:18:05 +0200 Subject: loplugin:salbool: Automatic rewrite of sal_False/True Change-Id: Ie511eeb586e8c592bc255a09eff1bcf673a29ea9 --- mysqlc/source/mysqlc_connection.cxx | 2 +- mysqlc/source/mysqlc_databasemetadata.cxx | 4 +-- mysqlc/source/mysqlc_driver.cxx | 4 +-- mysqlc/source/mysqlc_resultset.cxx | 40 +++++++++++++++--------------- mysqlc/source/mysqlc_resultsetmetadata.cxx | 16 ++++++------ mysqlc/source/mysqlc_statement.cxx | 4 +-- 6 files changed, 35 insertions(+), 35 deletions(-) (limited to 'mysqlc') diff --git a/mysqlc/source/mysqlc_connection.cxx b/mysqlc/source/mysqlc_connection.cxx index 52562870f9b4..3534ab208a36 100644 --- a/mysqlc/source/mysqlc_connection.cxx +++ b/mysqlc/source/mysqlc_connection.cxx @@ -619,7 +619,7 @@ rtl::OUString OConnection::transFormPreparedStatement(const rtl::OUString& _sSQL } if ( m_xParameterSubstitution.is() ) { try { - sSqlStatement = m_xParameterSubstitution->substituteVariables(sSqlStatement,sal_True); + sSqlStatement = m_xParameterSubstitution->substituteVariables(sSqlStatement,true); } catch(const Exception&) { } } return sSqlStatement; diff --git a/mysqlc/source/mysqlc_databasemetadata.cxx b/mysqlc/source/mysqlc_databasemetadata.cxx index af99c9192d36..5be0de8ece2e 100644 --- a/mysqlc/source/mysqlc_databasemetadata.cxx +++ b/mysqlc/source/mysqlc_databasemetadata.cxx @@ -595,7 +595,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert(sal_Int32 /* fromType */, s } catch (const sql::SQLException& e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding()); } - return sal_False; + return false; } sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy() @@ -954,7 +954,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency(sal_Int32 setT } catch (const sql::SQLException& e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_rConnection.getConnectionEncoding()); } - return sal_False; + return false; } sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible(sal_Int32 setType) diff --git a/mysqlc/source/mysqlc_driver.cxx b/mysqlc/source/mysqlc_driver.cxx index 3a31685d9c2e..0c0f44ed0281 100644 --- a/mysqlc/source/mysqlc_driver.cxx +++ b/mysqlc/source/mysqlc_driver.cxx @@ -241,14 +241,14 @@ Sequence< DriverPropertyInfo > SAL_CALL MysqlCDriver::getPropertyInfo(const rtl: aDriverInfo.push_back(DriverPropertyInfo( rtl::OUString("Hostname") ,rtl::OUString("Name of host") - ,sal_True + ,true ,rtl::OUString("localhost") ,Sequence< rtl::OUString >()) ); aDriverInfo.push_back(DriverPropertyInfo( rtl::OUString("Port") ,rtl::OUString("Port") - ,sal_True + ,true ,rtl::OUString("3306") ,Sequence< rtl::OUString >()) ); diff --git a/mysqlc/source/mysqlc_resultset.cxx b/mysqlc/source/mysqlc_resultset.cxx index 6f8236e5aba6..1d8cfc8128fc 100644 --- a/mysqlc/source/mysqlc_resultset.cxx +++ b/mysqlc/source/mysqlc_resultset.cxx @@ -193,7 +193,7 @@ sal_Bool SAL_CALL OResultSet::getBoolean(sal_Int32 column) } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } - return sal_False; + return false; } sal_Int8 SAL_CALL OResultSet::getByte(sal_Int32 column) @@ -527,7 +527,7 @@ sal_Bool SAL_CALL OResultSet::isBeforeFirst() } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } - return sal_False; //fool + return false; //fool } sal_Bool SAL_CALL OResultSet::isAfterLast() @@ -542,7 +542,7 @@ sal_Bool SAL_CALL OResultSet::isAfterLast() } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } - return sal_False; //fool + return false; //fool } sal_Bool SAL_CALL OResultSet::isFirst() @@ -557,7 +557,7 @@ sal_Bool SAL_CALL OResultSet::isFirst() } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } - return sal_False; //fool + return false; //fool } sal_Bool SAL_CALL OResultSet::isLast() @@ -572,7 +572,7 @@ sal_Bool SAL_CALL OResultSet::isLast() } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } - return sal_False; //fool + return false; //fool } void SAL_CALL OResultSet::beforeFirst() @@ -629,7 +629,7 @@ sal_Bool SAL_CALL OResultSet::first() throw(SQLException, RuntimeException, std: } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } - return sal_False; //fool + return false; //fool } sal_Bool SAL_CALL OResultSet::last() @@ -644,7 +644,7 @@ sal_Bool SAL_CALL OResultSet::last() } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } - return sal_False; //fool + return false; //fool } sal_Bool SAL_CALL OResultSet::absolute(sal_Int32 row) @@ -659,7 +659,7 @@ sal_Bool SAL_CALL OResultSet::absolute(sal_Int32 row) } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } - return sal_False; //fool + return false; //fool } sal_Bool SAL_CALL OResultSet::relative(sal_Int32 row) @@ -674,7 +674,7 @@ sal_Bool SAL_CALL OResultSet::relative(sal_Int32 row) } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } - return sal_False; //fool + return false; //fool } sal_Bool SAL_CALL OResultSet::previous() @@ -689,7 +689,7 @@ sal_Bool SAL_CALL OResultSet::previous() } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } - return sal_False; //fool + return false; //fool } Reference< XInterface > SAL_CALL OResultSet::getStatement() @@ -709,7 +709,7 @@ sal_Bool SAL_CALL OResultSet::rowDeleted() MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - return sal_False; + return false; } sal_Bool SAL_CALL OResultSet::rowInserted() @@ -719,7 +719,7 @@ sal_Bool SAL_CALL OResultSet::rowInserted() MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - return sal_False; + return false; } sal_Bool SAL_CALL OResultSet::rowUpdated() @@ -729,7 +729,7 @@ sal_Bool SAL_CALL OResultSet::rowUpdated() MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - return sal_False; + return false; } sal_Bool SAL_CALL OResultSet::next() @@ -744,7 +744,7 @@ sal_Bool SAL_CALL OResultSet::next() } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } - return sal_False; //fool + return false; //fool } sal_Bool SAL_CALL OResultSet::wasNull() @@ -759,7 +759,7 @@ sal_Bool SAL_CALL OResultSet::wasNull() } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } - return sal_False; //fool + return false; //fool } void SAL_CALL OResultSet::cancel() @@ -1045,7 +1045,7 @@ sal_Bool SAL_CALL OResultSet::moveToBookmark(const Any& /* bookmark */) MutexGuard aGuard(m_aMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); - return sal_False; + return false; } sal_Bool SAL_CALL OResultSet::moveRelativeToBookmark(const Any& /* bookmark */, sal_Int32 /* rows */) @@ -1056,7 +1056,7 @@ sal_Bool SAL_CALL OResultSet::moveRelativeToBookmark(const Any& /* bookmark */, checkDisposed(OResultSet_BASE::rBHelper.bDisposed); mysqlc_sdbc_driver::throwFeatureNotImplementedException("OResultSet::moveRelativeToBookmark", *this); - return sal_False; + return false; } sal_Int32 SAL_CALL OResultSet::compareBookmarks(const Any& /* n1 */, const Any& /* n2 */) @@ -1075,7 +1075,7 @@ sal_Bool SAL_CALL OResultSet::hasOrderedBookmarks() throw(SQLException, RuntimeException, std::exception) { OSL_TRACE("OResultSet::hasOrderedBookmarks"); - return sal_False; + return false; } sal_Int32 SAL_CALL OResultSet::hashBookmark(const Any& /* bookmark */) @@ -1141,7 +1141,7 @@ sal_Bool OResultSet::convertFastPropertyValue(Any & /* rConvertedValue */, default: ; } - return sal_False; + return false; } void OResultSet::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, const Any& /* rValue */) @@ -1168,7 +1168,7 @@ void OResultSet::getFastPropertyValue(Any& _rValue, sal_Int32 nHandle) const OSL_TRACE("OResultSet::getFastPropertyValue"); switch (nHandle) { case PROPERTY_ID_ISBOOKMARKABLE: - _rValue <<= sal_False; + _rValue <<= false; break; case PROPERTY_ID_CURSORNAME: break; diff --git a/mysqlc/source/mysqlc_resultsetmetadata.cxx b/mysqlc/source/mysqlc_resultsetmetadata.cxx index 6466910b6ab8..dba7d33d164f 100644 --- a/mysqlc/source/mysqlc_resultsetmetadata.cxx +++ b/mysqlc/source/mysqlc_resultsetmetadata.cxx @@ -96,7 +96,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive(sal_Int32 column) } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } - return sal_False; // fool compiler + return false; // fool compiler } rtl::OUString SAL_CALL OResultSetMetaData::getSchemaName(sal_Int32 column) @@ -218,7 +218,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isCurrency(sal_Int32 column) } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } - return sal_False; // fool compiler + return false; // fool compiler } sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement(sal_Int32 column) @@ -234,7 +234,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement(sal_Int32 column) } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } - return sal_False; // fool compiler + return false; // fool compiler } sal_Bool SAL_CALL OResultSetMetaData::isSigned(sal_Int32 column) @@ -250,7 +250,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isSigned(sal_Int32 column) } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } - return sal_False; // fool compiler + return false; // fool compiler } sal_Int32 SAL_CALL OResultSetMetaData::getPrecision(sal_Int32 column) @@ -313,7 +313,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isSearchable(sal_Int32 column) } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } - return sal_False; // fool compiler + return false; // fool compiler } sal_Bool SAL_CALL OResultSetMetaData::isReadOnly(sal_Int32 column) @@ -329,7 +329,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isReadOnly(sal_Int32 column) } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } - return sal_False; // fool compiler + return false; // fool compiler } sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable(sal_Int32 column) @@ -345,7 +345,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable(sal_Int32 column) } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } - return sal_False; // fool compiler + return false; // fool compiler } sal_Bool SAL_CALL OResultSetMetaData::isWritable(sal_Int32 column) @@ -361,7 +361,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isWritable(sal_Int32 column) } catch (const sql::SQLException &e) { mysqlc_sdbc_driver::translateAndThrow(e, *this, m_encoding); } - return sal_False; // fool compiler + return false; // fool compiler } void OResultSetMetaData::checkColumnIndex(sal_Int32 columnIndex) diff --git a/mysqlc/source/mysqlc_statement.cxx b/mysqlc/source/mysqlc_statement.cxx index 859f7a929a82..637b81bc7da7 100644 --- a/mysqlc/source/mysqlc_statement.cxx +++ b/mysqlc/source/mysqlc_statement.cxx @@ -279,7 +279,7 @@ sal_Bool SAL_CALL OCommonStatement::getMoreResults() // if your driver supports more than only one resultset // and has one more at this moment return true - return sal_False; + return false; } Any SAL_CALL OCommonStatement::getWarnings() @@ -377,7 +377,7 @@ void OCommonStatement::getFastPropertyValue(Any& _rValue, sal_Int32 nHandle) con case PROPERTY_ID_ESCAPEPROCESSING: break; case PROPERTY_ID_USEBOOKMARKS: - _rValue <<= sal_False; + _rValue <<= false; break; default: ; -- cgit