StelModuleMgr.cpp   StelModuleMgr.cpp 
skipping to change at line 61 skipping to change at line 61
if (callingListsToRegenerate) if (callingListsToRegenerate)
generateCallingLists(); generateCallingLists();
callingListsToRegenerate = false; callingListsToRegenerate = false;
} }
/************************************************************************* /*************************************************************************
Register a new StelModule to the list Register a new StelModule to the list
*************************************************************************/ *************************************************************************/
void StelModuleMgr::registerModule(StelModule* m, bool fgenerateCallingList s) void StelModuleMgr::registerModule(StelModule* m, bool fgenerateCallingList s)
{ {
if (modules.find(m->objectName()) != modules.end()) QString name = m->objectName();
if (modules.find(name) != modules.end())
{ {
qWarning() << "Module \"" << m->objectName() << "\" is alrea dy loaded."; qWarning() << "Module \"" << name << "\" is already loaded." ;
return; return;
} }
modules.insert(m->objectName(), m); modules.insert(name, m);
m->setParent(this); m->setParent(this);
if (fgenerateCallingLists) if (fgenerateCallingLists)
generateCallingLists(); generateCallingLists();
} }
/************************************************************************* /*************************************************************************
Unregister and delete a StelModule. Unregister and delete a StelModule.
*************************************************************************/ *************************************************************************/
void StelModuleMgr::unloadModule(const QString& moduleID, bool alsoDelete) void StelModuleMgr::unloadModule(const QString& moduleID, bool alsoDelete)
skipping to change at line 169 skipping to change at line 170
// Unload all plugins // Unload all plugins
void StelModuleMgr::unloadAllPlugins() void StelModuleMgr::unloadAllPlugins()
{ {
QListIterator<PluginDescriptor> i(getPluginsList()); QListIterator<PluginDescriptor> i(getPluginsList());
i.toBack(); i.toBack();
while (i.hasPrevious()) while (i.hasPrevious())
{ {
const PluginDescriptor& d = i.previous(); const PluginDescriptor& d = i.previous();
if (d.loadAtStartup==false) if (d.loadAtStartup==false)
continue; continue;
unloadModule(d.key); unloadModule(d.key, true);
qDebug() << "Unloaded plugin " << d.key << "."; qDebug() << "Unloaded plugin " << d.key << ".";
} }
} }
/************************************************************************* /*************************************************************************
Generate properly sorted calling lists for each action (e,g, draw, update) Generate properly sorted calling lists for each action (e,g, draw, update)
according to modules orders dependencies according to modules orders dependencies
*************************************************************************/ *************************************************************************/
void StelModuleMgr::generateCallingLists() void StelModuleMgr::generateCallingLists()
{ {
 End of changes. 4 change blocks. 
4 lines changed or deleted 5 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/