X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fmain.cpp;h=073a9b73e21af6c535e894dfdb6639b3e66f02a7;hb=740253c894f69f0f4244119dce8818caee470942;hp=d926754dd555ced125a3290666338e9950664186;hpb=e8a065f2385c219c511b57dac52786120bfa097d;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/main.cpp b/synfig-core/trunk/src/synfig/main.cpp
index d926754..073a9b7 100644
--- a/synfig-core/trunk/src/synfig/main.cpp
+++ b/synfig-core/trunk/src/synfig/main.cpp
@@ -1,8 +1,8 @@
 /* === S Y N F I G ========================================================= */
-/*!	\file main.cpp
+/*!	\file synfig/main.cpp
 **	\brief \writeme
 **
-**	$Id: main.cpp,v 1.3 2005/01/10 07:40:26 darco Exp $
+**	$Id$
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@ -117,7 +117,7 @@ synfig::check_version_(int version,int vec_size, int color_size,int canvas_size,
 	bool ret=true;
 
 	CHECK_EXPIRE_TIME();
-	
+
 	if(version!=SYNFIG_LIBRARY_VERSION)
 	{
 		synfig::error(_("API Version mismatch (LIB:%d, PROG:%d)"),SYNFIG_LIBRARY_VERSION,version);
@@ -143,11 +143,11 @@ synfig::check_version_(int version,int vec_size, int color_size,int canvas_size,
 		synfig::error(_("Size of Layer mismatch (app:%d, lib:%d)"),layer_size,sizeof(Layer));
 		ret=false;
 	}
-	
+
 	return ret;
 }
 
-static void broken_pipe_signal (int sig)  {
+static void broken_pipe_signal (int /*sig*/)  {
 	synfig::warning("Broken Pipe...");
 }
 
@@ -194,12 +194,12 @@ bool retrieve_modules_to_load(String filename,std::list<String> &modules_to_load
 			String modulename;
 			getline(file,modulename);
 			if(!modulename.empty() && find(modules_to_load.begin(),modules_to_load.end(),modulename)==modules_to_load.end())
-				modules_to_load.push_back(modulename);			
+				modules_to_load.push_back(modulename);
 		}
 	}
 
-	
-	
+
+
 	return true;
 }
 
@@ -215,24 +215,24 @@ synfig::Main::Main(const synfig::String& basepath,ProgressCallback *cb):
 
 	synfig_ref_count_.reset();
 	ref_count_=synfig_ref_count_;
-	
+
 	// Add initialization after this point
 
 
 	CHECK_EXPIRE_TIME();
 
 	String prefix=basepath+"/..";
-	int i;
+	unsigned int i;
 #ifdef _DEBUG
 	std::set_terminate(__gnu_cxx::__verbose_terminate_handler);
 #endif
-	
+
 #if defined(HAVE_SIGNAL_H) && defined(SIGPIPE)
 	signal(SIGPIPE, broken_pipe_signal);
 #endif
-	
+
 	//_config_search_path=new vector"string.h"();
-	
+
 	// Init the subsystems
 	if(cb)cb->amount_complete(0, 100);
 	if(cb)cb->task(_("Starting Subsystem \"Modules\""));
@@ -253,7 +253,7 @@ synfig::Main::Main(const synfig::String& basepath,ProgressCallback *cb):
 		Module::subsys_stop();
 		throw std::runtime_error(_("Unable to initialize subsystem \"Targets\""));
 	}
-	
+
 	if(cb)cb->task(_("Starting Subsystem \"Importers\""));
 	if(!Importer::subsys_init())
 	{
@@ -272,16 +272,16 @@ synfig::Main::Main(const synfig::String& basepath,ProgressCallback *cb):
 		Module::subsys_stop();
 		throw std::runtime_error(_("Unable to initialize subsystem \"ValueNodes\""));
 	}
-	
+
 	// Load up the list importer
 	Importer::book()[String("lst")]=ListImporter::create;
-		
 
-	
-	// Load up the modules	
+
+
+	// Load up the modules
 	std::list<String> modules_to_load;
 	std::vector<String> locations;
-	
+
 	if(!getenv("SYNFIG_MODULE_LIST"))
 	{
 		locations.push_back("standard");
@@ -306,7 +306,7 @@ synfig::Main::Main(const synfig::String& basepath,ProgressCallback *cb):
 	{
 		locations.push_back(getenv("SYNFIG_MODULE_LIST"));
 	}
-/*	
+/*
 	const char *locations[]=
 	{
 		"standard",	//0
@@ -328,24 +328,24 @@ synfig::Main::Main(const synfig::String& basepath,ProgressCallback *cb):
 #endif
 	};
 */
-	
+
 	for(i=0;i<locations.size();i++)
 		if(retrieve_modules_to_load(locations[i],modules_to_load))
 			if(cb)cb->task(strprintf(_("Loading modules from %s"),locations[i].c_str()));
-	
+
 	std::list<String>::iterator iter;
-	
+
 	for(i=0,iter=modules_to_load.begin();iter!=modules_to_load.end();++iter,i++)
 	{
 		Module::Register(*iter,cb);
 		if(cb)cb->amount_complete((i+1)*100,modules_to_load.size()*100);
 	}
-	
+
 //	load_modules(cb);
-	
+
 	CHECK_EXPIRE_TIME();
 
-	
+
 	if(cb)cb->amount_complete(100, 100);
 	if(cb)cb->task(_("DONE"));
 }
@@ -368,7 +368,7 @@ synfig::Main::~Main()
 			synfig::warning("%s: count()=%d",iter->first.c_str(), iter->second.count());
 		}
 	}
-		
+
 	ValueNode::subsys_stop();
 	Importer::subsys_stop();
 	Target::subsys_stop();