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

diff --git a/source/core/application.cpp b/source/core/application.cpp
index a60f605..51f013e 100644
--- a/source/core/application.cpp
+++ b/source/core/application.cpp
@@ -1,14 +1,10 @@
-/* $Id$
-
-This file is part of libmspcore
-Copyright © 2006-2008, 2011  Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
+#ifdef WIN32
+#include <windows.h>
+#endif
 #include <signal.h>
-#include <iostream>
 #include <typeinfo>
-#include "../debug/demangle.h"
+#include <msp/debug/demangle.h>
+#include <msp/io/print.h>
 #include "application.h"
 #include "getopt.h"
 
@@ -37,14 +33,14 @@ 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 +54,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;
 		}
 
@@ -77,9 +72,9 @@ int Application::run(int argc, char **argv, void *data)
 		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';
+		IO::print(IO::cerr, "An uncaught exception occurred.\n");
+		IO::print(IO::cerr, "  type:   %s\n", Debug::demangle(typeid(e).name()));
+		IO::print(IO::cerr, "  what(): %s\n", e.what());
 #endif
 
 		return 124;