Move Application member documentation to the header

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

diff --git a/source/core/application.cpp b/source/core/application.cpp
index a60f605cbf03162a3e22d9ec3e1939f8472a68dd..ebd928b7b7ce049cd2d33ebcedba2ab8f8d4f190 100644 (file)
--- a/source/core/application.cpp
+++ b/source/core/application.cpp
@@ -1,14 +1,5 @@
-/* $Id$
-
-This file is part of libmspcore
-Copyright © 2006-2008, 2011  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #include <signal.h>
-#include <iostream>
-#include <typeinfo>
-#include "../debug/demangle.h"
+#include <msp/io/print.h>
 #include "application.h"
 #include "getopt.h"
 
@@ -24,27 +15,19 @@ Application::Application():
        exit_code(0)
 { }
 
-/**
-Constructs an instance of the registered application class and runs it.  If the
-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.
-*/
 int Application::run(int argc, char **argv, void *data)
 {
        static bool called = false;
        if(called)
        {
-               cerr<<"Trying to call Application::run_app twice!\n";
+               IO::cerr.write("Trying to call Application::run_app twice!\n");
                return 125;
        }
        called = true;
 
        if(!starter_)
        {
-               cerr<<"Trying to run with no RegisteredApplication class!\n";
+               IO::cerr.write("Trying to run with no RegisteredApplication class!\n");
                return 126;
        }
 
@@ -58,8 +41,7 @@ int Application::run(int argc, char **argv, void *data)
                }
                catch(const usage_error &e)
                {
-                       cerr<<e.what()<<'\n';
-                       cerr<<e.help()<<'\n';
+                       IO::print(IO::cerr, "%s\n%s\n", e.what(), e.help());
                        return 1;
                }
 
@@ -73,23 +55,12 @@ int Application::run(int argc, char **argv, void *data)
        {
                delete app_;
 
-#ifdef WIN32
-               string msg = Debug::demangle(typeid(e).name())+":\n"+e.what();
-               MessageBoxA(0, msg.c_str(), "Uncaught exception", MB_OK|MB_ICONERROR);
-#else
-               cerr<<"An uncaught exception occurred.\n";
-               cerr<<"  type:   "<<Debug::demangle(typeid(e).name())<<'\n';
-               cerr<<"  what(): "<<e.what()<<'\n';
-#endif
+               display_exception(e);
 
                return 124;
        }
 }
 
-/**
-Default main loop.  Calls tick() repeatedly until exit() is called.  A custom
-main loop should monitor the done member variable and return exit_code.
-*/
 int Application::main()
 {
        done = false;
@@ -99,26 +70,17 @@ int Application::main()
        return exit_code;
 }
 
-/**
-Sets the specified signal to be delivered to the sighandler member function.
-*/
 void Application::catch_signal(int s)
 {
        signal(s, &sighandler_);
 }
 
-/**
-Causes the application to exit gracefully with the given exit code.
-*/
 void Application::exit(int c)
 {
        done = true;
        exit_code = c;
 }
 
-/**
-Static wrapper function to call a member function of the Application instance.
-*/
 void Application::sighandler_(int s)
 {
        app_->sighandler(s);