X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fcore%2Fapplication.h;h=7dfea8a0ad13abaa05d3102ace97a0962e957fd4;hp=38df732f1a5779782566d249b701a19ca99011a2;hb=609c9a508cfdc7b42c46c4f21d17639204165a00;hpb=fcd7272c28b6da5a68d41e5aac7be1dfd2eeab78

diff --git a/source/core/application.h b/source/core/application.h
index 38df732..7dfea8a 100644
--- a/source/core/application.h
+++ b/source/core/application.h
@@ -1,55 +1,42 @@
-/* $Id$
-
-This file is part of libmspcore
-Copyright © 2006-2008, 2011  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_CORE_APPLICATION_H_
 #define MSP_CORE_APPLICATION_H_
 
+#include <stdexcept>
+
 namespace Msp {
 
 /**
-Base class for applications.  Inherit the main class from this and add a static
-member of type RegApp<MainClass>.
+Base class for applications.  See also RegisteredApplication.
 */
 class Application
 {
 protected:
-	class RegBase
+	class Starter
 	{
-	public:
-		virtual Application *create_app(int, char **)=0;
-		virtual void usage(const char *, const char *, bool)=0;
-		virtual ~RegBase() { }
 	protected:
-		RegBase();
-	};
-
-	template<typename T>
-	class RegApp: public RegBase
-	{
+		Starter();
 	public:
-		Application *create_app(int argc, char **argv) { return new T(argc, argv); }
-		void usage(const char *r, const char *a, bool b) { T::usage(r, a, b); }
+		virtual ~Starter() { }
+
+		virtual Application *create_app(int, char **) = 0;
 	};
 
 	bool done;
 	int exit_code;
 
 private:
-	static RegBase *reg_app_;
+	static Starter *starter_;
 	static Application *app_;
 	static void *data_;
 
+	Application(const Application &);
+	Application &operator=(const Application &);
 protected:
 	Application();
 public:
 	virtual ~Application() { }
 
 	static int run(int, char **, void * =0);
-	static void usage(const char *, const char *, bool);
 	static void *get_data() { return data_; }
 
 protected:
@@ -61,10 +48,34 @@ protected:
 private:
 	static void sighandler_(int);
 
-	Application(const Application &);
-	Application &operator=(const Application &);
+	static void display_exception(const std::exception &);
 };
 
+
+/**
+Registers the class to be used for program startup.  The main application class
+should be derived from this.
+*/
+template<typename T>
+class RegisteredApplication: public Application
+{
+private:
+	class Starter: public Application::Starter
+	{
+	public:
+		Application *create_app(int argc, char **argv) { return new T(argc, argv); }
+	};
+
+	static Starter starter_;
+
+protected:
+	// Force the starter into existence
+	RegisteredApplication() { (void)starter_; }
+};
+
+template<typename T>
+typename RegisteredApplication<T>::Starter RegisteredApplication<T>::starter_;
+
 } // namespace Msp
 
 #endif