X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Fuimanager.cpp;h=68a39a1b040a80c09f2c3fccb15a0bf632079c6e;hb=7c3682a6d1bb940fd74e9e327bbc2dd3a8fdb504;hp=06b438be48ac0c173d46dac442f7d5238219f3c7;hpb=02252941b29de64037116f4d37991a38d9ff0d94;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/uimanager.cpp b/synfig-studio/trunk/src/synfigapp/uimanager.cpp
index 06b438b..68a39a1 100644
--- a/synfig-studio/trunk/src/synfigapp/uimanager.cpp
+++ b/synfig-studio/trunk/src/synfigapp/uimanager.cpp
@@ -2,19 +2,20 @@
 /*!	\file uimanager.cpp
 **	\brief Template File
 **
-**	$Id: uimanager.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $
+**	$Id$
 **
 **	\legal
-**	Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
-**	This software and associated documentation
-**	are CONFIDENTIAL and PROPRIETARY property of
-**	the above-mentioned copyright holder.
+**	This package is free software; you can redistribute it and/or
+**	modify it under the terms of the GNU General Public License as
+**	published by the Free Software Foundation; either version 2 of
+**	the License, or (at your option) any later version.
 **
-**	You may not copy, print, publish, or in any
-**	other way distribute this software without
-**	a prior written agreement with
-**	the copyright holder.
+**	This package is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**	General Public License for more details.
 **	\endlegal
 */
 /* ========================================================================= */
@@ -32,6 +33,8 @@
 #include <iostream>
 #include <string>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -73,7 +76,7 @@ ConsoleUIInterface::yes_no(const std::string &title, const std::string &message,
 }
 
 UIInterface::Response
-ConsoleUIInterface::yes_no_cancel(const string &title, const string &message,Response dflt)
+ConsoleUIInterface::yes_no_cancel(const std::string &title, const std::string &message, Response dflt)
 {
 	cout<<title<<": "<<message<<' ';
 	if(dflt==RESPONSE_NO)
@@ -125,7 +128,7 @@ ConsoleUIInterface::ok_cancel(const std::string &title, const std::string &messa
 			return RESPONSE_OK;
 	}
 }
-	
+
 bool
 ConsoleUIInterface::task(const std::string &task)
 {
@@ -148,7 +151,7 @@ ConsoleUIInterface::warning(const std::string &task)
 }
 
 bool
-ConsoleUIInterface::amount_complete(int current, int total)
+ConsoleUIInterface::amount_complete(int /*current*/, int /*total*/)
 {
 	return true;
 }