X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fapplication.h;h=c3c693d3052a2fb9808bc3018cdecd40218102d2;hb=5763dd6e8089c97699cbcbd221afb7fe1841bcdd;hp=8ff286f3e2cc3202de01d85247a3126191128cbf;hpb=99b9121e2158603372c7313400283b622e6754d8;p=libs%2Fcore.git

diff --git a/source/core/application.h b/source/core/application.h
index 8ff286f..c3c693d 100644
--- a/source/core/application.h
+++ b/source/core/application.h
@@ -27,14 +27,12 @@ protected:
 	int exit_code = 0;
 
 private:
-	static Starter *starter_;
-	static Application *app_;
-	static const char *argv0_;
-	static std::string name_;
-	static void *data_;
-
-	Application(const Application &);
-	Application &operator=(const Application &);
+	static Starter *_starter;
+	static Application *_app;
+	static const char *_argv0;
+	static std::string _name;
+	static void *_data;
+
 protected:
 	Application(const std::string & = std::string());
 public:
@@ -55,9 +53,9 @@ public:
 	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
@@ -78,7 +76,7 @@ protected:
 private:
 	/** Static wrapper function to call a member function of the Application
 	instance. */
-	static void sighandler_(int);
+	static void _sighandler(int);
 };
 
 
@@ -96,16 +94,16 @@ private:
 		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)
-	{ (void)starter_; }  // Force the starter into existence
+	{ (void)_starter; }  // Force the starter into existence
 };
 
 template<typename T>
-typename RegisteredApplication<T>::Starter RegisteredApplication<T>::starter_;
+typename RegisteredApplication<T>::Starter RegisteredApplication<T>::_starter;
 
 } // namespace Msp