Update naming of internal variables and functions

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

diff --git a/source/core/application.cpp b/source/core/application.cpp
index dda4440270e64c78e5388ea282afb9993c6525fb..1fbe15452fd8a13d39c3c0939d2c09419e5b6733 100644 (file)
--- a/source/core/application.cpp
+++ b/source/core/application.cpp
@@ -15,26 +15,26 @@ using namespace std;
 
 namespace Msp {
 
-Application *Application::app_ = 0;
-Application::Starter *Application::starter_ = 0;
-const char *Application::argv0_ = 0;
-string Application::name_;
-void *Application::data_ = 0;
+Application *Application::_app = 0;
+Application::Starter *Application::_starter = 0;
+const char *Application::_argv0 = 0;
+string Application::_name;
+void *Application::_data = 0;
 
 Application::Application(const string &n)
 {
-       if(app_)
+       if(_app)
                throw logic_error("instance already exists");
 
        if(!n.empty())
-               name_ = n;
+               _name = n;
        else
-               name_ = FS::basename(argv0_);
+               _name = FS::basename(_argv0);
 }
 
 int Application::run(int argc, char **argv, void *data, void (*created_callback)(void *))
 {
-       if(!starter_)
+       if(!_starter)
        {
                IO::cerr.write("Application::run called with no RegisteredApplication class!\n");
                return 126;
@@ -46,7 +46,7 @@ int Application::run(int argc, char **argv, void *data, void (*created_callback)
        {
                try
                {
-                       app_ = starter_->create_app(argc, argv);
+                       _app = _starter->create_app(argc, argv);
                }
                catch(const usage_error &e)
                {
@@ -57,9 +57,9 @@ int Application::run(int argc, char **argv, void *data, void (*created_callback)
                if(created_callback)
                        created_callback(data);
 
-               int result = app_->main();
-               Application *a = app_;
-               app_ = 0;
+               int result = _app->main();
+               Application *a = _app;
+               _app = 0;
                delete a;
                return result;
        }
@@ -84,8 +84,8 @@ int Application::run(int argc, char **argv, void *data, void (*created_callback)
                        }
                }
 
-               delete app_;
-               app_ = 0;
+               delete _app;
+               _app = 0;
 
                return 124;
        }
@@ -93,7 +93,7 @@ int Application::run(int argc, char **argv, void *data, void (*created_callback)
 
 void Application::set_startup_info(const char *argv0, void *data)
 {
-       if(argv0_)
+       if(_argv0)
                throw logic_error("startup info already set");
 
        static FS::Path exe;
@@ -113,8 +113,8 @@ void Application::set_startup_info(const char *argv0, void *data)
        if(exe.empty())
                exe = FS::realpath(argv0);
 
-       argv0_ = exe.c_str();
-       data_ = data;
+       _argv0 = exe.c_str();
+       _data = data;
 }
 
 int Application::main()
@@ -128,7 +128,7 @@ int Application::main()
 
 void Application::catch_signal(int s)
 {
-       signal(s, &sighandler_);
+       signal(s, &_sighandler);
 }
 
 void Application::exit(int c)
@@ -137,18 +137,18 @@ void Application::exit(int c)
        exit_code = c;
 }
 
-void Application::sighandler_(int s)
+void Application::_sighandler(int s)
 {
-       app_->sighandler(s);
+       _app->sighandler(s);
 }
 
 
 Application::Starter::Starter()
 {
-       if(starter_)
+       if(_starter)
                throw logic_error("Can't create more than one Starter instance");
 
-       starter_ = this;
+       _starter = this;
 }
 
 } // namespace Msp