[Libreoffice-commits] core.git: connectivity/source include/connectivity
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Thu Aug 22 07:35:56 UTC 2019
connectivity/source/drivers/dbase/DIndex.cxx | 2 +-
connectivity/source/drivers/evoab2/NConnection.hxx | 2 +-
connectivity/source/drivers/evoab2/NStatement.cxx | 2 +-
connectivity/source/drivers/evoab2/NStatement.hxx | 2 +-
connectivity/source/drivers/flat/ETable.cxx | 2 +-
connectivity/source/drivers/hsqldb/HTable.cxx | 2 +-
connectivity/source/drivers/mork/MConnection.hxx | 2 +-
connectivity/source/drivers/mork/MDriver.hxx | 4 ++--
connectivity/source/drivers/mysql_jdbc/YTable.cxx | 2 +-
connectivity/source/inc/dbase/DIndex.hxx | 4 ++--
connectivity/source/inc/dbase/dindexnode.hxx | 8 ++++----
connectivity/source/inc/file/FTable.hxx | 2 +-
connectivity/source/inc/flat/ETable.hxx | 2 +-
connectivity/source/inc/hsqldb/HTable.hxx | 2 +-
connectivity/source/inc/mysql/YTable.hxx | 2 +-
connectivity/source/inc/odbc/OBoundParam.hxx | 4 ++--
include/connectivity/paramwrapper.hxx | 2 +-
17 files changed, 23 insertions(+), 23 deletions(-)
New commits:
commit b1dc8e2379b53c3d57283d43655cf4d51d586ec0
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Wed Aug 21 20:21:35 2019 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Thu Aug 22 09:35:02 2019 +0200
loplugin:constmethod in connectivity
Change-Id: Idd81089279b23d93276107d84446c77e49d42b77
Reviewed-on: https://gerrit.libreoffice.org/77933
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx
index f9ad5295a088..23a5d28f9fd9 100644
--- a/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/connectivity/source/drivers/dbase/DIndex.cxx
@@ -379,7 +379,7 @@ SvStream& connectivity::dbase::WriteODbaseIndex(SvStream &rStream, ODbaseIndex&
return rStream;
}
-OUString ODbaseIndex::getCompletePath()
+OUString ODbaseIndex::getCompletePath() const
{
OUString sDir = m_pTable->getConnection()->getURL() +
OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_DELIMITER) +
diff --git a/connectivity/source/drivers/evoab2/NConnection.hxx b/connectivity/source/drivers/evoab2/NConnection.hxx
index 9ece2b65b280..2b2737927b53 100644
--- a/connectivity/source/drivers/evoab2/NConnection.hxx
+++ b/connectivity/source/drivers/evoab2/NConnection.hxx
@@ -64,7 +64,7 @@ namespace connectivity
/// @throws css::sdbc::SQLException
void construct(const OUString& _rUrl,const css::uno::Sequence< css::beans::PropertyValue >& _rInfo );
- OString const & getPassword() { return m_aPassword; }
+ OString const & getPassword() const { return m_aPassword; }
void setPassword( OString const & aStr ) { m_aPassword = aStr; }
// own methods
const OEvoabDriver& getDriver() const { return m_rDriver; }
diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx
index ab44ad948a2f..8f6d7959f222 100644
--- a/connectivity/source/drivers/evoab2/NStatement.cxx
+++ b/connectivity/source/drivers/evoab2/NStatement.cxx
@@ -401,7 +401,7 @@ EBookQuery *OCommonStatement::whereAnalysis( const OSQLParseNode* parseTree )
return pResult;
}
-OUString OCommonStatement::getTableName()
+OUString OCommonStatement::getTableName() const
{
OUString aTableName;
diff --git a/connectivity/source/drivers/evoab2/NStatement.hxx b/connectivity/source/drivers/evoab2/NStatement.hxx
index a2f918af0b9b..a36e524af5c2 100644
--- a/connectivity/source/drivers/evoab2/NStatement.hxx
+++ b/connectivity/source/drivers/evoab2/NStatement.hxx
@@ -185,7 +185,7 @@ namespace connectivity
void parseSql( const OUString& sql, QueryData& _out_rQueryData );
EBookQuery *whereAnalysis( const OSQLParseNode* parseTree );
void orderByAnalysis( const OSQLParseNode* _pOrderByClause, SortDescriptor& _out_rSort );
- OUString getTableName();
+ OUString getTableName() const;
public:
diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx
index ff753ce484eb..b535c35ae627 100644
--- a/connectivity/source/drivers/flat/ETable.cxx
+++ b/connectivity/source/drivers/flat/ETable.cxx
@@ -449,7 +449,7 @@ void OFlatTable::construct()
}
}
-OUString OFlatTable::getEntry()
+OUString OFlatTable::getEntry() const
{
OUString sURL;
try
diff --git a/connectivity/source/drivers/hsqldb/HTable.cxx b/connectivity/source/drivers/hsqldb/HTable.cxx
index ec73225d3abd..b7a841a76ff4 100644
--- a/connectivity/source/drivers/hsqldb/HTable.cxx
+++ b/connectivity/source/drivers/hsqldb/HTable.cxx
@@ -301,7 +301,7 @@ void OHSQLTable::dropDefaultValue(const OUString& _rColName)
executeStatement(sSql);
}
-OUString OHSQLTable::getAlterTableColumnPart()
+OUString OHSQLTable::getAlterTableColumnPart() const
{
OUString sSql( "ALTER TABLE " );
diff --git a/connectivity/source/drivers/mork/MConnection.hxx b/connectivity/source/drivers/mork/MConnection.hxx
index c512e12316d1..0bcb936bd06b 100644
--- a/connectivity/source/drivers/mork/MConnection.hxx
+++ b/connectivity/source/drivers/mork/MConnection.hxx
@@ -47,7 +47,7 @@ namespace connectivity
explicit OConnection(MorkDriver* const driver);
virtual ~OConnection() override;
- const rtl::Reference<MorkDriver>& getDriver() {return m_xDriver;};
+ const rtl::Reference<MorkDriver>& getDriver() const {return m_xDriver;};
MorkParser* getMorkParser(const OString& t) {return t == "CollectedAddressBook" ? m_pHistory.get() : m_pBook.get();};
// OComponentHelper
diff --git a/connectivity/source/drivers/mork/MDriver.hxx b/connectivity/source/drivers/mork/MDriver.hxx
index 7d598f26ab04..3d644bbbc805 100644
--- a/connectivity/source/drivers/mork/MDriver.hxx
+++ b/connectivity/source/drivers/mork/MDriver.hxx
@@ -35,8 +35,8 @@ class MorkDriver:
public:
explicit MorkDriver(const css::uno::Reference< css::uno::XComponentContext >& context);
- const css::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& getFactory(){return m_xFactory;}
- const OUString& getProfilePath() {return m_sProfilePath;}
+ const css::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& getFactory() const {return m_xFactory;}
+ const OUString& getProfilePath() const {return m_sProfilePath;}
private:
MorkDriver(const MorkDriver&) = delete;
diff --git a/connectivity/source/drivers/mysql_jdbc/YTable.cxx b/connectivity/source/drivers/mysql_jdbc/YTable.cxx
index b3bd6c15a98b..a3f303982839 100644
--- a/connectivity/source/drivers/mysql_jdbc/YTable.cxx
+++ b/connectivity/source/drivers/mysql_jdbc/YTable.cxx
@@ -306,7 +306,7 @@ void OMySQLTable::dropDefaultValue(const OUString& _rColName)
executeStatement(sSql);
}
-OUString OMySQLTable::getAlterTableColumnPart()
+OUString OMySQLTable::getAlterTableColumnPart() const
{
OUString sSql("ALTER TABLE ");
diff --git a/connectivity/source/inc/dbase/DIndex.hxx b/connectivity/source/inc/dbase/DIndex.hxx
index e1452967e130..d4a9d7dbfafd 100644
--- a/connectivity/source/inc/dbase/DIndex.hxx
+++ b/connectivity/source/inc/dbase/DIndex.hxx
@@ -82,7 +82,7 @@ namespace connectivity
ODbaseTable* m_pTable;
bool m_bUseCollector : 1; // Use the Garbage Collector
- OUString getCompletePath();
+ OUString getCompletePath() const;
void closeImpl();
// Closes and kills the index file and throws an error
void impl_killFileAndthrowError_throw(const char* pErrorId, const OUString& _sFile);
@@ -106,7 +106,7 @@ namespace connectivity
void SetRootPos(sal_uInt32 nPos) {m_nRootPage = nPos;}
void SetPageCount(sal_uInt32 nCount) {m_nPageCount = nCount;}
- sal_uInt32 GetPageCount() {return m_nPageCount;}
+ sal_uInt32 GetPageCount() const {return m_nPageCount;}
sal_uInt16 GetMaxNodes() const {return m_aHeader.db_maxkeys;}
diff --git a/connectivity/source/inc/dbase/dindexnode.hxx b/connectivity/source/inc/dbase/dindexnode.hxx
index ec5896058aa5..8a8110253edc 100644
--- a/connectivity/source/inc/dbase/dindexnode.hxx
+++ b/connectivity/source/inc/dbase/dindexnode.hxx
@@ -156,7 +156,7 @@ namespace connectivity
bool IsRoot() const;
bool IsLeaf() const;
bool IsModified() const;
- bool HasParent();
+ bool HasParent() const;
bool IsFull() const;
@@ -164,7 +164,7 @@ namespace connectivity
ONDXPagePtr& GetChild(ODbaseIndex const * pIndex = nullptr);
// Parent does not need to be reloaded
- const ONDXPagePtr& GetParent();
+ const ONDXPagePtr& GetParent() const;
ODbaseIndex& GetIndex() {return rIndex;}
const ODbaseIndex& GetIndex() const {return rIndex;}
@@ -212,8 +212,8 @@ namespace connectivity
inline bool ONDXPage::IsRoot() const {return !aParent.Is();}
inline bool ONDXPage::IsLeaf() const {return !aChild.HasPage();}
inline bool ONDXPage::IsModified() const {return bModified;}
- inline bool ONDXPage::HasParent() {return aParent.Is();}
- inline const ONDXPagePtr& ONDXPage::GetParent() {return aParent;}
+ inline bool ONDXPage::HasParent() const {return aParent.Is();}
+ inline const ONDXPagePtr& ONDXPage::GetParent() const {return aParent;}
inline void ONDXPage::SetParent(ONDXPagePtr aPa = ONDXPagePtr())
{
diff --git a/connectivity/source/inc/file/FTable.hxx b/connectivity/source/inc/file/FTable.hxx
index bd12eca69eee..d9ae501bd3f4 100644
--- a/connectivity/source/inc/file/FTable.hxx
+++ b/connectivity/source/inc/file/FTable.hxx
@@ -85,7 +85,7 @@ namespace connectivity
OUString SAL_CALL getName() override { return m_Name; }
- const OUString& getSchema() { return m_SchemaName; }
+ const OUString& getSchema() const { return m_SchemaName; }
bool isReadOnly() const { return !m_bWriteable; }
// m_pFileStream && !m_pFileStream->IsWritable(); }
// css::lang::XUnoTunnel
diff --git a/connectivity/source/inc/flat/ETable.hxx b/connectivity/source/inc/flat/ETable.hxx
index fccc731185c0..7dbc56de195b 100644
--- a/connectivity/source/inc/flat/ETable.hxx
+++ b/connectivity/source/inc/flat/ETable.hxx
@@ -100,7 +100,7 @@ namespace connectivity
virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) override;
static css::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId();
- OUString getEntry();
+ OUString getEntry() const;
};
}
}
diff --git a/connectivity/source/inc/hsqldb/HTable.hxx b/connectivity/source/inc/hsqldb/HTable.hxx
index 2bab33454946..9f3bbe42f18c 100644
--- a/connectivity/source/inc/hsqldb/HTable.hxx
+++ b/connectivity/source/inc/hsqldb/HTable.hxx
@@ -101,7 +101,7 @@ namespace connectivity
/**
returns the ALTER TABLE XXX COLUMN statement
*/
- OUString getAlterTableColumnPart();
+ OUString getAlterTableColumnPart() const;
// some methods to alter table structures
void alterColumnType(sal_Int32 nNewType,const OUString& _rColName,const css::uno::Reference< css::beans::XPropertySet >& _xDescriptor);
diff --git a/connectivity/source/inc/mysql/YTable.hxx b/connectivity/source/inc/mysql/YTable.hxx
index 435505a60334..5c5f5e48ec7b 100644
--- a/connectivity/source/inc/mysql/YTable.hxx
+++ b/connectivity/source/inc/mysql/YTable.hxx
@@ -100,7 +100,7 @@ namespace connectivity
virtual void SAL_CALL alterColumnByName( const OUString& colName, const css::uno::Reference< css::beans::XPropertySet >& descriptor ) override;
/** returns the ALTER TABLE XXX statement
*/
- OUString getAlterTableColumnPart();
+ OUString getAlterTableColumnPart() const;
// some methods to alter table structures
void alterColumnType(sal_Int32 nNewType,const OUString& _rColName,const css::uno::Reference< css::beans::XPropertySet >& _xDescriptor);
diff --git a/connectivity/source/inc/odbc/OBoundParam.hxx b/connectivity/source/inc/odbc/OBoundParam.hxx
index 41ddf5076ae4..0616760bfaeb 100644
--- a/connectivity/source/inc/odbc/OBoundParam.hxx
+++ b/connectivity/source/inc/odbc/OBoundParam.hxx
@@ -87,7 +87,7 @@ namespace connectivity
// getInputStream
// Gets the input stream for the bound parameter
- const css::uno::Reference< css::io::XInputStream>& getInputStream ()
+ const css::uno::Reference< css::io::XInputStream>& getInputStream () const
{
return paramInputStream;
}
@@ -96,7 +96,7 @@ namespace connectivity
// getInputStreamLen
// Gets the input stream length for the bound parameter
- sal_Int32 getInputStreamLen ()
+ sal_Int32 getInputStreamLen () const
{
return paramInputStreamLen;
}
diff --git a/include/connectivity/paramwrapper.hxx b/include/connectivity/paramwrapper.hxx
index 493475baee55..e6b27852e69b 100644
--- a/include/connectivity/paramwrapper.hxx
+++ b/include/connectivity/paramwrapper.hxx
@@ -164,7 +164,7 @@ namespace param
virtual css::uno::Any SAL_CALL getByIndex(sal_Int32 _rIndex) override;
public:
- const Parameters& getParameters() { return m_aParameters; }
+ const Parameters& getParameters() const { return m_aParameters; }
const ::connectivity::ORowSetValue& operator[]( size_t _index ) const { return m_aParameters[ _index ]->Value(); }
::connectivity::ORowSetValue& operator[]( size_t _index ) { return m_aParameters[ _index ]->Value(); }
More information about the Libreoffice-commits
mailing list