wip

.circleci/config.yml

@@ -11,24 +11,13 @@
 version: 2.1
 orbs:
   aws-cli: circleci/aws-cli@2.0.6
-  macos: circleci/macos@2.5.1 # For Rosetta (see below)
-  node: circleci/node@5.2.0 # For a recent npm version (see below)
 jobs:
   # Build the **entire** app for macOS.
   build-macos:
     macos:
       xcode: 14.2.0
-    resource_class: macos.m1.large.gen1
     steps:
       - checkout
-      # Install Rosetta for AWS CLI and disable TSO to speed up S3 uploads (https://support.circleci.com/hc/en-us/articles/19334402064027-Troubleshooting-slow-uploads-to-S3-for-jobs-using-an-m1-macOS-resource-class)
-      - macos/install-rosetta
-      - run: sudo sysctl net.inet.tcp.tso=0
-
-      # Install a recent version of npm to workaround a notarization issue because of a symlink made by npm: https://github.com/electron-userland/electron-builder/issues/7755
-      # Node.js v20.14.0 comes with npm v10.7.0.
-      - node/install:
-          node-version: "20.14.0"
 
       # System dependencies (for Emscripten and upload)
       - run:
@@ -176,7 +165,6 @@ jobs:
 
   # Build the WebAssembly library only (so that it's cached on a S3 and easy to re-use).
   build-gdevelop_js-wasm-only:
-    resource_class: medium+ # Compilation time decrease linearly with the number of CPUs, but not linking (so "large" does not speedup total build time).
     docker:
       - image: cimg/node:16.13
 
@@ -233,83 +221,10 @@ jobs:
           name: Deploy to S3 (latest)
           command: aws s3 sync Binaries/embuild/GDevelop.js s3://gdevelop-gdevelop.js/$(git rev-parse --abbrev-ref HEAD)/latest/
 
-  # Build the WebAssembly library with clang-tidy and memory sanitizers.
-  build-gdevelop_js-debug-sanitizers-and-extra-checks:
-    resource_class: xlarge # Total time decrease linearly with the number of CPUs.
-    docker:
-      - image: cimg/node:16.13
-
-    working_directory: ~/GDevelop
-
-    steps:
-      - checkout
-      - aws-cli/setup
-
-      # System dependencies (for Emscripten)
-      - run:
-          name: Install dependencies for Emscripten
-          command: sudo apt-get update && sudo apt install cmake
-
-      - run:
-          name: Install dependencies for clang-tidy v19
-          command: wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && sudo ./llvm.sh 19 && sudo apt install clang-tidy-19
-
-      - run:
-          name: Install Python3 dependencies for Emscripten
-          command: sudo apt install python-is-python3 python3-distutils -y
-
-      - run:
-          name: Install Emscripten (for GDevelop.js)
-          command: git clone https://github.com/juj/emsdk.git && cd emsdk && ./emsdk install 3.1.21 && ./emsdk activate 3.1.21 && cd ..
-
-      # GDevelop.js dependencies
-      - restore_cache:
-          keys:
-            - gdevelop.js-linux-nodejs-dependencies-{{ checksum "GDevelop.js/package-lock.json" }}
-            # fallback to using the latest cache if no exact match is found
-            - gdevelop.js-linux-nodejs-dependencies-
-
-      - run:
-          name: Install GDevelop.js dependencies and build it
-          command: cd GDevelop.js && npm install && cd ..
-
-      # Build GDevelop.js
-      - run:
-          name: Build GDevelop.js ('debug-sanitizers' variant)
-          command: cd GDevelop.js && source ../emsdk/emsdk_env.sh && npm run build -- --variant=debug-sanitizers
-
-      - run:
-          name: Run clang-tidy
-          command: cd GDevelop.js && npm run lint
-
-      - run:
-          name: Run tests
-          command: cd GDevelop.js && npm run test -- --maxWorkers=4
-
-      # Upload artifacts (CircleCI)
-      - store_artifacts:
-          path: Binaries/embuild/GDevelop.js
-
-      # Upload artifacts (AWS)
-      - run:
-          name: Deploy to S3 (specific commit)
-          command: aws s3 sync Binaries/embuild/GDevelop.js s3://gdevelop-gdevelop.js/$(git rev-parse --abbrev-ref HEAD)/variant/debug-sanitizers/commit/$(git rev-parse HEAD)/
-
 workflows:
-  gdevelop_js-wasm:
-    jobs:
-      - build-gdevelop_js-wasm-only
-  gdevelop_js-wasm-extra-checks:
-    jobs:
-      - build-gdevelop_js-debug-sanitizers-and-extra-checks:
-          # Extra checks are resource intensive so don't all run them.
-          filters:
-            branches:
-              only:
-                - master
-                - /experimental-build.*/
   builds:
     jobs:
+      - build-gdevelop_js-wasm-only
       - build-macos:
           filters:
             branches:

.clang-tidy

@@ -1,4 +0,0 @@
-Checks: 'clang-diagnostic-*,clang-analyzer-*,cppcoreguidelines-*,-cppcoreguidelines-explicit-virtual-functions,-cppcoreguidelines-avoid-const-or-ref-data-members,-cppcoreguidelines-special-member-functions,-cppcoreguidelines-avoid-magic-numbers,-cppcoreguidelines-non-private-member-variables-in-classes,-cppcoreguidelines-owning-memory,-cppcoreguidelines-virtual-class-destructor,-clang-analyzer-optin.performance.Padding,-cppcoreguidelines-narrowing-conversions'
-WarningsAsErrors: 'cppcoreguidelines-pro-type-member-init, clang-analyzer-optin.cplusplus.UninitializedObject'
-HeaderFilterRegex: '.*'
-FormatStyle: none

.gitattributes

@@ -1,11 +1,12 @@
 Core/GDCore/Serialization/rapidjson/rapidjson.h/* linguist-vendored
+Core/GDCore/TinyXml/* linguist-vendored
 Extensions/ParticleSystem/SPARK/* linguist-vendored
 Extensions/PhysicsBehavior/Box2D/* linguist-vendored
 Extensions/PhysicsBehavior/box2djs/* linguist-vendored
 Extensions/Physics2Behavior/box2d.js linguist-vendored
 Extensions/BBText/pixi-multistyle-text/* linguist-vendored
 Extensions/P2P/A_peer.js linguist-vendored
-Extensions/Multiplayer/peer.js linguist-vendored
 Extensions/Shopify/shopify-buy.umd.polyfilled.min.js linguist-vendored
 Extensions/TileMap/pako/* linguist-vendored
 Extensions/TileMap/pixi-tilemap/* linguist-vendored
+Extensions/TweenBehavior/shifty.js linguist-vendored

.github/workflows/gdcore-tools-hook.yml

@@ -1,22 +0,0 @@
-# This worflow notifies arthuro555's gdcore-tools repository when a new release is published.
-#
-# This is used to allow gdcore-tools, a library to use GDCore outside of GDevelop,
-# to attempt to automatically build, test, and publish a release for the new
-# GDevelop version.
-name: Trigger gdcore-tools pipeline
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  dispatch-event:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Repository Dispatch
-        uses: peter-evans/repository-dispatch@v3
-        with:
-          token: ${{ secrets.GDCORE_TOOLS_PAT }}
-          repository: arthuro555/gdcore-tools
-          event-type: gdevelop-release
-          client-payload: '{"release": ${{ toJson(github.event.release) }}}'

.travis.yml

@@ -17,11 +17,11 @@ cache:
 addons:
   apt:
     sources:
-      - ubuntu-toolchain-r-test
+    - ubuntu-toolchain-r-test
     packages:
-      # Build dependencies:
-      - cmake
-      - p7zip-full
+    # Build dependencies:
+    - cmake
+    - p7zip-full
 
 before_install:
   # This workaround is required to avoid libstdc++ errors (Emscripten requires a recent version of libstdc++)
@@ -29,48 +29,47 @@ before_install:
   - sudo dpkg --force-all -i libstdc++6
 
 install:
-  # Ensure we use a recent version of Node.js (and npm).
+# Ensure we use a recent version of Node.js (and npm).
   - nvm install v16 && nvm use v16
-  #Compile the tests only for GDCore
+#Compile the tests only for GDCore
   - mkdir .build-tests
   - cd .build-tests
   - cmake -DBUILD_GDJS=FALSE -DBUILD_TESTS=TRUE -DCMAKE_CXX_COMPILER=$(which $CXX) -DCMAKE_C_COMPILER=$(which $CC) ..
   - make -j 4
   - cd ..
-  # Install Emscripten (for GDevelop.js)
-  # Specify the tag for the core repository to avois breaking changes.
-  - git clone --depth 1 --branch 3.1.21 https://github.com/juj/emsdk.git
+# Install Emscripten (for GDevelop.js)
+  - git clone https://github.com/juj/emsdk.git
   - cd emsdk && ./emsdk install 3.1.21 && ./emsdk activate 3.1.21 && cd ..
-  # Install GDevelop.js dependencies
+# Install GDevelop.js dependencies
   - cd GDevelop.js && npm install && cd ..
-  # Build GDevelop.js
-  # (in a subshell to avoid Emscripten polluting the Node.js and npm version for the rest of the build)
+# Build GDevelop.js
+# (in a subshell to avoid Emscripten polluting the Node.js and npm version for the rest of the build)
   - (set -e; cd GDevelop.js && source ../emsdk/emsdk_env.sh && npm run build && cd ..)
-  # Install newIDE tests dependencies
+# Install newIDE tests dependencies
   - npm -v
   - cd newIDE/app && npm install
   - cd ../..
-  # Install GDJS tests dependencies
+# Install GDJS tests dependencies
   - cd GDJS && npm install && cd tests && npm install
   - cd ../..
 
 script:
-  # GDCore tests:
+# GDCore tests:
   - cd .build-tests
   - Core/GDCore_tests
   - cd ..
-  # GDevelop.js tests
+# GDevelop.js tests
   - cd GDevelop.js
   - npm test
   - cd ..
-  # newIDE tests:
+# newIDE tests:
   - cd newIDE/app
   - npm test
   - npm run flow
   - npm run check-format
   - npm run check-script-types
   - cd ../..
-  # GDJS tests:
+# GDJS tests:
   - cd GDJS
   - npm run check-format
   - cd ..

.vscode/GDevelopExtensions.code-snippets

@@ -107,7 +107,7 @@
     "description": "Define a parameter in a GDevelop extension definition.",
     "prefix": "gdparam",
     "body": [
-      ".addParameter('${1|string,expression,object,behavior,yesorno,stringWithSelector,scenevar,globalvar,objectvar,objectList,objectListWithoutPicking,color,key,sceneName,file,layer,relationalOperator,operator,trueorfalse,musicfile,soundfile,mouse,passwordjoyaxis,camera,objectPtr,forceMultiplier|}', '${2:Parameter description}', '${3:Optional parameter data}', /*parameterIsOptional=*/${4|false,true|})"
+      ".addParameter('${1|string,expression,object,behavior,yesorno,stringWithSelector,scenevar,globalvar,objectvar,objectList,objectListWithoutPicking,color,key,sceneName,file,layer,relationalOperator,operator,trueorfalse,musicfile,soundfile,police,mouse,passwordjoyaxis,camera,objectPtr,forceMultiplier|}', '${2:Parameter description}', '${3:Optional parameter data}', /*parameterIsOptional=*/${4|false,true|})"
     ]
   },
   "Add code only parameter": {

.vscode/settings.json

@@ -114,8 +114,7 @@
     "__bits": "cpp",
     "__verbose_abort": "cpp",
     "variant": "cpp",
-    "charconv": "cpp",
-    "execution": "cpp"
+    "charconv": "cpp"
   },
   "files.exclude": {
     "Binaries/*build*": true,

CMakeLists.txt

@@ -60,7 +60,7 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "Release" AND NOT WIN32 AND CMAKE_COMPILER_IS_
 endif()
 
 #Activate C++11
-set(CMAKE_CXX_STANDARD 11) # Upgrading to C++17 should be tried.
+set(CMAKE_CXX_STANDARD 11) # Upgrading to C++17 would need to remove usage of bind2nd (should be easy).
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 # Mark some warnings as errors
@@ -69,18 +69,12 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
 	# uninitialized variables or other hard to debug bugs.
 	add_compile_options(
 		-Wall
-		-Wextra
-		-Wuninitialized
-		-Wconditional-uninitialized
 		-Wno-unknown-warning-option
 		-Wno-reorder-ctor
 		-Wno-reorder
-		-Wno-unused-parameter
 		-Wno-pessimizing-move
-		-Wno-unused-variable # Not a good style, but not a risk
+		-Wno-unused-variable
 		-Wno-unused-private-field
-		-Wno-ignored-qualifiers # Not a risk
-		-Wno-sign-compare # Not a big risk
 
 		# Make as much warnings considered as errors as possible (only one for now).
 		-Werror=return-stack-address

Core/CMakeLists.txt

@@ -11,11 +11,6 @@ set(CMAKE_CXX_USE_RESPONSE_FILE_FOR_INCLUDES 1)
 set(GDCORE_include_dir ${GD_base_dir}/Core PARENT_SCOPE)
 set(GDCORE_lib_dir ${GD_base_dir}/Binaries/Output/${CMAKE_BUILD_TYPE}_${CMAKE_SYSTEM_NAME} PARENT_SCOPE)
 
-# Create VersionPriv.h - only useful for testing.
-if (NOT EMSCRIPTEN)
-	file(WRITE "${GD_base_dir}/Core/GDCore/Tools/VersionPriv.h" "#define GD_VERSION_STRING \"0.0.0-0\"")
-endif()
-
 # Dependencies on external libraries:
 #
 

Core/GDCore/DocMainPage.h

@@ -58,7 +58,99 @@
  * Common functions and tools for programming.
  */
 
+/**
+ * \defgroup TinyXml Integrated TinyXml library
+ *
+ * See the full documentation of TinyXml [here](http://www.grinninglizard.com/tinyxmldocs/index.html).
+ */
+
 /**
  * \defgroup SpriteObjectExtension Standard Sprite Object extension
  * \ingroup BuiltinExtensions
- */
+ */
+
+/**
+ * \class TiXmlAttribute
+ * \brief Part of the tinyxml library
+ * \ingroup TinyXml
+ */
+/**
+ * \class TiXmlAttributeSet
+ * \brief Part of the tinyxml library
+ * \ingroup TinyXml
+ */
+/**
+ * \class TiXmlBase
+ * \brief Part of the tinyxml library
+ * \ingroup TinyXml
+ */
+/**
+ * \class TiXmlComment
+ * \brief Part of the tinyxml library
+ * \ingroup TinyXml
+ */
+/**
+ * \class TiXmlCursor
+ * \brief Part of the tinyxml library
+ * \ingroup TinyXml
+ */
+/**
+ * \class TiXmlDeclaration
+ * \brief Part of the tinyxml library
+ * \ingroup TinyXml
+ */
+/**
+ * \class TiXmlDocument
+ * \brief Part of the tinyxml library
+ * \ingroup TinyXml
+ */
+/**
+ * \class TiXmlElement
+ * \brief Part of the tinyxml library
+ * \ingroup TinyXml
+ */
+/**
+ * \class TiXmlHandle
+ * \brief Part of the tinyxml library
+ * \ingroup TinyXml
+ */
+/**
+ * \class TiXmlNode
+ * \brief Part of the tinyxml library
+ * \ingroup TinyXml
+ */
+/**
+ * \class TiXmlOutStream
+ * \brief Part of the tinyxml library
+ * \ingroup TinyXml
+ */
+/**
+ * \class TiXmlParsingData
+ * \brief Part of the tinyxml library
+ * \ingroup TinyXml
+ */
+/**
+ * \class TiXmlPrinter
+ * \brief Part of the tinyxml library
+ * \ingroup TinyXml
+ */
+/**
+ * \class TiXmlString
+ * \brief Part of the tinyxml library
+ * \ingroup TinyXml
+ */
+/**
+ * \class TiXmlText
+ * \brief Part of the tinyxml library
+ * \ingroup TinyXml
+ */
+/**
+ * \class TiXmlUnknown
+ * \brief Part of the tinyxml library
+ * \ingroup TinyXml
+ */
+/**
+ * \class TiXmlVisitor
+ * \brief Part of the tinyxml library
+ * \ingroup TinyXml
+ */

Core/GDCore/Events/Builtin/ForEachEvent.cpp

@@ -8,6 +8,7 @@
 #include "GDCore/Events/Serialization.h"
 #include "GDCore/Events/Tools/EventsCodeNameMangler.h"
 #include "GDCore/Serialization/SerializerElement.h"
+#include "GDCore/TinyXml/tinyxml.h"
 
 using namespace std;
 

Core/GDCore/Events/Builtin/GroupEvent.cpp

@@ -10,6 +10,7 @@
 #include "GDCore/Events/CodeGeneration/EventsCodeGenerator.h"
 #include "GDCore/Events/Serialization.h"
 #include "GDCore/Serialization/SerializerElement.h"
+#include "GDCore/TinyXml/tinyxml.h"
 
 using namespace std;
 

Core/GDCore/Events/Builtin/WhileEvent.h

@@ -72,6 +72,8 @@ class GD_CORE_API WhileEvent : public gd::BaseEvent {
                               ///< de/activate infinite loop warning when the
                               ///< user create the event
 
+  mutable unsigned int whileConditionsHeight;
+
   int GetConditionsHeight() const;
   int GetActionsHeight() const;
   int GetWhileConditionsHeight() const;

Core/GDCore/Events/CodeGeneration/DiagnosticReport.h

@@ -14,10 +14,10 @@
 namespace gd {
 
 /**
- * \brief
+ * \brief 
  */
 class GD_CORE_API ProjectDiagnostic {
- public:
+public:
   enum ErrorType {
     UndeclaredVariable,
     MissingBehavior,
@@ -25,17 +25,12 @@ class GD_CORE_API ProjectDiagnostic {
     MismatchedObjectType,
   };
 
-  ProjectDiagnostic(ErrorType type_,
-                    const gd::String &message_,
+  ProjectDiagnostic(ErrorType type_, const gd::String &message_,
                     const gd::String &actualValue_,
-                    const gd::String &expectedValue_,
-                    const gd::String &objectName_ = "")
-      : type(type_),
-        message(message_),
-        actualValue(actualValue_),
-        expectedValue(expectedValue_),
-        objectName(objectName_) {};
-  virtual ~ProjectDiagnostic() {};
+                    const gd::String &expectedValue_, const gd::String &objectName_ = "")
+      : type(type_), message(message_), actualValue(actualValue_), expectedValue(expectedValue_),
+        objectName(objectName_){};
+  virtual ~ProjectDiagnostic(){};
 
   ErrorType GetType() const { return type; };
   const gd::String &GetMessage() const { return message; }
@@ -43,7 +38,7 @@ class GD_CORE_API ProjectDiagnostic {
   const gd::String &GetActualValue() const { return actualValue; }
   const gd::String &GetExpectedValue() const { return expectedValue; }
 
- private:
+private:
   ErrorType type;
   gd::String message;
   gd::String objectName;
@@ -52,12 +47,12 @@ class GD_CORE_API ProjectDiagnostic {
 };
 
 /**
- * \brief
+ * \brief 
  */
 class GD_CORE_API DiagnosticReport {
- public:
-  DiagnosticReport() {};
-  virtual ~DiagnosticReport() {};
+public:
+  DiagnosticReport(){};
+  virtual ~DiagnosticReport(){};
 
   void Add(const gd::ProjectDiagnostic &projectDiagnostic) {
     projectDiagnostics.push_back(
@@ -72,39 +67,32 @@ class GD_CORE_API DiagnosticReport {
 
   const gd::String &GetSceneName() const { return sceneName; }
 
-  void SetSceneName(const gd::String &sceneName_) { sceneName = sceneName_; }
-
-  void LogAllDiagnostics() {
-    for (auto &diagnostic : projectDiagnostics) {
-      std::cout << diagnostic->GetMessage()
-                << "(object: " << diagnostic->GetObjectName()
-                << ", actual value: " << diagnostic->GetActualValue()
-                << ", expected value: " << diagnostic->GetExpectedValue() << ")"
-                << std::endl;
-    }
+  void SetSceneName(const gd::String &sceneName_) {
+    sceneName = sceneName_;
   }
 
- private:
+private:
   std::vector<std::unique_ptr<gd::ProjectDiagnostic>> projectDiagnostics;
   gd::String sceneName;
 };
 
 /**
- * \brief
+ * \brief 
  */
 class GD_CORE_API WholeProjectDiagnosticReport {
- public:
-  WholeProjectDiagnosticReport() {};
-  virtual ~WholeProjectDiagnosticReport() {};
+public:
+  WholeProjectDiagnosticReport(){};
+  virtual ~WholeProjectDiagnosticReport(){};
 
   const DiagnosticReport &Get(std::size_t index) const {
     return *diagnosticReports[index].get();
   };
 
-  void Clear() { diagnosticReports.clear(); };
+  void Clear() {
+    diagnosticReports.clear();
+  };
 
-  DiagnosticReport &AddNewDiagnosticReportForScene(
-      const gd::String &sceneName) {
+  DiagnosticReport& AddNewDiagnosticReportForScene(const gd::String &sceneName) {
     auto diagnosticReport = gd::make_unique<gd::DiagnosticReport>();
     diagnosticReport->SetSceneName(sceneName);
     diagnosticReports.push_back(std::move(diagnosticReport));
@@ -114,7 +102,7 @@ class GD_CORE_API WholeProjectDiagnosticReport {
   std::size_t Count() const { return diagnosticReports.size(); };
 
   bool HasAnyIssue() {
-    for (auto &diagnosticReport : diagnosticReports) {
+    for (auto& diagnosticReport : diagnosticReports) {
       if (diagnosticReport->Count() > 0) {
         return true;
       }
@@ -122,8 +110,8 @@ class GD_CORE_API WholeProjectDiagnosticReport {
     return false;
   }
 
- private:
+private:
   std::vector<std::unique_ptr<gd::DiagnosticReport>> diagnosticReports;
 };
 
-}  // namespace gd
+} // namespace gd

Core/GDCore/Events/CodeGeneration/EffectsCodeGenerator.cpp

@@ -15,7 +15,6 @@
 #include "GDCore/Project/Layout.h"
 #include "GDCore/Project/Object.h"
 #include "GDCore/Project/Project.h"
-#include "GDCore/Project/EventsFunctionsExtension.h"
 #include "GDCore/IDE/ProjectBrowserHelper.h"
 
 namespace gd {
@@ -48,9 +47,6 @@ void EffectsCodeGenerator::GenerateEffectsIncludeFiles(
   
   // TODO Merge with UsedExtensionsFinder.
 
-  // TODO Factorize with the iteration on all effects for resource exposure.
-  // TODO Implement an ArbitraryEffectWorker and add a method in ProjectBrowserHelper
-
   // See also gd::Project::ExposeResources for a method that traverse the whole
   // project (this time for resources) and
   // WholeProjectRefactorer::ExposeProjectEvents.
@@ -72,27 +68,6 @@ void EffectsCodeGenerator::GenerateEffectsIncludeFiles(
 
   // Add objects effects
   gd::ProjectBrowserHelper::ExposeProjectObjects(project, effectsCodeGenerator);
-
-  // Add event-based objects layouts effects
-  for (std::size_t s = 0; s < project.GetEventsFunctionsExtensionsCount();
-       s++) {
-    auto &eventsFunctionExtension = project.GetEventsFunctionsExtension(s);
-
-    auto &eventsBasedObjects = eventsFunctionExtension.GetEventsBasedObjects();
-    for (std::size_t objectIndex = 0;
-         objectIndex < eventsBasedObjects.GetCount(); ++objectIndex) {
-      auto &eventsBasedObject = eventsBasedObjects.Get(objectIndex);
-
-      auto &layers = eventsBasedObject.GetLayers();
-      for (std::size_t l = 0; l < layers.GetLayersCount(); ++l) {
-        auto &effects = layers.GetLayer(l).GetEffects();
-        for (std::size_t e = 0; e < effects.GetEffectsCount(); ++e) {
-          auto &effect = effects.GetEffect(e);
-          effectsCodeGenerator.AddEffectIncludeFiles(effect);
-        }
-      }
-    }
-  }
 }
 
 }  // namespace gd

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.cpp

@@ -42,15 +42,14 @@ gd::String EventsCodeGenerator::GenerateRelationalOperatorCall(
     const vector<gd::String>& arguments,
     const gd::String& callStartString,
     std::size_t startFromArgument) {
-  std::size_t relationalOperatorIndex = instrInfos.parameters.GetParametersCount();
-  for (std::size_t i = startFromArgument; i < instrInfos.parameters.GetParametersCount();
+  std::size_t relationalOperatorIndex = instrInfos.parameters.size();
+  for (std::size_t i = startFromArgument; i < instrInfos.parameters.size();
        ++i) {
-    if (instrInfos.parameters.GetParameter(i).GetType() == "relationalOperator") {
+    if (instrInfos.parameters[i].GetType() == "relationalOperator")
       relationalOperatorIndex = i;
-    }
   }
   // Ensure that there is at least one parameter after the relational operator
-  if (relationalOperatorIndex + 1 >= instrInfos.parameters.GetParametersCount()) {
+  if (relationalOperatorIndex + 1 >= instrInfos.parameters.size()) {
     ReportError();
     return "";
   }
@@ -77,11 +76,11 @@ gd::String EventsCodeGenerator::GenerateRelationalOperatorCall(
 
 /**
  * @brief Generate a relational operation
- *
+ * 
  * @param relationalOperator the operator
  * @param lhs the left hand operand
  * @param rhs the right hand operand
- * @return gd::String
+ * @return gd::String 
  */
 gd::String EventsCodeGenerator::GenerateRelationalOperation(
     const gd::String& relationalOperator,
@@ -123,16 +122,14 @@ gd::String EventsCodeGenerator::GenerateOperatorCall(
     const gd::String& callStartString,
     const gd::String& getterStartString,
     std::size_t startFromArgument) {
-  std::size_t operatorIndex = instrInfos.parameters.GetParametersCount();
-  for (std::size_t i = startFromArgument; i < instrInfos.parameters.GetParametersCount();
+  std::size_t operatorIndex = instrInfos.parameters.size();
+  for (std::size_t i = startFromArgument; i < instrInfos.parameters.size();
        ++i) {
-    if (instrInfos.parameters.GetParameter(i).GetType() == "operator") {
-      operatorIndex = i;
-    }
+    if (instrInfos.parameters[i].GetType() == "operator") operatorIndex = i;
   }
 
   // Ensure that there is at least one parameter after the operator
-  if (operatorIndex + 1 >= instrInfos.parameters.GetParametersCount()) {
+  if (operatorIndex + 1 >= instrInfos.parameters.size()) {
     ReportError();
     return "";
   }
@@ -194,16 +191,14 @@ gd::String EventsCodeGenerator::GenerateCompoundOperatorCall(
     const vector<gd::String>& arguments,
     const gd::String& callStartString,
     std::size_t startFromArgument) {
-  std::size_t operatorIndex = instrInfos.parameters.GetParametersCount();
-  for (std::size_t i = startFromArgument; i < instrInfos.parameters.GetParametersCount();
+  std::size_t operatorIndex = instrInfos.parameters.size();
+  for (std::size_t i = startFromArgument; i < instrInfos.parameters.size();
        ++i) {
-    if (instrInfos.parameters.GetParameter(i).GetType() == "operator") {
-      operatorIndex = i;
-    }
+    if (instrInfos.parameters[i].GetType() == "operator") operatorIndex = i;
   }
 
   // Ensure that there is at least one parameter after the operator
-  if (operatorIndex + 1 >= instrInfos.parameters.GetParametersCount()) {
+  if (operatorIndex + 1 >= instrInfos.parameters.size()) {
     ReportError();
     return "";
   }
@@ -247,16 +242,14 @@ gd::String EventsCodeGenerator::GenerateMutatorCall(
     const vector<gd::String>& arguments,
     const gd::String& callStartString,
     std::size_t startFromArgument) {
-  std::size_t operatorIndex = instrInfos.parameters.GetParametersCount();
-  for (std::size_t i = startFromArgument; i < instrInfos.parameters.GetParametersCount();
+  std::size_t operatorIndex = instrInfos.parameters.size();
+  for (std::size_t i = startFromArgument; i < instrInfos.parameters.size();
        ++i) {
-    if (instrInfos.parameters.GetParameter(i).GetType() == "operator") {
-      operatorIndex = i;
-    }
+    if (instrInfos.parameters[i].GetType() == "operator") operatorIndex = i;
   }
 
   // Ensure that there is at least one parameter after the operator
-  if (operatorIndex + 1 >= instrInfos.parameters.GetParametersCount()) {
+  if (operatorIndex + 1 >= instrInfos.parameters.size()) {
     ReportError();
     return "";
   }
@@ -323,7 +316,7 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
   }
 
   // Insert code only parameters and be sure there is no lack of parameter.
-  while (condition.GetParameters().size() < instrInfos.parameters.GetParametersCount()) {
+  while (condition.GetParameters().size() < instrInfos.parameters.size()) {
     vector<gd::Expression> parameters = condition.GetParameters();
     parameters.push_back(gd::Expression(""));
     condition.SetParameters(parameters);
@@ -331,13 +324,13 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
 
   gd::EventsCodeGenerator::CheckBehaviorParameters(condition, instrInfos);
   // Verify that there are no mismatches between object type in parameters.
-  for (std::size_t pNb = 0; pNb < instrInfos.parameters.GetParametersCount(); ++pNb) {
-    if (ParameterMetadata::IsObject(instrInfos.parameters.GetParameter(pNb).GetType())) {
+  for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
+    if (ParameterMetadata::IsObject(instrInfos.parameters[pNb].GetType())) {
       gd::String objectInParameter =
           condition.GetParameter(pNb).GetPlainString();
 
       const auto &expectedObjectType =
-          instrInfos.parameters.GetParameter(pNb).GetExtraInfo();
+          instrInfos.parameters[pNb].GetExtraInfo();
       const auto &actualObjectType =
           GetObjectsContainersList().GetTypeOfObject(objectInParameter);
       if (!GetObjectsContainersList().HasObjectOrGroupNamed(
@@ -345,14 +338,14 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
         gd::ProjectDiagnostic projectDiagnostic(
             gd::ProjectDiagnostic::ErrorType::UnknownObject, "",
             objectInParameter, "");
-        if (diagnosticReport) diagnosticReport->Add(projectDiagnostic);
+        diagnosticReport->Add(projectDiagnostic);
         return "/* Unknown object - skipped. */";
       } else if (!expectedObjectType.empty() &&
                  actualObjectType != expectedObjectType) {
         gd::ProjectDiagnostic projectDiagnostic(
             gd::ProjectDiagnostic::ErrorType::MismatchedObjectType, "",
             actualObjectType, expectedObjectType, objectInParameter);
-        if (diagnosticReport) diagnosticReport->Add(projectDiagnostic);
+        diagnosticReport->Add(projectDiagnostic);
         return "/* Mismatched object type - skipped. */";
       }
     }
@@ -360,7 +353,7 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
 
   if (instrInfos.IsObjectInstruction()) {
     gd::String objectName = condition.GetParameter(0).GetPlainString();
-    if (!objectName.empty() && instrInfos.parameters.GetParametersCount() > 0) {
+    if (!objectName.empty() && !instrInfos.parameters.empty()) {
       std::vector<gd::String> realObjects =
           GetObjectsContainersList().ExpandObjectName(objectName, context.GetCurrentObject());
       for (std::size_t i = 0; i < realObjects.size(); ++i) {
@@ -388,7 +381,7 @@ gd::String EventsCodeGenerator::GenerateConditionCode(
       }
     }
   } else if (instrInfos.IsBehaviorInstruction()) {
-    if (instrInfos.parameters.GetParametersCount() >= 2) {
+    if (instrInfos.parameters.size() >= 2) {
       const gd::String &objectName = condition.GetParameter(0).GetPlainString();
       const gd::String &behaviorName =
           condition.GetParameter(1).GetPlainString();
@@ -509,7 +502,7 @@ void EventsCodeGenerator::CheckBehaviorParameters(
             gd::ProjectDiagnostic projectDiagnostic(
                 gd::ProjectDiagnostic::ErrorType::MissingBehavior, "",
                 actualBehaviorType, expectedBehaviorType, lastObjectName);
-            if (diagnosticReport) diagnosticReport->Add(projectDiagnostic);
+            diagnosticReport->Add(projectDiagnostic);
           }
         }
       });
@@ -546,7 +539,7 @@ gd::String EventsCodeGenerator::GenerateActionCode(
           : instrInfos.codeExtraInformation.functionCallName;
 
   // Be sure there is no lack of parameter.
-  while (action.GetParameters().size() < instrInfos.parameters.GetParametersCount()) {
+  while (action.GetParameters().size() < instrInfos.parameters.size()) {
     vector<gd::Expression> parameters = action.GetParameters();
     parameters.push_back(gd::Expression(""));
     action.SetParameters(parameters);
@@ -554,12 +547,12 @@ gd::String EventsCodeGenerator::GenerateActionCode(
 
   gd::EventsCodeGenerator::CheckBehaviorParameters(action, instrInfos);
   // Verify that there are no mismatches between object type in parameters.
-  for (std::size_t pNb = 0; pNb < instrInfos.parameters.GetParametersCount(); ++pNb) {
-    if (ParameterMetadata::IsObject(instrInfos.parameters.GetParameter(pNb).GetType())) {
+  for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
+    if (ParameterMetadata::IsObject(instrInfos.parameters[pNb].GetType())) {
       gd::String objectInParameter = action.GetParameter(pNb).GetPlainString();
 
       const auto &expectedObjectType =
-          instrInfos.parameters.GetParameter(pNb).GetExtraInfo();
+          instrInfos.parameters[pNb].GetExtraInfo();
       const auto &actualObjectType =
           GetObjectsContainersList().GetTypeOfObject(objectInParameter);
       if (!GetObjectsContainersList().HasObjectOrGroupNamed(
@@ -567,14 +560,14 @@ gd::String EventsCodeGenerator::GenerateActionCode(
         gd::ProjectDiagnostic projectDiagnostic(
             gd::ProjectDiagnostic::ErrorType::UnknownObject, "",
             objectInParameter, "");
-        if (diagnosticReport) diagnosticReport->Add(projectDiagnostic);
+        diagnosticReport->Add(projectDiagnostic);
         return "/* Unknown object - skipped. */";
       } else if (!expectedObjectType.empty() &&
                  actualObjectType != expectedObjectType) {
         gd::ProjectDiagnostic projectDiagnostic(
             gd::ProjectDiagnostic::ErrorType::MismatchedObjectType, "",
             actualObjectType, expectedObjectType, objectInParameter);
-        if (diagnosticReport) diagnosticReport->Add(projectDiagnostic);
+        diagnosticReport->Add(projectDiagnostic);
         return "/* Mismatched object type - skipped. */";
       }
     }
@@ -584,7 +577,7 @@ gd::String EventsCodeGenerator::GenerateActionCode(
   if (instrInfos.IsObjectInstruction()) {
     gd::String objectName = action.GetParameter(0).GetPlainString();
 
-    if (instrInfos.parameters.GetParametersCount() > 0) {
+    if (!instrInfos.parameters.empty()) {
       std::vector<gd::String> realObjects =
           GetObjectsContainersList().ExpandObjectName(objectName, context.GetCurrentObject());
       for (std::size_t i = 0; i < realObjects.size(); ++i) {
@@ -612,7 +605,7 @@ gd::String EventsCodeGenerator::GenerateActionCode(
       }
     }
   } else if (instrInfos.IsBehaviorInstruction()) {
-    if (instrInfos.parameters.GetParametersCount() >= 2) {
+    if (instrInfos.parameters.size() >= 2) {
       const gd::String &objectName = action.GetParameter(0).GetPlainString();
       const gd::String &behaviorName = action.GetParameter(1).GetPlainString();
       const gd::String &actualBehaviorType =
@@ -716,14 +709,11 @@ EventsCodeGenerator::GenerateCallback(
   const gd::String actionsDeclarationsCode =
       GenerateObjectsDeclarationCode(callbackContext);
 
-  const gd::String clearLocalVariablesCode =
-      GenerateLocalVariablesStackAccessor() + ".length = 0;\n";
-
-  const gd::String callbackCode = callbackFunctionName + " = function (" +
-                                  GenerateEventsParameters(callbackContext) +
-                                  ") {\n" + restoreLocalVariablesCode +
-                                  actionsDeclarationsCode + actionsCode +
-                                  clearLocalVariablesCode + "}\n";
+  const gd::String callbackCode =
+      callbackFunctionName + " = function (" +
+      GenerateEventsParameters(callbackContext) + ") {\n" +
+      restoreLocalVariablesCode +
+      actionsDeclarationsCode + actionsCode + "}\n";
 
   AddCustomCodeOutsideMain(callbackCode);
 
@@ -828,7 +818,7 @@ gd::String EventsCodeGenerator::GenerateParameterCodes(
              metadata.GetType() == "spineResource" ||
              // Deprecated, old parameter names:
              metadata.GetType() == "password" || metadata.GetType() == "musicfile" ||
-             metadata.GetType() == "soundfile") {
+             metadata.GetType() == "soundfile" || metadata.GetType() == "police") {
     argOutput = "\"" + ConvertToString(parameter.GetPlainString()) + "\"";
   } else if (metadata.GetType() == "mouse") {
     argOutput = "\"" + ConvertToString(parameter.GetPlainString()) + "\"";
@@ -870,7 +860,7 @@ gd::String EventsCodeGenerator::GenerateParameterCodes(
 
 vector<gd::String> EventsCodeGenerator::GenerateParametersCodes(
     const vector<gd::Expression>& parameters,
-    const ParameterMetadataContainer& parametersInfo,
+    const vector<gd::ParameterMetadata>& parametersInfo,
     EventsCodeGenerationContext& context,
     std::vector<std::pair<gd::String, gd::String> >*
         supplementaryParametersTypes) {
@@ -1007,7 +997,7 @@ gd::String EventsCodeGenerator::GenerateEventsListCode(
 
     output += "\n" + scopeBegin + "\n" + declarationsCode + "\n" +
               eventCoreCode + "\n" + scopeEnd + "\n";
-
+    
     if (event.HasVariables()) {
       GetProjectScopedContainers().GetVariablesContainersList().Pop();
     }
@@ -1107,10 +1097,10 @@ gd::String EventsCodeGenerator::GenerateFreeCondition(
 
   // Add logical not if needed
   bool conditionAlreadyTakeCareOfInversion = false;
-  for (std::size_t i = 0; i < instrInfos.parameters.GetParametersCount();
+  for (std::size_t i = 0; i < instrInfos.parameters.size();
        ++i)  // Some conditions already have a "conditionInverted" parameter
   {
-    if (instrInfos.parameters.GetParameter(i).GetType() == "conditionInverted")
+    if (instrInfos.parameters[i].GetType() == "conditionInverted")
       conditionAlreadyTakeCareOfInversion = true;
   }
   if (!conditionAlreadyTakeCareOfInversion && conditionInverted)
@@ -1131,7 +1121,7 @@ gd::String EventsCodeGenerator::GenerateObjectCondition(
   // Prepare call
   // Add a static_cast if necessary
   gd::String objectFunctionCallNamePart =
-      (!instrInfos.parameters.GetParameter(0).GetExtraInfo().empty())
+      (!instrInfos.parameters[0].GetExtraInfo().empty())
           ? "static_cast<" + objInfo.className + "*>(" +
                 GetObjectListName(objectName, context) + "[i])->" +
                 instrInfos.codeExtraInformation.functionCallName
@@ -1186,13 +1176,8 @@ gd::String EventsCodeGenerator::GenerateFreeAction(
   // Generate call
   gd::String call;
   if (instrInfos.codeExtraInformation.type == "number" ||
-      instrInfos.codeExtraInformation.type == "string" ||
-      // Boolean actions declared with addExpressionAndConditionAndAction uses
-      // MutatorAndOrAccessor even though they don't declare an operator parameter.
-      // Boolean operators are only used with SetMutators or SetCustomCodeGenerator.
-      (instrInfos.codeExtraInformation.type == "boolean" &&
-       instrInfos.codeExtraInformation.accessType ==
-           gd::InstructionMetadata::ExtraInformation::AccessType::Mutators)) {
+      instrInfos.codeExtraInformation.type == "string" || 
+      instrInfos.codeExtraInformation.type == "boolean") {
     if (instrInfos.codeExtraInformation.accessType ==
         gd::InstructionMetadata::ExtraInformation::MutatorAndOrAccessor)
       call = GenerateOperatorCall(

Core/GDCore/Events/CodeGeneration/EventsCodeGenerator.h

@@ -128,7 +128,7 @@ class GD_CORE_API EventsCodeGenerator {
    */
   std::vector<gd::String> GenerateParametersCodes(
       const std::vector<gd::Expression>& parameters,
-      const ParameterMetadataContainer& parametersInfo,
+      const std::vector<gd::ParameterMetadata>& parametersInfo,
       EventsCodeGenerationContext& context,
       std::vector<std::pair<gd::String, gd::String> >*
           supplementaryParametersTypes = 0);
@@ -528,7 +528,7 @@ protected:
   parameter -> string
    * - operator : Used to update a value using a setter and a getter -> string
    * - key, mouse, objectvar, scenevar, globalvar, password, musicfile,
-  soundfile -> string
+  soundfile, police -> string
    * - trueorfalse, yesorno -> boolean ( See GenerateTrue/GenerateFalse ).
    *
    * <br><br>
@@ -849,7 +849,7 @@ protected:
       instructionUniqueIds;  ///< The unique ids generated for instructions.
   size_t eventsListNextUniqueId;  ///< The next identifier to use for an events
                                   ///< list function name.
-
+  
   gd::DiagnosticReport* diagnosticReport;
 };
 

Core/GDCore/Events/CodeGeneration/ExpressionCodeGenerator.cpp

@@ -430,11 +430,11 @@ gd::String ExpressionCodeGenerator::GenerateParametersCodes(
   size_t nonCodeOnlyParameterIndex = 0;
   gd::String parametersCode;
   for (std::size_t i = initialParameterIndex;
-       i < expressionMetadata.GetParameters().GetParametersCount();
+       i < expressionMetadata.parameters.size();
        ++i) {
     if (i != initialParameterIndex) parametersCode += ", ";
 
-    auto& parameterMetadata = expressionMetadata.GetParameters().GetParameter(i);
+    auto& parameterMetadata = expressionMetadata.parameters[i];
     if (!parameterMetadata.IsCodeOnly()) {
       if (nonCodeOnlyParameterIndex < parameters.size()) {
         auto objectName = gd::ExpressionVariableOwnerFinder::GetObjectName(codeGenerator.GetPlatform(),

Core/GDCore/Events/EventsList.h

@@ -18,6 +18,7 @@ class BaseEvent;
 namespace gd {
 class SerializerElement;
 }
+class TiXmlElement;
 
 #undef CreateEvent
 

Core/GDCore/Events/Parsers/ExpressionParser2Node.h

@@ -36,8 +36,8 @@ struct GD_CORE_API ExpressionParserLocation {
 
  private:
   bool isValid;
-  size_t startPosition = 0;
-  size_t endPosition = 0;
+  size_t startPosition;
+  size_t endPosition;
 };
 
 /**
@@ -58,7 +58,6 @@ struct GD_CORE_API ExpressionParserError {
     MalformedObjectParameter,
     UnknownParameterType,
     MissingBehavior,
-    VariableNameCollision,
   };
 
   ExpressionParserError(gd::ExpressionParserError::ErrorType type_,

Core/GDCore/Events/Serialization.cpp

@@ -182,10 +182,10 @@ void EventsListSerialization::UpdateInstructionsFromGD2x(
     // Common updates for some parameters
     const std::vector<gd::Expression>& parameters = instr.GetParameters();
     for (std::size_t j = 0;
-         j < parameters.size() && j < metadata.parameters.GetParametersCount();
+         j < parameters.size() && j < metadata.parameters.size();
          ++j) {
-      if (metadata.parameters.GetParameter(j).GetType() == "relationalOperator" ||
-          metadata.parameters.GetParameter(j).GetType() == "operator") {
+      if (metadata.parameters[j].GetType() == "relationalOperator" ||
+          metadata.parameters[j].GetType() == "operator") {
         if (j == parameters.size() - 1) {
           std::cout << "ERROR: No more parameters after a [relational]operator "
                        "when trying to update an instruction from GD2.x";

Core/GDCore/Extensions/Builtin/BaseObjectExtension.cpp

@@ -1377,8 +1377,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
                        _("Variables"),
                        "res/actions/var.png")
       .AddParameter("object", _("Object"))
-      .AddParameter("objectvar", _("Variable"))
-      .SetRelevantForFunctionEventsOnly();
+      .AddParameter("objectvar", _("Variable"));
 
   obj.AddExpression("ObjectTimerElapsedTime",
                     _("Object timer value"),
@@ -1768,22 +1767,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(
       .AddParameter("expression",
                     _("Angle of tolerance, in degrees (0: minimum tolerance)"))
       .AddCodeOnlyParameter("conditionInverted", "")
-      .SetHidden()
-      .MarkAsAdvanced();
-
-  extension
-      .AddCondition("IsTurnedTowardObject",
-                    _("An object is turned toward another"),
-                    _("Check if an object is turned toward another"),
-                    _("_PARAM0_ is turned toward _PARAM1_ ± _PARAM2_°"),
-                    _("Angle"),
-                    "res/conditions/estTourne24.png",
-                    "res/conditions/estTourne.png")
-      .AddParameter("objectList", _("Name of the object"))
-      .AddParameter("objectList", _("Name of the second object"))
-      .AddParameter("expression",
-                    _("Angle of tolerance, in degrees (0: minimum tolerance)"))
-      .AddCodeOnlyParameter("conditionInverted", "")
       .MarkAsAdvanced();
 
   extension

Core/GDCore/Extensions/Builtin/CameraExtension.cpp

@@ -327,25 +327,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0");
 
-  extension
-      .AddCondition(
-          "CameraZoom",
-          _("Camera zoom"),
-          _("Compare the zoom of a camera of a layer."),
-          _("Zoom of camera _PARAM2_ of layer _PARAM1_"),
-          "",
-          "res/conditions/camera24.png",
-          "res/conditions/camera.png")
-      .AddCodeOnlyParameter("currentScene", "")
-      .AddParameter("layer", _("Layer"), "", true)
-      .SetDefaultValue("\"\"")
-      .AddParameter("expression", _("Camera number (default : 0)"), "", true)
-      .SetDefaultValue("0")
-      .UseStandardRelationalOperatorParameters(
-          "number", gd::ParameterOptions::MakeNewOptions().SetDescription(
-              _("Zoom")))
-      .MarkAsAdvanced();
-
   extension
       .AddAction(
           "FixCamera",

Core/GDCore/Extensions/Builtin/MouseExtension.cpp

@@ -338,7 +338,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
       .AddParameter("expression", _("Camera number (default : 0)"), "", true)
       .SetDefaultValue("0");
 
-  // Deprecated
   extension
       .AddCondition(
           "PopStartedTouch",
@@ -355,7 +354,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
       .AddCodeOnlyParameter("currentScene", "")
       .SetHidden();
 
-  // Deprecated
   extension
       .AddCondition(
           "PopEndedTouch",
@@ -372,7 +370,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(
       .AddCodeOnlyParameter("currentScene", "")
       .SetHidden();
 
-  // Deprecated
   extension
       .AddCondition(
           "HasAnyTouchStarted",

Core/GDCore/Extensions/Builtin/SpriteExtension/SpriteAnimationList.cpp

@@ -116,13 +116,6 @@ void SpriteAnimationList::ExposeResources(gd::ArbitraryResourceWorker& worker) {
   }
 }
 
-bool SpriteAnimationList::HasAnimationNamed(const gd::String &name) const {
-  return !name.empty() && (find_if(animations.begin(), animations.end(),
-                                   [&name](const Animation &animation) {
-                                     return animation.GetName() == name;
-                                   }) != animations.end());
-}
-
 const Animation& SpriteAnimationList::GetAnimation(std::size_t nb) const {
   if (nb >= animations.size()) return badAnimation;
 

Core/GDCore/Extensions/Builtin/SpriteExtension/SpriteAnimationList.h

@@ -51,11 +51,6 @@ class GD_CORE_API SpriteAnimationList {
    */
   std::size_t GetAnimationsCount() const { return animations.size(); };
 
-  /**
-   * \brief Return true if an animation exists for a given name.
-   */
-  bool HasAnimationNamed(const gd::String &name) const;
-
   /**
    * \brief Add an animation at the end of the existing ones.
    */

Core/GDCore/Extensions/Builtin/SpriteExtension/SpriteExtension.cpp

@@ -33,7 +33,6 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(
                                      "most elements of a game."),
                                    "CppPlatform/Extensions/spriteicon.png")
           .SetCategoryFullName(_("General"))
-          .SetOpenFullEditorLabel(_("Edit animations"))
           .AddDefaultBehavior("EffectCapability::EffectBehavior")
           .AddDefaultBehavior("ResizableCapability::ResizableBehavior")
           .AddDefaultBehavior("ScalableCapability::ScalableBehavior")

Core/GDCore/Extensions/Builtin/SpriteExtension/SpriteObject.cpp

@@ -24,34 +24,37 @@
 namespace gd {
 
 SpriteObject::SpriteObject()
-    : updateIfNotVisible(false),
-      preScale(1) {}
+    : updateIfNotVisible(false) {}
 
 SpriteObject::~SpriteObject(){};
 
 void SpriteObject::DoUnserializeFrom(gd::Project& project,
                                      const gd::SerializerElement& element) {
   updateIfNotVisible = element.GetBoolAttribute("updateIfNotVisible", true);
-  preScale = element.GetDoubleAttribute("preScale", 1);
   animations.UnserializeFrom(element);
 }
 
 void SpriteObject::DoSerializeTo(gd::SerializerElement& element) const {
   element.SetAttribute("updateIfNotVisible", updateIfNotVisible);
-  if (preScale != 1) {
-    element.SetAttribute("preScale", preScale);
-  }
   animations.SerializeTo(element);
 }
 
 std::map<gd::String, gd::PropertyDescriptor> SpriteObject::GetProperties()
     const {
   std::map<gd::String, gd::PropertyDescriptor> properties;
+  properties[_("Animate even if hidden or far from the screen")]
+      .SetValue(updateIfNotVisible ? "true" : "false")
+      .SetType("Boolean");
+  properties["PLEASE_ALSO_SHOW_EDIT_BUTTON_THANKS"].SetValue("");
+
   return properties;
 }
 
 bool SpriteObject::UpdateProperty(const gd::String& name,
                                   const gd::String& value) {
+  if (name == _("Animate even if hidden or far from the screen"))
+    updateIfNotVisible = value == "1";
+
   return true;
 }
 
@@ -61,7 +64,9 @@ void SpriteObject::ExposeResources(gd::ArbitraryResourceWorker& worker) {
 
 std::map<gd::String, gd::PropertyDescriptor>
 SpriteObject::GetInitialInstanceProperties(
-    const gd::InitialInstance& initialInstance) {
+    const gd::InitialInstance& initialInstance,
+    gd::Project& project,
+    gd::Layout& scene) {
   std::map<gd::String, gd::PropertyDescriptor> properties;
   properties["animation"] =
       gd::PropertyDescriptor(
@@ -75,7 +80,9 @@ SpriteObject::GetInitialInstanceProperties(
 bool SpriteObject::UpdateInitialInstanceProperty(
     gd::InitialInstance& initialInstance,
     const gd::String& name,
-    const gd::String& value) {
+    const gd::String& value,
+    gd::Project& project,
+    gd::Layout& scene) {
   if (name == "animation") {
     initialInstance.SetRawDoubleProperty(
         "animation", std::max(0, value.empty() ? 0 : value.To<int>()));
@@ -84,19 +91,6 @@ bool SpriteObject::UpdateInitialInstanceProperty(
   return true;
 }
 
-size_t SpriteObject::GetAnimationsCount() const {
-  return animations.GetAnimationsCount();
-}
-
-const gd::String &SpriteObject::GetAnimationName(size_t index) const {
-  return animations.GetAnimation(index).GetName();
-}
-
-bool SpriteObject::HasAnimationNamed(
-    const gd::String &name) const {
-  return animations.HasAnimationNamed(name);
-}
-
 const SpriteAnimationList& SpriteObject::GetAnimations() const {
   return animations;
 }

Core/GDCore/Extensions/Builtin/SpriteExtension/SpriteObject.h

@@ -47,17 +47,15 @@ class GD_CORE_API SpriteObject : public gd::ObjectConfiguration {
   bool UpdateProperty(const gd::String& name, const gd::String& value) override;
 
   std::map<gd::String, gd::PropertyDescriptor> GetInitialInstanceProperties(
-      const gd::InitialInstance& position) override;
+      const gd::InitialInstance& position,
+      gd::Project& project,
+      gd::Layout& scene) override;
   bool UpdateInitialInstanceProperty(gd::InitialInstance& position,
                                      const gd::String& name,
-                                     const gd::String& value) override;
+                                     const gd::String& value,
+                                     gd::Project& project,
+                                     gd::Layout& scene) override;
 
-  size_t GetAnimationsCount() const override;
-
-  const gd::String &GetAnimationName(size_t index) const override;
-
-  bool HasAnimationNamed(const gd::String &animationName) const override;
-  
   /**
    * \brief Return the animation configuration.
    */
@@ -82,23 +80,6 @@ class GD_CORE_API SpriteObject : public gd::ObjectConfiguration {
    */
   bool GetUpdateIfNotVisible() const { return updateIfNotVisible; }
 
-  /**
-   * \brief Return the scale applied to object to evaluate the default dimensions.
-   */
-  double GetPreScale() { return preScale; }
-
-  /**
-   * \brief Set the scale applied to object to evaluate the default dimensions.
-   * 
-   * Its value must be strictly positive.
-   */
-  void SetPreScale(double preScale_) {
-    if (preScale_ <= 0) {
-      return;
-    }
-    preScale = preScale_;
-  }
-
  private:
   void DoUnserializeFrom(gd::Project& project,
                          const gd::SerializerElement& element) override;
@@ -109,7 +90,6 @@ class GD_CORE_API SpriteObject : public gd::ObjectConfiguration {
   bool updateIfNotVisible;  ///< If set to true, ask the game engine to play
                             ///< object animation even if hidden or far from
                             ///< the screen.
-  double preScale;
 };
 
 }  // namespace gd

Core/GDCore/Extensions/Builtin/VariablesExtension.cpp

@@ -231,7 +231,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
             "it is a text (string)."),
           _("Arrays and structures"),
           "res/actions/var.png")
-      .AddParameter("variable", _("Array variable"));
+      .AddParameter("variable", _("Array variable"))
+      .SetRelevantForLayoutEventsOnly();
 
   extension
       .AddExpression(
@@ -241,7 +242,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
             "it is a number."),
           _("Arrays and structures"),
           "res/actions/var.png")
-      .AddParameter("variable", _("Array variable"));
+      .AddParameter("variable", _("Array variable"))
+      .SetRelevantForLayoutEventsOnly();
 
   extension
       .AddStrExpression(
@@ -251,7 +253,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
             "it is a text (string)."),
           _("Arrays and structures"),
           "res/actions/var.png")
-      .AddParameter("variable", _("Array variable"));
+      .AddParameter("variable", _("Array variable"))
+      .SetRelevantForLayoutEventsOnly();
 
   extension
       .AddExpression(
@@ -261,7 +264,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
             "it is a number."),
           _("Arrays and structures"),
           "res/actions/var.png")
-      .AddParameter("variable", _("Array variable"));
+      .AddParameter("variable", _("Array variable"))
+      .SetRelevantForLayoutEventsOnly();
 
   // Legacy instructions
 
@@ -835,7 +839,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsVariablesExtension(
                      _("Number of children"),
                      _("Number of children in a scene array or "
                        "structure variable"),
-                     _("Arrays and structures"),
+                     _("External variables/Scene variables/Arrays and structures"),
                      "res/actions/var.png")
       .AddParameter("variable", _("Array or structure variable"), "AllowUndeclaredVariable");
 

Core/GDCore/Extensions/Metadata/BehaviorMetadata.cpp

@@ -424,7 +424,7 @@ std::map<gd::String, gd::PropertyDescriptor> BehaviorMetadata::GetProperties() c
   return instance->GetProperties();
 }
 
-gd::BehaviorsSharedData* BehaviorMetadata::GetSharedDataInstance() const {
+gd::BehaviorsSharedData* BehaviorMetadata::GetSharedDataInstance() const { 
   return sharedDatasInstance.get();
 }
 
@@ -440,18 +440,12 @@ std::map<gd::String, gd::PropertyDescriptor> BehaviorMetadata::GetSharedProperti
 
 const std::vector<gd::String>& BehaviorMetadata::GetRequiredBehaviorTypes() const {
   requiredBehaviors.clear();
-  if (!instance) {
-    return requiredBehaviors;
-  }
-  for (auto& property : instance->GetProperties()) {
+  for (auto& property : Get().GetProperties()) {
     const String& propertyName = property.first;
     const gd::PropertyDescriptor& propertyDescriptor = property.second;
 
     if (propertyDescriptor.GetType() == "Behavior") {
-      const auto& extraInfos = propertyDescriptor.GetExtraInfo();
-      if (extraInfos.size() > 0) {
-        requiredBehaviors.push_back(extraInfos[0]);
-      }
+      requiredBehaviors.push_back(propertyDescriptor.GetExtraInfo()[0]);
     }
   }
   return requiredBehaviors;

Core/GDCore/Extensions/Metadata/BehaviorMetadata.h

@@ -12,7 +12,6 @@
 #include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
 #include "GDCore/Extensions/Metadata/InstructionMetadata.h"
 #include "GDCore/String.h"
-#include "GDCore/Project/QuickCustomization.h"
 namespace gd {
 class Behavior;
 class BehaviorsSharedData;
@@ -42,10 +41,10 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
       const gd::String& className_,
       std::shared_ptr<gd::Behavior> instance,
       std::shared_ptr<gd::BehaviorsSharedData> sharedDatasInstance);
-
+      
   /**
    * \brief Construct a behavior metadata, without "blueprint" behavior.
-   *
+   * 
    * \note This is used by events based behaviors.
    */
   BehaviorMetadata(
@@ -298,27 +297,9 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
     return *this;
   }
 
-  QuickCustomization::Visibility GetQuickCustomizationVisibility() const {
-    return quickCustomizationVisibility;
-  }
-
-  BehaviorMetadata &SetQuickCustomizationVisibility(QuickCustomization::Visibility visibility) {
-    quickCustomizationVisibility = visibility;
-    return *this;
-  }
-
-  BehaviorMetadata &SetOpenFullEditorLabel(const gd::String& label) {
-    openFullEditorLabel = label;
-    return *this;
-  }
-
-  const gd::String& GetOpenFullEditorLabel() const {
-    return openFullEditorLabel;
-  }
-
   /**
    * \brief Return the associated gd::Behavior, handling behavior contents.
-   *
+   * 
    * \note Returns a dumb Behavior for events based behaviors as CustomBehavior
    * are using EventBasedBehavior.
    */
@@ -336,7 +317,7 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
   /**
    * \brief Return the associated gd::BehaviorsSharedData, handling behavior
    * shared data, if any (nullptr if none).
-   *
+   * 
    * \note Returns nullptr for events based behaviors as they don't declare
    * shared data yet.
    */
@@ -393,8 +374,6 @@ class GD_CORE_API BehaviorMetadata : public InstructionOrExpressionContainerMeta
   mutable std::vector<gd::String> requiredBehaviors;
   bool isPrivate = false;
   bool isHidden = false;
-  gd::String openFullEditorLabel;
-  QuickCustomization::Visibility quickCustomizationVisibility = QuickCustomization::Visibility::Default;
 
   // TODO: Nitpicking: convert these to std::unique_ptr to clarify ownership.
   std::shared_ptr<gd::Behavior> instance;

Core/GDCore/Extensions/Metadata/EffectMetadata.h

@@ -185,10 +185,10 @@ class GD_CORE_API EffectMetadata {
   gd::String fullname;
   gd::String description;
   std::vector<gd::String> includeFiles;
-  bool isMarkedAsNotWorkingForObjects = false;
-  bool isMarkedAsOnlyWorkingFor2D = false;
-  bool isMarkedAsOnlyWorkingFor3D = false;
-  bool isMarkedAsUnique = false;
+  bool isMarkedAsNotWorkingForObjects;
+  bool isMarkedAsOnlyWorkingFor2D;
+  bool isMarkedAsOnlyWorkingFor3D;
+  bool isMarkedAsUnique;
   std::map<gd::String, gd::PropertyDescriptor> properties;
 };
 

Core/GDCore/Extensions/Metadata/EventMetadata.cpp

@@ -19,8 +19,7 @@ EventMetadata::EventMetadata(const gd::String &name_,
     : fullname(fullname_),
       description(description_),
       group(group_),
-      instance(instance_),
-      hasCustomCodeGenerator(false) {
+      instance(instance_) {
   ClearCodeGenerationAndPreprocessing();
   if (instance) instance->SetType(name_);
 }

Core/GDCore/Extensions/Metadata/EventMetadata.h

@@ -83,7 +83,7 @@ class GD_CORE_API EventMetadata {
   gd::String group;
 
   std::shared_ptr<gd::BaseEvent> instance;
-  bool hasCustomCodeGenerator = false;
+  bool hasCustomCodeGenerator;
   std::function<gd::String(gd::BaseEvent& event,
                            gd::EventsCodeGenerator& codeGenerator,
                            gd::EventsCodeGenerationContext& context)>

Core/GDCore/Extensions/Metadata/ExpressionMetadata.cpp

@@ -38,12 +38,12 @@ gd::ExpressionMetadata& ExpressionMetadata::AddParameter(
     const gd::String& description,
     const gd::String& supplementaryInformation,
     bool parameterIsOptional) {
-  parameters.AddNewParameter("")
-  .SetType(type)
-  .SetDescription(description)
-  .SetCodeOnly(false)
-  .SetOptional(parameterIsOptional)
-  .SetExtraInfo(
+  gd::ParameterMetadata info;
+  info.SetType(type);
+  info.description = description;
+  info.codeOnly = false;
+  info.SetOptional(parameterIsOptional);
+  info.SetExtraInfo(
       // For objects/behavior, the supplementary information
       // parameter is an object/behavior type...
       ((gd::ParameterMetadata::IsObject(type) ||
@@ -59,16 +59,22 @@ gd::ExpressionMetadata& ExpressionMetadata::AddParameter(
   // TODO: Assert against supplementaryInformation === "emsc" (when running with
   // Emscripten), and warn about a missing argument when calling addParameter.
 
+  parameters.push_back(info);
   return *this;
 }
 
-gd::ExpressionMetadata &ExpressionMetadata::AddCodeOnlyParameter(
-    const gd::String &type, const gd::String &supplementaryInformation) {
-  parameters.AddNewParameter("").SetType(type).SetCodeOnly().SetExtraInfo(
-      supplementaryInformation);
+gd::ExpressionMetadata& ExpressionMetadata::AddCodeOnlyParameter(
+    const gd::String& type, const gd::String& supplementaryInformation) {
+  gd::ParameterMetadata info;
+  info.SetType(type);
+  info.codeOnly = true;
+  info.SetExtraInfo(supplementaryInformation);
+
+  parameters.push_back(info);
   return *this;
 }
 
+
 gd::ExpressionMetadata& ExpressionMetadata::SetRequiresBaseObjectCapability(
     const gd::String& capability) {
   requiredBaseObjectCapability = capability;

Core/GDCore/Extensions/Metadata/ExpressionMetadata.h

@@ -193,9 +193,8 @@ class GD_CORE_API ExpressionMetadata : public gd::AbstractFunctionMetadata {
    * \see AddParameter
    */
   ExpressionMetadata &SetDefaultValue(const gd::String &defaultValue) override {
-    if (parameters.GetParametersCount() > 0) {
-      parameters.GetInternalVector().back()->SetDefaultValue(defaultValue);
-    }
+    if (!parameters.empty())
+      parameters.back().SetDefaultValue(defaultValue);
     return *this;
   };
 
@@ -207,9 +206,8 @@ class GD_CORE_API ExpressionMetadata : public gd::AbstractFunctionMetadata {
    */
   ExpressionMetadata &
   SetParameterLongDescription(const gd::String &longDescription) override {
-    if (parameters.GetParametersCount() > 0) {
-      parameters.GetInternalVector().back()->SetLongDescription(longDescription);
-    }
+    if (!parameters.empty())
+      parameters.back().SetLongDescription(longDescription);
     return *this;
   };
 
@@ -222,9 +220,7 @@ class GD_CORE_API ExpressionMetadata : public gd::AbstractFunctionMetadata {
    */
   ExpressionMetadata &SetParameterExtraInfo(
       const gd::String &extraInfo) override {
-    if (parameters.GetParametersCount() > 0) {
-      parameters.GetInternalVector().back()->SetExtraInfo(extraInfo);
-    }
+    if (!parameters.empty()) parameters.back().SetExtraInfo(extraInfo);
     return *this;
   }
 
@@ -252,16 +248,19 @@ class GD_CORE_API ExpressionMetadata : public gd::AbstractFunctionMetadata {
   const gd::String& GetGroup() const { return group; }
   const gd::String& GetSmallIconFilename() const { return smallIconFilename; }
   const gd::ParameterMetadata& GetParameter(std::size_t id) const {
-    return parameters.GetParameter(id);
+    return parameters[id];
   };
   gd::ParameterMetadata& GetParameter(std::size_t id) {
-    return parameters.GetParameter(id);
+    return parameters[id];
   };
-  std::size_t GetParametersCount() const { return parameters.GetParametersCount(); };
-  const gd::ParameterMetadataContainer& GetParameters() const {
+  std::size_t GetParametersCount() const { return parameters.size(); };
+  const std::vector<gd::ParameterMetadata>& GetParameters() const {
     return parameters;
   };
 
+  std::vector<gd::ParameterMetadata> parameters;
+
+  
   /**
    * \brief Set the function name which will be used when generating the code.
    * \param functionName the name of the function to call
@@ -369,8 +368,6 @@ class GD_CORE_API ExpressionMetadata : public gd::AbstractFunctionMetadata {
   bool isPrivate;
   gd::String requiredBaseObjectCapability;
   gd::String relevantContext;
-
-  gd::ParameterMetadataContainer parameters;
 };
 
 }  // namespace gd

Core/GDCore/Extensions/Metadata/InstructionMetadata.cpp

@@ -9,7 +9,6 @@
 
 #include "GDCore/CommonTools.h"
 #include "GDCore/Extensions/PlatformExtension.h"
-#include "GDCore/Project/ParameterMetadataContainer.h"
 #include "GDCore/Serialization/SerializerElement.h"
 #include "GDCore/Tools/Localization.h"
 #include "GDCore/Tools/Log.h"
@@ -78,7 +77,7 @@ InstructionMetadata& InstructionMetadata::AddParameter(
   // TODO: Assert against supplementaryInformation === "emsc" (when running with
   // Emscripten), and warn about a missing argument when calling addParameter.
 
-  parameters.AddParameter(info);
+  parameters.push_back(info);
   return *this;
 }
 
@@ -89,7 +88,7 @@ InstructionMetadata& InstructionMetadata::AddCodeOnlyParameter(
   info.codeOnly = true;
   info.SetExtraInfo(supplementaryInformation);
 
-  parameters.AddParameter(info);
+  parameters.push_back(info);
   return *this;
 }
 
@@ -103,7 +102,7 @@ InstructionMetadata& InstructionMetadata::UseStandardOperatorParameters(
     AddParameter(
         "yesorno",
         options.description.empty() ? _("New value") : options.description);
-    size_t valueParamIndex = parameters.GetParametersCount() - 1;
+    size_t valueParamIndex = parameters.size() - 1;
 
     if (isObjectInstruction || isBehaviorInstruction) {
       gd::String templateSentence = _("Set _PARAM0_ as <subject>: <value>");
@@ -128,8 +127,8 @@ InstructionMetadata& InstructionMetadata::UseStandardOperatorParameters(
                  options.description.empty() ? _("Value") : options.description,
                  options.typeExtraInfo);
 
-    size_t operatorParamIndex = parameters.GetParametersCount() - 2;
-    size_t valueParamIndex = parameters.GetParametersCount() - 1;
+    size_t operatorParamIndex = parameters.size() - 2;
+    size_t valueParamIndex = parameters.size() - 1;
 
     if (isObjectInstruction || isBehaviorInstruction) {
       gd::String templateSentence = _("Change <subject> of _PARAM0_: <operator> <value>");
@@ -182,8 +181,8 @@ InstructionMetadata::UseStandardRelationalOperatorParameters(
     AddParameter(type,
                  options.description.empty() ? _("Value to compare") : options.description,
                  options.typeExtraInfo);
-    size_t operatorParamIndex = parameters.GetParametersCount() - 2;
-    size_t valueParamIndex = parameters.GetParametersCount() - 1;
+    size_t operatorParamIndex = parameters.size() - 2;
+    size_t valueParamIndex = parameters.size() - 1;
 
     if (isObjectInstruction || isBehaviorInstruction) {
       gd::String templateSentence = _("<subject> of _PARAM0_ <operator> <value>");

Core/GDCore/Extensions/Metadata/InstructionMetadata.h

@@ -14,7 +14,6 @@
 #include <memory>
 
 #include "GDCore/Events/Instruction.h"
-#include "GDCore/Project/ParameterMetadataContainer.h"
 #include "GDCore/String.h"
 #include "ParameterMetadata.h"
 #include "ParameterOptions.h"
@@ -62,12 +61,12 @@ class GD_CORE_API InstructionMetadata : public gd::AbstractFunctionMetadata {
   const gd::String &GetDescription() const { return description; }
   const gd::String &GetSentence() const { return sentence; }
   const gd::String &GetGroup() const { return group; }
-  ParameterMetadata &GetParameter(size_t i) { return parameters.GetParameter(i); }
+  ParameterMetadata &GetParameter(size_t i) { return parameters[i]; }
   const ParameterMetadata &GetParameter(size_t i) const {
-    return parameters.GetParameter(i);
+    return parameters[i];
   }
-  size_t GetParametersCount() const { return parameters.GetParametersCount(); }
-  const ParameterMetadataContainer &GetParameters() const {
+  size_t GetParametersCount() const { return parameters.size(); }
+  const std::vector<ParameterMetadata> &GetParameters() const {
     return parameters;
   }
   const gd::String &GetIconFilename() const { return iconFilename; }
@@ -257,9 +256,7 @@ class GD_CORE_API InstructionMetadata : public gd::AbstractFunctionMetadata {
    * \see AddParameter
    */
   InstructionMetadata &SetDefaultValue(const gd::String &defaultValue_) override {
-    if (parameters.GetParametersCount() > 0) {
-      parameters.GetInternalVector().back()->SetDefaultValue(defaultValue_);
-    }
+    if (!parameters.empty()) parameters.back().SetDefaultValue(defaultValue_);
     return *this;
   };
 
@@ -271,9 +268,8 @@ class GD_CORE_API InstructionMetadata : public gd::AbstractFunctionMetadata {
    */
   InstructionMetadata &SetParameterLongDescription(
       const gd::String &longDescription) override {
-    if (parameters.GetParametersCount() > 0) {
-      parameters.GetInternalVector().back()->SetLongDescription(longDescription);
-    }
+    if (!parameters.empty())
+      parameters.back().SetLongDescription(longDescription);
     return *this;
   }
 
@@ -285,9 +281,7 @@ class GD_CORE_API InstructionMetadata : public gd::AbstractFunctionMetadata {
    * \see AddParameter
    */
   InstructionMetadata &SetParameterExtraInfo(const gd::String &extraInfo) override {
-    if (parameters.GetParametersCount() > 0) {
-      parameters.GetInternalVector().back()->SetExtraInfo(extraInfo);
-    }
+    if (!parameters.empty()) parameters.back().SetExtraInfo(extraInfo);
     return *this;
   }
 
@@ -566,7 +560,7 @@ class GD_CORE_API InstructionMetadata : public gd::AbstractFunctionMetadata {
    */
   InstructionMetadata &GetCodeExtraInformation() { return *this; }
 
-  ParameterMetadataContainer parameters;
+  std::vector<ParameterMetadata> parameters;
 
  private:
   gd::String fullname;

Core/GDCore/Extensions/Metadata/MetadataProvider.cpp

@@ -454,12 +454,11 @@ const gd::ParameterMetadata* MetadataProvider::GetFunctionCallParameterMetadata(
       // TODO use a badMetadata instead of a nullptr?
       const gd::ParameterMetadata* parameterMetadata = nullptr;
       while (metadataParameterIndex <
-             metadata.GetParameters().GetParametersCount()) {
-        if (!metadata.GetParameters().GetParameter(metadataParameterIndex)
+             metadata.parameters.size()) {
+        if (!metadata.parameters[metadataParameterIndex]
                  .IsCodeOnly()) {
           if (visibleParameterIndex == parameterIndex) {
-            parameterMetadata =
-                &metadata.GetParameters().GetParameter(metadataParameterIndex);
+            parameterMetadata = &metadata.parameters[metadataParameterIndex];
           }
           visibleParameterIndex++;
         }

Core/GDCore/Extensions/Metadata/MetadataProvider.h

@@ -288,8 +288,8 @@ class GD_CORE_API MetadataProvider {
   static EffectMetadata badEffectMetadata;
   static gd::InstructionMetadata badInstructionMetadata;
   static gd::ExpressionMetadata badExpressionMetadata;
-  int useless = 0;  // Useless member to avoid emscripten "must have a positive
-                    // integer typeid pointer" runtime error.
+  int useless;  // Useless member to avoid emscripten "must have a positive
+                // integer typeid pointer" runtime error.
 };
 
 }  // namespace gd

Core/GDCore/Extensions/Metadata/ObjectMetadata.cpp

@@ -54,7 +54,7 @@ ObjectMetadata::ObjectMetadata(const gd::String& extensionNamespace_,
                      []() -> std::unique_ptr<gd::ObjectConfiguration> {
       gd::LogFatalError(
           "Error: Event-based objects don't have blueprint. "
-          "This method should never be called.");
+          "This method should not never be called.");
       return nullptr;
     }) {}
 

Core/GDCore/Extensions/Metadata/ObjectMetadata.h

@@ -246,11 +246,6 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
     return *this;
   }
 
-  ObjectMetadata& ResetDefaultBehaviorsJustForTesting() {
-    defaultBehaviorTypes.clear();
-    return *this;
-  }
-
   const gd::String& GetName() const override { return name; }
   const gd::String& GetFullName() const override { return fullname; }
   const gd::String& GetCategoryFullName() const { return categoryFullName; }
@@ -328,15 +323,6 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
    */
   bool IsRenderedIn3D() const { return isRenderedIn3D; }
 
-  ObjectMetadata &SetOpenFullEditorLabel(const gd::String& label) {
-    openFullEditorLabel = label;
-    return *this;
-  }
-
-  const gd::String& GetOpenFullEditorLabel() const {
-    return openFullEditorLabel;
-  }
-
   std::map<gd::String, gd::InstructionMetadata> conditionsInfos;
   std::map<gd::String, gd::InstructionMetadata> actionsInfos;
   std::map<gd::String, gd::ExpressionMetadata> expressionsInfos;
@@ -358,7 +344,6 @@ class GD_CORE_API ObjectMetadata : public InstructionOrExpressionContainerMetada
   std::set<gd::String> defaultBehaviorTypes;
   bool hidden = false;
   bool isRenderedIn3D = false;
-  gd::String openFullEditorLabel;
 
   std::shared_ptr<gd::ObjectConfiguration>
       blueprintObject;  ///< The "blueprint" object to be copied when a new

Core/GDCore/Extensions/Metadata/ParameterMetadata.h

@@ -4,8 +4,8 @@
  * reserved. This project is released under the MIT License.
  */
 
-#pragma once
-
+#ifndef PARAMETER_METADATA_H
+#define PARAMETER_METADATA_H
 #include <map>
 #include <memory>
 
@@ -29,12 +29,6 @@ class GD_CORE_API ParameterMetadata {
   ParameterMetadata();
   virtual ~ParameterMetadata(){};
 
-  /**
-   * \brief Return a pointer to a new ParameterMetadata constructed from
-   * this one.
-   */
-  ParameterMetadata* Clone() const { return new ParameterMetadata(*this); };
-
   /**
    * \brief Return the metadata of the parameter type.
    */
@@ -254,3 +248,5 @@ class GD_CORE_API ParameterMetadata {
 };
 
 }  // namespace gd
+
+#endif  // PARAMETER_METADATA_H

Core/GDCore/Extensions/Metadata/ParameterMetadataTools.cpp

@@ -6,156 +6,86 @@
 #include "ParameterMetadataTools.h"
 
 #include "GDCore/Events/Expression.h"
-#include "GDCore/Events/Parsers/ExpressionParser2.h"
-#include "GDCore/Events/Parsers/ExpressionParser2NodePrinter.h"
 #include "GDCore/Project/Object.h"
 #include "GDCore/Project/ObjectsContainer.h"
 #include "GDCore/Project/ObjectsContainersList.h"
-#include "GDCore/Project/ParameterMetadataContainer.h"
 #include "GDCore/Project/Project.h"
 #include "GDCore/String.h"
 #include "InstructionMetadata.h"
+#include "GDCore/Events/Parsers/ExpressionParser2.h"
+#include "GDCore/Events/Parsers/ExpressionParser2NodePrinter.h"
 
 namespace gd {
 const ParameterMetadata ParameterMetadataTools::badParameterMetadata;
 
 void ParameterMetadataTools::ParametersToObjectsContainer(
     const gd::Project& project,
-    const ParameterMetadataContainer& parameters,
+    const std::vector<gd::ParameterMetadata>& parameters,
     gd::ObjectsContainer& outputObjectsContainer) {
-  // Keep track of all objects and their behaviors names, so we can remove
-  // those who are in the container but not in the parameters anymore.
-  std::set<gd::String> allObjectNames;
-  std::map<gd::String, std::set<gd::String>> allObjectNonDefaultBehaviorNames;
+  outputObjectsContainer.GetObjects().clear();
 
   gd::String lastObjectName;
-  for (std::size_t i = 0; i < parameters.GetParametersCount(); ++i) {
-    const auto& parameter = parameters.GetParameter(i);
+  for (std::size_t i = 0; i < parameters.size(); ++i) {
+    const auto& parameter = parameters[i];
     if (parameter.GetName().empty()) continue;
 
     if (gd::ParameterMetadata::IsObject(parameter.GetType())) {
-      const gd::String& objectName = parameter.GetName();
-      const gd::String& objectType = parameter.GetExtraInfo();
-      allObjectNames.insert(objectName);
-
-      // Check if we can keep the existing object.
-      if (outputObjectsContainer.HasObjectNamed(objectName)) {
-        const gd::Object& object = outputObjectsContainer.GetObject(objectName);
-
-        if (object.GetType() != objectType) {
-          // Object type has changed, remove it so it is re-created.
-          outputObjectsContainer.RemoveObject(objectName);
-        }
-      }
-
-      if (outputObjectsContainer.HasObjectNamed(objectName)) {
-        // Keep the existing object, ensure the default behaviors
-        // are all present (and no more than required by the object type).
-        // Non default behaviors coming from parameters will be added or removed later.
-        project.EnsureObjectDefaultBehaviors(outputObjectsContainer.GetObject(objectName));
-      } else {
-        // Create a new object (and its default behaviors) if needed.
-        outputObjectsContainer.InsertNewObject(
-            project,
-            objectType,
-            objectName,
-            outputObjectsContainer.GetObjectsCount());
-      }
+      outputObjectsContainer.InsertNewObject(
+          project,
+          parameter.GetExtraInfo(),
+          parameter.GetName(),
+          outputObjectsContainer.GetObjectsCount());
 
       // Memorize the last object name. By convention, parameters that require
       // an object (mainly, "objectvar" and "behavior") should be placed after
       // the object in the list of parameters (if possible, just after).
       // Search "lastObjectName" in the codebase for other place where this
       // convention is enforced.
-      lastObjectName = objectName;
+      lastObjectName = parameter.GetName();
     } else if (gd::ParameterMetadata::IsBehavior(parameter.GetType())) {
       if (!lastObjectName.empty()) {
         if (outputObjectsContainer.HasObjectNamed(lastObjectName)) {
-          const gd::String& behaviorName = parameter.GetName();
-          const gd::String& behaviorType = parameter.GetExtraInfo();
-
-          gd::Object& object = outputObjectsContainer.GetObject(lastObjectName);
-          allObjectNonDefaultBehaviorNames[lastObjectName].insert(behaviorName);
-
-          // Check if we can keep the existing behavior.
-          if (object.HasBehaviorNamed(behaviorName)) {
-            if (object.GetBehavior(behaviorName).GetTypeName() !=
-                behaviorType) {
-              // Behavior type has changed, remove it so it is re-created.
-              object.RemoveBehavior(behaviorName);
-            }
-          }
+          const gd::Object& object =
+              outputObjectsContainer.GetObject(lastObjectName);
+          gd::String behaviorName = parameter.GetName();
 
           if (!object.HasBehaviorNamed(behaviorName)) {
-            object.AddNewBehavior(
-                project, parameter.GetExtraInfo(), behaviorName);
+            outputObjectsContainer.GetObject(lastObjectName)
+                .AddNewBehavior(
+                    project, parameter.GetExtraInfo(), behaviorName);
           }
         }
       }
     }
   }
-
-  // Remove objects that are not in the parameters anymore.
-  std::set<gd::String> objectNamesInContainer =
-      outputObjectsContainer.GetAllObjectNames();
-  for (const auto& objectName : objectNamesInContainer) {
-    if (allObjectNames.find(objectName) == allObjectNames.end()) {
-      outputObjectsContainer.RemoveObject(objectName);
-    }
-  }
-
-  // Remove behaviors of objects that are not in the parameters anymore.
-  for (const auto& objectName : allObjectNames) {
-    if (!outputObjectsContainer.HasObjectNamed(objectName)) {
-      // Should not happen.
-      continue;
-    }
-
-    auto& object = outputObjectsContainer.GetObject(objectName);
-    const auto& allBehaviorNames = allObjectNonDefaultBehaviorNames[objectName];
-    for (const auto& behaviorName : object.GetAllBehaviorNames()) {
-      if (object.GetBehavior(behaviorName).IsDefaultBehavior()) {
-        // Default behaviors are already ensured to be all present
-        // (and no more than required by the object type).
-        continue;
-      }
-
-      if (allBehaviorNames.find(behaviorName) == allBehaviorNames.end()) {
-        object.RemoveBehavior(behaviorName);
-      }
-    }
-  }
 }
 
 void ParameterMetadataTools::ForEachParameterMatchingSearch(
-    const std::vector<const ParameterMetadataContainer*>&
+    const std::vector<const std::vector<gd::ParameterMetadata>*>&
         parametersVectorsList,
     const gd::String& search,
     std::function<void(const gd::ParameterMetadata&)> cb) {
   for (auto it = parametersVectorsList.rbegin();
        it != parametersVectorsList.rend();
        ++it) {
-    const ParameterMetadataContainer* parametersVector = *it;
+    const std::vector<gd::ParameterMetadata>* parametersVector = *it;
 
-    for (const auto &parameterMetadata :
-         parametersVector->GetInternalVector()) {
-      if (parameterMetadata->GetName().FindCaseInsensitive(search) !=
-          gd::String::npos)
-        cb(*parameterMetadata);
+    for (const auto& parameterMetadata: *parametersVector) {
+      if (parameterMetadata.GetName().FindCaseInsensitive(search) != gd::String::npos) cb(parameterMetadata);
     }
   }
 }
 
 bool ParameterMetadataTools::Has(
-      const std::vector<const ParameterMetadataContainer*>& parametersVectorsList,
+      const std::vector<const std::vector<gd::ParameterMetadata>*>& parametersVectorsList,
       const gd::String& parameterName) {
   for (auto it = parametersVectorsList.rbegin();
        it != parametersVectorsList.rend();
        ++it) {
-    const ParameterMetadataContainer* parametersVector = *it;
+    const std::vector<gd::ParameterMetadata>* parametersVector = *it;
 
-    for (const auto& parameterMetadata: parametersVector->GetInternalVector()) {
-      if (parameterMetadata->GetName() == parameterName) return true;
+    for (const auto& parameterMetadata: *parametersVector) {
+      if (parameterMetadata.GetName() == parameterName) return true;
     }
   }
 
@@ -163,18 +93,16 @@ bool ParameterMetadataTools::Has(
 }
 
 const gd::ParameterMetadata& ParameterMetadataTools::Get(
-    const std::vector<const ParameterMetadataContainer*>&
+    const std::vector<const std::vector<gd::ParameterMetadata>*>&
         parametersVectorsList,
     const gd::String& parameterName) {
   for (auto it = parametersVectorsList.rbegin();
        it != parametersVectorsList.rend();
        ++it) {
-    const ParameterMetadataContainer* parametersVector = *it;
+    const std::vector<gd::ParameterMetadata>* parametersVector = *it;
 
-    for (const auto &parameterMetadata :
-         parametersVector->GetInternalVector()) {
-      if (parameterMetadata->GetName() == parameterName)
-        return *parameterMetadata;
+    for (const auto& parameterMetadata: *parametersVector) {
+      if (parameterMetadata.GetName() == parameterName) return parameterMetadata;
     }
   }
 
@@ -183,7 +111,7 @@ const gd::ParameterMetadata& ParameterMetadataTools::Get(
 
 void ParameterMetadataTools::IterateOverParameters(
     const std::vector<gd::Expression>& parameters,
-    const ParameterMetadataContainer& parametersMetadata,
+    const std::vector<gd::ParameterMetadata>& parametersMetadata,
     std::function<void(const gd::ParameterMetadata& parameterMetadata,
                        const gd::Expression& parameterValue,
                        const gd::String& lastObjectName)> fn) {
@@ -200,17 +128,15 @@ void ParameterMetadataTools::IterateOverParameters(
 
 void ParameterMetadataTools::IterateOverParametersWithIndex(
     const std::vector<gd::Expression>& parameters,
-    const ParameterMetadataContainer& parametersMetadata,
+    const std::vector<gd::ParameterMetadata>& parametersMetadata,
     std::function<void(const gd::ParameterMetadata& parameterMetadata,
                        const gd::Expression& parameterValue,
                        size_t parameterIndex,
                        const gd::String& lastObjectName)> fn) {
   gd::String lastObjectName = "";
-  for (std::size_t pNb = 0; pNb < parametersMetadata.GetParametersCount();
-       ++pNb) {
-    const gd::ParameterMetadata &parameterMetadata =
-        parametersMetadata.GetParameter(pNb);
-    const gd::Expression &parameterValue =
+  for (std::size_t pNb = 0; pNb < parametersMetadata.size(); ++pNb) {
+    const gd::ParameterMetadata& parameterMetadata = parametersMetadata[pNb];
+    const gd::Expression& parameterValue =
         pNb < parameters.size() ? parameters[pNb].GetPlainString() : "";
     const gd::Expression& parameterValueOrDefault =
         parameterValue.GetPlainString().empty() && parameterMetadata.IsOptional()
@@ -253,10 +179,10 @@ void ParameterMetadataTools::IterateOverParametersWithIndex(
 
   size_t parameterIndex = 0;
   for (size_t metadataIndex = (isObjectFunction ? 1 : 0);
-       metadataIndex < metadata.GetParameters().GetParametersCount() &&
+       metadataIndex < metadata.parameters.size() &&
        parameterIndex < node.parameters.size();
        ++metadataIndex) {
-    auto &parameterMetadata = metadata.GetParameters().GetParameter(metadataIndex);
+    auto &parameterMetadata = metadata.parameters[metadataIndex];
     if (parameterMetadata.IsCodeOnly()) {
       continue;
     }
@@ -278,17 +204,16 @@ void ParameterMetadataTools::IterateOverParametersWithIndex(
 }
 
 size_t ParameterMetadataTools::GetObjectParameterIndexFor(
-    const ParameterMetadataContainer& parametersMetadata,
+    const std::vector<gd::ParameterMetadata>& parametersMetadata,
     size_t parameterIndex) {
   // By convention, parameters that require
   // an object (mainly, "objectvar" and "behavior") should be placed after
   // the object in the list of parameters (if possible, just after).
   // Search "lastObjectName" in the codebase for other place where this
   // convention is enforced.
-  for (std::size_t pNb = parameterIndex;
-       pNb < parametersMetadata.GetParametersCount(); pNb--) {
-    if (gd::ParameterMetadata::IsObject(
-            parametersMetadata.GetParameter(pNb).GetType())) {
+  for (std::size_t pNb = parameterIndex; pNb < parametersMetadata.size();
+       pNb--) {
+    if (gd::ParameterMetadata::IsObject(parametersMetadata[pNb].GetType())) {
       return pNb;
     }
   }

Core/GDCore/Extensions/Metadata/ParameterMetadataTools.h

@@ -15,7 +15,6 @@ class ObjectsContainer;
 class ObjectsContainersList;
 class ParameterMetadata;
 class Expression;
-class ParameterMetadataContainer;
 struct FunctionCallNode;
 struct ExpressionNode;
 }  // namespace gd
@@ -25,20 +24,20 @@ class GD_CORE_API ParameterMetadataTools {
  public:
   static void ParametersToObjectsContainer(
       const gd::Project& project,
-      const ParameterMetadataContainer& parameters,
+      const std::vector<gd::ParameterMetadata>& parameters,
       gd::ObjectsContainer& outputObjectsContainer);
 
   static void ForEachParameterMatchingSearch(
-      const std::vector<const ParameterMetadataContainer*>& parametersVectorsList,
+      const std::vector<const std::vector<gd::ParameterMetadata>*>& parametersVectorsList,
       const gd::String& search,
       std::function<void(const gd::ParameterMetadata&)> cb);
 
   static bool Has(
-      const std::vector<const ParameterMetadataContainer*>& parametersVectorsList,
+      const std::vector<const std::vector<gd::ParameterMetadata>*>& parametersVectorsList,
       const gd::String& parameterName);
 
   static const gd::ParameterMetadata& Get(
-      const std::vector<const ParameterMetadataContainer*>& parametersVectorsList,
+      const std::vector<const std::vector<gd::ParameterMetadata>*>& parametersVectorsList,
       const gd::String& parameterName);
 
   /**
@@ -48,7 +47,7 @@ class GD_CORE_API ParameterMetadataTools {
    */
   static void IterateOverParameters(
       const std::vector<gd::Expression>& parameters,
-      const ParameterMetadataContainer& parametersMetadata,
+      const std::vector<gd::ParameterMetadata>& parametersMetadata,
       std::function<void(const gd::ParameterMetadata& parameterMetadata,
                          const gd::Expression& parameterValue,
                          const gd::String& lastObjectName)> fn);
@@ -60,7 +59,7 @@ class GD_CORE_API ParameterMetadataTools {
    */
   static void IterateOverParametersWithIndex(
       const std::vector<gd::Expression>& parameters,
-      const ParameterMetadataContainer& parametersMetadata,
+      const std::vector<gd::ParameterMetadata>& parametersMetadata,
       std::function<void(const gd::ParameterMetadata& parameterMetadata,
                          const gd::Expression& parameterValue,
                          size_t parameterIndex,
@@ -85,7 +84,7 @@ class GD_CORE_API ParameterMetadataTools {
    * it's linked to.
    */
   static size_t GetObjectParameterIndexFor(
-      const ParameterMetadataContainer& parametersMetadata,
+      const std::vector<gd::ParameterMetadata>& parametersMetadata,
       size_t parameterIndex);
 
 private:

Core/GDCore/Extensions/Metadata/ValueTypeMetadata.cpp

@@ -53,32 +53,27 @@ const gd::String &ValueTypeMetadata::GetExpressionPrimitiveValueType(
 
 const gd::String &
 ValueTypeMetadata::GetPrimitiveValueType(const gd::String &parameterType) {
-  if (parameterType == "number" ||
-      gd::ValueTypeMetadata::IsTypeValue("number", parameterType)) {
-    return ValueTypeMetadata::numberType;
-  }
-  if (parameterType == "string" ||
-      gd::ValueTypeMetadata::IsTypeValue("string", parameterType)) {
-    return ValueTypeMetadata::stringType;
-  }
   if (parameterType == "variable" ||
-      gd::ValueTypeMetadata::IsTypeValue("variable", parameterType)) {
+      gd::ValueTypeMetadata::IsTypeExpression("variable", parameterType)) {
     return ValueTypeMetadata::variableType;
   }
-  if (parameterType == "boolean" ||
-      gd::ValueTypeMetadata::IsTypeValue("boolean", parameterType)) {
+  if (parameterType == "boolean" || parameterType == "yesorno" ||
+      parameterType == "trueorfalse") {
     return ValueTypeMetadata::booleanType;
   }
-  return parameterType;
+  // These 2 types are not strings from the code generator point of view,
+  // but it is for event-based extensions.
+  if (parameterType == "key" || parameterType == "mouse") {
+    return ValueTypeMetadata::stringType;
+  }
+  return GetExpressionPrimitiveValueType(parameterType);
 }
 
 const gd::String ValueTypeMetadata::numberValueType = "number";
 const gd::String ValueTypeMetadata::booleanValueType = "boolean";
-const gd::String ValueTypeMetadata::stringValueType = "string";
 const gd::String ValueTypeMetadata::colorValueType = "color";
 const gd::String ValueTypeMetadata::choiceValueType = "stringWithSelector";
-const gd::String ValueTypeMetadata::behaviorValueType = "behavior";
-const gd::String ValueTypeMetadata::leaderboardIdValueType = "leaderboardId";
+const gd::String ValueTypeMetadata::stringValueType = "string";
 
 const gd::String &ValueTypeMetadata::ConvertPropertyTypeToValueType(
     const gd::String &propertyType) {
@@ -90,10 +85,6 @@ const gd::String &ValueTypeMetadata::ConvertPropertyTypeToValueType(
     return colorValueType;
   } else if (propertyType == "Choice") {
     return choiceValueType;
-  } else if (propertyType == "Behavior") {
-    return behaviorValueType;
-  } else if (propertyType == "LeaderboardId") {
-    return leaderboardIdValueType;
   }
   // For "String" or default
   return stringValueType;

Core/GDCore/Extensions/Metadata/ValueTypeMetadata.h

@@ -111,21 +111,21 @@ class GD_CORE_API ValueTypeMetadata {
    * given type.
    */
   bool IsNumber() const {
-    return gd::ValueTypeMetadata::IsTypeValue("number", name);
+    return gd::ValueTypeMetadata::IsTypeExpression("number", name);
   }
 
   /**
    * \brief Return true if the type is a string.
    */
   bool IsString() const {
-    return gd::ValueTypeMetadata::IsTypeValue("string", name);
+    return gd::ValueTypeMetadata::IsTypeExpression("string", name);
   }
 
   /**
    * \brief Return true if the type is a boolean.
    */
   bool IsBoolean() const {
-    return gd::ValueTypeMetadata::IsTypeValue("boolean", name);
+    return gd::ValueTypeMetadata::IsTypeExpression("boolean", name);
   }
 
   /**
@@ -135,17 +135,7 @@ class GD_CORE_API ValueTypeMetadata {
    * and ExpressionAutocompletion) and in the EventsCodeGenerator.
    */
   bool IsVariable() const {
-    return gd::ValueTypeMetadata::IsVariable(name);
-  }
-
-  /**
-   * \brief Return true if the type of the parameter is a variable.
-   * \note If you had a new type of parameter, also add it in the IDE (
-   * see EventsFunctionParametersEditor, ParameterRenderingService
-   * and ExpressionAutocompletion) and in the EventsCodeGenerator.
-   */
-  static bool IsVariable(const gd::String &type) {
-    return gd::ValueTypeMetadata::GetPrimitiveValueType(type) == "variable";
+    return gd::ValueTypeMetadata::IsTypeExpression("variable", name);
   }
 
   /**
@@ -185,9 +175,7 @@ class GD_CORE_API ValueTypeMetadata {
   }
 
   /**
-   * \brief Return true if the type is an expression of the given type from the
-   * caller point of view.
-   *
+   * \brief Return true if the type is an expression of the given type.
    * \note If you are adding a new type of parameter, also add it in the IDE (
    * see EventsFunctionParametersEditor, ParameterRenderingService
    * and ExpressionAutocompletion) and in the EventsCodeGenerator.
@@ -198,7 +186,6 @@ class GD_CORE_API ValueTypeMetadata {
       return parameterType == "number" || parameterType == "expression" ||
              parameterType == "camera" || parameterType == "forceMultiplier";
     } else if (type == "string") {
-      // "key" and "mouse" are not mapped her, see GetPrimitiveValueType.
       return parameterType == "string" || parameterType == "layer" ||
              parameterType == "color" || parameterType == "file" ||
              parameterType == "stringWithSelector" ||
@@ -223,8 +210,8 @@ class GD_CORE_API ValueTypeMetadata {
              parameterType == "scenevar";
     } else if (type == "resource") {
       return parameterType == "fontResource" ||
-             parameterType == "audioResource" ||
-             parameterType == "videoResource" ||
+             parameterType == "soundfile" ||
+             parameterType == "musicfile" ||
              parameterType == "bitmapFontResource" ||
              parameterType == "imageResource" ||
              parameterType == "jsonResource" ||
@@ -232,30 +219,7 @@ class GD_CORE_API ValueTypeMetadata {
              parameterType == "tilesetResource" ||
              parameterType == "model3DResource" ||
              parameterType == "atlasResource" ||
-             parameterType == "spineResource" ||
-             // Deprecated, old parameter types:
-             parameterType == "soundfile" ||
-             parameterType == "musicfile";
-    }
-    return false;
-  }
-
-  /**
-   * \brief Return true if the type is a value of the given primitive type from
-   * the function events point of view
-   */
-  static bool IsTypeValue(const gd::String &type,
-                           const gd::String &parameterType) {
-    if (gd::ValueTypeMetadata::IsTypeExpression(type, parameterType)) {
-      return true;
-    }
-    // These 2 parameter types are not strings from the outside of a function as
-    // the generator add quote around a text, but from the events inside of the
-    // function the parameter is a string.
-    //
-    // See EventsCodeGenerator::GenerateParameterCodes
-    if (type == "string") {
-      return parameterType == "key" || parameterType == "mouse";
+             parameterType == "spineResource";
     }
     return false;
   }
@@ -311,11 +275,9 @@ class GD_CORE_API ValueTypeMetadata {
 
   static const gd::String numberValueType;
   static const gd::String booleanValueType;
-  static const gd::String stringValueType;
   static const gd::String colorValueType;
   static const gd::String choiceValueType;
-  static const gd::String behaviorValueType;
-  static const gd::String leaderboardIdValueType;
+  static const gd::String stringValueType;
 };
 
 }  // namespace gd

Core/GDCore/Extensions/Platform.cpp

@@ -96,11 +96,11 @@ std::shared_ptr<gd::PlatformExtension> Platform::GetExtension(
 std::unique_ptr<gd::ObjectConfiguration> Platform::CreateObjectConfiguration(
     gd::String type) const {
   if (creationFunctionTable.find(type) == creationFunctionTable.end()) {
-    gd::LogWarning("Tried to create an object configuration with an unknown type: " + type
+    gd::LogWarning("Tried to create an object with an unknown type: " + type
               + " for platform " + GetName() + "!");
     type = "";
     if (creationFunctionTable.find("") == creationFunctionTable.end()) {
-      gd::LogFatalError("Unable to create a base object configuration!");
+      gd::LogError("Unable to create a Base object!");
       return nullptr;
     }
   }

Core/GDCore/Extensions/PlatformExtension.cpp

@@ -808,24 +808,6 @@ gd::String PlatformExtension::GetObjectFullType(const gd::String &extensionName,
   return extensionName + separator + objectName;
 }
 
-gd::String PlatformExtension::GetExtensionFromFullObjectType(const gd::String& type) {
-  const auto separatorIndex =
-      type.find(PlatformExtension::GetNamespaceSeparator());
-  if (separatorIndex == std::string::npos) {
-    return "";
-  }
-  return type.substr(0, separatorIndex);
-}
-
-gd::String PlatformExtension::GetObjectNameFromFullObjectType(const gd::String& type) {
-  const auto separatorIndex =
-      type.find(PlatformExtension::GetNamespaceSeparator());
-  if (separatorIndex == std::string::npos) {
-    return "";
-  }
-  return type.substr(separatorIndex + 2);
-}
-
 PlatformExtension::PlatformExtension()
     : deprecated(false), category(_("General")) {}
 

Core/GDCore/Extensions/PlatformExtension.h

@@ -40,7 +40,8 @@ class Object;
 class ObjectConfiguration;
 }  // namespace gd
 
-typedef std::function<std::unique_ptr<gd::ObjectConfiguration>()> CreateFunPtr;
+typedef std::function<std::unique_ptr<gd::ObjectConfiguration>()>
+    CreateFunPtr;
 
 namespace gd {
 
@@ -50,25 +51,25 @@ namespace gd {
  */
 class GD_CORE_API CompilationInfo {
  public:
-  CompilationInfo() {};
-  virtual ~CompilationInfo() {};
+  CompilationInfo() : informationCompleted(false){};
+  virtual ~CompilationInfo(){};
 
-  bool informationCompleted = false;
+  bool informationCompleted;
 
-  bool runtimeOnly = false;  ///< True if the extension was compiled for a
-                             ///< runtime use only
+  bool runtimeOnly;  ///< True if the extension was compiled for a runtime use
+                     ///< only
 
 #if defined(__GNUC__)
-  int gccMajorVersion = 0;
-  int gccMinorVersion = 0;
-  int gccPatchLevel = 0;
+  int gccMajorVersion;
+  int gccMinorVersion;
+  int gccPatchLevel;
 #endif
 
-  int sfmlMajorVersion = 0;
-  int sfmlMinorVersion = 0;
+  int sfmlMajorVersion;
+  int sfmlMinorVersion;
 
   gd::String gdCoreVersion;
-  int sizeOfpInt = 0;
+  int sizeOfpInt;
 };
 
 struct GD_CORE_API DuplicatedInstructionOptions {
@@ -238,12 +239,11 @@ class GD_CORE_API PlatformExtension {
    * \param instance The "blueprint" object to be copied when a new object is
    asked for.
    */
-  gd::ObjectMetadata& AddObject(
-      const gd::String& name_,
-      const gd::String& fullname_,
-      const gd::String& description_,
-      const gd::String& icon_,
-      std::shared_ptr<gd::ObjectConfiguration> instance);
+  gd::ObjectMetadata& AddObject(const gd::String& name_,
+                                const gd::String& fullname_,
+                                const gd::String& description_,
+                                const gd::String& icon_,
+                                std::shared_ptr<gd::ObjectConfiguration> instance);
 
   /**
    * \brief Declare a new events based object as being part of the extension.
@@ -253,10 +253,11 @@ class GD_CORE_API PlatformExtension {
    * \param description The user friendly description of the object
    * \param icon The icon of the object.
    */
-  gd::ObjectMetadata& AddEventsBasedObject(const gd::String& name_,
-                                           const gd::String& fullname_,
-                                           const gd::String& description_,
-                                           const gd::String& icon_);
+  gd::ObjectMetadata& AddEventsBasedObject(
+      const gd::String& name_,
+      const gd::String& fullname_,
+      const gd::String& description_,
+      const gd::String& icon_);
 
   /**
    * \brief Declare a new behavior as being part of the extension.
@@ -419,7 +420,8 @@ class GD_CORE_API PlatformExtension {
   PlatformExtension& SetTags(const gd::String& csvTags) {
     tags.clear();
     tags = csvTags.Split(',');
-    for (size_t i = 0; i < tags.size(); i++) {
+    for (size_t i = 0; i < tags.size(); i++)
+    {
       tags[i] = tags[i].Trim().LowerCase();
     }
     return *this;
@@ -632,30 +634,26 @@ class GD_CORE_API PlatformExtension {
    */
   static gd::String GetNamespaceSeparator() { return "::"; }
 
-  static gd::String GetEventsFunctionFullType(const gd::String& extensionName,
-                                              const gd::String& functionName);
+  static gd::String GetEventsFunctionFullType(const gd::String &extensionName,
+                                              const gd::String &functionName);
 
-  static gd::String GetBehaviorEventsFunctionFullType(
-      const gd::String& extensionName,
-      const gd::String& behaviorName,
-      const gd::String& functionName);
+  static gd::String
+  GetBehaviorEventsFunctionFullType(const gd::String &extensionName,
+                                    const gd::String &behaviorName,
+                                    const gd::String &functionName);
 
-  static gd::String GetBehaviorFullType(const gd::String& extensionName,
-                                        const gd::String& behaviorName);
+  static gd::String GetBehaviorFullType(const gd::String &extensionName,
+                                        const gd::String &behaviorName);
 
-  static gd::String GetObjectEventsFunctionFullType(
-      const gd::String& extensionName,
-      const gd::String& objectName,
-      const gd::String& functionName);
+  static gd::String
+  GetObjectEventsFunctionFullType(const gd::String &extensionName,
+                                  const gd::String &objectName,
+                                  const gd::String &functionName);
 
-  static gd::String GetObjectFullType(const gd::String& extensionName,
-                                      const gd::String& objectName);
+  static gd::String GetObjectFullType(const gd::String &extensionName,
+                                      const gd::String &objectName);
 
-  static gd::String GetExtensionFromFullObjectType(const gd::String& type);
-
-  static gd::String GetObjectNameFromFullObjectType(const gd::String& type);
-
- private:
+private:
   /**
    * Set the namespace (the string all actions/conditions/expressions start
    * with).
@@ -670,10 +668,10 @@ class GD_CORE_API PlatformExtension {
   gd::String fullname;      ///< Name displayed to users in the editor.
   gd::String informations;  ///< Description displayed to users in the editor.
   gd::String category;
-  gd::String author;   ///< Author displayed to users in the editor.
-  gd::String license;  ///< License name displayed to users in the editor.
-  bool deprecated;     ///< true if the extension is deprecated and shouldn't be
-                       ///< shown in IDE.
+  gd::String author;        ///< Author displayed to users in the editor.
+  gd::String license;       ///< License name displayed to users in the editor.
+  bool deprecated;  ///< true if the extension is deprecated and shouldn't be
+                    ///< shown in IDE.
   gd::String helpPath;  ///< The relative path to the help for this extension in
                         ///< the documentation.
   gd::String iconUrl;   ///< The URL to the icon to be shown for this extension.

Core/GDCore/Extensions/PlatformExtension.inl

@@ -5,8 +5,6 @@
  * project is released under the MIT License.
  */
 
-// NOLINTBEGIN
-
 #ifndef GDCORE_PLATFORMEXTENSION_INL
 #define GDCORE_PLATFORMEXTENSION_INL
 
@@ -38,5 +36,3 @@ gd::ObjectMetadata& PlatformExtension::AddObject(const gd::String& name,
 }  // namespace gd
 
 #endif
-
-// NOLINTEND

Core/GDCore/IDE/CaptureOptions.cpp

@@ -1,18 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#include "GDCore/IDE/CaptureOptions.h"
-
-#include "GDCore/String.h"
-
-using namespace std;
-
-namespace gd {
-
-Screenshot::Screenshot() {}
-
-CaptureOptions::CaptureOptions() {}
-
-}  // namespace gd

Core/GDCore/IDE/CaptureOptions.h

@@ -1,50 +0,0 @@
-#pragma once
-#include <memory>
-#include <vector>
-
-#include "GDCore/String.h"
-
-namespace gd {
-
-class GD_CORE_API Screenshot {
- public:
-  Screenshot();
-  virtual ~Screenshot() {};
-
-  void SetDelayTimeInSeconds(int delayTimeInMs_) {
-    delayTimeInMs = delayTimeInMs_;
-  }
-  int GetDelayTimeInSeconds() const { return delayTimeInMs; }
-
-  void SetSignedUrl(const gd::String& signedUrl_) { signedUrl = signedUrl_; }
-  const gd::String& GetSignedUrl() const { return signedUrl; }
-
-  void SetPublicUrl(const gd::String& publicUrl_) { publicUrl = publicUrl_; }
-  const gd::String& GetPublicUrl() const { return publicUrl; }
-
- private:
-  int delayTimeInMs = 0;
-  gd::String signedUrl;
-  gd::String publicUrl;
-};
-
-class GD_CORE_API CaptureOptions {
- public:
-  CaptureOptions();
-  virtual ~CaptureOptions() {};
-
-  bool IsEmpty() const { return screenshots.empty(); }
-
-  void AddScreenshot(const Screenshot& screenshot) {
-    screenshots.push_back(screenshot);
-  }
-
-  const std::vector<Screenshot>& GetScreenshots() const { return screenshots; }
-
-  void ClearScreenshots() { screenshots.clear(); }
-
- private:
-  std::vector<Screenshot> screenshots;
-};
-
-}  // namespace gd

Core/GDCore/IDE/EventBasedBehaviorBrowser.cpp

@@ -29,6 +29,9 @@ void EventBasedBehaviorBrowser::ExposeEvents(
       project, eventsFunctionsExtension, eventsBasedBehavior, worker);
 }
 
+void EventBasedBehaviorBrowser::ExposeObjects(
+    gd::Project &project, gd::ArbitraryObjectsWorker &worker) const {}
+
 void EventBasedBehaviorBrowser::ExposeFunctions(
     gd::Project &project, gd::ArbitraryEventsFunctionsWorker &worker) const {
   worker.Launch(eventsBasedBehavior.GetEventsFunctions());
@@ -40,4 +43,7 @@ void EventBasedBehaviorBrowser::ExposeEventBasedBehaviors(
   worker.Launch(eventsBasedBehavior);
 }
 
+void EventBasedBehaviorBrowser::ExposeBehaviorSharedDatas(
+    gd::Project &project, gd::ArbitraryBehaviorSharedDataWorker &worker) const {}
+
 } // namespace gd

Core/GDCore/IDE/EventBasedBehaviorBrowser.h

@@ -67,7 +67,7 @@ public:
    * \brief Do nothing.
    */
   void ExposeObjects(gd::Project &project,
-                     gd::ArbitraryObjectsWorker &worker) const override {};
+                     gd::ArbitraryObjectsWorker &worker) const override;
 
   /**
    * \brief Call the specified worker on the event-based behavior.
@@ -80,7 +80,7 @@ public:
    * \brief Do nothing.
    */
   void ExposeBehaviorSharedDatas(gd::Project &project,
-                         gd::ArbitraryBehaviorSharedDataWorker &worker) const override {};
+                         gd::ArbitraryBehaviorSharedDataWorker &worker) const override;
 
 private:
   const gd::EventsFunctionsExtension &eventsFunctionsExtension;

Core/GDCore/IDE/EventBasedObjectBrowser.cpp

@@ -1,37 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#include "EventBasedObjectBrowser.h"
-
-#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
-#include "GDCore/IDE/Project/ArbitraryEventBasedBehaviorsWorker.h"
-#include "GDCore/IDE/Project/ArbitraryEventsFunctionsWorker.h"
-#include "GDCore/IDE/Project/ArbitraryObjectsWorker.h"
-#include "GDCore/IDE/Project/ArbitraryBehaviorSharedDataWorker.h"
-#include "GDCore/IDE/ProjectBrowserHelper.h"
-#include "GDCore/Project/EventsBasedObject.h"
-#include "GDCore/Project/Project.h"
-#include "GDCore/String.h"
-
-namespace gd {
-
-void EventBasedObjectBrowser::ExposeEvents(
-    gd::Project &project, gd::ArbitraryEventsWorker &worker) const {
-  gd::ProjectBrowserHelper::ExposeEventsBasedObjectEvents(
-      project, eventsBasedObject, worker);
-}
-
-void EventBasedObjectBrowser::ExposeEvents(
-    gd::Project &project, gd::ArbitraryEventsWorkerWithContext &worker) const {
-  gd::ProjectBrowserHelper::ExposeEventsBasedObjectEvents(
-      project, eventsFunctionsExtension, eventsBasedObject, worker);
-}
-
-void EventBasedObjectBrowser::ExposeFunctions(
-    gd::Project &project, gd::ArbitraryEventsFunctionsWorker &worker) const {
-  worker.Launch(eventsBasedObject.GetEventsFunctions());
-}
-
-} // namespace gd

Core/GDCore/IDE/EventBasedObjectBrowser.h

@@ -1,90 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#pragma once
-
-#include "GDCore/IDE/ProjectBrowser.h"
-
-namespace gd {
-class Project;
-class String;
-class EventsFunctionsExtension;
-class EventsFunction;
-class EventsBasedBehavior;
-class EventsBasedObject;
-class ArbitraryEventsWorker;
-class ArbitraryEventsWorkerWithContext;
-class ArbitraryEventsFunctionsWorker;
-class ArbitraryObjectsWorker;
-class ArbitraryEventBasedBehaviorsWorker;
-class ArbitraryBehaviorSharedDataWorker;
-} // namespace gd
-
-namespace gd {
-
-/**
- * \brief Expose event-based object contents to workers.
- */
-class GD_CORE_API EventBasedObjectBrowser : public ProjectBrowser {
-public:
-  EventBasedObjectBrowser(
-      const gd::EventsFunctionsExtension &eventsFunctionsExtension_,
-      gd::EventsBasedObject &eventsBasedObject_)
-      : eventsFunctionsExtension(eventsFunctionsExtension_),
-        eventsBasedObject(eventsBasedObject_) {}
-
-  /**
-   * \brief Call the specified worker on all events of the event-based
-   * object.
-   *
-   * This should be the preferred way to traverse all the events of an event-based object.
-   */
-  void ExposeEvents(gd::Project &project,
-                    gd::ArbitraryEventsWorker &worker) const override;
-
-  /**
-   * \brief Call the specified worker on all events of the event-based
-   * object.
-   *
-   * This should be the preferred way to traverse all the events of an event-based object.
-   */
-  void
-  ExposeEvents(gd::Project &project, 
-               gd::ArbitraryEventsWorkerWithContext &worker) const override;
-
-  /**
-   * \brief Call the specified worker on all functions of the event-based object
-   *
-   * This should be the preferred way to traverse all the function signatures
-   * of an event-based object.
-   */
-  void ExposeFunctions(gd::Project &project,
-                       gd::ArbitraryEventsFunctionsWorker &worker) const override;
-
-  /**
-   * \brief Do nothing.
-   */
-  void ExposeObjects(gd::Project &project,
-                     gd::ArbitraryObjectsWorker &worker) const override {};
-
-  /**
-   * @brief Do nothing.
-   */
-  void ExposeEventBasedBehaviors(
-      gd::Project &project,
-      gd::ArbitraryEventBasedBehaviorsWorker &worker) const override {};
-
-  /**
-   * \brief Do nothing.
-   */
-  void ExposeBehaviorSharedDatas(gd::Project &project,
-                         gd::ArbitraryBehaviorSharedDataWorker &worker) const override {};
-
-private:
-  const gd::EventsFunctionsExtension &eventsFunctionsExtension;
-  gd::EventsBasedObject &eventsBasedObject;
-};
-
-} // namespace gd

Core/GDCore/IDE/Events/EventsFunctionSelfCallChecker.cpp

@@ -72,12 +72,12 @@ public:
       gd::String lastObjectParameter = "";
       const gd::InstructionMetadata &instrInfos =
           MetadataProvider::GetActionMetadata(platform, instruction.GetType());
-      for (std::size_t pNb = 0; pNb < instrInfos.parameters.GetParametersCount(); ++pNb) {
+      for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
 
         if (ParameterMetadata::IsExpression(
-                "number", instrInfos.parameters.GetParameter(pNb).GetType()) ||
+                "number", instrInfos.parameters[pNb].GetType()) ||
             ParameterMetadata::IsExpression(
-                "string", instrInfos.parameters.GetParameter(pNb).GetType())) {
+                "string", instrInfos.parameters[pNb].GetType())) {
           auto node = instruction.GetParameter(pNb).GetRootNode();
           node->Visit(*this);
         }

Core/GDCore/IDE/Events/EventsIdentifiersFinder.cpp

@@ -86,11 +86,9 @@ class GD_CORE_API IdentifierFinderExpressionNodeWorker
     }
 
     size_t parameterIndex = 0;
-    for (size_t metadataIndex = (isObjectFunction ? 1 : 0);
-         metadataIndex < metadata.GetParameters().GetParametersCount() &&
-         parameterIndex < node.parameters.size();
-         ++metadataIndex) {
-      auto& parameterMetadata = metadata.GetParameters().GetParameter(metadataIndex);
+    for (size_t metadataIndex = (isObjectFunction ? 1 : 0); metadataIndex < metadata.parameters.size()
+      && parameterIndex < node.parameters.size(); ++metadataIndex) {
+      auto& parameterMetadata = metadata.parameters[metadataIndex];
       if (parameterMetadata.IsCodeOnly()) {
         continue;
       }
@@ -146,10 +144,10 @@ class GD_CORE_API IdentifierFinderEventWorker
                               platform, instruction.GetType())
                         : MetadataProvider::GetActionMetadata(
                               platform, instruction.GetType());
-      for (std::size_t pNb = 0; pNb < instrInfos.parameters.GetParametersCount(); ++pNb) {
+      for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
         // The parameter has the searched type...
-      if (instrInfos.parameters.GetParameter(pNb).GetType() == "identifier"
-       && instrInfos.parameters.GetParameter(pNb).GetExtraInfo() == identifierType) {
+      if (instrInfos.parameters[pNb].GetType() == "identifier"
+       && instrInfos.parameters[pNb].GetExtraInfo() == identifierType) {
           //...remember the value of the parameter.
           if (objectName.empty() || lastObjectParameter == objectName) {
             results.insert(instruction.GetParameter(pNb).GetPlainString());
@@ -157,9 +155,9 @@ class GD_CORE_API IdentifierFinderEventWorker
         }
         // Search in expressions
         else if (ParameterMetadata::IsExpression(
-                    "number", instrInfos.parameters.GetParameter(pNb).GetType()) ||
+                    "number", instrInfos.parameters[pNb].GetType()) ||
                 ParameterMetadata::IsExpression(
-                    "string", instrInfos.parameters.GetParameter(pNb).GetType())) {
+                    "string", instrInfos.parameters[pNb].GetType())) {
           auto node = instruction.GetParameter(pNb).GetRootNode();
 
           IdentifierFinderExpressionNodeWorker searcher(
@@ -172,7 +170,7 @@ class GD_CORE_API IdentifierFinderEventWorker
         }
         // Remember the value of the last "object" parameter.
         else if (gd::ParameterMetadata::IsObject(
-                    instrInfos.parameters.GetParameter(pNb).GetType())) {
+                    instrInfos.parameters[pNb].GetType())) {
           lastObjectParameter =
               instruction.GetParameter(pNb).GetPlainString();
         }

Core/GDCore/IDE/Events/EventsLeaderboardsLister.cpp

@@ -0,0 +1,41 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "GDCore/IDE/Events/EventsLeaderboardsLister.h"
+
+#include <map>
+#include <memory>
+#include <vector>
+
+#include "GDCore/Events/Event.h"
+#include "GDCore/Events/EventsList.h"
+#include "GDCore/Extensions/Metadata/InstructionMetadata.h"
+#include "GDCore/Extensions/Metadata/MetadataProvider.h"
+#include "GDCore/Project/Layout.h"
+#include "GDCore/Project/Project.h"
+#include "GDCore/String.h"
+
+namespace gd {
+
+bool EventsLeaderboardsLister::DoVisitInstruction(gd::Instruction& instruction,
+                                                  bool isCondition) {
+  const gd::InstructionMetadata& instrInfo =
+      isCondition ? MetadataProvider::GetConditionMetadata(
+                        project.GetCurrentPlatform(), instruction.GetType())
+                  : MetadataProvider::GetActionMetadata(
+                        project.GetCurrentPlatform(), instruction.GetType());
+
+  for (int i = 0; i < instruction.GetParametersCount() &&
+                  i < instrInfo.GetParametersCount();
+       ++i)
+    if (instrInfo.GetParameter(i).GetType() == "leaderboardId") {
+      leaderboardIds.insert(instruction.GetParameter(i).GetPlainString());
+    }
+  return false;
+}
+
+EventsLeaderboardsLister::~EventsLeaderboardsLister() {}
+
+}  // namespace gd

Core/GDCore/IDE/Events/EventsLeaderboardsLister.h

@@ -0,0 +1,48 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#ifndef EventsLeaderboardsLister_H
+#define EventsLeaderboardsLister_H
+#include <map>
+#include <memory>
+#include <set>
+#include <vector>
+
+#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
+#include "GDCore/String.h"
+namespace gd {
+class BaseEvent;
+class Project;
+class EventsList;
+}
+
+namespace gd {
+
+/**
+ * \brief List the leaderboard ids in the instructions.
+ *
+ * \ingroup IDE
+ */
+class GD_CORE_API EventsLeaderboardsLister : public ArbitraryEventsWorker {
+ public:
+  EventsLeaderboardsLister(gd::Project& project_) : project(project_){};
+  virtual ~EventsLeaderboardsLister();
+
+  /**
+   * Return the values of all leaderboardIds found in the events.
+   */
+  const std::set<gd::String>& GetLeaderboardIds() { return leaderboardIds; }
+
+ private:
+  virtual bool DoVisitInstruction(gd::Instruction& instruction,
+                                  bool isCondition);
+
+  std::set<gd::String> leaderboardIds;
+  gd::Project& project;
+};
+
+}  // namespace gd
+
+#endif  // EventsLeaderboardsLister_H

Core/GDCore/IDE/Events/EventsLeaderboardsRenamer.cpp

@@ -0,0 +1,49 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#include "GDCore/IDE/Events/EventsLeaderboardsRenamer.h"
+
+#include <map>
+#include <memory>
+#include <vector>
+
+#include "GDCore/Events/Event.h"
+#include "GDCore/Events/EventsList.h"
+#include "GDCore/Extensions/Metadata/InstructionMetadata.h"
+#include "GDCore/Extensions/Metadata/MetadataProvider.h"
+#include "GDCore/Project/Layout.h"
+#include "GDCore/Project/Project.h"
+#include "GDCore/String.h"
+
+namespace gd {
+
+bool EventsLeaderboardsRenamer::DoVisitInstruction(gd::Instruction& instruction,
+                                                   bool isCondition) {
+  const gd::InstructionMetadata& instrInfo =
+      isCondition ? MetadataProvider::GetConditionMetadata(
+                        project.GetCurrentPlatform(), instruction.GetType())
+                  : MetadataProvider::GetActionMetadata(
+                        project.GetCurrentPlatform(), instruction.GetType());
+
+  for (int i = 0; i < instruction.GetParametersCount() &&
+                  i < instrInfo.GetParametersCount();
+       ++i) {
+    const gd::ParameterMetadata parameter = instrInfo.GetParameter(i);
+
+    if (parameter.GetType() == "leaderboardId") {
+      const gd::String leaderboardId =
+          instruction.GetParameter(i).GetPlainString();
+
+      if (leaderboardIdMap.find(leaderboardId) != leaderboardIdMap.end()) {
+        instruction.SetParameter(i, leaderboardIdMap[leaderboardId]);
+      }
+    }
+  }
+  return false;
+}
+
+EventsLeaderboardsRenamer::~EventsLeaderboardsRenamer() {}
+
+}  // namespace gd

Core/GDCore/IDE/Events/EventsLeaderboardsRenamer.h

@@ -0,0 +1,46 @@
+/*
+ * GDevelop Core
+ * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
+ * reserved. This project is released under the MIT License.
+ */
+#ifndef EventsLeaderboardsRenamer_H
+#define EventsLeaderboardsRenamer_H
+#include <map>
+#include <memory>
+#include <set>
+#include <vector>
+
+#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
+#include "GDCore/String.h"
+namespace gd {
+class BaseEvent;
+class Project;
+class EventsList;
+}
+
+namespace gd {
+
+/**
+ * \brief Replace the leaderboard ids in the instructions.
+ *
+ * \ingroup IDE
+ */
+class GD_CORE_API EventsLeaderboardsRenamer : public ArbitraryEventsWorker {
+ public:
+  EventsLeaderboardsRenamer(
+      gd::Project& project_,
+      const std::map<gd::String, gd::String>& leaderboardIdMap_)
+      : project(project_), leaderboardIdMap(leaderboardIdMap_){};
+  virtual ~EventsLeaderboardsRenamer();
+
+ private:
+  virtual bool DoVisitInstruction(gd::Instruction& instruction,
+                                  bool isCondition);
+
+  std::map<gd::String, gd::String> leaderboardIdMap;
+  gd::Project& project;
+};
+
+}  // namespace gd
+
+#endif  // EventsLeaderboardsRenamer_H

Core/GDCore/IDE/Events/EventsParameterReplacer.cpp

@@ -1,243 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#include "GDCore/IDE/Events/EventsParameterReplacer.h"
-
-#include <map>
-#include <memory>
-#include <unordered_map>
-#include <unordered_set>
-#include <vector>
-
-#include "GDCore/Events/Event.h"
-#include "GDCore/Events/EventsList.h"
-#include "GDCore/Events/Parsers/ExpressionParser2NodePrinter.h"
-#include "GDCore/Events/Parsers/ExpressionParser2NodeWorker.h"
-#include "GDCore/Extensions/Metadata/MetadataProvider.h"
-#include "GDCore/Extensions/Metadata/ParameterMetadata.h"
-#include "GDCore/Extensions/Metadata/ParameterMetadataTools.h"
-#include "GDCore/IDE/Events/ExpressionValidator.h"
-#include "GDCore/Project/Layout.h"
-#include "GDCore/Project/Project.h"
-#include "GDCore/Project/ProjectScopedContainers.h"
-#include "GDCore/Project/PropertiesContainer.h"
-#include "GDCore/String.h"
-#include "GDCore/Tools/Log.h"
-
-namespace gd {
-
-/**
- * \brief Go through the nodes and rename parameters.
- *
- * \see gd::ExpressionParser2
- */
-class GD_CORE_API ExpressionParameterReplacer
-    : public ExpressionParser2NodeWorker {
- public:
-  ExpressionParameterReplacer(
-      const gd::Platform& platform_,
-      const gd::ProjectScopedContainers& projectScopedContainers_,
-      bool isParentTypeAVariable_,
-      const std::unordered_map<gd::String, gd::String>& oldToNewPropertyNames_)
-      : hasDoneRenaming(false),
-        platform(platform_),
-        projectScopedContainers(projectScopedContainers_),
-        isParentTypeAVariable(isParentTypeAVariable_),
-        oldToNewPropertyNames(oldToNewPropertyNames_){};
-  virtual ~ExpressionParameterReplacer(){};
-
-  bool HasDoneRenaming() const { return hasDoneRenaming; }
-
- protected:
-  void OnVisitSubExpressionNode(SubExpressionNode& node) override {
-    node.expression->Visit(*this);
-  }
-  void OnVisitOperatorNode(OperatorNode& node) override {
-    node.leftHandSide->Visit(*this);
-    node.rightHandSide->Visit(*this);
-  }
-  void OnVisitUnaryOperatorNode(UnaryOperatorNode& node) override {
-    node.factor->Visit(*this);
-  }
-  void OnVisitNumberNode(NumberNode& node) override {}
-  void OnVisitTextNode(TextNode& node) override {}
-  void OnVisitVariableNode(VariableNode& node) override {
-    if (isParentTypeAVariable) {
-        // Do nothing, it's a variable.
-        if (node.child) node.child->Visit(*this);
-        return;
-    }
-
-    // The node represents a variable or an object name on which a variable
-    // will be accessed, or a property with a child.
-
-    projectScopedContainers.MatchIdentifierWithName<void>(
-      // The property name is changed after the refactor operation.
-      node.name,
-      [&]() {
-        // Do nothing, it's an object variable.
-        if (node.child) node.child->Visit(*this);
-      }, [&]() {
-        // Do nothing, it's a variable.
-        if (node.child) node.child->Visit(*this);
-      }, [&]() {
-        // Do nothing, it's a property.
-        if (node.child) node.child->Visit(*this);
-      }, [&]() {
-        // This is a parameter
-        RenameParameter(node.name);
-        if (node.child) node.child->Visit(*this);
-      }, [&]() {
-        // Do nothing, it's something else.
-        if (node.child) node.child->Visit(*this);
-      });
-  }
-  void OnVisitVariableAccessorNode(VariableAccessorNode& node) override {
-    if (node.child) node.child->Visit(*this);
-  }
-  void OnVisitVariableBracketAccessorNode(
-      VariableBracketAccessorNode& node) override {
-    bool isGrandParentTypeAVariable = isParentTypeAVariable;
-    isParentTypeAVariable = false;
-    node.expression->Visit(*this);
-    isParentTypeAVariable = isGrandParentTypeAVariable;
-    if (node.child) node.child->Visit(*this);
-  }
-  void OnVisitIdentifierNode(IdentifierNode& node) override {
-    if (isParentTypeAVariable) {
-        // Do nothing, it's a variable.
-        return;
-    }
-    projectScopedContainers.MatchIdentifierWithName<void>(
-      // The property name is changed after the refactor operation
-      node.identifierName,
-      [&]() {
-        // Do nothing, it's an object variable.
-      }, [&]() {
-        // Do nothing, it's a variable.
-      }, [&]() {
-        // Do nothing, it's a property.
-      }, [&]() {
-        // This is a parameter.
-        RenameParameter(node.identifierName);
-      }, [&]() {
-        // Do nothing, it's something else.
-      });
-  }
-  void OnVisitObjectFunctionNameNode(ObjectFunctionNameNode& node) override {}
-  void OnVisitFunctionCallNode(FunctionCallNode &node) override {
-    bool isGrandParentTypeAVariable = isParentTypeAVariable;
-    for (auto &parameter : node.parameters) {
-      const auto &parameterMetadata =
-          gd::MetadataProvider::GetFunctionCallParameterMetadata(
-              platform, projectScopedContainers.GetObjectsContainersList(),
-              node, *parameter);
-      if (!parameterMetadata) {
-        continue;
-      }
-      const auto &parameterTypeMetadata =
-          parameterMetadata->GetValueTypeMetadata();
-      if (gd::EventsParameterReplacer::CanContainParameter(
-              parameterTypeMetadata)) {
-        isParentTypeAVariable = parameterTypeMetadata.IsVariable();
-        parameter->Visit(*this);
-      }
-    }
-    isParentTypeAVariable = isGrandParentTypeAVariable;
-  }
-  void OnVisitEmptyNode(EmptyNode& node) override {}
-
- private:
-  bool hasDoneRenaming;
-
-  bool RenameParameter(
-      gd::String& name) {
-    if (oldToNewPropertyNames.count(name) >= 1) {
-      name = oldToNewPropertyNames.find(name)->second;
-      hasDoneRenaming = true;
-      return true;
-    }
-
-    return false;  // Nothing was changed or done.
-  }
-
-  // Scope:
-  const gd::Platform& platform;
-  const gd::ProjectScopedContainers& projectScopedContainers;
-
-  // Renaming to do
-  const std::unordered_map<gd::String, gd::String>& oldToNewPropertyNames;
-
-  gd::String objectNameToUseForVariableAccessor;
-  bool isParentTypeAVariable;
-};
-
-bool EventsParameterReplacer::DoVisitInstruction(gd::Instruction& instruction,
-                                                bool isCondition) {
-  const auto& metadata = isCondition
-                             ? gd::MetadataProvider::GetConditionMetadata(
-                                   platform, instruction.GetType())
-                             : gd::MetadataProvider::GetActionMetadata(
-                                   platform, instruction.GetType());
-
-  gd::ParameterMetadataTools::IterateOverParametersWithIndex(
-      instruction.GetParameters(),
-      metadata.GetParameters(),
-      [&](const gd::ParameterMetadata& parameterMetadata,
-          const gd::Expression& parameterValue,
-          size_t parameterIndex,
-          const gd::String& lastObjectName) {
-        if (!gd::EventsParameterReplacer::CanContainParameter(
-          parameterMetadata.GetValueTypeMetadata())) {
-          return;
-        }
-        auto node = parameterValue.GetRootNode();
-        if (node) {
-          ExpressionParameterReplacer renamer(
-              platform, GetProjectScopedContainers(),
-              parameterMetadata.GetValueTypeMetadata().IsVariable(),
-              oldToNewPropertyNames);
-          node->Visit(renamer);
-
-          if (renamer.HasDoneRenaming()) {
-            instruction.SetParameter(
-                parameterIndex, ExpressionParser2NodePrinter::PrintNode(*node));
-          }
-        }
-      });
-
-  return false;
-}
-
-bool EventsParameterReplacer::DoVisitEventExpression(
-    gd::Expression& expression, const gd::ParameterMetadata& metadata) {
-  if (!gd::EventsParameterReplacer::CanContainParameter(
-          metadata.GetValueTypeMetadata())) {
-    return false;
-  }
-  auto node = expression.GetRootNode();
-  if (node) {
-    ExpressionParameterReplacer renamer(
-        platform, GetProjectScopedContainers(),
-        metadata.GetValueTypeMetadata().IsVariable(), oldToNewPropertyNames);
-    node->Visit(renamer);
-
-    if (renamer.HasDoneRenaming()) {
-      expression = ExpressionParser2NodePrinter::PrintNode(*node);
-    }
-  }
-
-  return false;
-}
-
-bool EventsParameterReplacer::CanContainParameter(
-    const gd::ValueTypeMetadata &valueTypeMetadata) {
-  return valueTypeMetadata.IsVariable() || valueTypeMetadata.IsNumber() ||
-         valueTypeMetadata.IsString();
-}
-
-EventsParameterReplacer::~EventsParameterReplacer() {}
-
-}  // namespace gd

Core/GDCore/IDE/Events/EventsParameterReplacer.h

@@ -1,52 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#pragma once
-
-#include <map>
-#include <memory>
-#include <unordered_map>
-#include <unordered_set>
-#include <vector>
-
-#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
-#include "GDCore/String.h"
-namespace gd {
-class BaseEvent;
-class PropertiesContainer;
-class EventsList;
-class Platform;
-}  // namespace gd
-
-namespace gd {
-/**
- * \brief Replace in expressions and in parameters of actions or conditions,
- * references to the name of a parameter by another.
- *
- * \ingroup IDE
- */
-class GD_CORE_API EventsParameterReplacer
-    : public ArbitraryEventsWorkerWithContext {
- public:
-  EventsParameterReplacer(
-      const gd::Platform &platform_,
-      const std::unordered_map<gd::String, gd::String> &oldToNewPropertyNames_)
-      : platform(platform_),
-        oldToNewPropertyNames(oldToNewPropertyNames_){};
-  virtual ~EventsParameterReplacer();
-
-  static bool CanContainParameter(const gd::ValueTypeMetadata &valueTypeMetadata);
-
- private:
-  bool DoVisitInstruction(gd::Instruction &instruction,
-                          bool isCondition) override;
-  bool DoVisitEventExpression(gd::Expression &expression,
-                              const gd::ParameterMetadata &metadata) override;
-
-  const gd::Platform &platform;
-  const std::unordered_map<gd::String, gd::String> &oldToNewPropertyNames;
-};
-
-}  // namespace gd

Core/GDCore/IDE/Events/EventsPropertyReplacer.cpp

@@ -41,7 +41,6 @@ class GD_CORE_API ExpressionPropertyReplacer
       const gd::Platform& platform_,
       const gd::ProjectScopedContainers& projectScopedContainers_,
       const gd::PropertiesContainer& targetPropertiesContainer_,
-      bool isParentTypeAVariable_,
       const std::unordered_map<gd::String, gd::String>& oldToNewPropertyNames_,
       const std::unordered_set<gd::String>& removedPropertyNames_)
       : hasDoneRenaming(false),
@@ -49,7 +48,6 @@ class GD_CORE_API ExpressionPropertyReplacer
         platform(platform_),
         projectScopedContainers(projectScopedContainers_),
         targetPropertiesContainer(targetPropertiesContainer_),
-        isParentTypeAVariable(isParentTypeAVariable_),
         oldToNewPropertyNames(oldToNewPropertyNames_),
         removedPropertyNames(removedPropertyNames_){};
   virtual ~ExpressionPropertyReplacer(){};
@@ -71,21 +69,16 @@ class GD_CORE_API ExpressionPropertyReplacer
   void OnVisitNumberNode(NumberNode& node) override {}
   void OnVisitTextNode(TextNode& node) override {}
   void OnVisitVariableNode(VariableNode& node) override {
-    if (isParentTypeAVariable) {
-        // Do nothing, it's a variable.
-        if (node.child) node.child->Visit(*this);
-        return;
-    }
-
     auto& propertiesContainersList =
         projectScopedContainers.GetPropertiesContainersList();
 
     // The node represents a variable or an object name on which a variable
     // will be accessed, or a property with a child.
 
+    // Match the potential *new* name of the property, because refactorings are
+    // done after changes in the variables container.
     projectScopedContainers.MatchIdentifierWithName<void>(
-      // The property name is changed after the refactor operation.
-      node.name,
+      GetPotentialNewName(node.name),
       [&]() {
         // Do nothing, it's an object variable.
         if (node.child) node.child->Visit(*this);
@@ -107,7 +100,16 @@ class GD_CORE_API ExpressionPropertyReplacer
         // Do nothing, it's a parameter.
         if (node.child) node.child->Visit(*this);
       }, [&]() {
-        // Do nothing, it's something else.
+        // This is something else - potentially a deleted property.
+        // Check if it's coming from the target container with
+        // properties to replace.
+        if (propertiesContainersList.HasPropertiesContainer(
+                targetPropertiesContainer)) {
+          // The node represents a property, that can come from the target
+          // (because the target is in the scope), replace or remove it:
+          RenameOrRemovePropertyOfTargetPropertyContainer(node.name);
+        }
+
         if (node.child) node.child->Visit(*this);
       });
   }
@@ -116,24 +118,17 @@ class GD_CORE_API ExpressionPropertyReplacer
   }
   void OnVisitVariableBracketAccessorNode(
       VariableBracketAccessorNode& node) override {
-    bool isGrandParentTypeAVariable = isParentTypeAVariable;
-    isParentTypeAVariable = false;
     node.expression->Visit(*this);
-    isParentTypeAVariable = isGrandParentTypeAVariable;
     if (node.child) node.child->Visit(*this);
   }
   void OnVisitIdentifierNode(IdentifierNode& node) override {
-    if (isParentTypeAVariable) {
-        // Do nothing, it's a variable.
-        return;
-    }
-
     auto& propertiesContainersList =
         projectScopedContainers.GetPropertiesContainersList();
 
+    // Match the potential *new* name of the property, because refactorings are
+    // done after changes in the variables container.
     projectScopedContainers.MatchIdentifierWithName<void>(
-      // The property name is changed after the refactor operation
-      node.identifierName,
+      GetPotentialNewName(node.identifierName),
       [&]() {
         // Do nothing, it's an object variable.
       }, [&]() {
@@ -150,29 +145,22 @@ class GD_CORE_API ExpressionPropertyReplacer
       }, [&]() {
         // Do nothing, it's a parameter.
       }, [&]() {
-        // Do nothing, it's something else.
+        // This is something else - potentially a deleted property.
+        // Check if it's coming from the target container with
+        // properties to replace.
+        if (propertiesContainersList.HasPropertiesContainer(
+                targetPropertiesContainer)) {
+          // The node represents a property, that can come from the target
+          // (because the target is in the scope), replace or remove it:
+          RenameOrRemovePropertyOfTargetPropertyContainer(node.identifierName);
+        }
       });
   }
   void OnVisitObjectFunctionNameNode(ObjectFunctionNameNode& node) override {}
-  void OnVisitFunctionCallNode(FunctionCallNode &node) override {
-    bool isGrandParentTypeAVariable = isParentTypeAVariable;
-    for (auto &parameter : node.parameters) {
-      const auto &parameterMetadata =
-          gd::MetadataProvider::GetFunctionCallParameterMetadata(
-              platform, projectScopedContainers.GetObjectsContainersList(),
-              node, *parameter);
-      if (!parameterMetadata) {
-        continue;
-      }
-      const auto &parameterTypeMetadata =
-          parameterMetadata->GetValueTypeMetadata();
-      if (gd::EventsPropertyReplacer::CanContainProperty(
-              parameterTypeMetadata)) {
-        isParentTypeAVariable = parameterTypeMetadata.IsVariable();
-        parameter->Visit(*this);
-      }
+  void OnVisitFunctionCallNode(FunctionCallNode& node) override {
+    for (auto& parameter : node.parameters) {
+      parameter->Visit(*this);
     }
-    isParentTypeAVariable = isGrandParentTypeAVariable;
   }
   void OnVisitEmptyNode(EmptyNode& node) override {}
 
@@ -180,6 +168,12 @@ class GD_CORE_API ExpressionPropertyReplacer
   bool hasDoneRenaming;
   bool removedPropertyUsed;
 
+  const gd::String& GetPotentialNewName(const gd::String& oldName) {
+    return oldToNewPropertyNames.count(oldName) >= 1
+            ? oldToNewPropertyNames.find(oldName)->second
+            : oldName;
+  }
+
   bool RenameOrRemovePropertyOfTargetPropertyContainer(
       gd::String& propertyName) {
     if (oldToNewPropertyNames.count(propertyName) >= 1) {
@@ -204,7 +198,6 @@ class GD_CORE_API ExpressionPropertyReplacer
   const std::unordered_set<gd::String>& removedPropertyNames;
 
   gd::String objectNameToUseForVariableAccessor;
-  bool isParentTypeAVariable;
 };
 
 bool EventsPropertyReplacer::DoVisitInstruction(gd::Instruction& instruction,
@@ -223,16 +216,20 @@ bool EventsPropertyReplacer::DoVisitInstruction(gd::Instruction& instruction,
           const gd::Expression& parameterValue,
           size_t parameterIndex,
           const gd::String& lastObjectName) {
-        if (!gd::EventsPropertyReplacer::CanContainProperty(
-          parameterMetadata.GetValueTypeMetadata())) {
-          return;
-        }
+        const gd::String& type = parameterMetadata.GetType();
+
+        if (!gd::ParameterMetadata::IsExpression("variable", type) &&
+            !gd::ParameterMetadata::IsExpression("number", type) &&
+            !gd::ParameterMetadata::IsExpression("string", type))
+          return;  // Not an expression that can contain properties.
+
         auto node = parameterValue.GetRootNode();
         if (node) {
-          ExpressionPropertyReplacer renamer(
-              platform, GetProjectScopedContainers(), targetPropertiesContainer,
-              parameterMetadata.GetValueTypeMetadata().IsVariable(),
-              oldToNewPropertyNames, removedPropertyNames);
+          ExpressionPropertyReplacer renamer(platform,
+                                             GetProjectScopedContainers(),
+                                             targetPropertiesContainer,
+                                             oldToNewPropertyNames,
+                                             removedPropertyNames);
           node->Visit(renamer);
 
           if (renamer.IsRemovedPropertyUsed()) {
@@ -249,16 +246,20 @@ bool EventsPropertyReplacer::DoVisitInstruction(gd::Instruction& instruction,
 
 bool EventsPropertyReplacer::DoVisitEventExpression(
     gd::Expression& expression, const gd::ParameterMetadata& metadata) {
-  if (!gd::EventsPropertyReplacer::CanContainProperty(
-          metadata.GetValueTypeMetadata())) {
-    return false;
-  }
+  const gd::String& type = metadata.GetType();
+
+  if (!gd::ParameterMetadata::IsExpression("variable", type) &&
+      !gd::ParameterMetadata::IsExpression("number", type) &&
+      !gd::ParameterMetadata::IsExpression("string", type))
+    return false;  // Not an expression that can contain properties.
+
   auto node = expression.GetRootNode();
   if (node) {
-    ExpressionPropertyReplacer renamer(
-        platform, GetProjectScopedContainers(), targetPropertiesContainer,
-        metadata.GetValueTypeMetadata().IsVariable(), oldToNewPropertyNames,
-        removedPropertyNames);
+    ExpressionPropertyReplacer renamer(platform,
+                                       GetProjectScopedContainers(),
+                                       targetPropertiesContainer,
+                                       oldToNewPropertyNames,
+                                       removedPropertyNames);
     node->Visit(renamer);
 
     if (renamer.IsRemovedPropertyUsed()) {
@@ -271,12 +272,6 @@ bool EventsPropertyReplacer::DoVisitEventExpression(
   return false;
 }
 
-bool EventsPropertyReplacer::CanContainProperty(
-    const gd::ValueTypeMetadata &valueTypeMetadata) {
-  return valueTypeMetadata.IsVariable() || valueTypeMetadata.IsNumber() ||
-         valueTypeMetadata.IsString();
-}
-
 EventsPropertyReplacer::~EventsPropertyReplacer() {}
 
 }  // namespace gd

Core/GDCore/IDE/Events/EventsPropertyReplacer.h

@@ -4,7 +4,6 @@
  * reserved. This project is released under the MIT License.
  */
 #pragma once
-
 #include <map>
 #include <memory>
 #include <unordered_map>
@@ -42,8 +41,6 @@ class GD_CORE_API EventsPropertyReplacer
         removedPropertyNames(removedPropertyNames_){};
   virtual ~EventsPropertyReplacer();
 
-  static bool CanContainProperty(const gd::ValueTypeMetadata &valueTypeMetadata);
-
  private:
   bool DoVisitInstruction(gd::Instruction &instruction,
                           bool isCondition) override;

Core/GDCore/IDE/Events/EventsRefactorer.cpp

@@ -22,7 +22,6 @@
 #include "GDCore/Project/EventsBasedObject.h"
 #include "GDCore/Project/ProjectScopedContainers.h"
 #include "GDCore/IDE/Events/ExpressionTypeFinder.h"
-#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
 
 using namespace std;
 
@@ -52,17 +51,17 @@ class GD_CORE_API ExpressionObjectRenamer : public ExpressionParser2NodeWorker {
 
   static bool Rename(const gd::Platform &platform,
                      const gd::ProjectScopedContainers &projectScopedContainers,
-                     const gd::String &rootType, gd::ExpressionNode &node,
-                     const gd::String &objectName,
-                     const gd::String &objectNewName) {
-    if (gd::ExpressionValidator::HasNoErrors(platform, projectScopedContainers,
-                                             rootType, node)) {
-      ExpressionObjectRenamer renamer(platform, projectScopedContainers,
-                                      rootType, objectName, objectNewName);
+                     const gd::String &rootType,
+                     gd::ExpressionNode& node,
+                     const gd::String& objectName,
+                     const gd::String& objectNewName) {
+    if (gd::ExpressionValidator::HasNoErrors(platform, projectScopedContainers, rootType, node)) {
+      ExpressionObjectRenamer renamer(platform, projectScopedContainers, rootType, objectName, objectNewName);
       node.Visit(renamer);
 
       return renamer.HasDoneRenaming();
     }
+
     return false;
   }
 
@@ -84,7 +83,7 @@ class GD_CORE_API ExpressionObjectRenamer : public ExpressionParser2NodeWorker {
   void OnVisitVariableNode(VariableNode& node) override {
     auto type = gd::ExpressionTypeFinder::GetType(platform, projectScopedContainers, rootType, node);
 
-    if (gd::ValueTypeMetadata::IsVariable(type)) {
+    if (gd::ValueTypeMetadata::IsTypeLegacyPreScopedVariable(type)) {
       // Nothing to do (this can't reference an object)
     } else {
       if (node.name == objectName) {
@@ -120,7 +119,7 @@ class GD_CORE_API ExpressionObjectRenamer : public ExpressionParser2NodeWorker {
         node.identifierName == objectName) {
       hasDoneRenaming = true;
       node.identifierName = objectNewName;
-    } else if (gd::ValueTypeMetadata::IsVariable(type)) {
+    } else if (gd::ValueTypeMetadata::IsTypeLegacyPreScopedVariable(type)) {
       // Nothing to do (this can't reference an object)
     } else {
       if (node.identifierName == objectName) {
@@ -296,118 +295,187 @@ class GD_CORE_API ExpressionObjectFinder : public ExpressionParser2NodeWorker {
   const gd::String rootType;
 };
 
-/**
- * \brief Replace in expressions and in parameters of actions or conditions,
- * references to the name of an object by another.
- *
- * \ingroup IDE
- */
-class GD_CORE_API EventsObjectReplacer
-    : public ArbitraryEventsWorkerWithContext {
-public:
-  EventsObjectReplacer(const gd::Platform &platform_,
-                       const gd::ObjectsContainer &targetedObjectsContainer_,
-                       const gd::String &oldObjectName_,
-                       const gd::String &newObjectName_)
-      : platform(platform_),
-        targetedObjectsContainer(targetedObjectsContainer_),
-        oldObjectName(oldObjectName_), newObjectName(newObjectName_){};
+bool EventsRefactorer::RenameObjectInActions(const gd::Platform& platform,
+                                             gd::ProjectScopedContainers& projectScopedContainers,
+                                             gd::InstructionsList& actions,
+                                             gd::String oldName,
+                                             gd::String newName) {
+  bool somethingModified = false;
 
-  virtual ~EventsObjectReplacer() {}
+  for (std::size_t aId = 0; aId < actions.size(); ++aId) {
+    const gd::InstructionMetadata& instrInfos =
+        MetadataProvider::GetActionMetadata(platform, actions[aId].GetType());
+    for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
+      // Replace object's name in parameters
+      if (gd::ParameterMetadata::IsObject(instrInfos.parameters[pNb].GetType()) &&
+          actions[aId].GetParameter(pNb).GetPlainString() == oldName)
+        actions[aId].SetParameter(pNb, gd::Expression(newName));
+      // Replace object's name in expressions
+      else if (ParameterMetadata::IsExpression(
+                   "number", instrInfos.parameters[pNb].GetType())) {
+        auto node = actions[aId].GetParameter(pNb).GetRootNode();
 
-private:
-  bool DoVisitInstruction(gd::Instruction &instruction,
-                          bool isCondition) override {
-    if (&targetedObjectsContainer !=
-        GetProjectScopedContainers()
-            .GetObjectsContainersList()
-            .GetObjectsContainerFromObjectName(oldObjectName)) {
-      return false;
-    }
-    const auto &metadata = isCondition
-                               ? gd::MetadataProvider::GetConditionMetadata(
-                                     platform, instruction.GetType())
-                               : gd::MetadataProvider::GetActionMetadata(
-                                     platform, instruction.GetType());
+        if (ExpressionObjectRenamer::Rename(platform, projectScopedContainers, "number", *node, oldName, newName)) {
+          actions[aId].SetParameter(
+              pNb, ExpressionParser2NodePrinter::PrintNode(*node));
+        }
+      }
+      // Replace object's name in text expressions
+      else if (ParameterMetadata::IsExpression(
+                   "string", instrInfos.parameters[pNb].GetType())) {
+        auto node = actions[aId].GetParameter(pNb).GetRootNode();
 
-    gd::ParameterMetadataTools::IterateOverParametersWithIndex(
-        instruction.GetParameters(), metadata.GetParameters(),
-        [&](const gd::ParameterMetadata &parameterMetadata,
-            const gd::Expression &parameterValue, size_t parameterIndex,
-            const gd::String &lastObjectName) {
-          if (!gd::EventsObjectReplacer::CanContainObject(
-                  parameterMetadata.GetValueTypeMetadata())) {
-            return;
-          }
-          auto node = parameterValue.GetRootNode();
-          if (node) {
-            ExpressionObjectRenamer renamer(
-                platform, GetProjectScopedContainers(),
-                parameterMetadata.GetValueTypeMetadata().GetName(),
-                oldObjectName, newObjectName);
-            node->Visit(renamer);
-
-            if (renamer.HasDoneRenaming()) {
-              instruction.SetParameter(
-                  parameterIndex,
-                  ExpressionParser2NodePrinter::PrintNode(*node));
-            }
-          }
-        });
-
-    return false;
-  }
-
-  bool DoVisitEventExpression(gd::Expression &expression,
-                              const gd::ParameterMetadata &metadata) override {
-    if (&targetedObjectsContainer !=
-        GetProjectScopedContainers()
-            .GetObjectsContainersList()
-            .GetObjectsContainerFromObjectName(oldObjectName)) {
-      return false;
-    }
-    if (!gd::EventsObjectReplacer::CanContainObject(
-            metadata.GetValueTypeMetadata())) {
-      return false;
-    }
-    auto node = expression.GetRootNode();
-    if (node) {
-      ExpressionObjectRenamer renamer(platform, GetProjectScopedContainers(),
-                                      metadata.GetValueTypeMetadata().GetName(),
-                                      oldObjectName, newObjectName);
-      node->Visit(renamer);
-
-      if (renamer.HasDoneRenaming()) {
-        expression = ExpressionParser2NodePrinter::PrintNode(*node);
+        if (ExpressionObjectRenamer::Rename(platform, projectScopedContainers, "string", *node, oldName, newName)) {
+          actions[aId].SetParameter(
+              pNb, ExpressionParser2NodePrinter::PrintNode(*node));
+        }
       }
     }
 
-    return false;
+    if (!actions[aId].GetSubInstructions().empty())
+      somethingModified =
+          RenameObjectInActions(platform,
+                                projectScopedContainers,
+                                actions[aId].GetSubInstructions(),
+                                oldName,
+                                newName) ||
+          somethingModified;
   }
 
-  bool CanContainObject(const gd::ValueTypeMetadata &valueTypeMetadata) {
-    return valueTypeMetadata.IsObject() || valueTypeMetadata.IsVariable() ||
-           valueTypeMetadata.IsNumber() || valueTypeMetadata.IsString();
+  return somethingModified;
+}
+
+bool EventsRefactorer::RenameObjectInConditions(
+    const gd::Platform& platform,
+    gd::ProjectScopedContainers& projectScopedContainers,
+    gd::InstructionsList& conditions,
+    gd::String oldName,
+    gd::String newName) {
+  bool somethingModified = false;
+
+  for (std::size_t cId = 0; cId < conditions.size(); ++cId) {
+    const gd::InstructionMetadata& instrInfos =
+        MetadataProvider::GetConditionMetadata(platform,
+                                               conditions[cId].GetType());
+    for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
+      // Replace object's name in parameters
+      if (gd::ParameterMetadata::IsObject(instrInfos.parameters[pNb].GetType()) &&
+          conditions[cId].GetParameter(pNb).GetPlainString() == oldName)
+        conditions[cId].SetParameter(pNb, gd::Expression(newName));
+      // Replace object's name in expressions
+      else if (ParameterMetadata::IsExpression(
+                   "number", instrInfos.parameters[pNb].GetType())) {
+        auto node = conditions[cId].GetParameter(pNb).GetRootNode();
+
+        if (ExpressionObjectRenamer::Rename(platform, projectScopedContainers, "number", *node, oldName, newName)) {
+          conditions[cId].SetParameter(
+              pNb, ExpressionParser2NodePrinter::PrintNode(*node));
+        }
+      }
+      // Replace object's name in text expressions
+      else if (ParameterMetadata::IsExpression(
+                   "string", instrInfos.parameters[pNb].GetType())) {
+        auto node = conditions[cId].GetParameter(pNb).GetRootNode();
+
+        if (ExpressionObjectRenamer::Rename(platform, projectScopedContainers, "string", *node, oldName, newName)) {
+          conditions[cId].SetParameter(
+              pNb, ExpressionParser2NodePrinter::PrintNode(*node));
+        }
+      }
+    }
+
+    if (!conditions[cId].GetSubInstructions().empty())
+      somethingModified =
+          RenameObjectInConditions(platform,
+                                   projectScopedContainers,
+                                   conditions[cId].GetSubInstructions(),
+                                   oldName,
+                                   newName) ||
+          somethingModified;
   }
 
-  const gd::Platform &platform;
-  const gd::ObjectsContainer &targetedObjectsContainer;
-  const gd::String &oldObjectName;
-  const gd::String &newObjectName;
-};
+  return somethingModified;
+}
+
+bool EventsRefactorer::RenameObjectInEventParameters(
+    const gd::Platform& platform,
+    gd::ProjectScopedContainers& projectScopedContainers,
+    gd::Expression& expression,
+    gd::ParameterMetadata parameterMetadata,
+    gd::String oldName,
+    gd::String newName) {
+  bool somethingModified = false;
+
+  if (gd::ParameterMetadata::IsObject(parameterMetadata.GetType()) &&
+      expression.GetPlainString() == oldName)
+    expression = gd::Expression(newName);
+  // Replace object's name in expressions
+  else if (ParameterMetadata::IsExpression("number",
+                                           parameterMetadata.GetType())) {
+    auto node = expression.GetRootNode();
+
+    if (ExpressionObjectRenamer::Rename(platform, projectScopedContainers, "number", *node, oldName, newName)) {
+      expression = ExpressionParser2NodePrinter::PrintNode(*node);
+    }
+  }
+  // Replace object's name in text expressions
+  else if (ParameterMetadata::IsExpression("string",
+                                           parameterMetadata.GetType())) {
+    auto node = expression.GetRootNode();
+
+    if (ExpressionObjectRenamer::Rename(platform, projectScopedContainers, "string", *node, oldName, newName)) {
+      expression = ExpressionParser2NodePrinter::PrintNode(*node);
+    }
+  }
+
+  return somethingModified;
+}
 
 void EventsRefactorer::RenameObjectInEvents(const gd::Platform& platform,
-                                            const gd::ProjectScopedContainers& projectScopedContainers,
+                                            gd::ProjectScopedContainers& projectScopedContainers,
                                             gd::EventsList& events,
-                                            const gd::ObjectsContainer &targetedObjectsContainer,
                                             gd::String oldName,
                                             gd::String newName) {
-  gd::EventsObjectReplacer eventsParameterReplacer(platform, targetedObjectsContainer, oldName, newName);
-  eventsParameterReplacer.Launch(events, projectScopedContainers);
+  for (std::size_t i = 0; i < events.size(); ++i) {
+    vector<gd::InstructionsList*> conditionsVectors =
+        events[i].GetAllConditionsVectors();
+    for (std::size_t j = 0; j < conditionsVectors.size(); ++j) {
+      bool somethingModified = RenameObjectInConditions(
+          platform, projectScopedContainers, *conditionsVectors[j], oldName, newName);
+    }
+
+    vector<gd::InstructionsList*> actionsVectors =
+        events[i].GetAllActionsVectors();
+    for (std::size_t j = 0; j < actionsVectors.size(); ++j) {
+      bool somethingModified = RenameObjectInActions(
+          platform, projectScopedContainers, *actionsVectors[j], oldName, newName);
+    }
+
+    vector<pair<gd::Expression*, gd::ParameterMetadata>>
+        expressionsWithMetadata = events[i].GetAllExpressionsWithMetadata();
+    for (std::size_t j = 0; j < expressionsWithMetadata.size(); ++j) {
+      gd::Expression* expression = expressionsWithMetadata[j].first;
+      gd::ParameterMetadata parameterMetadata =
+          expressionsWithMetadata[j].second;
+      bool somethingModified = RenameObjectInEventParameters(platform,
+                                                             projectScopedContainers,
+                                                             *expression,
+                                                             parameterMetadata,
+                                                             oldName,
+                                                             newName);
+    }
+
+    if (events[i].CanHaveSubEvents())
+      RenameObjectInEvents(platform,
+                           projectScopedContainers,
+                           events[i].GetSubEvents(),
+                           oldName,
+                           newName);
+  }
 }
 
 bool EventsRefactorer::RemoveObjectInActions(const gd::Platform& platform,
-                                             const gd::ProjectScopedContainers& projectScopedContainers,
+                                             gd::ProjectScopedContainers& projectScopedContainers,
                                              gd::InstructionsList& actions,
                                              gd::String name) {
   bool somethingModified = false;
@@ -417,16 +485,16 @@ bool EventsRefactorer::RemoveObjectInActions(const gd::Platform& platform,
 
     const gd::InstructionMetadata& instrInfos =
         MetadataProvider::GetActionMetadata(platform, actions[aId].GetType());
-    for (std::size_t pNb = 0; pNb < instrInfos.parameters.GetParametersCount(); ++pNb) {
+    for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
       // Find object's name in parameters
-      if (gd::ParameterMetadata::IsObject(instrInfos.parameters.GetParameter(pNb).GetType()) &&
+      if (gd::ParameterMetadata::IsObject(instrInfos.parameters[pNb].GetType()) &&
           actions[aId].GetParameter(pNb).GetPlainString() == name) {
         deleteMe = true;
         break;
       }
       // Find object's name in expressions
       else if (ParameterMetadata::IsExpression(
-                   "number", instrInfos.parameters.GetParameter(pNb).GetType())) {
+                   "number", instrInfos.parameters[pNb].GetType())) {
         auto node = actions[aId].GetParameter(pNb).GetRootNode();
 
         if (ExpressionObjectFinder::CheckIfHasObject(platform, projectScopedContainers, "number", *node, name)) {
@@ -436,7 +504,7 @@ bool EventsRefactorer::RemoveObjectInActions(const gd::Platform& platform,
       }
       // Find object's name in text expressions
       else if (ParameterMetadata::IsExpression(
-                   "string", instrInfos.parameters.GetParameter(pNb).GetType())) {
+                   "string", instrInfos.parameters[pNb].GetType())) {
         auto node = actions[aId].GetParameter(pNb).GetRootNode();
 
         if (ExpressionObjectFinder::CheckIfHasObject(platform, projectScopedContainers, "string", *node, name)) {
@@ -464,7 +532,7 @@ bool EventsRefactorer::RemoveObjectInActions(const gd::Platform& platform,
 
 bool EventsRefactorer::RemoveObjectInConditions(
     const gd::Platform& platform,
-    const gd::ProjectScopedContainers& projectScopedContainers,
+    gd::ProjectScopedContainers& projectScopedContainers,
     gd::InstructionsList& conditions,
     gd::String name) {
   bool somethingModified = false;
@@ -475,16 +543,16 @@ bool EventsRefactorer::RemoveObjectInConditions(
     const gd::InstructionMetadata& instrInfos =
         MetadataProvider::GetConditionMetadata(platform,
                                                conditions[cId].GetType());
-    for (std::size_t pNb = 0; pNb < instrInfos.parameters.GetParametersCount(); ++pNb) {
+    for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
       // Find object's name in parameters
-      if (gd::ParameterMetadata::IsObject(instrInfos.parameters.GetParameter(pNb).GetType()) &&
+      if (gd::ParameterMetadata::IsObject(instrInfos.parameters[pNb].GetType()) &&
           conditions[cId].GetParameter(pNb).GetPlainString() == name) {
         deleteMe = true;
         break;
       }
       // Find object's name in expressions
       else if (ParameterMetadata::IsExpression(
-                   "number", instrInfos.parameters.GetParameter(pNb).GetType())) {
+                   "number", instrInfos.parameters[pNb].GetType())) {
         auto node = conditions[cId].GetParameter(pNb).GetRootNode();
 
         if (ExpressionObjectFinder::CheckIfHasObject(platform, projectScopedContainers, "number", *node, name)) {
@@ -494,7 +562,7 @@ bool EventsRefactorer::RemoveObjectInConditions(
       }
       // Find object's name in text expressions
       else if (ParameterMetadata::IsExpression(
-                   "string", instrInfos.parameters.GetParameter(pNb).GetType())) {
+                   "string", instrInfos.parameters[pNb].GetType())) {
         auto node = conditions[cId].GetParameter(pNb).GetRootNode();
 
         if (ExpressionObjectFinder::CheckIfHasObject(platform, projectScopedContainers, "string", *node, name)) {

Core/GDCore/IDE/Events/EventsRefactorer.h

@@ -3,8 +3,8 @@
  * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
  * reserved. This project is released under the MIT License.
  */
-#pragma once
-
+#ifndef GDCORE_EVENTSREFACTORER_H
+#define GDCORE_EVENTSREFACTORER_H
 #include <memory>
 #include <vector>
 
@@ -81,9 +81,8 @@ class GD_CORE_API EventsRefactorer {
    * events ).
    */
   static void RenameObjectInEvents(const gd::Platform& platform,
-                                   const gd::ProjectScopedContainers& projectScopedContainers,
+                                   gd::ProjectScopedContainers& projectScopedContainers,
                                    gd::EventsList& events,
-                                   const gd::ObjectsContainer &targetedObjectsContainer,
                                    gd::String oldName,
                                    gd::String newName);
 
@@ -122,13 +121,51 @@ class GD_CORE_API EventsRefactorer {
   virtual ~EventsRefactorer(){};
 
  private:
+  /**
+   * Replace all occurrences of an object name by another name in an action
+   * ( include : objects in parameters and in math/text expressions ).
+   *
+   * \return true if something was modified.
+   */
+  static bool RenameObjectInActions(const gd::Platform& platform,
+                                    gd::ProjectScopedContainers& projectScopedContainers,
+                                    gd::InstructionsList& instructions,
+                                    gd::String oldName,
+                                    gd::String newName);
+
+  /**
+   * Replace all occurrences of an object name by another name in a condition
+   * ( include : objects in parameters and in math/text expressions ).
+   *
+   * \return true if something was modified.
+   */
+  static bool RenameObjectInConditions(const gd::Platform& platform,
+                                       gd::ProjectScopedContainers& projectScopedContainers,
+                                       gd::InstructionsList& instructions,
+                                       gd::String oldName,
+                                       gd::String newName);
+  /**
+   * Replace all occurrences of an object name by another name in an expression
+   * with the specified metadata
+   * ( include : objects or objects in math/text expressions ).
+   *
+   * \return true if something was modified.
+   */
+  static bool RenameObjectInEventParameters(
+      const gd::Platform& platform,
+      gd::ProjectScopedContainers& projectScopedContainers,
+      gd::Expression& expression,
+      gd::ParameterMetadata parameterMetadata,
+      gd::String oldName,
+      gd::String newName);
+
   /**
    * Remove all conditions of the list using an object
    *
    * \return true if something was modified.
    */
   static bool RemoveObjectInConditions(const gd::Platform& platform,
-                                       const gd::ProjectScopedContainers& projectScopedContainers,
+                                       gd::ProjectScopedContainers& projectScopedContainers,
                                        gd::InstructionsList& conditions,
                                        gd::String name);
 
@@ -138,7 +175,7 @@ class GD_CORE_API EventsRefactorer {
    * \return true if something was modified.
    */
   static bool RemoveObjectInActions(const gd::Platform& platform,
-                                    const gd::ProjectScopedContainers& projectScopedContainers,
+                                    gd::ProjectScopedContainers& projectScopedContainers,
                                     gd::InstructionsList& conditions,
                                     gd::String name);
 
@@ -205,3 +242,5 @@ class GD_CORE_API EventsRefactorer {
 };
 
 }  // namespace gd
+
+#endif  // GDCORE_EVENTSREFACTORER_H

Core/GDCore/IDE/Events/EventsVariableInstructionTypeSwitcher.cpp

@@ -31,8 +31,6 @@
 
 namespace gd {
 
-VariablesContainer EventsVariableInstructionTypeSwitcher::nullVariablesContainer;
-
 bool EventsVariableInstructionTypeSwitcher::DoVisitInstruction(gd::Instruction& instruction,
                                                 bool isCondition) {
   const auto& metadata = isCondition
@@ -84,8 +82,7 @@ bool EventsVariableInstructionTypeSwitcher::DoVisitInstruction(gd::Instruction&
         // Every occurrence of the variable or its children are checked.
         // Ensuring that a child is actually the one with a type change would
         // take more time.
-        if (variablesContainer == &targetVariablesContainer ||
-            lastObjectName == groupName) {
+        if (variablesContainer == &targetVariablesContainer) {
           if (typeChangedVariableNames.find(variableName) !=
               typeChangedVariableNames.end()) {
             gd::VariableInstructionSwitcher::

Core/GDCore/IDE/Events/EventsVariableInstructionTypeSwitcher.h

@@ -17,7 +17,7 @@
 namespace gd {
 class VariablesContainer;
 class Platform;
-} // namespace gd
+}  // namespace gd
 
 namespace gd {
 /**
@@ -33,36 +33,21 @@ class GD_CORE_API EventsVariableInstructionTypeSwitcher
 public:
   EventsVariableInstructionTypeSwitcher(
       const gd::Platform &platform_,
-      const std::unordered_set<gd::String> &typeChangedVariableNames_,
-      const gd::VariablesContainer &targetVariablesContainer_)
+      const gd::VariablesContainer &targetVariablesContainer_,
+      const std::unordered_set<gd::String> &typeChangedVariableNames_)
       : platform(platform_),
-        typeChangedVariableNames(typeChangedVariableNames_),
-        targetVariablesContainer(targetVariablesContainer_), groupName(""){};
-  EventsVariableInstructionTypeSwitcher(
-      const gd::Platform &platform_,
-      const std::unordered_set<gd::String> &typeChangedVariableNames_,
-      const gd::String &groupName_)
-      : platform(platform_),
-        typeChangedVariableNames(typeChangedVariableNames_),
-        targetVariablesContainer(nullVariablesContainer),
-        groupName(groupName_){};
+        targetVariablesContainer(targetVariablesContainer_),
+        typeChangedVariableNames(typeChangedVariableNames_){};
   virtual ~EventsVariableInstructionTypeSwitcher();
 
-private:
+ private:
   bool DoVisitInstruction(gd::Instruction &instruction,
                           bool isCondition) override;
 
   const gd::Platform &platform;
   const gd::VariablesContainer &targetVariablesContainer;
-  /**
-   * Groups don't have VariablesContainer, so `targetVariablesContainer` will be
-   * pointing to `nullVariablesContainer` and the group name is use instead to
-   * check which instruction to modify.
-   */
-  const gd::String groupName;
+  gd::String objectName;
   const std::unordered_set<gd::String> &typeChangedVariableNames;
-
-  static VariablesContainer nullVariablesContainer;
 };
 
 } // namespace gd

Core/GDCore/IDE/Events/EventsVariableReplacer.cpp

@@ -32,8 +32,6 @@
 
 namespace gd {
 
-VariablesContainer EventsVariableReplacer::nullVariablesContainer;
-
 /**
  * \brief Go through the nodes and rename variables,
  * or signal if the instruction must be renamed if a removed variable is used.
@@ -46,26 +44,22 @@ class GD_CORE_API ExpressionVariableReplacer
   ExpressionVariableReplacer(
       const gd::Platform& platform_,
       const gd::ProjectScopedContainers& projectScopedContainers_,
-      const VariablesRenamingChangesetNode& variablesRenamingChangesetRoot_,
-      const std::unordered_set<gd::String>& removedVariableNames_,
       const gd::VariablesContainer& targetVariablesContainer_,
-      const gd::String &groupName_,
-      const gd::String &forcedInitialObjectName)
+      const VariablesRenamingChangesetNode& variablesRenamingChangesetRoot_,
+      const std::unordered_set<gd::String>& removedVariableNames_)
       : hasDoneRenaming(false),
         removedVariableUsed(false),
         platform(platform_),
         projectScopedContainers(projectScopedContainers_),
-        forcedVariablesContainer(nullptr),
-        forcedObjectName(forcedInitialObjectName),
-        variablesRenamingChangesetRoot(variablesRenamingChangesetRoot_),
-        removedVariableNames(removedVariableNames_),
+        forcedInitialVariablesContainer(nullptr),
         targetVariablesContainer(targetVariablesContainer_),
-        targetGroupName(groupName_){};
+        variablesRenamingChangesetRoot(variablesRenamingChangesetRoot_),
+        removedVariableNames(removedVariableNames_){};
   virtual ~ExpressionVariableReplacer(){};
 
   void SetForcedInitialVariablesContainer(
       const gd::VariablesContainer* forcedInitialVariablesContainer_) {
-    forcedVariablesContainer = forcedInitialVariablesContainer_;
+    forcedInitialVariablesContainer = forcedInitialVariablesContainer_;
   }
 
   bool HasDoneRenaming() const { return hasDoneRenaming; }
@@ -88,13 +82,12 @@ class GD_CORE_API ExpressionVariableReplacer
     // The node represents a variable or an object name on which a variable
     // will be accessed.
 
-    if (forcedVariablesContainer) {
+    if (forcedInitialVariablesContainer) {
       const gd::String oldVariableName = node.name;
       PushVariablesRenamingChangesetRoot();
       // A scope was forced. Honor it: it means this node represents a variable
       // of the forced variables container.
-      if (forcedVariablesContainer == &targetVariablesContainer ||
-          IsTargetingObjectGroup(forcedObjectName)) {
+      if (forcedInitialVariablesContainer == &targetVariablesContainer) {
         RenameOrRemoveVariableOfTargetVariableContainer(node.name);
       }
 
@@ -157,8 +150,7 @@ class GD_CORE_API ExpressionVariableReplacer
       // This is always true because MatchIdentifierWithName is used to get
       // objectNameToUseForVariableAccessor.
       if (objectsContainersList.HasObjectOrGroupVariablesContainer(
-              objectNameToUseForVariableAccessor, targetVariablesContainer) ||
-          IsTargetingObjectGroup(objectNameToUseForVariableAccessor)) {
+              objectNameToUseForVariableAccessor, targetVariablesContainer)) {
         objectNameToUseForVariableAccessor = "";
         // The node represents an object variable, and this object variables are
         // the target. Do the replacement or removals:
@@ -205,11 +197,10 @@ class GD_CORE_API ExpressionVariableReplacer
     // (and if it's a variable reference or a value does not have any importance
     // here).
 
-    if (forcedVariablesContainer) {
+    if (forcedInitialVariablesContainer) {
       // A scope was forced. Honor it: it means this node represents a variable
       // of the forced variables container.
-      if (forcedVariablesContainer == &targetVariablesContainer ||
-          IsTargetingObjectGroup(forcedObjectName)) {
+      if (forcedInitialVariablesContainer == &targetVariablesContainer) {
         renameVariableAndChild();
       }
       return;
@@ -222,8 +213,7 @@ class GD_CORE_API ExpressionVariableReplacer
         [&]() {
           // This represents an object.
           if (objectsContainersList.HasObjectOrGroupVariablesContainer(
-                  node.identifierName, targetVariablesContainer) ||
-              IsTargetingObjectGroup(node.identifierName)) {
+                  node.identifierName, targetVariablesContainer)) {
             // The node represents an object variable, and this object variables
             // are the target. Do the replacement or removals:
             PushVariablesRenamingChangesetRoot();
@@ -271,33 +261,31 @@ class GD_CORE_API ExpressionVariableReplacer
       // force the "scope" at which starts the evalution of variables.
       if (parameterMetadata && parameterMetadata->GetValueTypeMetadata()
                                    .IsLegacyPreScopedVariable()) {
-        const gd::VariablesContainer *oldForcedVariablesContainer =
-            forcedVariablesContainer;
-        const gd::String &oldForcedObjectName = forcedObjectName;
+        const gd::VariablesContainer* oldForcedInitialVariablesContainer =
+            forcedInitialVariablesContainer;
 
-        forcedVariablesContainer = nullptr;
-        forcedObjectName = "";
+        forcedInitialVariablesContainer = nullptr;
         if (parameterMetadata->GetType() == "globalvar") {
-          forcedVariablesContainer =
+          forcedInitialVariablesContainer =
               projectScopedContainers.GetVariablesContainersList()
                   .GetTopMostVariablesContainer();
         } else if (parameterMetadata->GetType() == "scenevar") {
-          forcedVariablesContainer =
+          forcedInitialVariablesContainer =
               projectScopedContainers.GetVariablesContainersList()
                   .GetBottomMostVariablesContainer();
         } else if (parameterMetadata->GetType() == "objectvar") {
           auto objectName = gd::ExpressionVariableOwnerFinder::GetObjectName(
-              platform, projectScopedContainers.GetObjectsContainersList(),
-              node.objectName, *node.parameters[parameterIndex].get());
-          forcedVariablesContainer =
+              platform,
+              projectScopedContainers.GetObjectsContainersList(),
+              node.objectName,
+              *node.parameters[parameterIndex].get());
+          forcedInitialVariablesContainer =
               projectScopedContainers.GetObjectsContainersList()
                   .GetObjectOrGroupVariablesContainer(objectName);
-          forcedObjectName = objectName;
         }
 
         node.parameters[parameterIndex]->Visit(*this);
-        forcedVariablesContainer = oldForcedVariablesContainer;
-        forcedObjectName = oldForcedObjectName;
+        forcedInitialVariablesContainer = oldForcedInitialVariablesContainer;
       } else {
         // For any other parameter, there is no special treatment being needed.
         node.parameters[parameterIndex]->Visit(*this);
@@ -310,10 +298,6 @@ class GD_CORE_API ExpressionVariableReplacer
   bool hasDoneRenaming;
   bool removedVariableUsed;
 
-  bool IsTargetingObjectGroup(const gd::String &objectGroupName) {
-    return !targetGroupName.empty() && objectGroupName == targetGroupName;
-  }
-
   bool RenameOrRemoveVariableOfTargetVariableContainer(
       gd::String& variableName) {
     const auto *currentVariablesRenamingChangesetNode =
@@ -398,17 +382,10 @@ class GD_CORE_API ExpressionVariableReplacer
   // Scope:
   const gd::Platform& platform;
   const gd::ProjectScopedContainers& projectScopedContainers;
-  const gd::VariablesContainer* forcedVariablesContainer;
-  gd::String forcedObjectName;
+  const gd::VariablesContainer* forcedInitialVariablesContainer;
 
   // Renaming or removing to do:
   const gd::VariablesContainer& targetVariablesContainer;
-  /**
-   * Groups don't have VariablesContainer, so `targetVariablesContainer` will be
-   * pointing to `nullVariablesContainer` and the group name is use instead to
-   * check which variable accesses to modify in expressions.
-   */
-  const gd::String& targetGroupName;
   const VariablesRenamingChangesetNode &variablesRenamingChangesetRoot;
   const std::unordered_set<gd::String>& removedVariableNames;
 
@@ -420,7 +397,7 @@ const gd::VariablesContainer*
 EventsVariableReplacer::FindForcedVariablesContainerIfAny(
     const gd::String& type, const gd::String& lastObjectName) {
   // Handle legacy pre-scoped variable parameters: in this case, we
-  // force the "scope" at which starts the evaluation of variables.
+  // force the "scope" at which starts the evalution of variables.
   if (type == "objectvar") {
     return GetProjectScopedContainers()
         .GetObjectsContainersList()
@@ -465,11 +442,9 @@ bool EventsVariableReplacer::DoVisitInstruction(gd::Instruction& instruction,
         if (node) {
           ExpressionVariableReplacer renamer(platform,
                                              GetProjectScopedContainers(),
-                                             variablesRenamingChangesetRoot,
-                                             removedVariableNames,
                                              targetVariablesContainer,
-                                             targetGroupName,
-                                             type == "objectvar" ? lastObjectName : "");
+                                             variablesRenamingChangesetRoot,
+                                             removedVariableNames);
           renamer.SetForcedInitialVariablesContainer(
               FindForcedVariablesContainerIfAny(type, lastObjectName));
           node->Visit(renamer);
@@ -499,11 +474,9 @@ bool EventsVariableReplacer::DoVisitEventExpression(
   if (node) {
     ExpressionVariableReplacer renamer(platform,
                                        GetProjectScopedContainers(),
-                                       variablesRenamingChangesetRoot,
-                                       removedVariableNames,
                                        targetVariablesContainer,
-                                       targetGroupName,
-                                       "");
+                                       variablesRenamingChangesetRoot,
+                                       removedVariableNames);
     renamer.SetForcedInitialVariablesContainer(
         FindForcedVariablesContainerIfAny(type, ""));
     node->Visit(renamer);

Core/GDCore/IDE/Events/EventsVariableReplacer.h

@@ -35,24 +35,13 @@ class GD_CORE_API EventsVariableReplacer
  public:
   EventsVariableReplacer(
       const gd::Platform &platform_,
+      const gd::VariablesContainer &targetVariablesContainer_,
       const VariablesRenamingChangesetNode &variablesRenamingChangesetRoot_,
-      const std::unordered_set<gd::String> &removedVariableNames_,
-      const gd::VariablesContainer &targetVariablesContainer_)
+      const std::unordered_set<gd::String> &removedVariableNames_)
       : platform(platform_),
-        variablesRenamingChangesetRoot(variablesRenamingChangesetRoot_),
-        removedVariableNames(removedVariableNames_),
         targetVariablesContainer(targetVariablesContainer_),
-        targetGroupName("") {};
-  EventsVariableReplacer(
-      const gd::Platform &platform_,
-      const VariablesRenamingChangesetNode &variablesRenamingChangesetRoot_,
-      const std::unordered_set<gd::String> &removedVariableNames_,
-      const gd::String &targetGroupName_)
-      : platform(platform_),
         variablesRenamingChangesetRoot(variablesRenamingChangesetRoot_),
-        removedVariableNames(removedVariableNames_),
-        targetVariablesContainer(nullVariablesContainer),
-        targetGroupName(targetGroupName_) {};
+        removedVariableNames(removedVariableNames_) {};
   virtual ~EventsVariableReplacer();
 
  private:
@@ -66,16 +55,9 @@ class GD_CORE_API EventsVariableReplacer
 
   const gd::Platform &platform;
   const gd::VariablesContainer &targetVariablesContainer;
-  /**
-   * Groups don't have VariablesContainer, so `targetVariablesContainer` will be
-   * pointing to `nullVariablesContainer` and the group name is use instead to
-   * check which variable accesses to modify in expressions.
-   */
-  const gd::String targetGroupName;
+  gd::String objectName;
   const VariablesRenamingChangesetNode &variablesRenamingChangesetRoot;
   const std::unordered_set<gd::String> &removedVariableNames;
-
-  static VariablesContainer nullVariablesContainer;
 };
 
 }  // namespace gd

Core/GDCore/IDE/Events/EventsVariablesFinder.cpp

@@ -93,11 +93,9 @@ class GD_CORE_API VariableFinderExpressionNodeWorker
     }
 
     size_t parameterIndex = 0;
-    for (size_t metadataIndex = (isObjectFunction ? 1 : 0);
-         metadataIndex < metadata.GetParameters().GetParametersCount() &&
-         parameterIndex < node.parameters.size();
-         ++metadataIndex) {
-      auto& parameterMetadata = metadata.GetParameters().GetParameter(metadataIndex);
+    for (size_t metadataIndex = (isObjectFunction ? 1 : 0); metadataIndex < metadata.parameters.size()
+      && parameterIndex < node.parameters.size(); ++metadataIndex) {
+      auto& parameterMetadata = metadata.parameters[metadataIndex];
       if (parameterMetadata.IsCodeOnly()) {
         continue;
       }
@@ -152,18 +150,18 @@ class GD_CORE_API VariableFinderEventWorker
                               platform, instruction.GetType())
                         : MetadataProvider::GetActionMetadata(
                               platform, instruction.GetType());
-      for (std::size_t pNb = 0; pNb < instrInfos.parameters.GetParametersCount(); ++pNb) {
+      for (std::size_t pNb = 0; pNb < instrInfos.parameters.size(); ++pNb) {
         // The parameter has the searched type...
-        if (instrInfos.parameters.GetParameter(pNb).GetType() == parameterType) {
+        if (instrInfos.parameters[pNb].GetType() == parameterType) {
           //...remember the value of the parameter.
           if (objectName.empty() || lastObjectParameter == objectName)
             results.insert(instruction.GetParameter(pNb).GetPlainString());
         }
         // Search in expressions
         else if (ParameterMetadata::IsExpression(
-                    "number", instrInfos.parameters.GetParameter(pNb).GetType()) ||
+                    "number", instrInfos.parameters[pNb].GetType()) ||
                 ParameterMetadata::IsExpression(
-                    "string", instrInfos.parameters.GetParameter(pNb).GetType())) {
+                    "string", instrInfos.parameters[pNb].GetType())) {
           auto node = instruction.GetParameter(pNb).GetRootNode();
 
           VariableFinderExpressionNodeWorker searcher(
@@ -176,7 +174,7 @@ class GD_CORE_API VariableFinderEventWorker
         }
         // Remember the value of the last "object" parameter.
         else if (gd::ParameterMetadata::IsObject(
-                    instrInfos.parameters.GetParameter(pNb).GetType())) {
+                    instrInfos.parameters[pNb].GetType())) {
           lastObjectParameter =
               instruction.GetParameter(pNb).GetPlainString();
         }

Core/GDCore/IDE/Events/ExpressionCompletionFinder.h

@@ -337,19 +337,19 @@ struct GD_CORE_API ExpressionCompletionDescription {
 
  private:
   CompletionKind completionKind;
-  gd::Variable::Type variableType = gd::Variable::Unknown;
-  gd::VariablesContainer::SourceType variableScope = gd::VariablesContainer::Unknown;
+  gd::Variable::Type variableType;
+  gd::VariablesContainer::SourceType variableScope;
   gd::String type;
   gd::String prefix;
   gd::String completion;
-  size_t replacementStartPosition = 0;
-  size_t replacementEndPosition = 0;
+  size_t replacementStartPosition;
+  size_t replacementEndPosition;
   gd::String objectName;
   gd::String behaviorName;
-  bool isExact = false;
-  bool isLastParameter = false;
-  const gd::ParameterMetadata* parameterMetadata = &badParameterMetadata;
-  const gd::ObjectConfiguration* objectConfiguration = &badObjectConfiguration;
+  bool isExact;
+  bool isLastParameter;
+  const gd::ParameterMetadata* parameterMetadata;
+  const gd::ObjectConfiguration* objectConfiguration;
 
   static const gd::ParameterMetadata badParameterMetadata;
   static const gd::ObjectConfiguration badObjectConfiguration;
@@ -463,15 +463,11 @@ class GD_CORE_API ExpressionCompletionFinder
           MetadataProvider::GetFunctionCallMetadata(
               platform, objectsContainersList, *functionCall);
 
-      const gd::ParameterMetadata *parameterMetadata = nullptr;
-      while (metadataParameterIndex <
-             metadata.GetParameters().GetParametersCount()) {
-        if (!metadata.GetParameters()
-                 .GetParameter(metadataParameterIndex)
-                 .IsCodeOnly()) {
+      const gd::ParameterMetadata* parameterMetadata = nullptr;
+      while (metadataParameterIndex < metadata.parameters.size()) {
+        if (!metadata.parameters[metadataParameterIndex].IsCodeOnly()) {
           if (visibleParameterIndex == parameterIndex) {
-            parameterMetadata =
-                &metadata.GetParameters().GetParameter(metadataParameterIndex);
+            parameterMetadata = &metadata.parameters[metadataParameterIndex];
           }
           visibleParameterIndex++;
         }
@@ -1066,8 +1062,8 @@ class GD_CORE_API ExpressionCompletionFinder
       bool eagerlyCompleteIfExactMatch = false) {
     projectScopedContainers.ForEachIdentifierMatchingSearch(
         search,
-        [&](const gd::String &objectName,
-            const ObjectConfiguration *objectConfiguration) {
+        [&](const gd::String& objectName,
+            const ObjectConfiguration* objectConfiguration) {
           ExpressionCompletionDescription description(
               ExpressionCompletionDescription::Object,
               location.GetStartPosition(),
@@ -1077,7 +1073,7 @@ class GD_CORE_API ExpressionCompletionFinder
           description.SetType(type);
           completions.push_back(description);
         },
-        [&](const gd::String &variableName, const gd::Variable &variable) {
+        [&](const gd::String& variableName, const gd::Variable& variable) {
           ExpressionCompletionDescription description(
               ExpressionCompletionDescription::Variable,
               location.GetStartPosition(),
@@ -1095,29 +1091,23 @@ class GD_CORE_API ExpressionCompletionFinder
                 variable, variableName, location);
           }
         },
-        [&](const gd::NamedPropertyDescriptor &property) {
-          auto propertyType = gd::ValueTypeMetadata::ConvertPropertyTypeToValueType(
-              property.GetType());
-          if (gd::ValueTypeMetadata::IsTypeValue("number", propertyType) ||
-              gd::ValueTypeMetadata::IsTypeValue("string", propertyType)) {
-            ExpressionCompletionDescription description(
-                ExpressionCompletionDescription::Property,
-                location.GetStartPosition(), location.GetEndPosition());
-            description.SetCompletion(property.GetName());
-            description.SetType(property.GetType());
-            completions.push_back(description);
-          }
+        [&](const gd::NamedPropertyDescriptor& property) {
+          ExpressionCompletionDescription description(
+              ExpressionCompletionDescription::Property,
+              location.GetStartPosition(),
+              location.GetEndPosition());
+          description.SetCompletion(property.GetName());
+          description.SetType(property.GetType());
+          completions.push_back(description);
         },
-        [&](const gd::ParameterMetadata &parameter) {
-          if (parameter.GetValueTypeMetadata().IsNumber() ||
-              parameter.GetValueTypeMetadata().IsString()) {
-            ExpressionCompletionDescription description(
-                ExpressionCompletionDescription::Parameter,
-                location.GetStartPosition(), location.GetEndPosition());
-            description.SetCompletion(parameter.GetName());
-            description.SetType(parameter.GetType());
-            completions.push_back(description);
-          }
+        [&](const gd::ParameterMetadata& parameter) {
+          ExpressionCompletionDescription description(
+              ExpressionCompletionDescription::Parameter,
+              location.GetStartPosition(),
+              location.GetEndPosition());
+          description.SetCompletion(parameter.GetName());
+          description.SetType(parameter.GetType());
+          completions.push_back(description);
         });
   }
 

Core/GDCore/IDE/Events/ExpressionNodeLocationFinder.h

@@ -33,10 +33,8 @@ class GD_CORE_API ExpressionNodeLocationFinder
    * \brief Initialize the finder to search at the specified position.
    */
   ExpressionNodeLocationFinder(size_t searchedPosition_)
-      : searchedPosition(searchedPosition_),
-        foundNode(nullptr),
-        parentNode(nullptr) {};
-  virtual ~ExpressionNodeLocationFinder() {};
+      : searchedPosition(searchedPosition_), foundNode(nullptr){};
+  virtual ~ExpressionNodeLocationFinder(){};
 
   /**
    * \brief Helper function to find the deepest node at the search position, if

Core/GDCore/IDE/Events/ExpressionTypeFinder.h

@@ -72,7 +72,7 @@ class GD_CORE_API ExpressionTypeFinder : public ExpressionParser2NodeWorker {
         child(nullptr) {};
 
   const gd::String &GetType() {
-    return gd::ValueTypeMetadata::GetExpressionPrimitiveValueType(type);
+    return gd::ParameterMetadata::GetExpressionValueType(type);
   };
 
   void OnVisitSubExpressionNode(SubExpressionNode& node) override {

Core/GDCore/IDE/Events/ExpressionValidator.cpp

@@ -36,15 +36,13 @@ namespace {
  * (by convention, 1 for object functions and 2 for behavior functions).
  */
 size_t GetMinimumParametersNumber(
-    const gd::ParameterMetadataContainer& parameters,
+    const std::vector<gd::ParameterMetadata>& parameters,
     size_t initialParameterIndex) {
   size_t nb = 0;
-  for (std::size_t i = initialParameterIndex;
-       i < parameters.GetParametersCount(); ++i) {
-    if (!parameters.GetParameter(i).IsOptional() &&
-        !parameters.GetParameter(i).IsCodeOnly())
-      nb++;
+  for (std::size_t i = initialParameterIndex; i < parameters.size(); ++i) {
+    if (!parameters[i].IsOptional() && !parameters[i].codeOnly) nb++;
   }
+
   return nb;
 }
 
@@ -53,14 +51,13 @@ size_t GetMinimumParametersNumber(
  * (by convention, 1 for object functions and 2 for behavior functions).
  */
 size_t GetMaximumParametersNumber(
-    const gd::ParameterMetadataContainer& parameters,
+    const std::vector<gd::ParameterMetadata>& parameters,
     size_t initialParameterIndex) {
   size_t nb = 0;
-  for (std::size_t i = initialParameterIndex;
-       i < parameters.GetParametersCount(); ++i) {
-    if (!parameters.GetParameter(i).IsCodeOnly())
-      nb++;
+  for (std::size_t i = initialParameterIndex; i < parameters.size(); ++i) {
+    if (!parameters[i].codeOnly) nb++;
   }
+
   return nb;
 }
 
@@ -68,26 +65,19 @@ size_t GetMaximumParametersNumber(
 
 bool ExpressionValidator::ValidateObjectVariableOrVariableOrProperty(
     const gd::IdentifierNode& identifier) {
-  return ValidateObjectVariableOrVariableOrProperty(identifier.identifierName, identifier.identifierNameLocation, identifier.childIdentifierName, identifier.childIdentifierNameLocation);
-}
-
-bool ExpressionValidator::ValidateObjectVariableOrVariableOrProperty(
-    const gd::String &identifierName,
-    const gd::ExpressionParserLocation identifierNameLocation,
-    const gd::String &childIdentifierName,
-    const gd::ExpressionParserLocation childIdentifierNameLocation) {
   auto validateVariableTypeForExpression =
-      [this, &identifierNameLocation](gd::Variable::Type type) {
+      [this, &identifier](gd::Variable::Type type) {
         // Collections type can't be used directly in expressions, a child
         // must be accessed.
         if (type == Variable::Structure) {
           RaiseTypeError(_("You need to specify the name of the child variable "
                            "to access. For example: `MyVariable.child`."),
-                         identifierNameLocation);
+                         identifier.identifierNameLocation);
         } else if (type == Variable::Array) {
           RaiseTypeError(_("You need to specify the name of the child variable "
                            "to access. For example: `MyVariable[0]`."),
-                         identifierNameLocation);
+                         identifier.identifierNameLocation);
+
         } else {
           // Number, string or boolean variables can be used in expressions.
           return;
@@ -103,41 +93,38 @@ bool ExpressionValidator::ValidateObjectVariableOrVariableOrProperty(
   // we consider this node will be of the type required by the parent.
   childType = parentType;
 
-  return projectScopedContainers.MatchIdentifierWithName<bool>(identifierName,
+  return projectScopedContainers.MatchIdentifierWithName<bool>(identifier.identifierName,
     [&]() {
       // This represents an object.
-      if (childIdentifierName.empty()) {
+      if (identifier.childIdentifierName.empty()) {
         RaiseTypeError(_("An object variable or expression should be entered."),
-                        identifierNameLocation);
+                        identifier.identifierNameLocation);
 
         return true; // We should have found a variable.
       }
 
-      auto variableExistence =
-          objectsContainersList.HasObjectOrGroupWithVariableNamed(
-              identifierName, childIdentifierName);
+      auto variableExistence = objectsContainersList.HasObjectOrGroupWithVariableNamed(identifier.identifierName, identifier.childIdentifierName);
 
       if (variableExistence == gd::ObjectsContainersList::DoesNotExist) {
         RaiseUndeclaredVariableError(_("This variable does not exist on this object or group."),
-                        childIdentifierNameLocation, childIdentifierName, identifierName);
+                        identifier.childIdentifierNameLocation, identifier.childIdentifierName, identifier.identifierName);
 
         return true; // We should have found a variable.
       }
       else if (variableExistence == gd::ObjectsContainersList::ExistsOnlyOnSomeObjectsOfTheGroup) {
         RaiseUndeclaredVariableError(_("This variable only exists on some objects of the group. It must be declared for all objects."),
-                        childIdentifierNameLocation, childIdentifierName, identifierName);
+                        identifier.childIdentifierNameLocation, identifier.childIdentifierName, identifier.identifierName);
 
         return true; // We should have found a variable.
       }
       else if (variableExistence == gd::ObjectsContainersList::GroupIsEmpty) {
         RaiseUndeclaredVariableError(_("This group is empty. Add an object to this group first."),
-                        identifierNameLocation, childIdentifierName, identifierName);
+                        identifier.identifierNameLocation, identifier.childIdentifierName, identifier.identifierName);
 
         return true; // We should have found a variable.
       }
 
-      auto variableType = objectsContainersList.GetTypeOfObjectOrGroupVariable(
-          identifierName, childIdentifierName);
+      auto variableType = objectsContainersList.GetTypeOfObjectOrGroupVariable(identifier.identifierName, identifier.childIdentifierName);
       ReadChildTypeFromVariable(variableType);
 
       return true; // We found a variable.
@@ -147,9 +134,9 @@ bool ExpressionValidator::ValidateObjectVariableOrVariableOrProperty(
       // Try to identify a declared variable with the name (and maybe the child
       // variable).
       const gd::Variable& variable =
-          variablesContainersList.Get(identifierName);
+          variablesContainersList.Get(identifier.identifierName);
 
-      if (childIdentifierName.empty()) {
+      if (identifier.childIdentifierName.empty()) {
         // Just the root variable is accessed, check it can be used in an
         // expression.
         validateVariableTypeForExpression(variable.GetType());
@@ -158,38 +145,33 @@ bool ExpressionValidator::ValidateObjectVariableOrVariableOrProperty(
         return true; // We found a variable.
       } else {
         // A child variable is accessed, check it can be used in an expression.
-        if (!variable.HasChild(childIdentifierName)) {
+        if (!variable.HasChild(identifier.childIdentifierName)) {
           RaiseTypeError(_("No child variable with this name found."),
-                        childIdentifierNameLocation);
+                        identifier.childIdentifierNameLocation);
 
           return true; // We should have found a variable.
         }
 
         const gd::Variable& childVariable =
-            variable.GetChild(childIdentifierName);
+            variable.GetChild(identifier.childIdentifierName);
         ReadChildTypeFromVariable(childVariable.GetType());
         return true; // We found a variable.
       }
     }, [&]() {
       // This is a property.
-      if (!childIdentifierName.empty()) {
+      if (!identifier.childIdentifierName.empty()) {
         RaiseTypeError(_("Accessing a child variable of a property is not possible - just write the property name."),
-            childIdentifierNameLocation);
+            identifier.childIdentifierNameLocation);
 
         return true; // We found a property, even if the child is not allowed.
       }
 
-      const gd::NamedPropertyDescriptor &property =
-          propertiesContainersList.Get(identifierName).second;
+      const gd::NamedPropertyDescriptor& property = propertiesContainersList.Get(identifier.identifierName).second;
 
       if (property.GetType() == "Number") {
-        childType = Type::Number;
+       childType = Type::Number;
       } else if (property.GetType() == "Boolean") {
-        // Nothing - we don't know the precise type (this could be used a string
-        // or as a number)
-      } else if (property.GetType() == "Behavior") {
-        RaiseTypeError(_("Behaviors can't be used as a value in expressions."),
-                       identifierNameLocation);
+        // Nothing - we don't know the precise type (this could be used a string or as a number)
       } else {
         // Assume type is String or equivalent.
         childType = Type::String;
@@ -198,14 +180,14 @@ bool ExpressionValidator::ValidateObjectVariableOrVariableOrProperty(
       return true; // We found a property.
     }, [&]() {
       // This is a parameter.
-      if (!childIdentifierName.empty()) {
+      if (!identifier.childIdentifierName.empty()) {
         RaiseTypeError(_("Accessing a child variable of a parameter is not possible - just write the parameter name."),
-            childIdentifierNameLocation);
+            identifier.childIdentifierNameLocation);
 
         return true; // We found a parameter, even if the child is not allowed.
       }
 
-      const auto& parameter = gd::ParameterMetadataTools::Get(parametersVectorsList, identifierName);
+      const auto& parameter = gd::ParameterMetadataTools::Get(parametersVectorsList, identifier.identifierName);
       const auto& valueTypeMetadata = parameter.GetValueTypeMetadata();
       if (valueTypeMetadata.IsNumber()) {
         childType = Type::Number;
@@ -215,7 +197,7 @@ bool ExpressionValidator::ValidateObjectVariableOrVariableOrProperty(
         // Nothing - we don't know the precise type (this could be used as a string or as a number).
       } else {
         RaiseTypeError(_("This parameter is not a string, number or boolean - it can't be used in an expression."),
-            identifierNameLocation);
+            identifier.identifierNameLocation);
 
         return true; // We found a parameter, even though the type is incompatible.
       }
@@ -340,11 +322,11 @@ ExpressionValidator::Type ExpressionValidator::ValidateFunction(
 
   // Validate parameters count
   size_t minParametersCount = GetMinimumParametersNumber(
-      metadata.GetParameters(),
+      metadata.parameters,
       ExpressionParser2::WrittenParametersFirstIndex(function.objectName,
                                                      function.behaviorName));
   size_t maxParametersCount = GetMaximumParametersNumber(
-      metadata.GetParameters(),
+      metadata.parameters,
       ExpressionParser2::WrittenParametersFirstIndex(function.objectName,
                                                      function.behaviorName));
   if (function.parameters.size() < minParametersCount ||
@@ -384,11 +366,11 @@ ExpressionValidator::Type ExpressionValidator::ValidateFunction(
   for (int parameterIndex = 0; parameterIndex < function.parameters.size();
        parameterIndex++) {
     auto& parameter = function.parameters[parameterIndex];
-    while (metadata.GetParameters().GetParameter(metadataIndex).IsCodeOnly()) {
+    while (metadata.GetParameters()[metadataIndex].IsCodeOnly()) {
       // The sizes are already checked above.
       metadataIndex++;
     }
-    auto& parameterMetadata = metadata.GetParameters().GetParameter(metadataIndex);
+    auto& parameterMetadata = metadata.GetParameters()[metadataIndex];
 
     if (!parameterMetadata.IsOptional() ||
         dynamic_cast<EmptyNode*>(parameter.get()) == nullptr) {

Core/GDCore/IDE/Events/ExpressionValidator.h

@@ -14,7 +14,6 @@
 #include "GDCore/Extensions/Metadata/ExpressionMetadata.h"
 #include "GDCore/Project/ProjectScopedContainers.h"
 #include "GDCore/Project/VariablesContainersList.h"
-#include "GDCore/Project/VariablesContainer.h"
 
 namespace gd {
 class Expression;
@@ -43,12 +42,10 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
                       const gd::String &extraInfo_ = "")
       : platform(platform_),
         projectScopedContainers(projectScopedContainers_),
-        parentType(StringToType(gd::ValueTypeMetadata::GetExpressionPrimitiveValueType(rootType_))),
+        parentType(StringToType(gd::ParameterMetadata::GetExpressionValueType(rootType_))),
         childType(Type::Unknown),
         forbidsUsageOfBracketsBecauseParentIsObject(false),
-        currentParameterExtraInfo(&extraInfo_),
-        variableObjectName(),
-        variableObjectNameLocation() {};
+        currentParameterExtraInfo(&extraInfo_) {};
   virtual ~ExpressionValidator(){};
 
   /**
@@ -206,7 +203,13 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
     if (parentType == Type::Variable) {
       childType = parentType;
 
-      CheckVariableExistence(node.location, node.name);
+      if (!currentParameterExtraInfo || *currentParameterExtraInfo != "AllowUndeclaredVariable") {
+        const auto& variablesContainersList = projectScopedContainers.GetVariablesContainersList();
+        if (!variablesContainersList.Has(node.name)) {
+          RaiseUndeclaredVariableError(_("No variable with this name found."), node.location, node.name);
+        }
+      }
+
       if (node.child) {
         node.child->Visit(*this);
       }
@@ -228,8 +231,7 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
       projectScopedContainers.MatchIdentifierWithName<void>(node.name,
         [&]() {
           // This represents an object.
-          variableObjectName = node.name;
-          variableObjectNameLocation = node.nameLocation;
+
           // While understood by the parser, it's forbidden to use the bracket notation just after
           // an object name (`MyObject["MyVariable"]`).
           forbidsUsageOfBracketsBecauseParentIsObject = true;
@@ -268,13 +270,7 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
   }
   void OnVisitVariableAccessorNode(VariableAccessorNode& node) override {
     ReportAnyError(node);
-    // TODO Also check child-variables existence on a path with only VariableAccessor to raise non-fatal errors.
-    if (!variableObjectName.empty()) {
-      ValidateObjectVariableOrVariableOrProperty(variableObjectName,
-                                                 variableObjectNameLocation,
-                                                 node.name, node.nameLocation);
-      variableObjectName = "";
-    }
+
     // In the case we accessed an object variable (`MyObject.MyVariable`),
     // brackets can now be used (`MyObject.MyVariable["MyChildVariable"]` is now valid).
     forbidsUsageOfBracketsBecauseParentIsObject = false;
@@ -287,7 +283,6 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
       VariableBracketAccessorNode& node) override {
     ReportAnyError(node);
 
-    variableObjectName = "";
     if (forbidsUsageOfBracketsBecauseParentIsObject) {
       RaiseError(gd::ExpressionParserError::ErrorType::BracketsNotAllowedForObjects,
                  _("You can't use the brackets to access an object variable. "
@@ -298,14 +293,12 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
     forbidsUsageOfBracketsBecauseParentIsObject = false;
 
     Type currentParentType = parentType;
-    Type currentChildType = childType;
     parentType = Type::NumberOrString;
     auto parentParameterExtraInfo = currentParameterExtraInfo;
     currentParameterExtraInfo = nullptr;
     node.expression->Visit(*this);
     currentParameterExtraInfo = parentParameterExtraInfo;
     parentType = currentParentType;
-    childType = currentChildType;
 
     if (node.child) {
       node.child->Visit(*this);
@@ -338,7 +331,12 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
       }
     }
     else if (parentType == Type::Variable) {
-      CheckVariableExistence(node.location, node.identifierName);
+      if (!currentParameterExtraInfo || *currentParameterExtraInfo != "AllowUndeclaredVariable") {
+        const auto& variablesContainersList = projectScopedContainers.GetVariablesContainersList();
+        if (!variablesContainersList.Has(node.identifierName)) {
+          RaiseUndeclaredVariableError(_("No variable with this name found."), node.location, node.identifierName);
+        }
+      }
     }
     else if (parentType != Type::Object && parentType != Type::LegacyVariable) {
       // It can't happen.
@@ -380,50 +378,6 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
   enum Type {Unknown = 0, Number, String, NumberOrString, Variable, LegacyVariable, Object, Empty};
   Type ValidateFunction(const gd::FunctionCallNode& function);
   bool ValidateObjectVariableOrVariableOrProperty(const gd::IdentifierNode& identifier);
-  bool ValidateObjectVariableOrVariableOrProperty(
-      const gd::String &identifierName,
-      const gd::ExpressionParserLocation identifierNameLocation,
-      const gd::String &childIdentifierName,
-      const gd::ExpressionParserLocation childIdentifierNameLocation);
-
-  void CheckVariableExistence(const ExpressionParserLocation &location, const gd::String& name) {
-    if (!currentParameterExtraInfo || *currentParameterExtraInfo != "AllowUndeclaredVariable") {
-      projectScopedContainers.MatchIdentifierWithName<void>(
-          name,
-          [&]() {
-            // This represents an object.
-            RaiseVariableNameCollisionError(
-                _("This variable has the same name as an object. Consider "
-                  "renaming one or the other."),
-                location, name);
-          },
-          [&]() {
-            // This is a variable.
-          },
-          [&]() {
-            // This is a property.
-            // This error won't happen unless the priority is changed.
-            RaiseVariableNameCollisionError(
-                _("This variable has the same name as a property. Consider "
-                  "renaming one or the other."),
-                location, name);
-          },
-          [&]() {
-            // This is a parameter.
-            // This error won't happen unless the priority is changed.
-            RaiseVariableNameCollisionError(
-                _("This variable has the same name as a parameter. Consider "
-                  "renaming one or the other."),
-                location, name);
-          },
-          [&]() {
-            // This is something else.
-            RaiseUndeclaredVariableError(
-                _("No variable with this name found."), location,
-                name);
-          });
-    }
-  }
 
   void ReportAnyError(const ExpressionNode& node, bool isFatal = true) {
     if (node.diagnostic) {
@@ -468,14 +422,6 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
                message, location, true, variableName, objectName);
   }
 
-  void RaiseVariableNameCollisionError(const gd::String &message,
-                                    const ExpressionParserLocation &location,
-                                    const gd::String &variableName,
-                                    const gd::String &objectName = "") {
-    RaiseError(gd::ExpressionParserError::ErrorType::VariableNameCollision,
-               message, location, false, variableName, objectName);
-  }
-
   void RaiseTypeError(const gd::String &message,
                       const ExpressionParserLocation &location,
                       bool isFatal = true) {
@@ -521,8 +467,6 @@ class GD_CORE_API ExpressionValidator : public ExpressionParser2NodeWorker {
   Type childType; ///< The type "discovered" down the tree and passed up.
   Type parentType; ///< The type "required" by the top of the tree.
   bool forbidsUsageOfBracketsBecauseParentIsObject;
-  gd::String variableObjectName;
-  gd::ExpressionParserLocation variableObjectNameLocation;
   const gd::String *currentParameterExtraInfo;
   const gd::Platform &platform;
   const gd::ProjectScopedContainers &projectScopedContainers;

Core/GDCore/IDE/Events/ExpressionsParameterMover.cpp

@@ -144,10 +144,10 @@ bool ExpressionsParameterMover::DoVisitInstruction(gd::Instruction& instruction,
                              : gd::MetadataProvider::GetActionMetadata(
                                    platform, instruction.GetType());
 
-  for (std::size_t pNb = 0; pNb < metadata.parameters.GetParametersCount() &&
+  for (std::size_t pNb = 0; pNb < metadata.parameters.size() &&
                             pNb < instruction.GetParametersCount();
        ++pNb) {
-    const gd::String& type = metadata.parameters.GetParameter(pNb).GetType();
+    const gd::String& type = metadata.parameters[pNb].GetType();
     const gd::Expression& expression = instruction.GetParameter(pNb);
 
     auto node = expression.GetRootNode();

Core/GDCore/IDE/Events/ExpressionsParameterMover.h

@@ -74,8 +74,8 @@ class GD_CORE_API ExpressionsParameterMover
 
   const gd::Platform &platform;
   gd::String functionName;
-  std::size_t oldIndex = 0;
-  std::size_t newIndex = 0;
+  std::size_t oldIndex;
+  std::size_t newIndex;
   gd::String behaviorType;
   gd::String objectType;
 };

Core/GDCore/IDE/Events/ExpressionsRenamer.cpp

@@ -151,7 +151,7 @@ bool ExpressionsRenamer::DoVisitInstruction(gd::Instruction& instruction,
                              : gd::MetadataProvider::GetActionMetadata(
                                    platform, instruction.GetType());
 
-  for (std::size_t pNb = 0; pNb < metadata.parameters.GetParametersCount() &&
+  for (std::size_t pNb = 0; pNb < metadata.parameters.size() &&
                             pNb < instruction.GetParametersCount();
        ++pNb) {
     const gd::Expression& expression = instruction.GetParameter(pNb);

Core/GDCore/IDE/Events/InstructionSentenceFormatter.cpp

@@ -43,7 +43,7 @@ InstructionSentenceFormatter::GetAsFormattedText(
     parse = false;
     size_t firstParamPosition = gd::String::npos;
     size_t firstParamIndex = gd::String::npos;
-    for (std::size_t i = 0; i < metadata.parameters.GetParametersCount(); ++i) {
+    for (std::size_t i = 0; i < metadata.parameters.size(); ++i) {
       size_t paramPosition =
           sentence.find("_PARAM" + gd::String::From(i) + "_");
       if (paramPosition < firstParamPosition) {

Core/GDCore/IDE/Events/LeaderboardIdRenamer.cpp

@@ -1,76 +0,0 @@
-#include "LeaderboardIdRenamer.h"
-
-#include <map>
-#include <memory>
-#include <vector>
-
-#include "GDCore/Events/Event.h"
-#include "GDCore/Events/EventsList.h"
-#include "GDCore/Extensions/Metadata/InstructionMetadata.h"
-#include "GDCore/Extensions/Metadata/MetadataProvider.h"
-#include "GDCore/Project/Behavior.h"
-#include "GDCore/Project/Layout.h"
-#include "GDCore/Project/Object.h"
-#include "GDCore/Project/Project.h"
-#include "GDCore/Project/PropertyDescriptor.h"
-#include "GDCore/String.h"
-
-namespace gd {
-
-void LeaderboardIdRenamer::DoVisitObject(gd::Object &object) {
-  for (auto &pair : object.GetConfiguration().GetProperties()) {
-    auto &propertyName = pair.first;
-    auto &property = pair.second;
-    if (property.GetType() == "LeaderboardId") {
-      auto &leaderboardId = property.GetValue();
-
-      allLeaderboardIds.insert(leaderboardId);
-
-      if (leaderboardIdMap.find(leaderboardId) != leaderboardIdMap.end()) {
-        object.GetConfiguration().UpdateProperty(
-            propertyName, leaderboardIdMap[leaderboardId]);
-      }
-    }
-  }
-};
-
-void LeaderboardIdRenamer::DoVisitBehavior(gd::Behavior &behavior) {};
-
-bool LeaderboardIdRenamer::DoVisitInstruction(gd::Instruction &instruction,
-                                              bool isCondition) {
-  const gd::InstructionMetadata &instrInfo =
-      isCondition ? MetadataProvider::GetConditionMetadata(
-                        project.GetCurrentPlatform(), instruction.GetType())
-                  : MetadataProvider::GetActionMetadata(
-                        project.GetCurrentPlatform(), instruction.GetType());
-
-  for (int i = 0; i < instruction.GetParametersCount() &&
-                  i < instrInfo.GetParametersCount();
-       ++i) {
-    const gd::ParameterMetadata parameter = instrInfo.GetParameter(i);
-
-    if (parameter.GetType() != "leaderboardId") {
-      continue;
-    }
-    const gd::String leaderboardIdExpression =
-        instruction.GetParameter(i).GetPlainString();
-    if (leaderboardIdExpression[0] != '"' ||
-        leaderboardIdExpression[leaderboardIdExpression.size() - 1] != '"') {
-      continue;
-    }
-    const gd::String leaderboardId =
-        leaderboardIdExpression.substr(1, leaderboardIdExpression.size() - 2);
-
-    allLeaderboardIds.insert(leaderboardId);
-
-    if (leaderboardIdMap.find(leaderboardId) != leaderboardIdMap.end()) {
-      instruction.SetParameter(i,
-                               "\"" + leaderboardIdMap[leaderboardId] + "\"");
-    }
-  }
-  return false;
-}
-
-LeaderboardIdRenamer::~LeaderboardIdRenamer() {}
-
-}  // namespace gd

Core/GDCore/IDE/Events/LeaderboardIdRenamer.h

@@ -1,50 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-
-#pragma once
-#include <map>
-
-#include "GDCore/IDE/Project/ArbitraryObjectsWorker.h"
-#include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
-#include "GDCore/String.h"
-
-namespace gd {
-class Object;
-class Behavior;
-}  // namespace gd
-
-namespace gd {
-
-class GD_CORE_API LeaderboardIdRenamer : public ArbitraryObjectsWorker, public ArbitraryEventsWorker {
- public:
-  LeaderboardIdRenamer(gd::Project& project_): project(project_) {};
-  virtual ~LeaderboardIdRenamer();
-
-  /**
-   * Set the leaderboard identifiers to be replaced.
-   */
-  void SetLeaderboardIdsToReplace(const std::map<gd::String, gd::String>& leaderboardIdMap_) {
-    leaderboardIdMap = leaderboardIdMap_;
-  }
-
-  /**
-   * Return the all the leaderboard identifiers found in the project.
-   */
-  const std::set<gd::String>& GetAllLeaderboardIds() const {
-    return allLeaderboardIds;
-  }
-
- private:
-  bool DoVisitInstruction(gd::Instruction& instruction, bool isCondition) override;
-  void DoVisitObject(gd::Object& object) override;
-  void DoVisitBehavior(gd::Behavior& behavior) override;
-
-  std::map<gd::String, gd::String> leaderboardIdMap;
-  std::set<gd::String> allLeaderboardIds;
-  gd::Project& project;
-};
-
-};  // namespace gd

Core/GDCore/IDE/EventsFunctionTools.cpp

@@ -20,20 +20,19 @@ namespace gd {
 
 void EventsFunctionTools::FreeEventsFunctionToObjectsContainer(
     const gd::Project& project,
-    const gd::EventsFunctionsContainer& functionContainer,
+    const gd::EventsFunctionsContainer functionContainer,
     const gd::EventsFunction& eventsFunction,
     gd::ObjectsContainer& outputObjectsContainer) {
   // Functions scope for objects is defined according
-  // to parameters.
+  // to parameters
+  outputObjectsContainer.GetObjects().clear();
+  outputObjectsContainer.GetObjectGroups().Clear();
+
   auto &parameters = eventsFunction.GetParametersForEvents(functionContainer);
   gd::ParameterMetadataTools::ParametersToObjectsContainer(
       project,
       parameters,
       outputObjectsContainer);
-
-  // TODO: in theory we should ensure stability of the groups across calls
-  // to this function. BUT groups in functions should probably have never been
-  // supported, so we're phasing this out in the UI.
   outputObjectsContainer.GetObjectGroups() = eventsFunction.GetObjectGroups();
 }
 
@@ -93,11 +92,18 @@ void EventsFunctionTools::ObjectEventsFunctionToObjectsContainer(
                    "its parameters).");
     return;
   }
-  if (eventsBasedObject.GetObjects().HasObjectNamed("Object")) {
+  if (eventsBasedObject.HasObjectNamed("Object")) {
     gd::LogWarning("Child-objects can't be named Object because it's reserved"
                   "for the parent. ");
     return;
   }
+
+  // ...and its children.
+  auto &children = eventsBasedObject.GetObjects();
+  for (auto &childObject : children) {
+    auto child = childObject.get();
+    outputObjectsContainer.InsertObject(*child, children.size());
+  }
 }
 
 }  // namespace gd

Core/GDCore/IDE/EventsFunctionTools.h

@@ -35,7 +35,7 @@ class GD_CORE_API EventsFunctionTools {
    */
   static void FreeEventsFunctionToObjectsContainer(
       const gd::Project& project,
-      const gd::EventsFunctionsContainer& functionContainer,
+      const gd::EventsFunctionsContainer functionContainer,
       const gd::EventsFunction& eventsFunction,
       gd::ObjectsContainer& outputObjectsContainer);
 

Core/GDCore/IDE/ExportedDependencyResolver.h

@@ -4,7 +4,6 @@
 #include "GDCore/Extensions/Metadata/DependencyMetadata.h"
 #include "GDCore/Extensions/PlatformExtension.h"
 #include "GDCore/Project/Project.h"
-#include "GDCore/Extensions/Platform.h"
 
 namespace gd {
 

Core/GDCore/IDE/GroupVariableHelper.cpp

@@ -1,196 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#include "GroupVariableHelper.h"
-
-#include "GDCore/IDE/WholeProjectRefactorer.h"
-#include "GDCore/Project/Object.h"
-#include "GDCore/Project/ObjectGroup.h"
-#include "GDCore/Project/ObjectsContainer.h"
-#include "GDCore/Project/ObjectsContainersList.h"
-#include "GDCore/Project/Variable.h"
-#include "GDCore/Project/VariablesContainer.h"
-#include "GDCore/String.h"
-
-namespace gd {
-
-void GroupVariableHelper::FillAnyVariableBetweenObjects(
-    gd::ObjectsContainer &globalObjectsContainer,
-    gd::ObjectsContainer &objectsContainer,
-    const gd::ObjectGroup &objectGroup) {
-  const auto &objectNames = objectGroup.GetAllObjectsNames();
-  for (const gd::String &sourceObjectName : objectNames) {
-    const bool hasObject = objectsContainer.HasObjectNamed(sourceObjectName);
-    if (!hasObject &&
-        !globalObjectsContainer.HasObjectNamed(sourceObjectName)) {
-      continue;
-    }
-    const auto &sourceObject =
-        hasObject ? objectsContainer.GetObject(sourceObjectName)
-                  : globalObjectsContainer.GetObject(sourceObjectName);
-    const auto &sourceVariablesContainer = sourceObject.GetVariables();
-
-    for (const gd::String &destinationObjectName : objectNames) {
-      if (sourceObjectName == destinationObjectName) {
-        continue;
-      }
-      const bool hasObject =
-          objectsContainer.HasObjectNamed(destinationObjectName);
-      if (!hasObject &&
-          !globalObjectsContainer.HasObjectNamed(destinationObjectName)) {
-        continue;
-      }
-      auto &destinationObject =
-          hasObject ? objectsContainer.GetObject(destinationObjectName)
-                    : globalObjectsContainer.GetObject(destinationObjectName);
-      auto &destinationVariablesContainer = destinationObject.GetVariables();
-
-      for (std::size_t sourceVariableIndex = 0;
-           sourceVariableIndex < sourceVariablesContainer.Count();
-           ++sourceVariableIndex) {
-        auto &sourceVariable =
-            sourceVariablesContainer.Get(sourceVariableIndex);
-        const auto &variableName =
-            sourceVariablesContainer.GetNameAt(sourceVariableIndex);
-
-        if (!destinationVariablesContainer.Has(variableName)) {
-          destinationVariablesContainer.Insert(
-              variableName, sourceVariable,
-              destinationVariablesContainer.Count());
-        }
-      }
-    }
-  }
-}
-
-gd::VariablesContainer GroupVariableHelper::MergeVariableContainers(
-    const gd::ObjectsContainersList &objectsContainersList,
-    const gd::ObjectGroup &objectGroup) {
-  gd::VariablesContainer mergedVariablesContainer;
-
-  const auto &objectNames = objectGroup.GetAllObjectsNames();
-  std::size_t objectIndex = 0;
-  bool isFirstObjectFound = false;
-  for (; objectIndex < objectNames.size() && !isFirstObjectFound;
-       objectIndex++) {
-    const gd::String &objectName = objectNames[objectIndex];
-    if (!objectsContainersList.HasObjectOrGroupNamed(objectName)) {
-      continue;
-    }
-    isFirstObjectFound = true;
-    mergedVariablesContainer =
-        *objectsContainersList.GetObjectOrGroupVariablesContainer(objectName);
-  }
-  for (; objectIndex < objectNames.size(); objectIndex++) {
-    const gd::String &objectName = objectNames[objectIndex];
-    if (!objectsContainersList.HasObjectOrGroupNamed(objectName)) {
-      continue;
-    }
-    const auto &variablesContainer =
-        *objectsContainersList.GetObjectOrGroupVariablesContainer(objectName);
-
-    for (std::size_t variableIndex = 0;
-         variableIndex < mergedVariablesContainer.Count(); ++variableIndex) {
-      auto &mergedVariable = mergedVariablesContainer.Get(variableIndex);
-      const auto &variableName =
-          mergedVariablesContainer.GetNameAt(variableIndex);
-
-      if (variablesContainer.Has(variableName)) {
-        auto &variable = variablesContainer.Get(variableName);
-        if (mergedVariable.GetType() != variable.GetType()) {
-          mergedVariable.CastTo(gd::Variable::Type::MixedTypes);
-        } else if (mergedVariable != variable) {
-          mergedVariable.MarkAsMixedValues();
-        }
-      } else {
-        mergedVariablesContainer.Remove(variableName);
-        variableIndex--;
-      }
-    }
-  }
-  return mergedVariablesContainer;
-}
-
-void GroupVariableHelper::FillMissingGroupVariablesToObjects(
-    gd::ObjectsContainer &globalObjectsContainer,
-    gd::ObjectsContainer &objectsContainer, const gd::ObjectGroup &objectGroup,
-    const gd::SerializerElement &originalSerializedVariables) {
-  gd::VariablesContainer groupVariablesContainer;
-  groupVariablesContainer.UnserializeFrom(originalSerializedVariables);
-  // Add missing variables to objects added in the group.
-  for (const gd::String &objectName : objectGroup.GetAllObjectsNames()) {
-    const bool hasObject = objectsContainer.HasObjectNamed(objectName);
-    if (!hasObject && !globalObjectsContainer.HasObjectNamed(objectName)) {
-      continue;
-    }
-    auto &object = hasObject ? objectsContainer.GetObject(objectName)
-                             : globalObjectsContainer.GetObject(objectName);
-    auto &variablesContainer = object.GetVariables();
-    for (std::size_t variableIndex = 0;
-         variableIndex < groupVariablesContainer.Count(); ++variableIndex) {
-      auto &groupVariable = groupVariablesContainer.Get(variableIndex);
-      const auto &variableName =
-          groupVariablesContainer.GetNameAt(variableIndex);
-
-      if (!variablesContainer.Has(variableName)) {
-        variablesContainer.Insert(variableName, groupVariable,
-                                  variablesContainer.Count());
-      }
-    }
-  }
-};
-
-// TODO Handle position changes for group variables.
-// We could try to change the order of object variables in a way that the next
-// call to MergeVariableContainers rebuild them in the same order.
-void GroupVariableHelper::ApplyChangesToObjects(
-    gd::ObjectsContainer &globalObjectsContainer,
-    gd::ObjectsContainer &objectsContainer,
-    const gd::VariablesContainer &groupVariablesContainer,
-    const gd::ObjectGroup &objectGroup,
-    const gd::VariablesChangeset &changeset) {
-  for (const gd::String &objectName : objectGroup.GetAllObjectsNames()) {
-    const bool hasObject = objectsContainer.HasObjectNamed(objectName);
-    if (!hasObject && !globalObjectsContainer.HasObjectNamed(objectName)) {
-      continue;
-    }
-    auto &object = hasObject ? objectsContainer.GetObject(objectName)
-                             : globalObjectsContainer.GetObject(objectName);
-    auto &variablesContainer = object.GetVariables();
-    for (const gd::String &variableName : changeset.removedVariableNames) {
-      variablesContainer.Remove(variableName);
-    }
-    for (const gd::String &variableName : changeset.addedVariableNames) {
-      if (variablesContainer.Has(variableName)) {
-        // It can happens if an object already had the variable but it was not
-        // shared by other object of the group.
-        continue;
-      }
-      variablesContainer.Insert(variableName,
-                                groupVariablesContainer.Get(variableName),
-                                variablesContainer.Count());
-    }
-    for (const auto &pair : changeset.oldToNewVariableNames) {
-      const gd::String &oldVariableName = pair.first;
-      const gd::String &newVariableName = pair.second;
-      if (variablesContainer.Has(newVariableName)) {
-        // It can happens if an object already had the variable but it was not
-        // shared by other object of the group.
-        variablesContainer.Remove(oldVariableName);
-      } else {
-        variablesContainer.Rename(oldVariableName, newVariableName);
-      }
-    }
-    // Apply type and value changes
-    for (const gd::String &variableName : changeset.valueChangedVariableNames) {
-      size_t index = variablesContainer.GetPosition(variableName);
-      variablesContainer.Remove(variableName);
-      variablesContainer.Insert(
-          variableName, groupVariablesContainer.Get(variableName), index);
-    }
-  }
-}
-
-} // namespace gd

Core/GDCore/IDE/GroupVariableHelper.h

@@ -1,75 +0,0 @@
-/*
- * GDevelop Core
- * Copyright 2008-2016 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#pragma once
-
-#include "GDCore/Project/VariablesContainer.h"
-
-namespace gd {
-class ObjectsContainersList;
-class ObjectsContainer;
-class ObjectGroup;
-class VariablesContainer;
-struct VariablesChangeset;
-} // namespace gd
-
-namespace gd {
-
-/**
- * Help handling variables of group objects as a whole.
- *
- * This is used by the object group variable editor.
- */
-class GD_CORE_API GroupVariableHelper {
-public:
-  /**
-   * Copy every variable from every object of the group to the other objects
-   * if they don't have it already.
-   *
-   * In the editor, when an object group is created, users can choose between:
-   * - doing no change and only see variables that are already shared by any
-   * objects of the group
-   * - applying this function and see every variable
-   */
-  static void
-  FillAnyVariableBetweenObjects(gd::ObjectsContainer &globalObjectsContainer,
-                                gd::ObjectsContainer &objectsContainer,
-                                const gd::ObjectGroup &objectGroup);
-
-  /**
-   * Build a variable container with the intersection of variables from the
-   * every objects of the given group.
-   */
-  static gd::VariablesContainer MergeVariableContainers(
-      const gd::ObjectsContainersList &objectsContainersList,
-      const gd::ObjectGroup &objectGroup);
-
-  /**
-   * @brief Copy the variables of the group to all objects.
-   *
-   * Objects can be added during the group edition and may not necessarily have
-   * all the variables initially shared by the group.
-   *
-   * \see gd::GroupVariableHelper::MergeVariableContainers
-   */
-  static void FillMissingGroupVariablesToObjects(
-      gd::ObjectsContainer &globalObjectsContainer,
-      gd::ObjectsContainer &objectsContainer,
-      const gd::ObjectGroup &objectGroup,
-      const gd::SerializerElement &originalSerializedVariables);
-
-  /**
-   * @brief Apply the changes done with the variables editor to the objects of
-   * the group.
-   */
-  static void
-  ApplyChangesToObjects(gd::ObjectsContainer &globalObjectsContainers,
-                        gd::ObjectsContainer &objectsContainers,
-                        const gd::VariablesContainer &groupVariablesContainer,
-                        const gd::ObjectGroup &objectGroup,
-                        const gd::VariablesChangeset &changeset);
-};
-
-} // namespace gd

Core/GDCore/IDE/Project/ArbitraryResourceWorker.cpp

@@ -225,7 +225,9 @@ bool ResourceWorkerInEventsWorker::DoVisitInstruction(gd::Instruction& instructi
                             size_t parameterIndex,
                             const gd::String& lastObjectName) {
         const String& parameterValue = parameterExpression.GetPlainString();
-        if (parameterMetadata.GetType() == "fontResource") {
+        if (parameterMetadata.GetType() ==
+                "police" ||  // Should be renamed fontResource
+            parameterMetadata.GetType() == "fontResource") {
           gd::String updatedParameterValue = parameterValue;
           worker.ExposeFont(updatedParameterValue);
           instruction.SetParameter(parameterIndex, updatedParameterValue);
@@ -293,7 +295,7 @@ void ResourceWorkerInObjectsWorker::DoVisitObject(gd::Object &object) {
 };
 
 void ResourceWorkerInObjectsWorker::DoVisitBehavior(gd::Behavior &behavior){
-  behavior.ExposeResources(worker);
+    // TODO Allow behaviors to expose resources
 };
 
 gd::ResourceWorkerInObjectsWorker

Core/GDCore/IDE/Project/EventsBasedObjectDependencyFinder.cpp

@@ -1,41 +0,0 @@
-/*
- * GDevelop JS Platform
- * Copyright 2008-2023 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-#include "EventsBasedObjectDependencyFinder.h"
-
-#include "GDCore/Project/EventsBasedObject.h"
-#include "GDCore/Project/Object.h"
-#include "GDCore/Project/Project.h"
-
-namespace gd {
-bool EventsBasedObjectDependencyFinder::IsDependentFromEventsBasedObject(
-    const gd::Project &project, const gd::EventsBasedObject &eventsBasedObject,
-    const gd::EventsBasedObject &dependency) {
-  return gd::EventsBasedObjectDependencyFinder::
-      IsDependentFromEventsBasedObject(project, eventsBasedObject, dependency,
-                                       0);
-}
-bool EventsBasedObjectDependencyFinder::IsDependentFromEventsBasedObject(
-    const gd::Project &project, const gd::EventsBasedObject &eventsBasedObject,
-    const gd::EventsBasedObject &dependency, int depth) {
-
-  if (&eventsBasedObject == &dependency) {
-    return true;
-  }
-  if (depth > 200) {
-    return false;
-  }
-  for (auto &object : eventsBasedObject.GetObjects().GetObjects()) {
-    const gd::String &objectType = object->GetType();
-    if (project.HasEventsBasedObject(objectType) &&
-        gd::EventsBasedObjectDependencyFinder::IsDependentFromEventsBasedObject(
-            project, project.GetEventsBasedObject(objectType), dependency,
-            depth + 1)) {
-      return true;
-    }
-  }
-  return false;
-}
-} // namespace gd

Core/GDCore/IDE/Project/EventsBasedObjectDependencyFinder.h

@@ -1,37 +0,0 @@
-/*
- * GDevelop JS Platform
- * Copyright 2008-2023 Florian Rival (Florian.Rival@gmail.com). All rights
- * reserved. This project is released under the MIT License.
- */
-
-#pragma once
-
-#include "GDCore/String.h"
-
-namespace gd {
-class Project;
-class EventsBasedObject;
-} // namespace gd
-
-namespace gd {
-
-/**
- * \brief Find resource usages in several parts of the project.
- *
- * \ingroup IDE
- */
-class EventsBasedObjectDependencyFinder {
-public:
-  static bool IsDependentFromEventsBasedObject(
-      const gd::Project &project,
-      const gd::EventsBasedObject &eventsBasedObject,
-      const gd::EventsBasedObject &dependency);
-
-private:
-  static bool IsDependentFromEventsBasedObject(
-      const gd::Project &project,
-      const gd::EventsBasedObject &eventsBasedObject,
-      const gd::EventsBasedObject &dependency, int depth);
-};
-
-} // namespace gd

Core/GDCore/IDE/Project/FunctionParameterBehaviorTypeRenamer.cpp

@@ -15,10 +15,10 @@ namespace gd {
 
 void FunctionParameterBehaviorTypeRenamer::DoVisitEventsFunction(
     gd::EventsFunction &eventsFunction) {
-  for (auto &&parameter : eventsFunction.GetParameters().GetInternalVector()) {
-    if (gd::ParameterMetadata::IsBehavior(parameter->GetType()) &&
-        parameter->GetExtraInfo() == oldBehaviorType) {
-      parameter->SetExtraInfo(newBehaviorType);
+  for (auto &&parameter : eventsFunction.GetParameters()) {
+    if (gd::ParameterMetadata::IsBehavior(parameter.GetType()) &&
+        parameter.GetExtraInfo() == oldBehaviorType) {
+      parameter.SetExtraInfo(newBehaviorType);
     }
   }
 }

Core/GDCore/IDE/Project/FunctionParameterObjectTypeRenamer.cpp

@@ -15,10 +15,10 @@ namespace gd {
 
 void FunctionParameterObjectTypeRenamer::DoVisitEventsFunction(
     gd::EventsFunction &eventsFunction) {
-  for (auto &&parameter : eventsFunction.GetParameters().GetInternalVector()) {
-    if (gd::ParameterMetadata::IsObject(parameter->GetType()) &&
-        parameter->GetExtraInfo() == oldObjectType) {
-      parameter->SetExtraInfo(newObjectType);
+  for (auto &&parameter : eventsFunction.GetParameters()) {
+    if (gd::ParameterMetadata::IsObject(parameter.GetType()) &&
+        parameter.GetExtraInfo() == oldObjectType) {
+      parameter.SetExtraInfo(newObjectType);
     }
   }
 }

Core/GDCore/IDE/ProjectBrowserHelper.cpp

@@ -170,8 +170,7 @@ void ProjectBrowserHelper::ExposeEventsFunctionsExtensionEvents(
     gd::ArbitraryEventsWorkerWithContext &worker) {
     // Add (free) events functions
     for (auto &&eventsFunction : eventsFunctionsExtension.GetInternalVector()) {
-      gd::ObjectsContainer parameterObjectsContainer(
-          gd::ObjectsContainer::SourceType::Function);
+      gd::ObjectsContainer parameterObjectsContainer;
       auto projectScopedContainers = gd::ProjectScopedContainers::
           MakeNewProjectScopedContainersForFreeEventsFunction(
               project, eventsFunctionsExtension, *eventsFunction,
@@ -210,8 +209,7 @@ void ProjectBrowserHelper::ExposeEventsBasedBehaviorEvents(
   auto &behaviorEventsFunctions = eventsBasedBehavior.GetEventsFunctions();
   for (auto &&eventsFunction : behaviorEventsFunctions.GetInternalVector()) {
 
-    gd::ObjectsContainer parameterObjectsContainers(
-        gd::ObjectsContainer::SourceType::Function);
+    gd::ObjectsContainer parameterObjectsContainers;
     auto projectScopedContainers = gd::ProjectScopedContainers::
         MakeNewProjectScopedContainersForBehaviorEventsFunction(
             project, eventsFunctionsExtension, eventsBasedBehavior,
@@ -238,8 +236,7 @@ void ProjectBrowserHelper::ExposeEventsBasedObjectEvents(
   auto &objectEventsFunctions = eventsBasedObject.GetEventsFunctions();
   for (auto &&eventsFunction : objectEventsFunctions.GetInternalVector()) {
 
-    gd::ObjectsContainer parameterObjectsContainers(
-        gd::ObjectsContainer::SourceType::Function);
+    gd::ObjectsContainer parameterObjectsContainers;
     auto projectScopedContainers = gd::ProjectScopedContainers::
         MakeNewProjectScopedContainersForObjectEventsFunction(
             project, eventsFunctionsExtension, eventsBasedObject,
@@ -253,7 +250,7 @@ void ProjectBrowserHelper::ExposeProjectObjects(
     gd::Project &project, gd::ArbitraryObjectsWorker &worker) {
 
   // Global objects
-  worker.Launch(project.GetObjects());
+  worker.Launch(project);
 
   // Layout objects
   for (size_t i = 0; i < project.GetLayoutsCount(); i++) {
@@ -268,7 +265,7 @@ void ProjectBrowserHelper::ExposeProjectObjects(
     for (auto &&eventsBasedObjectUniquePtr :
          eventsFunctionsExtension.GetEventsBasedObjects().GetInternalVector()) {
       auto eventsBasedObject = eventsBasedObjectUniquePtr.get();
-      worker.Launch(eventsBasedObject->GetObjects());
+      worker.Launch(*eventsBasedObject);
     }
   }
 };
@@ -278,7 +275,7 @@ void ProjectBrowserHelper::ExposeLayoutObjects(gd::Layout &layout,
   // In the future, layouts may have children object containers.
 
   // Layout objects
-  worker.Launch(layout.GetObjects());
+  worker.Launch(layout);
 }
 
 void ProjectBrowserHelper::ExposeProjectFunctions(

Core/GDCore/IDE/ProjectStripper.cpp

@@ -17,7 +17,7 @@
 namespace gd {
 
 void GD_CORE_API ProjectStripper::StripProjectForExport(gd::Project &project) {
-  project.GetObjects().GetObjectGroups().Clear();
+  project.GetObjectGroups().Clear();
   while (project.GetExternalEventsCount() > 0)
     project.RemoveExternalEvents(project.GetExternalEvents(0).GetName());
 
@@ -26,7 +26,7 @@ void GD_CORE_API ProjectStripper::StripProjectForExport(gd::Project &project) {
   wholeProjectBrowser.ExposeObjects(project, behaviorDefaultFlagClearer);
 
   for (unsigned int i = 0; i < project.GetLayoutsCount(); ++i) {
-    project.GetLayout(i).GetObjects().GetObjectGroups().Clear();
+    project.GetLayout(i).GetObjectGroups().Clear();
     project.GetLayout(i).GetEvents().Clear();
   }
 

Core/GDCore/IDE/PropertyFunctionGenerator.cpp

@@ -153,7 +153,7 @@ void PropertyFunctionGenerator::GenerateGetterAndSetter(
             extension.GetName(), eventsBasedEntity.GetName());
         objectParameter.SetExtraInfo(objectFullType);
       }
-      setter.GetParameters().AddParameter(objectParameter);
+      setter.GetParameters().push_back(objectParameter);
       if (isBehavior) {
         gd::ParameterMetadata behaviorParameter;
         gd::String behaviorFullType =
@@ -163,7 +163,7 @@ void PropertyFunctionGenerator::GenerateGetterAndSetter(
             .SetName("Behavior")
             .SetDescription("Behavior")
             .SetExtraInfo(behaviorFullType);
-        setter.GetParameters().AddParameter(behaviorParameter);
+        setter.GetParameters().push_back(behaviorParameter);
       }
       gd::ParameterMetadata valueParameter;
       valueParameter.SetType("yesorno")
@@ -171,7 +171,7 @@ void PropertyFunctionGenerator::GenerateGetterAndSetter(
           .SetDescription(capitalizedName)
           .SetOptional(true)
           .SetDefaultValue("yes");
-      setter.GetParameters().AddParameter(valueParameter);
+      setter.GetParameters().push_back(valueParameter);
     } else {
       setter.SetFunctionType(gd::EventsFunction::ActionWithOperator);
       setter.SetGetterName(getterName);
@@ -247,7 +247,7 @@ bool PropertyFunctionGenerator::CanGenerateGetterAndSetter(
     const gd::NamedPropertyDescriptor &property) {
   auto &type = property.GetType();
   if (type != "Boolean" && type != "Number" && type != "String" &&
-      type != "Choice" && type != "Color" && type != "LeaderboardId") {
+      type != "Choice" && type != "Color") {
     return false;
   }
 

Core/GDCore/IDE/ResourceExposer.cpp

@@ -6,9 +6,17 @@
 #include "ResourceExposer.h"
 
 #include "GDCore/IDE/Events/ArbitraryEventsWorker.h"
+#include "GDCore/IDE/EventsFunctionTools.h"
+#include "GDCore/IDE/Project/ArbitraryBehaviorSharedDataWorker.h"
+#include "GDCore/IDE/Project/ArbitraryEventBasedBehaviorsWorker.h"
+#include "GDCore/IDE/Project/ArbitraryEventsFunctionsWorker.h"
+#include "GDCore/IDE/Project/ArbitraryObjectsWorker.h"
 #include "GDCore/IDE/Project/ArbitraryResourceWorker.h"
 #include "GDCore/IDE/ProjectBrowserHelper.h"
+#include "GDCore/Project/EventsBasedBehavior.h"
+#include "GDCore/Project/EventsBasedObject.h"
 #include "GDCore/Project/EventsFunctionsExtension.h"
+#include "GDCore/Project/ExternalEvents.h"
 #include "GDCore/Project/Layout.h"
 #include "GDCore/Project/Project.h"
 #include "GDCore/Project/Effect.h"
@@ -16,6 +24,7 @@
 #include "GDCore/Extensions/Platform.h"
 #include "GDCore/Extensions/Metadata/MetadataProvider.h"
 #include "GDCore/Extensions/Metadata/EffectMetadata.h"
+#include "GDCore/IDE/Events/UsedExtensionsFinder.h"
 
 namespace gd {
 
@@ -67,7 +76,7 @@ void ResourceExposer::ExposeWholeProjectResources(gd::Project& project, gd::Arbi
 void ResourceExposer::ExposeProjectResources(gd::Project& project, gd::ArbitraryResourceWorker& worker) {
   // Expose global objects configuration resources
   auto objectWorker = gd::GetResourceWorkerOnObjects(project, worker);
-  objectWorker.Launch(project.GetObjects());
+  objectWorker.Launch(project);
 }
 
 void ResourceExposer::ExposeLayoutResources(