Mark constructors and destructors as default where appropriate

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

diff --git a/source/core/application.h b/source/core/application.h
index 35ab8734ef30fa08b7a9da21e3c854a9f30d24b1..8ff286f3e2cc3202de01d85247a3126191128cbf 100644 (file)
--- a/source/core/application.h
+++ b/source/core/application.h
@@ -2,13 +2,15 @@
 #define MSP_CORE_APPLICATION_H_
 
 #include <stdexcept>
+#include <string>
+#include "noncopyable.h"
 
 namespace Msp {
 
 /**
 Base class for applications.  See also RegisteredApplication.
 */
-class Application
+class Application: private NonCopyable
 {
 protected:
        class Starter
@@ -16,13 +18,13 @@ protected:
        protected:
                Starter();
        public:
-               virtual ~Starter() { }
+               virtual ~Starter() = default;
 
                virtual Application *create_app(int, char **) = 0;
        };
 
-       bool done;
-       int exit_code;
+       bool done = false;
+       int exit_code = 0;
 
 private:
        static Starter *starter_;
@@ -36,7 +38,7 @@ private:
 protected:
        Application(const std::string & = std::string());
 public:
-       virtual ~Application() { }
+       virtual ~Application() = default;
 
        /** Constructs an instance of the registered application class and runs it.
        If the application throws a usage_error, a help message is printed.  The
@@ -44,7 +46,14 @@ 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 * = 0, void (*)(void *) = 0);
+
+       /** Sets application startup info, including argv[0] value and platform-
+       specific data.
+
+       This function can only be called once, and is normally called by
+       Application::run(). */
+       static void set_startup_info(const char *, void *);
 
        static void *get_data() { return data_; }
        static const char *get_argv0() { return argv0_; }