aboutsummaryrefslogtreecommitdiff
path: root/gui/saveload.h
diff options
context:
space:
mode:
authorColin Snover2017-11-10 23:06:42 -0600
committerColin Snover2017-12-03 20:26:38 -0600
commitd087c9605ffffdc9053c5efdc83f53658afbe9a6 (patch)
treedc03820fe11d65d683c386512086f62faeb98089 /gui/saveload.h
parent55855cab838c2cb48ea02b983924f4c2b53583c1 (diff)
downloadscummvm-rg350-d087c9605ffffdc9053c5efdc83f53658afbe9a6.tar.gz
scummvm-rg350-d087c9605ffffdc9053c5efdc83f53658afbe9a6.tar.bz2
scummvm-rg350-d087c9605ffffdc9053c5efdc83f53658afbe9a6.zip
BASE: Remove bad casts between incompatible Plugin types
Previously, a C-style cast was used to convert a Common::Array<Plugin *>, populated with pointers to StaticPlugin and DynamicPlugin instances, to a Common::Array<PluginSubclass<T> *>, but PluginSubclass<T> is a *sibling* class to StaticPlugin/DynamicPlugin, so this cast was invalid and the results undefined. The methods for retrieving subclasses of plugins can't be easily changed to just generate an array of temporary wrapper objects that expose an identical API which dereferences to the preferred PluginObject subclass because pointers to these objects are retained by other parts of ScummVM, so the wrappers would needed to be persisted or they would need to just re-expose the underlying Plugin object again. This indicated that a way to solve this problem is to have the callers receive Plugin objects and get the PluginObject from the Plugin by explicitly stating their desired type, in a similar manner to std::get(std::variant), so that the pattern used by this patch to solve the problem. Closes gh-1051.
Diffstat (limited to 'gui/saveload.h')
-rw-r--r--gui/saveload.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/gui/saveload.h b/gui/saveload.h
index 01a78c4924..be0bc4206f 100644
--- a/gui/saveload.h
+++ b/gui/saveload.h
@@ -51,7 +51,7 @@ public:
* @return The selcted save slot. -1 in case none is selected.
*/
int runModalWithCurrentTarget();
- int runModalWithPluginAndTarget(const EnginePlugin *plugin, const String &target);
+ int runModalWithPluginAndTarget(const Plugin *plugin, const String &target);
const Common::String &getResultString() const;