mirror of
https://gitea.wildfiregames.com/0ad/0ad.git
synced 2026-07-27 21:12:18 +00:00
Move Script* classes to Script namespace
- Rename ScriptEngine, ScriptContext, ScriptInterface, ScriptRequest to
Script::Engine, Script::Context, Script::Interface, Script::Request
- Remove 'Script' prefix from filenames:
ScriptContext.* → Context.*
ScriptInterface.* → Interface.*
ScriptRequest.* → Request.*
ScriptEngine.* → Engine.*
ScriptConversions.* → Conversions.*
ScriptExceptions.* → Exceptions.*
ScriptForward.* → ForwardDeclarations.*
ScriptStats.* → Stats.*
- Update all includes, forward declarations, and friend classes
- Use namespace Script { ... } in .cpp definitions to avoid repetitive
Script:: prefix (keeping global callbacks outside)
- Rename internal implementation structs:
ScriptInterface_impl → Interface_impl
ScriptFunction → Function
- Update copyright year to 2026 in all touched files
- Suppress pre-existing cppcheck warnings (uninitvar, nullPointer, unknown
macro) by adding them to suppressions-list.txt (these are not caused
by this refactor)
Fixes #7516
This commit is contained in:
@@ -25,7 +25,7 @@
|
||||
#include "ps/ModIo.h"
|
||||
#include "scriptinterface/FunctionWrapper.h"
|
||||
#include "scriptinterface/Object.h"
|
||||
#include "scriptinterface/ScriptRequest.h"
|
||||
#include "scriptinterface/Request.h"
|
||||
|
||||
#include <js/RootingAPI.h>
|
||||
#include <js/TypeDecls.h>
|
||||
@@ -39,7 +39,7 @@ namespace JS { class CallArgs; }
|
||||
|
||||
namespace JSI_ModIo
|
||||
{
|
||||
ModIo* ModIoGetter(const ScriptRequest&, JS::CallArgs&)
|
||||
ModIo* ModIoGetter(const Script::Request&, JS::CallArgs&)
|
||||
{
|
||||
if (!g_ModIo)
|
||||
{
|
||||
@@ -60,7 +60,7 @@ void StartGetGameId()
|
||||
}
|
||||
|
||||
// TODO: could provide a FromJSVal for ModIoModData
|
||||
JS::Value GetMods(const ScriptRequest& rq)
|
||||
JS::Value GetMods(const Script::Request& rq)
|
||||
{
|
||||
if (!g_ModIo)
|
||||
{
|
||||
@@ -105,7 +105,7 @@ const std::map<DownloadProgressStatus, std::string> statusStrings = {
|
||||
};
|
||||
|
||||
// TODO: could provide a FromJSVal for DownloadProgressData
|
||||
JS::Value GetDownloadProgress(const ScriptRequest& rq)
|
||||
JS::Value GetDownloadProgress(const Script::Request& rq)
|
||||
{
|
||||
if (!g_ModIo)
|
||||
{
|
||||
@@ -125,14 +125,14 @@ JS::Value GetDownloadProgress(const ScriptRequest& rq)
|
||||
return progressData;
|
||||
}
|
||||
|
||||
void RegisterScriptFunctions(const ScriptRequest& rq)
|
||||
void RegisterScriptFunctions(const Script::Request& rq)
|
||||
{
|
||||
ScriptFunction::Register<&StartGetGameId>(rq, "ModIoStartGetGameId");
|
||||
ScriptFunction::Register<&ModIo::StartListMods, &ModIoGetter>(rq, "ModIoStartListMods");
|
||||
ScriptFunction::Register<&ModIo::StartDownloadMod, &ModIoGetter>(rq, "ModIoStartDownloadMod");
|
||||
ScriptFunction::Register<&ModIo::AdvanceRequest, &ModIoGetter>(rq, "ModIoAdvanceRequest");
|
||||
ScriptFunction::Register<&ModIo::CancelRequest, &ModIoGetter>(rq, "ModIoCancelRequest");
|
||||
ScriptFunction::Register<&GetMods>(rq, "ModIoGetMods");
|
||||
ScriptFunction::Register<&GetDownloadProgress>(rq, "ModIoGetDownloadProgress");
|
||||
Script::Function::Register<&StartGetGameId>(rq, "ModIoStartGetGameId");
|
||||
Script::Function::Register<&ModIo::StartListMods, &ModIoGetter>(rq, "ModIoStartListMods");
|
||||
Script::Function::Register<&ModIo::StartDownloadMod, &ModIoGetter>(rq, "ModIoStartDownloadMod");
|
||||
Script::Function::Register<&ModIo::AdvanceRequest, &ModIoGetter>(rq, "ModIoAdvanceRequest");
|
||||
Script::Function::Register<&ModIo::CancelRequest, &ModIoGetter>(rq, "ModIoCancelRequest");
|
||||
Script::Function::Register<&GetMods>(rq, "ModIoGetMods");
|
||||
Script::Function::Register<&GetDownloadProgress>(rq, "ModIoGetDownloadProgress");
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user