Merge pull request #6999 from Icinga/bugfix/compiler-warnings

[icinga2] / lib / config / applyrule.hpp

diff --git a/lib/config/applyrule.hpp b/lib/config/applyrule.hpp
index 80f57ae137e2e930a78b3f860e6f0e3795b3a7e1..bc4868b9e750c3a4121e15f201b60f83536839b9 100644 (file)
--- a/lib/config/applyrule.hpp
+++ b/lib/config/applyrule.hpp
@@ -1,21 +1,4 @@
-/******************************************************************************
- * Icinga 2                                                                   *
- * Copyright (C) 2012-2017 Icinga Development Team (https://www.icinga.com/)  *
- *                                                                            *
- * This program is free software; you can redistribute it and/or              *
- * modify it under the terms of the GNU General Public License                *
- * as published by the Free Software Foundation; either version 2             *
- * of the License, or (at your option) any later version.                     *
- *                                                                            *
- * This program 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 General Public License for more details.                               *
- *                                                                            *
- * You should have received a copy of the GNU General Public License          *
- * along with this program; if not, write to the Free Software Foundation     *
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.             *
- ******************************************************************************/
+/* Icinga 2 | (c) 2012 Icinga GmbH | GPLv2+ */
 
 #ifndef APPLYRULE_H
 #define APPLYRULE_H
@@ -30,31 +13,31 @@ namespace icinga
 /**
  * @ingroup config
  */
-class I2_CONFIG_API ApplyRule
+class ApplyRule
 {
 public:
        typedef std::map<String, std::vector<String> > TypeMap;
        typedef std::map<String, std::vector<ApplyRule> > RuleMap;
 
-       String GetTargetType(void) const;
-       String GetName(void) const;
-       std::shared_ptr<Expression> GetExpression(void) const;
-       std::shared_ptr<Expression> GetFilter(void) const;
-       String GetPackage(void) const;
-       String GetFKVar(void) const;
-       String GetFVVar(void) const;
-       std::shared_ptr<Expression> GetFTerm(void) const;
-       bool GetIgnoreOnError(void) const;
-       DebugInfo GetDebugInfo(void) const;
-       Dictionary::Ptr GetScope(void) const;
-       void AddMatch(void);
-       bool HasMatches(void) const;
+       String GetTargetType() const;
+       String GetName() const;
+       std::shared_ptr<Expression> GetExpression() const;
+       std::shared_ptr<Expression> GetFilter() const;
+       String GetPackage() const;
+       String GetFKVar() const;
+       String GetFVVar() const;
+       std::shared_ptr<Expression> GetFTerm() const;
+       bool GetIgnoreOnError() const;
+       DebugInfo GetDebugInfo() const;
+       Dictionary::Ptr GetScope() const;
+       void AddMatch();
+       bool HasMatches() const;
 
        bool EvaluateFilter(ScriptFrame& frame) const;
 
        static void AddRule(const String& sourceType, const String& targetType, const String& name, const std::shared_ptr<Expression>& expression,
-           const std::shared_ptr<Expression>& filter, const String& package, const String& fkvar, const String& fvvar, const std::shared_ptr<Expression>& fterm,
-           bool ignoreOnError, const DebugInfo& di, const Dictionary::Ptr& scope);
+               const std::shared_ptr<Expression>& filter, const String& package, const String& fkvar, const String& fvvar, const std::shared_ptr<Expression>& fterm,
+               bool ignoreOnError, const DebugInfo& di, const Dictionary::Ptr& scope);
        static std::vector<ApplyRule>& GetRules(const String& type);
 
        static void RegisterType(const String& sourceType, const std::vector<String>& targetTypes);
@@ -62,7 +45,7 @@ public:
        static bool IsValidTargetType(const String& sourceType, const String& targetType);
        static std::vector<String> GetTargetTypes(const String& sourceType);
 
-       static void CheckMatches(void);
+       static void CheckMatches(bool silent);
 
 private:
        String m_TargetType;
@@ -81,9 +64,9 @@ private:
        static TypeMap m_Types;
        static RuleMap m_Rules;
 
-       ApplyRule(const String& targetType, const String& name, const std::shared_ptr<Expression>& expression,
-           const std::shared_ptr<Expression>& filter, const String& package, const String& fkvar, const String& fvvar, const std::shared_ptr<Expression>& fterm,
-           bool ignoreOnError, const DebugInfo& di, const Dictionary::Ptr& scope);
+       ApplyRule(String targetType, String name, std::shared_ptr<Expression> expression,
+               std::shared_ptr<Expression> filter, String package, String fkvar, String fvvar, std::shared_ptr<Expression> fterm,
+               bool ignoreOnError, DebugInfo di, Dictionary::Ptr scope);
 };
 
 }