X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fcore%2Fapplication.cpp;h=a60f605cbf03162a3e22d9ec3e1939f8472a68dd;hp=139f94f2d88054d745ad9119b562dd7ec174d596;hb=c2eeec205dbf17f6ca38fda2671c6aaf2d1c505f;hpb=d5dd704b2576f878809e87dbb8ff8591b9bdbce4

diff --git a/source/core/application.cpp b/source/core/application.cpp
index 139f94f..a60f605 100644
--- a/source/core/application.cpp
+++ b/source/core/application.cpp
@@ -8,12 +8,9 @@ Distributed under the LGPL
 #include <signal.h>
 #include <iostream>
 #include <typeinfo>
-#include "../debug/backtrace.h"
 #include "../debug/demangle.h"
-#include "../time/units.h"
-#include "../time/utils.h"
 #include "application.h"
-#include "except.h"
+#include "getopt.h"
 
 using namespace std;
 
@@ -29,7 +26,8 @@ Application::Application():
 
 /**
 Constructs an instance of the registered application class and runs it.  If the
-application throws a UsageError, the static usage() function is called.
+application throws a usage_error, a help message is printed.  The GetOpt class
+will throw such exceptions automatically in error conditions.
 
 This function can only be called once.  The global main() function provided by
 the library normally does it automatically at program startup.
@@ -58,9 +56,10 @@ int Application::run(int argc, char **argv, void *data)
 		{
 			app_ = starter_->create_app(argc, argv);
 		}
-		catch(const UsageError &e)
+		catch(const usage_error &e)
 		{
-			starter_->usage(e.what(), argv[0], e.get_brief());
+			cerr<<e.what()<<'\n';
+			cerr<<e.help()<<'\n';
 			return 1;
 		}
 
@@ -81,36 +80,12 @@ int Application::run(int argc, char **argv, void *data)
 		cerr<<"An uncaught exception occurred.\n";
 		cerr<<"  type:   "<<Debug::demangle(typeid(e).name())<<'\n';
 		cerr<<"  what(): "<<e.what()<<'\n';
-
-		const Exception *exc = dynamic_cast<const Exception *>(&e);
-		if(exc && !exc->get_backtrace().get_frames().empty())
-		{
-			cerr<<"  backtrace:\n";
-			const list<Debug::Backtrace::StackFrame> &frames = exc->get_backtrace().get_frames();
-			for(list<Debug::Backtrace::StackFrame>::const_iterator i=frames.begin(); i!=frames.end(); ++i)
-				cerr<<"    "<<*i<<'\n';
-		}
 #endif
 
 		return 124;
 	}
 }
 
-/**
-Prints a message describing the usage of the application.  The default version
-will blame the programmer for being lazy.
-
-@param   reason  Why the function was called
-@param   argv0   The value of argv[0], to be used in the message
-@param   brief   Whether to print a brief or long usage message
-*/
-void Application::usage(const char *reason, const char *, bool)
-{
-	if(reason)
-		cerr<<"UsageError: "<<reason<<'\n';
-	cerr<<"The programmer was lazy and didn't write a usage() function for this application.\n";
-}
-
 /**
 Default main loop.  Calls tick() repeatedly until exit() is called.  A custom
 main loop should monitor the done member variable and return exit_code.
@@ -153,7 +128,7 @@ void Application::sighandler_(int s)
 Application::Starter::Starter()
 {
 	if(starter_)
-		throw InvalidState("Can't create more than one Starter instance");
+		throw logic_error("Can't create more than one Starter instance");
 
 	starter_ = this;
 }