Move CompatUtility::GetCheckableInCheckPeriod() into Livestatus feature

[icinga2] / lib / livestatus / livestatusquery.cpp

diff --git a/lib/livestatus/livestatusquery.cpp b/lib/livestatus/livestatusquery.cpp
index c7b56be037894c5fdae1236b9d1e6368dc164bd7..a8e7577aa21813933d77ba4ca7656347d6c78030 100644 (file)
--- a/lib/livestatus/livestatusquery.cpp
+++ b/lib/livestatus/livestatusquery.cpp
@@ -71,10 +71,10 @@ LivestatusQuery::LivestatusQuery(const std::vector<String>& lines, const String&
        m_CompatLogPath = compat_log_path;
 
        /* default separators */
-       m_Separators.push_back("\n");
-       m_Separators.push_back(";");
-       m_Separators.push_back(",");
-       m_Separators.push_back("|");
+       m_Separators.emplace_back("\n");
+       m_Separators.emplace_back(";");
+       m_Separators.emplace_back(",");
+       m_Separators.emplace_back("|");
 
        String line = lines[0];
 
@@ -233,7 +233,7 @@ LivestatusQuery::LivestatusQuery(const std::vector<String>& lines, const String&
                                        aggregators.pop_back();
                        }
 
-                       deq.push_back(filter);
+                       deq.emplace_back(filter);
                        if (&deq == &stats) {
                                Aggregator::Ptr aggregator = new CountAggregator();
                                aggregator->SetFilter(filter);
@@ -279,7 +279,7 @@ LivestatusQuery::LivestatusQuery(const std::vector<String>& lines, const String&
        m_Aggregators.swap(aggregators);
 }
 
-int LivestatusQuery::GetExternalCommands(void)
+int LivestatusQuery::GetExternalCommands()
 {
        boost::mutex::scoped_lock lock(l_QueryMutex);
 
@@ -317,7 +317,7 @@ Filter::Ptr LivestatusQuery::ParseFilter(const String& params, unsigned long& fr
        tokens.emplace_back(std::move(temp_buffer));
 
        if (tokens.size() == 2)
-               tokens.push_back("");
+               tokens.emplace_back("");
 
        if (tokens.size() < 3)
                return nullptr;
@@ -534,7 +534,7 @@ void LivestatusQuery::ExecuteGetHelper(const Stream::Ptr& stream)
 
                        int index = 0;
 
-                       for (const Aggregator::Ptr aggregator : m_Aggregators) {
+                       for (const Aggregator::Ptr& aggregator : m_Aggregators) {
                                aggregator->Apply(table, object.Row, &stats[index]);
                                index++;
                        }