Add move semantics to Variant

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

diff --git a/source/core/application.h b/source/core/application.h
index 8ff286f3e2cc3202de01d85247a3126191128cbf..d5a571a28a9f73306dffae3e99b470e39a2fcb47 100644 (file)
--- a/source/core/application.h
+++ b/source/core/application.h
@@ -3,6 +3,7 @@
 
 #include <stdexcept>
 #include <string>
+#include "mspcore_api.h"
 #include "noncopyable.h"
 
 namespace Msp {
@@ -10,10 +11,10 @@ namespace Msp {
 /**
 Base class for applications.  See also RegisteredApplication.
 */
-class Application: private NonCopyable
+class MSPCORE_API Application: private NonCopyable
 {
 protected:
-       class Starter
+       class MSPCORE_API Starter
        {
        protected:
                Starter();
@@ -27,14 +28,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:
@@ -46,7 +45,7 @@ public:
 
        This function can only be called once.  The global main() function provided
        by the library normally does it automatically at program startup. */
-       static int run(int, char **, void * = 0, void (*)(void *) = 0);
+       static int run(int, char **, void * = nullptr, void (*)(void *) = nullptr);
 
        /** Sets application startup info, including argv[0] value and platform-
        specific data.
@@ -55,9 +54,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();
+       static const char *get_argv0();
+       static const std::string &get_name();
 
 protected:
        /** Default main loop.  Calls tick() repeatedly until exit() is called.  A
@@ -78,7 +77,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 +95,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