Skip to content

Commit

Permalink
+ fix some weirdness in Application class
Browse files Browse the repository at this point in the history
  • Loading branch information
wwmayer committed Feb 24, 2016
1 parent e6624bf commit 660a30c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 9 deletions.
11 changes: 3 additions & 8 deletions src/App/Application.cpp
Expand Up @@ -165,13 +165,8 @@ PyDoc_STRVAR(Console_doc,
"FreeCAD Console\n"
);

Application::Application(ParameterManager * /*pcSysParamMngr*/,
ParameterManager * /*pcUserParamMngr*/,
std::map<std::string,std::string> &mConfig)
://_pcSysParamMngr(pcSysParamMngr),
//_pcUserParamMngr(pcUserParamMngr),
_mConfig(mConfig),
_pActiveDoc(0)
Application::Application(std::map<std::string,std::string> &mConfig)
: _mConfig(mConfig), _pActiveDoc(0)
{
//_hApp = new ApplicationOCC;
mpcPramManager["System parameter"] = _pcSysParamMngr;
Expand Down Expand Up @@ -1277,7 +1272,7 @@ void Application::initApplication(void)

// creating the application
if (!(mConfig["Verbose"] == "Strict")) Console().Log("Create Application\n");
Application::_pcSingleton = new Application(0,0,mConfig);
Application::_pcSingleton = new Application(mConfig);

// set up Unit system default
ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath
Expand Down
2 changes: 1 addition & 1 deletion src/App/Application.h
Expand Up @@ -273,7 +273,7 @@ class AppExport Application

private:
/// Constructor
Application(ParameterManager *pcSysParamMngr, ParameterManager *pcUserParamMngr,std::map<std::string,std::string> &mConfig);
Application(std::map<std::string,std::string> &mConfig);
/// Destructor
virtual ~Application();

Expand Down

0 comments on commit 660a30c

Please sign in to comment.