Removed unused parameters.

[synfig.git] / synfig-core / trunk / src / synfig / main.cpp

diff --git a/synfig-core/trunk/src/synfig/main.cpp b/synfig-core/trunk/src/synfig/main.cpp
index 48b3546..6a532ea 100644 (file)
--- a/synfig-core/trunk/src/synfig/main.cpp
+++ b/synfig-core/trunk/src/synfig/main.cpp
@@ -1,20 +1,21 @@
 /* === 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 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
 */
 /* ========================================================================= */
@@ -116,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);
@@ -142,7 +143,7 @@ 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;
 }
 
@@ -193,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;
 }
 
@@ -214,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\""));
@@ -252,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())
        {
@@ -271,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");
@@ -305,7 +306,7 @@ synfig::Main::Main(const synfig::String& basepath,ProgressCallback *cb):
        {
                locations.push_back(getenv("SYNFIG_MODULE_LIST"));
        }
-/*     
+/*
        const char *locations[]=
        {
                "standard",     //0
@@ -327,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"));
 }
@@ -367,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();