thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

BASE: PLUGINS: Rename plugin matching helpers

Browse source 
- give*From* -> get*From*
This commit is contained in:
aryanrawlani28 2020-09-30 14:05:56 +05:30 • committed by Eugene Sandulenko
parent 02730ee176
commit c48719404a
11 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
base/commandLine.cpp
View file

@ -895,7 +895,7 @@ static Common::Error listSaves(const Common::String &singleTarget) {
printf("MetaEnginePlugin could not be loaded for target '%s'\n", i->c_str()); printf("MetaEnginePlugin could not be loaded for target '%s'\n", i->c_str());
continue; continue;
} else { } else {
enginePlugin = PluginMan.giveEngineFromMetaEngine(metaEnginePlugin); enginePlugin = PluginMan.getEngineFromMetaEngine(metaEnginePlugin);
if (!enginePlugin) { if (!enginePlugin) {
// If the target was specified, treat this as an error, and otherwise skip it. // If the target was specified, treat this as an error, and otherwise skip it.

4
base/main.cpp
View file

@ -192,7 +192,7 @@ static Common::Error runGame(const Plugin *plugin, OSystem &system, const Common
// Right now we have a MetaEngine plugin. We must find the matching engine plugin to // Right now we have a MetaEngine plugin. We must find the matching engine plugin to
// call createInstance and other connecting functions. // call createInstance and other connecting functions.
Plugin *enginePluginToLaunchGame = PluginMan.giveEngineFromMetaEngine(plugin); Plugin *enginePluginToLaunchGame = PluginMan.getEngineFromMetaEngine(plugin);
if (!enginePluginToLaunchGame) { if (!enginePluginToLaunchGame) {
err = Common::kEnginePluginNotFound; err = Common::kEnginePluginNotFound;
@ -550,7 +550,7 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
// Right now, we have a MetaEngine plugin, and we want to unload all except Engine. // Right now, we have a MetaEngine plugin, and we want to unload all except Engine.
// First, get the relevant Engine plugin from MetaEngine. // First, get the relevant Engine plugin from MetaEngine.
const Plugin *enginePlugin = PluginMan.giveEngineFromMetaEngine(plugin); const Plugin *enginePlugin = PluginMan.getEngineFromMetaEngine(plugin);
// Then, pass in the pointer to enginePlugin, with the matching type, so our function behaves as-is. // Then, pass in the pointer to enginePlugin, with the matching type, so our function behaves as-is.
PluginManager::instance().unloadPluginsExcept(PLUGIN_TYPE_ENGINE, enginePlugin); PluginManager::instance().unloadPluginsExcept(PLUGIN_TYPE_ENGINE, enginePlugin);

4
base/plugins.cpp
View file

@ -271,7 +271,7 @@ void PluginManager::addPluginProvider(PluginProvider *pp) {
_providers.push_back(pp); _providers.push_back(pp);
} }
Plugin *PluginManager::giveEngineFromMetaEngine(const Plugin *plugin) { Plugin *PluginManager::getEngineFromMetaEngine(const Plugin *plugin) {
assert(plugin->getType() == PLUGIN_TYPE_METAENGINE); assert(plugin->getType() == PLUGIN_TYPE_METAENGINE);
Plugin *enginePlugin = nullptr; Plugin *enginePlugin = nullptr;
@ -305,7 +305,7 @@ Plugin *PluginManager::giveEngineFromMetaEngine(const Plugin *plugin) {
return nullptr; return nullptr;
} }
Plugin *PluginManager::giveMetaEngineFromEngine(const Plugin *plugin) { Plugin *PluginManager::getMetaEngineFromEngine(const Plugin *plugin) {
assert(plugin->getType() == PLUGIN_TYPE_ENGINE); assert(plugin->getType() == PLUGIN_TYPE_ENGINE);
Plugin *metaEngine = nullptr; Plugin *metaEngine = nullptr;

4
base/plugins.h
View file

@ -347,7 +347,7 @@ public:
* *
* @return A plugin of type METAENGINE. * @return A plugin of type METAENGINE.
*/ */
Plugin *giveMetaEngineFromEngine(const Plugin *plugin); Plugin *getMetaEngineFromEngine(const Plugin *plugin);
/** /**
* A method which takes in a plugin of type METAENGINE, * A method which takes in a plugin of type METAENGINE,
@ -359,7 +359,7 @@ public:
* *
* @return A plugin of type ENGINE. * @return A plugin of type ENGINE.
*/ */
Plugin *giveEngineFromMetaEngine(const Plugin *plugin); Plugin *getEngineFromMetaEngine(const Plugin *plugin);
// Functions used by the uncached PluginManager // Functions used by the uncached PluginManager
virtual void init() {} virtual void init() {}

2
engines/advancedDetector.cpp
View file

@ -681,7 +681,7 @@ void AdvancedMetaEngine::initSubSystems(const ADGameDescription *gameDesc) const
Common::Error AdvancedMetaEngineConnect::createInstance(OSystem *syst, Engine **engine) const { Common::Error AdvancedMetaEngineConnect::createInstance(OSystem *syst, Engine **engine) const {
PluginList pl = PluginMan.getPlugins(PLUGIN_TYPE_ENGINE); PluginList pl = PluginMan.getPlugins(PLUGIN_TYPE_ENGINE);
if (pl.size() == 1) { if (pl.size() == 1) {
Plugin *metaEnginePlugin = PluginMan.giveMetaEngineFromEngine(pl[0]); Plugin *metaEnginePlugin = PluginMan.getMetaEngineFromEngine(pl[0]);
if (metaEnginePlugin) { if (metaEnginePlugin) {
return metaEnginePlugin->get<AdvancedMetaEngine>().createInstance(syst, engine); return metaEnginePlugin->get<AdvancedMetaEngine>().createInstance(syst, engine);
} }

2
engines/engine.cpp
View file

@ -875,7 +875,7 @@ MetaEngineConnect &Engine::getMetaEngineConnect() {
const Plugin *metaEnginePlugin = EngineMan.findPlugin(ConfMan.get("engineid")); const Plugin *metaEnginePlugin = EngineMan.findPlugin(ConfMan.get("engineid"));
assert(metaEnginePlugin); assert(metaEnginePlugin);
const Plugin *enginePlugin = PluginMan.giveEngineFromMetaEngine(metaEnginePlugin); const Plugin *enginePlugin = PluginMan.getEngineFromMetaEngine(metaEnginePlugin);
assert(enginePlugin); assert(enginePlugin);
return enginePlugin->get<MetaEngineConnect>(); return enginePlugin->get<MetaEngineConnect>();

2
engines/sci/detection.cpp
View file

@ -453,7 +453,7 @@ ADDetectedGame SciMetaEngine::fallbackDetect(const FileMap &allFiles, const Comm
const Plugin *metaEnginePlugin = EngineMan.findPlugin(getEngineId()); const Plugin *metaEnginePlugin = EngineMan.findPlugin(getEngineId());
if (metaEnginePlugin) { if (metaEnginePlugin) {
const Plugin *enginePlugin = PluginMan.giveEngineFromMetaEngine(metaEnginePlugin); const Plugin *enginePlugin = PluginMan.getEngineFromMetaEngine(metaEnginePlugin);
if (enginePlugin) { if (enginePlugin) {
return enginePlugin->get<AdvancedMetaEngineConnect>().fallbackDetectExtern(_md5Bytes, allFiles, fslist); return enginePlugin->get<AdvancedMetaEngineConnect>().fallbackDetectExtern(_md5Bytes, allFiles, fslist);
} else { } else {

2
engines/wintermute/detection.cpp
View file

@ -97,7 +97,7 @@ public:
const Plugin *metaEnginePlugin = EngineMan.findPlugin(getEngineId()); const Plugin *metaEnginePlugin = EngineMan.findPlugin(getEngineId());
if (metaEnginePlugin) { if (metaEnginePlugin) {
const Plugin *enginePlugin = PluginMan.giveEngineFromMetaEngine(metaEnginePlugin); const Plugin *enginePlugin = PluginMan.getEngineFromMetaEngine(metaEnginePlugin);
if (enginePlugin) { if (enginePlugin) {
return enginePlugin->get<AdvancedMetaEngineConnect>().fallbackDetectExtern(_md5Bytes, allFiles, fslist); return enginePlugin->get<AdvancedMetaEngineConnect>().fallbackDetectExtern(_md5Bytes, allFiles, fslist);
} else { } else {

2
gui/editgamedialog.cpp
View file

@ -115,7 +115,7 @@ EditGameDialog::EditGameDialog(const String &domain)
if (!metaEnginePlugin) { if (!metaEnginePlugin) {
warning("MetaEnginePlugin for target \"%s\" not found!", domain.c_str()); warning("MetaEnginePlugin for target \"%s\" not found!", domain.c_str());
} else { } else {
enginePlugin = PluginMan.giveEngineFromMetaEngine(metaEnginePlugin); enginePlugin = PluginMan.getEngineFromMetaEngine(metaEnginePlugin);
if (!enginePlugin) { if (!enginePlugin) {
warning("Engine Plugin for target \"%s\" not found! Game specific settings might be missing.", domain.c_str()); warning("Engine Plugin for target \"%s\" not found! Game specific settings might be missing.", domain.c_str());
} }

2
gui/launcher.cpp
View file

@ -475,7 +475,7 @@ void LauncherDialog::loadGame(int item) {
// If we found a relevant plugin, find the matching engine plugin. // If we found a relevant plugin, find the matching engine plugin.
if (metaEnginePlugin) { if (metaEnginePlugin) {
enginePlugin = PluginMan.giveEngineFromMetaEngine(metaEnginePlugin); enginePlugin = PluginMan.getEngineFromMetaEngine(metaEnginePlugin);
} }
if (enginePlugin) { if (enginePlugin) {

2
gui/saveload.cpp
View file

@ -81,7 +81,7 @@ int SaveLoadChooser::runModalWithCurrentTarget() {
if (!plugin) { if (!plugin) {
error("SaveLoadChooser::runModalWithCurrentTarget(): Cannot find plugin"); error("SaveLoadChooser::runModalWithCurrentTarget(): Cannot find plugin");
} else { } else {
enginePlugin = PluginMan.giveEngineFromMetaEngine(plugin); enginePlugin = PluginMan.getEngineFromMetaEngine(plugin);
if (!enginePlugin) { if (!enginePlugin) {
error("SaveLoadChooser::runModalWithCurrentTarget(): Couldn't match a Engine from the MetaEngine. \ error("SaveLoadChooser::runModalWithCurrentTarget(): Couldn't match a Engine from the MetaEngine. \