[Libreoffice-commits] core.git: connectivity/source
Stephan Bergmann (via logerrit)
logerrit at kemper.freedesktop.org
Tue Nov 24 15:57:05 UTC 2020
connectivity/source/drivers/macab/MacabAddressBook.cxx | 4 +--
connectivity/source/drivers/macab/MacabAddressBook.hxx | 5 ++--
connectivity/source/drivers/macab/MacabHeader.cxx | 2 -
connectivity/source/drivers/macab/MacabHeader.hxx | 6 ++++-
connectivity/source/drivers/macab/MacabRecords.cxx | 5 ++--
connectivity/source/drivers/macab/MacabRecords.hxx | 5 ++--
connectivity/source/drivers/macab/macabcondition.cxx | 16 ++++++++-------
connectivity/source/drivers/macab/macabcondition.hxx | 18 ++++++++++-------
connectivity/source/drivers/macab/macaborder.cxx | 2 -
connectivity/source/drivers/macab/macaborder.hxx | 3 +-
10 files changed, 40 insertions(+), 26 deletions(-)
New commits:
commit 965f349952a90334c14a86ce1dd65711b73e8e85
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Nov 24 14:23:03 2020 +0100
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Tue Nov 24 16:56:17 2020 +0100
loplugin:stringview (macOS)
Change-Id: I20e4bdefdf8f05bbe1ac547a16e8d5e06e3303eb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106501
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/connectivity/source/drivers/macab/MacabAddressBook.cxx b/connectivity/source/drivers/macab/MacabAddressBook.cxx
index 09e4892033e8..a14b7abee9b9 100644
--- a/connectivity/source/drivers/macab/MacabAddressBook.cxx
+++ b/connectivity/source/drivers/macab/MacabAddressBook.cxx
@@ -130,7 +130,7 @@ MacabRecords *MacabAddressBook::getMacabRecords()
/* Get the MacabRecords for a given name: either a group name or the
* default table name.
*/
-MacabRecords *MacabAddressBook::getMacabRecords(const OUString& _tableName)
+MacabRecords *MacabAddressBook::getMacabRecords(std::u16string_view _tableName)
{
if(_tableName == getDefaultTableName())
{
@@ -192,7 +192,7 @@ std::vector<MacabGroup *> MacabAddressBook::getMacabGroups()
}
-MacabGroup *MacabAddressBook::getMacabGroup(OUString const & _groupName)
+MacabGroup *MacabAddressBook::getMacabGroup(std::u16string_view _groupName)
{
// initialize groups if not already initialized
if(!m_bRetrievedGroups)
diff --git a/connectivity/source/drivers/macab/MacabAddressBook.hxx b/connectivity/source/drivers/macab/MacabAddressBook.hxx
index 33c267313796..23fec939f701 100644
--- a/connectivity/source/drivers/macab/MacabAddressBook.hxx
+++ b/connectivity/source/drivers/macab/MacabAddressBook.hxx
@@ -23,6 +23,7 @@
#include "MacabRecords.hxx"
#include "MacabGroup.hxx"
+#include <string_view>
#include <vector>
#include <premac.h>
@@ -48,8 +49,8 @@ namespace connectivity::macab
MacabRecords *getMacabRecords();
std::vector<MacabGroup *> getMacabGroups();
- MacabGroup *getMacabGroup(const OUString& _groupName);
- MacabRecords *getMacabRecords(const OUString& _tableName);
+ MacabGroup *getMacabGroup(std::u16string_view _groupName);
+ MacabRecords *getMacabRecords(std::u16string_view _tableName);
MacabGroup *getMacabGroupMatch(const OUString& _groupName);
MacabRecords *getMacabRecordsMatch(const OUString& _tableName);
diff --git a/connectivity/source/drivers/macab/MacabHeader.cxx b/connectivity/source/drivers/macab/MacabHeader.cxx
index dc83d9c3dec8..46f0c177d3fc 100644
--- a/connectivity/source/drivers/macab/MacabHeader.cxx
+++ b/connectivity/source/drivers/macab/MacabHeader.cxx
@@ -263,7 +263,7 @@ sal_Int32 MacabHeader::compareFields(const macabfield *_field1, const macabfield
}
-sal_Int32 MacabHeader::getColumnNumber(const OUString& s) const
+sal_Int32 MacabHeader::getColumnNumber(std::u16string_view s) const
{
sal_Int32 i;
for(i = 0; i < size; i++)
diff --git a/connectivity/source/drivers/macab/MacabHeader.hxx b/connectivity/source/drivers/macab/MacabHeader.hxx
index 8902af091d5a..839a755fb6f1 100644
--- a/connectivity/source/drivers/macab/MacabHeader.hxx
+++ b/connectivity/source/drivers/macab/MacabHeader.hxx
@@ -20,6 +20,10 @@
#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MACAB_MACABHEADER_HXX
#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MACAB_MACABHEADER_HXX
+#include <sal/config.h>
+
+#include <string_view>
+
#include "MacabRecord.hxx"
namespace connectivity::macab
@@ -34,7 +38,7 @@ namespace connectivity::macab
void operator+= (const MacabHeader *r);
OUString getString(const sal_Int32 i) const;
void sortRecord();
- sal_Int32 getColumnNumber(const OUString& s) const;
+ sal_Int32 getColumnNumber(std::u16string_view s) const;
static sal_Int32 compareFields(const macabfield *_field1, const macabfield *_field2);
diff --git a/connectivity/source/drivers/macab/MacabRecords.cxx b/connectivity/source/drivers/macab/MacabRecords.cxx
index 0bc27ea0ee6f..737cdee7d6f8 100644
--- a/connectivity/source/drivers/macab/MacabRecords.cxx
+++ b/connectivity/source/drivers/macab/MacabRecords.cxx
@@ -244,7 +244,8 @@ macabfield *MacabRecords::getField(const sal_Int32 _recordNumber, const sal_Int3
}
-macabfield *MacabRecords::getField(const sal_Int32 _recordNumber, const OUString& _columnName) const
+macabfield *MacabRecords::getField(const sal_Int32 _recordNumber, std::u16string_view _columnName)
+ const
{
if(header != nullptr)
{
@@ -262,7 +263,7 @@ macabfield *MacabRecords::getField(const sal_Int32 _recordNumber, const OUString
}
-sal_Int32 MacabRecords::getFieldNumber(const OUString& _columnName) const
+sal_Int32 MacabRecords::getFieldNumber(std::u16string_view _columnName) const
{
if(header != nullptr)
return header->getColumnNumber(_columnName);
diff --git a/connectivity/source/drivers/macab/MacabRecords.hxx b/connectivity/source/drivers/macab/MacabRecords.hxx
index 933b741e82c9..7e7da60a5486 100644
--- a/connectivity/source/drivers/macab/MacabRecords.hxx
+++ b/connectivity/source/drivers/macab/MacabRecords.hxx
@@ -22,6 +22,7 @@
#include <sal/config.h>
+#include <string_view>
#include <vector>
#include "MacabRecord.hxx"
@@ -96,8 +97,8 @@ namespace connectivity::macab
void swap(const sal_Int32 _id1, const sal_Int32 _id2);
macabfield *getField(const sal_Int32 _recordNumber, const sal_Int32 _columnNumber) const;
- macabfield *getField(const sal_Int32 _recordNumber, const OUString& _columnName) const;
- sal_Int32 getFieldNumber(const OUString& _columnName) const;
+ macabfield *getField(const sal_Int32 _recordNumber, std::u16string_view _columnName) const;
+ sal_Int32 getFieldNumber(std::u16string_view _columnName) const;
sal_Int32 size() const;
diff --git a/connectivity/source/drivers/macab/macabcondition.cxx b/connectivity/source/drivers/macab/macabcondition.cxx
index 0d1d20227a42..41e087b2c421 100644
--- a/connectivity/source/drivers/macab/macabcondition.cxx
+++ b/connectivity/source/drivers/macab/macabcondition.cxx
@@ -51,7 +51,8 @@ bool MacabConditionConstant::eval(const MacabRecord *) const
return m_bValue;
}
-MacabConditionColumn::MacabConditionColumn(const MacabHeader *header, const OUString &sColumnName)
+MacabConditionColumn::MacabConditionColumn(
+ const MacabHeader *header, std::u16string_view sColumnName)
: MacabCondition(),
m_nFieldNumber(header->getColumnNumber(sColumnName))
{
@@ -69,7 +70,7 @@ bool MacabConditionColumn::isAlwaysFalse() const
return false;
}
-MacabConditionNull::MacabConditionNull(const MacabHeader *header, const OUString &sColumnName)
+MacabConditionNull::MacabConditionNull(const MacabHeader *header, std::u16string_view sColumnName)
: MacabConditionColumn(header, sColumnName)
{
}
@@ -86,7 +87,8 @@ bool MacabConditionNull::eval(const MacabRecord *aRecord) const
return false;
}
-MacabConditionNotNull::MacabConditionNotNull(const MacabHeader *header, const OUString &sColumnName)
+MacabConditionNotNull::MacabConditionNotNull(
+ const MacabHeader *header, std::u16string_view sColumnName)
: MacabConditionColumn(header, sColumnName)
{
}
@@ -103,13 +105,13 @@ bool MacabConditionNotNull::eval(const MacabRecord *aRecord) const
return true;
}
-MacabConditionCompare::MacabConditionCompare(const MacabHeader *header, const OUString &sColumnName, const OUString &sMatchString)
+MacabConditionCompare::MacabConditionCompare(const MacabHeader *header, std::u16string_view sColumnName, const OUString &sMatchString)
: MacabConditionColumn(header, sColumnName),
m_sMatchString(sMatchString)
{
}
-MacabConditionEqual::MacabConditionEqual(const MacabHeader *header, const OUString &sColumnName, const OUString &sMatchString)
+MacabConditionEqual::MacabConditionEqual(const MacabHeader *header, std::u16string_view sColumnName, const OUString &sMatchString)
: MacabConditionCompare(header, sColumnName, sMatchString)
{
}
@@ -132,7 +134,7 @@ bool MacabConditionEqual::eval(const MacabRecord *aRecord) const
return nReturn == 0;
}
-MacabConditionDifferent::MacabConditionDifferent(const MacabHeader *header, const OUString &sColumnName, const OUString &sMatchString)
+MacabConditionDifferent::MacabConditionDifferent(const MacabHeader *header, std::u16string_view sColumnName, const OUString &sMatchString)
: MacabConditionCompare(header, sColumnName, sMatchString)
{
}
@@ -155,7 +157,7 @@ bool MacabConditionDifferent::eval(const MacabRecord *aRecord) const
return nReturn != 0;
}
-MacabConditionSimilar::MacabConditionSimilar(const MacabHeader *header, const OUString &sColumnName, const OUString &sMatchString)
+MacabConditionSimilar::MacabConditionSimilar(const MacabHeader *header, std::u16string_view sColumnName, const OUString &sMatchString)
: MacabConditionCompare(header, sColumnName, sMatchString)
{
}
diff --git a/connectivity/source/drivers/macab/macabcondition.hxx b/connectivity/source/drivers/macab/macabcondition.hxx
index 8d930ed34ff3..15c2478197b8 100644
--- a/connectivity/source/drivers/macab/macabcondition.hxx
+++ b/connectivity/source/drivers/macab/macabcondition.hxx
@@ -20,6 +20,10 @@
#ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MACAB_MACABCONDITION_HXX
#define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MACAB_MACABCONDITION_HXX
+#include <sal/config.h>
+
+#include <string_view>
+
#include "MacabHeader.hxx"
#include "MacabRecord.hxx"
@@ -58,7 +62,7 @@ class MacabConditionColumn : public MacabCondition
/// @throws css::sdbc::SQLException
MacabConditionColumn(
const MacabHeader *header,
- const OUString &sColumnName);
+ std::u16string_view sColumnName);
virtual bool isAlwaysTrue() const override;
virtual bool isAlwaysFalse() const override;
};
@@ -69,7 +73,7 @@ class MacabConditionNull : public MacabConditionColumn
/// @throws css::sdbc::SQLException
MacabConditionNull(
const MacabHeader *header,
- const OUString &sColumnName);
+ std::u16string_view sColumnName);
virtual bool eval(const MacabRecord *aRecord) const override;
};
@@ -79,7 +83,7 @@ class MacabConditionNotNull : public MacabConditionColumn
/// @throws css::sdbc::SQLException
MacabConditionNotNull(
const MacabHeader *header,
- const OUString &sColumnName);
+ std::u16string_view sColumnName);
virtual bool eval(const MacabRecord *aRecord) const override;
};
@@ -92,7 +96,7 @@ class MacabConditionCompare : public MacabConditionColumn
/// @throws css::sdbc::SQLException
MacabConditionCompare(
const MacabHeader *header,
- const OUString &sColumnName,
+ std::u16string_view sColumnName,
const OUString &sMatchString);
};
@@ -102,7 +106,7 @@ class MacabConditionEqual : public MacabConditionCompare
/// @throws css::sdbc::SQLException
MacabConditionEqual(
const MacabHeader *header,
- const OUString &sColumnName,
+ std::u16string_view sColumnName,
const OUString &sMatchString);
virtual bool eval(const MacabRecord *aRecord) const override;
};
@@ -113,7 +117,7 @@ class MacabConditionDifferent : public MacabConditionCompare
/// @throws css::sdbc::SQLException
MacabConditionDifferent(
const MacabHeader *header,
- const OUString &sColumnName,
+ std::u16string_view sColumnName,
const OUString &sMatchString);
virtual bool eval(const MacabRecord *aRecord) const override;
};
@@ -124,7 +128,7 @@ class MacabConditionSimilar : public MacabConditionCompare
/// @throws css::sdbc::SQLException
MacabConditionSimilar(
const MacabHeader *header,
- const OUString &sColumnName,
+ std::u16string_view sColumnName,
const OUString &sMatchString);
virtual bool eval(const MacabRecord *aRecord) const override;
};
diff --git a/connectivity/source/drivers/macab/macaborder.cxx b/connectivity/source/drivers/macab/macaborder.cxx
index aaef39ef6253..133e5d599136 100644
--- a/connectivity/source/drivers/macab/macaborder.cxx
+++ b/connectivity/source/drivers/macab/macaborder.cxx
@@ -28,7 +28,7 @@ MacabOrder::~MacabOrder()
{
}
-MacabSimpleOrder::MacabSimpleOrder(MacabHeader const *header, OUString const &sColumnName, bool bAscending)
+MacabSimpleOrder::MacabSimpleOrder(MacabHeader const *header, std::u16string_view sColumnName, bool bAscending)
: MacabOrder(),
m_nFieldNumber(header->getColumnNumber(sColumnName)),
m_bAscending(bAscending)
diff --git a/connectivity/source/drivers/macab/macaborder.hxx b/connectivity/source/drivers/macab/macaborder.hxx
index a5bef2f4adba..dfdf5ce5a950 100644
--- a/connectivity/source/drivers/macab/macaborder.hxx
+++ b/connectivity/source/drivers/macab/macaborder.hxx
@@ -25,6 +25,7 @@
#include "MacabRecord.hxx"
#include <memory>
+#include <string_view>
#include <vector>
namespace connectivity::macab
@@ -43,7 +44,7 @@ namespace connectivity::macab
bool m_bAscending;
public:
- MacabSimpleOrder(MacabHeader const *header, OUString const &sColumnName, bool bAscending);
+ MacabSimpleOrder(MacabHeader const *header, std::u16string_view sColumnName, bool bAscending);
virtual sal_Int32 compare(const MacabRecord *record1, const MacabRecord *record2) const override;
};
More information about the Libreoffice-commits
mailing list