bf14e33977
This addresses two different warnings from Fedora Rawhide:
/srv/runtests/work/sources/syncevolution/src/syncevo/SyncContext.cpp: In member function 'std::string SyncEvo::XMLFiles::get(SyncEvo::XMLFiles::Category)':
/srv/runtests/work/sources/syncevolution/src/syncevo/SyncContext.cpp:2390:28: error: loop variable 'entry' of type 'const StringPair&' {aka 'const std::pair<std::__cxx11::basic_string<char>, std::__cxx11::basic_string<char> >&'} binds to a temporary constructed from type 'std::pair<const std::__cxx11::basic_string<char>, std::__cxx11::basic_string<char> >' [-Werror=range-loop-construct]
2390 | for (const StringPair &entry: m_files[category]) {
| ^~~~~
/srv/runtests/work/sources/syncevolution/src/syncevo/SyncContext.cpp:2390:28: note: use non-reference type 'const StringPair' {aka 'const std::pair<std::__cxx11::basic_string<char>, std::__cxx11::basic_string<char> >'} to make the copy explicit or 'const std::pair<const std::__cxx11::basic_string<char>, std::__cxx11::basic_string<char> >&' to prevent copying
This fails because StringPair has non-const members. By using "auto",
we get rid of the need to define and pick exactly the right type.
/srv/runtests/work/sources/syncevolution/src/syncevo/SyncConfig.cpp: In member function 'void SyncEvo::SyncConfig::removeSyncSource(const string&)':
/srv/runtests/work/sources/syncevolution/src/syncevo/SyncConfig.cpp:2552:36: error: loop variable 'peer' creates a copy from type 'const string' {aka 'const std::__cxx11::basic_string<char>'} [-Werror=range-loop-construct]
2552 | for (const std::string peer: m_tree->getChildren(m_contextPath + "/peers")) {
| ^~~~
/srv/runtests/work/sources/syncevolution/src/syncevo/SyncConfig.cpp:2552:36: note: use reference type to prevent copying
2552 | for (const std::string peer: m_tree->getChildren(m_contextPath + "/peers")) {
| ^~~~
| &
We could have used "auto" also instead of "std::string", but here it
doesn't save that much typing and is more readable. We just have to
use a reference.
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
120 lines
3.2 KiB
C++
120 lines
3.2 KiB
C++
/*
|
|
* Copyright (C) 2008-2009 Patrick Ohly <patrick.ohly@gmx.de>
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) version 3.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
* 02110-1301 USA
|
|
*/
|
|
|
|
#include <syncevo/FilterConfigNode.h>
|
|
#include <syncevo/Exception.h>
|
|
|
|
#include <boost/algorithm/string/join.hpp>
|
|
|
|
#include <syncevo/declarations.h>
|
|
SE_BEGIN_CXX
|
|
|
|
FilterConfigNode::FilterConfigNode(const std::shared_ptr<ConfigNode> &node,
|
|
const ConfigFilter &filter) :
|
|
m_filter(filter),
|
|
m_node(node),
|
|
m_readOnlyNode(node)
|
|
{
|
|
}
|
|
|
|
FilterConfigNode::FilterConfigNode(const std::shared_ptr<const ConfigNode> &node,
|
|
const ConfigFilter &filter) :
|
|
m_filter(filter),
|
|
m_readOnlyNode(node)
|
|
{
|
|
}
|
|
|
|
void FilterConfigNode::addFilter(const std::string &property,
|
|
const InitStateString &value)
|
|
{
|
|
m_filter[property] = value;
|
|
}
|
|
|
|
void FilterConfigNode::setFilter(const ConfigFilter &filter)
|
|
{
|
|
m_filter = filter;
|
|
}
|
|
|
|
InitStateString FilterConfigNode::readProperty(const std::string &property) const
|
|
{
|
|
auto it = m_filter.find(property);
|
|
|
|
if (it != m_filter.end()) {
|
|
return it->second;
|
|
} else {
|
|
return m_readOnlyNode->readProperty(property);
|
|
}
|
|
}
|
|
|
|
void FilterConfigNode::writeProperty(const std::string &property,
|
|
const InitStateString &value,
|
|
const std::string &comment)
|
|
{
|
|
auto it = m_filter.find(property);
|
|
|
|
if (!m_node.get()) {
|
|
Exception::throwError(SE_HERE, getName() + ": read-only, setting properties not allowed");
|
|
}
|
|
|
|
if (it != m_filter.end()) {
|
|
m_filter.erase(it);
|
|
}
|
|
m_node->writeProperty(property, value, comment);
|
|
}
|
|
|
|
void FilterConfigNode::readProperties(ConfigProps &props) const
|
|
{
|
|
m_readOnlyNode->readProperties(props);
|
|
|
|
for (const auto &filter: m_filter) {
|
|
// overwrite existing values or add new ones
|
|
props[filter.first] = filter.second;
|
|
}
|
|
}
|
|
|
|
void FilterConfigNode::removeProperty(const std::string &property)
|
|
{
|
|
auto it = m_filter.find(property);
|
|
|
|
if (!m_node.get()) {
|
|
Exception::throwError(SE_HERE, getName() + ": read-only, removing properties not allowed");
|
|
}
|
|
|
|
if (it != m_filter.end()) {
|
|
m_filter.erase(it);
|
|
}
|
|
m_node->removeProperty(property);
|
|
}
|
|
|
|
void FilterConfigNode::clear()
|
|
{
|
|
m_filter.clear();
|
|
m_node->clear();
|
|
}
|
|
|
|
void FilterConfigNode::flush()
|
|
{
|
|
if (!m_node.get()) {
|
|
Exception::throwError(SE_HERE, getName() + ": read-only, flushing not allowed");
|
|
}
|
|
m_node->flush();
|
|
}
|
|
|
|
SE_END_CXX
|