X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fapplication.h;h=019dee1f3793f1ff0c10203e760b3cd02a17d9b2;hb=03862ac4f38db0799872850dc4ab43b88688e4eb;hp=6b3ec1aa65bdd98b2877440a3f7a2f6e668d191a;hpb=ce0b610396aa8f760462fa4d7a6bb207a43994d2;p=libs%2Fcore.git

diff --git a/source/core/application.h b/source/core/application.h
index 6b3ec1a..019dee1 100644
--- 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_;
@@ -31,12 +33,10 @@ private:
 	static std::string name_;
 	static void *data_;
 
-	Application(const Application &);
-	Application &operator=(const Application &);
 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 +44,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 * = 0, void (*)(void *) = 0);
 
 	/** Sets application startup info, including argv[0] value and platform-
 	specific data.