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

diff --git a/source/core/application.h b/source/core/application.h
index 305fbfe..7dfea8a 100644
--- a/source/core/application.h
+++ b/source/core/application.h
@@ -1,18 +1,12 @@
-/* $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
 {
@@ -25,7 +19,6 @@ protected:
 		virtual ~Starter() { }
 
 		virtual Application *create_app(int, char **) = 0;
-		virtual void usage(const char *, const char *, bool) = 0;
 	};
 
 	bool done;
@@ -36,13 +29,14 @@ private:
 	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:
@@ -53,11 +47,15 @@ protected:
 	virtual void sighandler(int) { }
 private:
 	static void sighandler_(int);
+
+	static void display_exception(const std::exception &);
 };
 
-	Application(const Application &);
-	Application &operator=(const Application &);
 
+/**
+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
 {
@@ -66,7 +64,6 @@ private:
 	{
 	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); }
 	};
 
 	static Starter starter_;