#5200: Rename ApplicationContext interface to IApplicationContext

codereader · Aug 22, 2020 · aa95088 · aa95088
1 parent 85ba623
commit aa95088
Show file tree

Hide file tree

Showing 163 changed files with 184 additions and 189 deletions.
diff --git a/.gitignore b/.gitignore
@@ -66,3 +66,6 @@ Makefile.in
 /tools/scripts/DarkRadiant_install.x64
 /tools/scripts/DarkRadiant_install
 /install/*.ilk
+/tools/msvc/Tests/x64
+/tools/msvc/x64
+/tools/msvc/packages
diff --git a/include/imodule.h b/include/imodule.h
@@ -51,7 +51,7 @@ inline ErrorHandlingFunction& GlobalErrorHandler()
  *
  * \ingroup module
  */
-class ApplicationContext
+class IApplicationContext
 {
 public:
 
@@ -64,7 +64,7 @@ class ApplicationContext
     /**
 	 * Destructor
 	 */
-	virtual ~ApplicationContext() {}
+	virtual ~IApplicationContext() {}
 
 	/**
 	 * Return the application path of the current Radiant instance.
@@ -180,7 +180,7 @@ class RegisterableModule: public sigc::trackable
 	 * @param ctx
 	 * The ApplicationContext of the running Radiant application.
 	 */
-	virtual void initialiseModule(const ApplicationContext& ctx) = 0;
+	virtual void initialiseModule(const IApplicationContext& ctx) = 0;
 
 	/**
 	 * Optional shutdown routine. Allows the module to de-register itself,
@@ -276,7 +276,7 @@ class IModuleRegistry
 	 * streams. The latter can be used by modules to initialise their
 	 * rMessage/globalErrorStreams().
 	 */
-	virtual const ApplicationContext& getApplicationContext() const = 0;
+	virtual const IApplicationContext& getApplicationContext() const = 0;
 
 	/**
 	 * Callable during the module registration phase, this method attempts

diff --git a/libs/module/ApplicationContextBase.cpp b/libs/module/ApplicationContextBase.cpp
@@ -15,8 +15,6 @@
 #include <windows.h>
 #endif
 
-//#include <wx/msgout.h>
-
 namespace radiant
 {
 
@@ -25,7 +23,6 @@ namespace radiant
  */
 std::string ApplicationContextBase::getApplicationPath() const
 {
-    //wxMessageOutputDebug().Output(wxString("Application Path is ") + _appPath);
 	return _appPath;
 }
 
@@ -91,12 +88,10 @@ std::string ApplicationContextBase::getSettingsPath() const
 
 std::string ApplicationContextBase::getBitmapsPath() const
 {
-    //wxMessageOutputDebug().Output(wxString("RTD Path is ") + getRuntimeDataPath());
 	return getRuntimeDataPath() + "bitmaps/";
 }
 
-const ApplicationContext::ArgumentList&
-ApplicationContextBase::getCmdLineArgs() const
+const IApplicationContext::ArgumentList& ApplicationContextBase::getCmdLineArgs() const
 {
 	return _cmdLineArgs;
 }

diff --git a/libs/module/ApplicationContextBase.h b/libs/module/ApplicationContextBase.h
@@ -7,7 +7,7 @@ namespace radiant
 {
 
 class ApplicationContextBase :
-	public ApplicationContext
+	public IApplicationContext
 {
 	// The app + home paths
 	std::string _appPath;

diff --git a/libs/module/CoreModule.cpp b/libs/module/CoreModule.cpp
@@ -12,7 +12,7 @@
 namespace module
 {
 
-CoreModule::CoreModule(ApplicationContext& context) :
+CoreModule::CoreModule(IApplicationContext& context) :
 	_instance(nullptr)
 {
 	std::string coreModuleFile = std::string(CORE_MODULE_LIBRARY) + MODULE_FILE_EXTENSION;

diff --git a/libs/module/CoreModule.h b/libs/module/CoreModule.h
@@ -17,7 +17,7 @@ class DynamicLibrary;
 class CoreModule
 {
 private:
-	typedef radiant::IRadiant* (*CreateRadiantFunc)(ApplicationContext& context);
+	typedef radiant::IRadiant* (*CreateRadiantFunc)(IApplicationContext& context);
 	typedef void (*DestroyRadiantFunc)(radiant::IRadiant* radiant);
 
 	radiant::IRadiant* _instance;
@@ -34,7 +34,7 @@ class CoreModule
 		{}
 	};
 
-	CoreModule(ApplicationContext& context);
+	CoreModule(IApplicationContext& context);
 
 	~CoreModule();
 

diff --git a/plugins/dm.conversation/plugin.cpp b/plugins/dm.conversation/plugin.cpp
@@ -34,7 +34,7 @@ class ConversationEditorModule :
 		return _dependencies;
 	}
 
-	virtual void initialiseModule(const ApplicationContext& ctx) {
+	virtual void initialiseModule(const IApplicationContext& ctx) {
 		rMessage() << getName() << "::initialiseModule called.\n";
 
 		// Add the callback event

diff --git a/plugins/dm.difficulty/plugin.cpp b/plugins/dm.difficulty/plugin.cpp
@@ -41,7 +41,7 @@ class DifficultyEditorModule :
 		return _dependencies;
 	}
 
-	void initialiseModule(const ApplicationContext& ctx)
+	void initialiseModule(const IApplicationContext& ctx)
 	{
 		rMessage() << getName() << "::initialiseModule called." << std::endl;
 

diff --git a/plugins/dm.editing/plugin.cpp b/plugins/dm.editing/plugin.cpp
@@ -43,7 +43,7 @@ class EditingModule :
 		return _dependencies;
 	}
 
-	virtual void initialiseModule(const ApplicationContext& ctx)
+	virtual void initialiseModule(const IApplicationContext& ctx)
 	{
 		rMessage() << getName() << "::initialiseModule called." << std::endl;
 

diff --git a/plugins/dm.gui/gui/GuiManager.cpp b/plugins/dm.gui/gui/GuiManager.cpp
@@ -210,7 +210,7 @@ const StringSet& GuiManager::getDependencies() const
 	return _dependencies;
 }
 
-void GuiManager::initialiseModule(const ApplicationContext& ctx)
+void GuiManager::initialiseModule(const IApplicationContext& ctx)
 {
 	rMessage() << getName() << "::initialiseModule called." << std::endl;
 

diff --git a/plugins/dm.gui/gui/GuiManager.h b/plugins/dm.gui/gui/GuiManager.h
@@ -83,7 +83,7 @@ class GuiManager :
 	// RegisterableModule
 	const std::string& getName() const override;
 	const StringSet& getDependencies() const override;
-	void initialiseModule(const ApplicationContext& ctx) override;
+	void initialiseModule(const IApplicationContext& ctx) override;
 	void shutdownModule() override;
 
 private:

diff --git a/plugins/dm.gui/plugin.cpp b/plugins/dm.gui/plugin.cpp
@@ -61,7 +61,7 @@ class GuiModule :
 		return _dependencies;
 	}
 
-	virtual void initialiseModule(const ApplicationContext& ctx)
+	virtual void initialiseModule(const IApplicationContext& ctx)
 	{
 		rMessage() << getName() << "::initialiseModule called." << std::endl;
 

diff --git a/plugins/dm.objectives/objectives.cpp b/plugins/dm.objectives/objectives.cpp
@@ -49,7 +49,7 @@ class ObjectivesEditorModule :
 		return _dependencies;
 	}
 
-	virtual void initialiseModule(const ApplicationContext& ctx) {
+	virtual void initialiseModule(const IApplicationContext& ctx) {
 		rMessage() << "ObjectivesEditorModule::initialiseModule called.\n";
 
 		// Add the callback event

diff --git a/plugins/dm.stimresponse/plugin.cpp b/plugins/dm.stimresponse/plugin.cpp
@@ -42,7 +42,7 @@ class StimResponseModule :
 		return _dependencies;
 	}
 
-	void initialiseModule(const ApplicationContext& ctx) override
+	void initialiseModule(const IApplicationContext& ctx) override
 	{
 		rMessage() << getName() << "::initialiseModule called." << std::endl;
 

diff --git a/plugins/script/ScriptingSystem.cpp b/plugins/script/ScriptingSystem.cpp
@@ -413,7 +413,7 @@ const StringSet& ScriptingSystem::getDependencies() const
 	return _dependencies;
 }
 
-void ScriptingSystem::initialiseModule(const ApplicationContext& ctx)
+void ScriptingSystem::initialiseModule(const IApplicationContext& ctx)
 {
 	rMessage() << getName() << "::initialiseModule called." << std::endl;
 

diff --git a/plugins/script/ScriptingSystem.h b/plugins/script/ScriptingSystem.h
@@ -80,7 +80,7 @@ class ScriptingSystem :
 	// RegisterableModule implementation
 	const std::string& getName() const override;
 	const StringSet& getDependencies() const override;
-	void initialiseModule(const ApplicationContext& ctx) override;
+	void initialiseModule(const IApplicationContext& ctx) override;
 	void shutdownModule() override;
 
 private:

diff --git a/plugins/sound/SoundManager.cpp b/plugins/sound/SoundManager.cpp
@@ -145,13 +145,11 @@ void SoundManager::ensureShadersLoaded()
     _defLoader.ensureFinished();
 }
 
-void SoundManager::initialiseModule(const ApplicationContext& ctx)
+void SoundManager::initialiseModule(const IApplicationContext& ctx)
 {
     // Create the SoundPlayer if sound is not disabled
-    const ApplicationContext::ArgumentList& args = ctx.getCmdLineArgs();
-    ApplicationContext::ArgumentList::const_iterator found(
-        std::find(args.begin(), args.end(), "--disable-sound")
-    );
+    const auto& args = ctx.getCmdLineArgs();
+    auto found = std::find(args.begin(), args.end(), "--disable-sound");
 
     if (found == args.end())
     {

diff --git a/plugins/sound/SoundManager.h b/plugins/sound/SoundManager.h
@@ -50,7 +50,7 @@ class SoundManager : public ISoundManager
 	// RegisterableModule implementation
 	virtual const std::string& getName() const override;
 	virtual const StringSet& getDependencies() const override;
-	virtual void initialiseModule(const ApplicationContext& ctx) override;
+	virtual void initialiseModule(const IApplicationContext& ctx) override;
 };
 typedef std::shared_ptr<SoundManager> SoundManagerPtr;
 

diff --git a/radiant/RadiantModule.cpp b/radiant/RadiantModule.cpp
@@ -69,7 +69,7 @@ const StringSet& RadiantModule::getDependencies() const
 	return _dependencies;
 }
 
-void RadiantModule::initialiseModule(const ApplicationContext& ctx)
+void RadiantModule::initialiseModule(const IApplicationContext& ctx)
 {
 	rMessage() << getName() << "::initialiseModule called." << std::endl;
 

diff --git a/radiant/RadiantModule.h b/radiant/RadiantModule.h
@@ -30,7 +30,7 @@ class RadiantModule :
 	// RegisterableModule implementation
 	const std::string& getName() const override;
 	const StringSet& getDependencies() const override;
-	void initialiseModule(const ApplicationContext& ctx) override;
+	void initialiseModule(const IApplicationContext& ctx) override;
 	void shutdownModule() override;
 
 	// Stuff to be done after the modules have been loaded

diff --git a/radiant/camera/GlobalCamera.cpp b/radiant/camera/GlobalCamera.cpp
@@ -510,7 +510,7 @@ const StringSet& GlobalCameraManager::getDependencies() const
 	return _dependencies;
 }
 
-void GlobalCameraManager::initialiseModule(const ApplicationContext& ctx)
+void GlobalCameraManager::initialiseModule(const IApplicationContext& ctx)
 {
 	rMessage() << getName() << "::initialiseModule called." << std::endl;
 

diff --git a/radiant/camera/GlobalCamera.h b/radiant/camera/GlobalCamera.h
@@ -130,7 +130,7 @@ class GlobalCameraManager :
 	// RegisterableModule implementation
 	const std::string& getName() const;
 	const StringSet& getDependencies() const;
-	void initialiseModule(const ApplicationContext& ctx);
+	void initialiseModule(const IApplicationContext& ctx);
 	void shutdownModule();
 
 private:

diff --git a/radiant/clipboard/ClipboardModule.cpp b/radiant/clipboard/ClipboardModule.cpp
@@ -49,7 +49,7 @@ const StringSet& ClipboardModule::getDependencies() const
 	return _dependencies;
 }
 
-void ClipboardModule::initialiseModule(const ApplicationContext& ctx)
+void ClipboardModule::initialiseModule(const IApplicationContext& ctx)
 {
 	rMessage() << getName() << "::initialiseModule called." << std::endl;
 }

diff --git a/radiant/clipboard/ClipboardModule.h b/radiant/clipboard/ClipboardModule.h
@@ -14,7 +14,7 @@ class ClipboardModule :
 
 	const std::string& getName() const override;
 	const StringSet& getDependencies() const override;
-	void initialiseModule(const ApplicationContext& ctx) override;
+	void initialiseModule(const IApplicationContext& ctx) override;
 };
 
 }
diff --git a/radiant/eventmanager/EventManager.cpp b/radiant/eventmanager/EventManager.cpp
@@ -64,7 +64,7 @@ const StringSet& EventManager::getDependencies() const
 	return _dependencies;
 }
 
-void EventManager::initialiseModule(const ApplicationContext& ctx)
+void EventManager::initialiseModule(const IApplicationContext& ctx)
 {
 	rMessage() << getName() << "::initialiseModule called." << std::endl;
 

diff --git a/radiant/eventmanager/EventManager.h b/radiant/eventmanager/EventManager.h
@@ -42,7 +42,7 @@ class EventManager :
 	// RegisterableModule implementation
 	const std::string& getName() const override;
 	const StringSet& getDependencies() const override;
-	void initialiseModule(const ApplicationContext& ctx) override;
+	void initialiseModule(const IApplicationContext& ctx) override;
 	void shutdownModule() override;
 
 	// Constructor

diff --git a/radiant/eventmanager/MouseToolManager.cpp b/radiant/eventmanager/MouseToolManager.cpp
@@ -37,7 +37,7 @@ const StringSet& MouseToolManager::getDependencies() const
     return _dependencies;
 }
 
-void MouseToolManager::initialiseModule(const ApplicationContext& ctx)
+void MouseToolManager::initialiseModule(const IApplicationContext& ctx)
 {
     GlobalRadiant().signal_radiantStarted().connect(
         sigc::mem_fun(this, &MouseToolManager::onRadiantStartup));

diff --git a/radiant/eventmanager/MouseToolManager.h b/radiant/eventmanager/MouseToolManager.h
@@ -28,7 +28,7 @@ class MouseToolManager :
     // RegisterableModule implementation
     const std::string& getName() const;
     const StringSet& getDependencies() const;
-    void initialiseModule(const ApplicationContext& ctx);
+    void initialiseModule(const IApplicationContext& ctx);
     void shutdownModule();
     void onRadiantStartup();
 

diff --git a/radiant/map/StartupMapLoader.cpp b/radiant/map/StartupMapLoader.cpp
@@ -22,7 +22,7 @@ void StartupMapLoader::onRadiantStartup()
 {
 	std::string mapToLoad = "";
 
-    const ApplicationContext::ArgumentList& args(
+    const auto& args(
         module::GlobalModuleRegistry().getApplicationContext().getCmdLineArgs()
     );
 
@@ -105,7 +105,7 @@ const StringSet& StartupMapLoader::getDependencies() const
 	return _dependencies;
 }
 
-void StartupMapLoader::initialiseModule(const ApplicationContext& ctx)
+void StartupMapLoader::initialiseModule(const IApplicationContext& ctx)
 {
 	rMessage() << getName() << "::initialiseModule called." << std::endl;
 

diff --git a/radiant/map/StartupMapLoader.h b/radiant/map/StartupMapLoader.h
@@ -13,7 +13,7 @@ class StartupMapLoader :
 public:
 	const std::string& getName() const override;
 	const StringSet& getDependencies() const override;
-	void initialiseModule(const ApplicationContext& ctx) override;
+	void initialiseModule(const IApplicationContext& ctx) override;
 
 private:
 	// This gets called as soon as the mainframe starts up

diff --git a/radiant/render/OpenGLModule.cpp b/radiant/render/OpenGLModule.cpp
@@ -181,7 +181,7 @@ const StringSet& OpenGLModule::getDependencies() const {
 	return _dependencies;
 }
 
-void OpenGLModule::initialiseModule(const ApplicationContext& ctx) {
+void OpenGLModule::initialiseModule(const IApplicationContext& ctx) {
 	rMessage() << "OpenGL::initialiseModule called.\n";
 }
 

diff --git a/radiant/render/OpenGLModule.h b/radiant/render/OpenGLModule.h
@@ -46,7 +46,7 @@ class OpenGLModule :
 	// RegisterableModule implementation
     virtual const std::string& getName() const override;
     virtual const StringSet& getDependencies() const override;
-    virtual void initialiseModule(const ApplicationContext& ctx) override;
+    virtual void initialiseModule(const IApplicationContext& ctx) override;
 
 private:
 	void sharedContextCreated();

diff --git a/radiant/settings/LocalisationModule.cpp b/radiant/settings/LocalisationModule.cpp
@@ -29,7 +29,7 @@ const StringSet& LocalisationModule::getDependencies() const
 	return _dependencies;
 }
 
-void LocalisationModule::initialiseModule(const ApplicationContext& ctx)
+void LocalisationModule::initialiseModule(const IApplicationContext& ctx)
 {
 	rMessage() << getName() << "::initialiseModule called" << std::endl;
 

diff --git a/radiant/settings/LocalisationModule.h b/radiant/settings/LocalisationModule.h
@@ -12,7 +12,7 @@ class LocalisationModule :
 public:
 	const std::string& getName() const override;
 	const StringSet& getDependencies() const override;
-	void initialiseModule(const ApplicationContext& ctx) override;
+	void initialiseModule(const IApplicationContext& ctx) override;
 	void shutdownModule() override;
 };
 

diff --git a/radiant/settings/LocalisationProvider.cpp b/radiant/settings/LocalisationProvider.cpp
@@ -33,7 +33,7 @@ class UnknownLanguageException :
 
 const char* const LocalisationProvider::RKEY_LANGUAGE = "user/ui/language";
 
-LocalisationProvider::LocalisationProvider(ApplicationContext& ctx)
+LocalisationProvider::LocalisationProvider(IApplicationContext& ctx)
 {
 	// Point wxWidgets to the folder where the catalog files are stored
 	_i18nPath = os::standardPathWithSlash(ctx.getApplicationPath() + "i18n");
@@ -62,7 +62,7 @@ std::shared_ptr<LocalisationProvider>& LocalisationProvider::Instance()
 	return _instancePtr;
 }
 
-void LocalisationProvider::Initialise(ApplicationContext& context)
+void LocalisationProvider::Initialise(IApplicationContext& context)
 {
 	Instance().reset(new LocalisationProvider(context));
 }