Update naming of internal variables and functions

[libs/core.git] / source / core / application.h

diff --git a/source/core/application.h b/source/core/application.h
index 019dee1f3793f1ff0c10203e760b3cd02a17d9b2..c3c693d3052a2fb9808bc3018cdecd40218102d2 100644 (file)
--- a/source/core/application.h
+++ b/source/core/application.h
@@ -27,11 +27,11 @@ protected:
        int exit_code = 0;
 
 private:
        int exit_code = 0;
 
 private:

-       static Starter *starter_;
-       static Application *app_;
-       static const char *argv0_;
-       static std::string name_;
-       static void *data_;
+       static Starter *_starter;
+       static Application *_app;
+       static const char *_argv0;
+       static std::string _name;
+       static void *_data;

 
 protected:
        Application(const std::string & = std::string());
 
 protected:
        Application(const std::string & = std::string());


@@ -53,9 +53,9 @@ public:
        Application::run(). */
        static void set_startup_info(const char *, void *);
 
        Application::run(). */
        static void set_startup_info(const char *, void *);
 

-       static void *get_data() { return data_; }
-       static const char *get_argv0() { return argv0_; }
-       static const std::string &get_name() { return name_; }
+       static void *get_data() { return _data; }
+       static const char *get_argv0() { return _argv0; }
+       static const std::string &get_name() { return _name; }

 
 protected:
        /** Default main loop.  Calls tick() repeatedly until exit() is called.  A
 
 protected:
        /** Default main loop.  Calls tick() repeatedly until exit() is called.  A


@@ -76,7 +76,7 @@ protected:
 private:
        /** Static wrapper function to call a member function of the Application
        instance. */
 private:
        /** Static wrapper function to call a member function of the Application
        instance. */

-       static void sighandler_(int);
+       static void _sighandler(int);

 };
 
 
 };
 
 


@@ -94,16 +94,16 @@ private:
                Application *create_app(int argc, char **argv) { return new T(argc, argv); }
        };
 
                Application *create_app(int argc, char **argv) { return new T(argc, argv); }
        };
 

-       static Starter starter_;
+       static Starter _starter;

 
 protected:
        RegisteredApplication(const std::string &n = std::string()):
                Application(n)
 
 protected:
        RegisteredApplication(const std::string &n = std::string()):
                Application(n)

-       { (void)starter_; }  // Force the starter into existence
+       { (void)_starter; }  // Force the starter into existence

 };
 
 template<typename T>
 };
 
 template<typename T>

-typename RegisteredApplication<T>::Starter RegisteredApplication<T>::starter_;
+typename RegisteredApplication<T>::Starter RegisteredApplication<T>::_starter;

 
 } // namespace Msp
 
 
 } // namespace Msp