Use default member initializers for constant initial values

[libs/datafile.git] / source / loader.h

diff --git a/source/loader.h b/source/loader.h
index 926a2a16a4adbf2d542701867a47358ad09a3467..648c414cd2158b7d83983988f8027525b53940e6 100644 (file)
--- a/source/loader.h
+++ b/source/loader.h
@@ -45,19 +45,19 @@ protected:
 
 private:
        ActionMap local_actions;
-       ActionMap *actions;
-       Parser *cur_parser;
-       unsigned cur_level;
-       const Statement *cur_st;
-       bool sub_loaded;
-       bool direct;
+       ActionMap *actions = nullptr;
+       Parser *cur_parser = nullptr;
+       unsigned cur_level = 0;
+       const Statement *cur_st = nullptr;
+       bool sub_loaded = false;
+       bool direct = false;
        std::vector<Loader *> aux_loaders;
 protected:
-       bool check_sub_loads;
+       bool check_sub_loads = false;
 
-       Loader();
+       Loader() = default;
 public:
-       virtual ~Loader() { }
+       virtual ~Loader() = default;
 
        /** Loads statements from a parser. */
        void load(Parser &p);
@@ -130,7 +130,7 @@ protected:
 
        /** Adds a keyword that is recognized but ignored. */
        void add(const std::string &k)
-       { add(k, 0); }
+       { add(k, nullptr); }
 
 private:
        void add(const std::string &, LoaderAction *);