Skip to content

Commit ff97960

Browse files
Remove unused built-in function for platform extension
1 parent 99873e5 commit ff97960

File tree

5 files changed

+41
-86
lines changed

5 files changed

+41
-86
lines changed

Core/GDCore/Extensions/PlatformExtension.cpp

+40-70
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
#include "GDCore/Extensions/Platform.h"
1919
#include "GDCore/IDE/PlatformManager.h"
2020
#include "GDCore/Project/Behavior.h"
21-
#include "GDCore/Project/ObjectConfiguration.h"
2221
#include "GDCore/Project/BehaviorsSharedData.h"
22+
#include "GDCore/Project/ObjectConfiguration.h"
2323
#include "GDCore/Tools/Localization.h"
2424

2525
namespace gd {
@@ -200,11 +200,11 @@ PlatformExtension::AddExpressionAndConditionAndAction(
200200
group,
201201
icon)
202202
: AddStrExpression(name,
203-
fullname,
204-
expressionDescriptionTemplate.FindAndReplace(
205-
"<subject>", descriptionSubject),
206-
group,
207-
icon);
203+
fullname,
204+
expressionDescriptionTemplate.FindAndReplace(
205+
"<subject>", descriptionSubject),
206+
group,
207+
icon);
208208

209209
return MultipleInstructionMetadata::WithExpressionAndConditionAndAction(
210210
expression, condition, action);
@@ -244,12 +244,10 @@ gd::ObjectMetadata& PlatformExtension::AddEventsBasedObject(
244244
const gd::String& description,
245245
const gd::String& icon24x24) {
246246
gd::String nameWithNamespace = GetNameSpace() + name;
247-
objectsInfos[nameWithNamespace] = ObjectMetadata(GetNameSpace(),
248-
nameWithNamespace,
249-
fullname,
250-
description,
251-
icon24x24)
252-
.SetHelpPath(GetHelpPath());
247+
objectsInfos[nameWithNamespace] =
248+
ObjectMetadata(
249+
GetNameSpace(), nameWithNamespace, fullname, description, icon24x24)
250+
.SetHelpPath(GetHelpPath());
253251
return objectsInfos[nameWithNamespace];
254252
}
255253

@@ -353,8 +351,7 @@ gd::BehaviorMetadata& PlatformExtension::GetBehaviorMetadata(
353351
return badBehaviorMetadata;
354352
}
355353

356-
bool PlatformExtension::HasBehavior(
357-
const gd::String& behaviorType) const {
354+
bool PlatformExtension::HasBehavior(const gd::String& behaviorType) const {
358355
return behaviorsInfo.find(behaviorType) != behaviorsInfo.end();
359356
}
360357

@@ -386,7 +383,7 @@ gd::InstructionMetadata& PlatformExtension::AddDuplicatedAction(
386383
auto copiedAction = actionsInfos.find(copiedNameWithNamespace);
387384
if (copiedAction == actionsInfos.end()) {
388385
gd::LogError("Could not find an action with name " +
389-
copiedNameWithNamespace + " to copy.");
386+
copiedNameWithNamespace + " to copy.");
390387
} else {
391388
actionsInfos[newNameWithNamespace] = copiedAction->second;
392389
}
@@ -406,7 +403,7 @@ gd::InstructionMetadata& PlatformExtension::AddDuplicatedCondition(
406403
auto copiedCondition = conditionsInfos.find(copiedNameWithNamespace);
407404
if (copiedCondition == conditionsInfos.end()) {
408405
gd::LogError("Could not find a condition with name " +
409-
copiedNameWithNamespace + " to copy.");
406+
copiedNameWithNamespace + " to copy.");
410407
} else {
411408
conditionsInfos[newNameWithNamespace] = copiedCondition->second;
412409
}
@@ -423,7 +420,7 @@ gd::ExpressionMetadata& PlatformExtension::AddDuplicatedExpression(
423420
auto copiedExpression = expressionsInfos.find(copiedNameWithNamespace);
424421
if (copiedExpression == expressionsInfos.end()) {
425422
gd::LogError("Could not find an expression with name " +
426-
copiedNameWithNamespace + " to copy.");
423+
copiedNameWithNamespace + " to copy.");
427424
} else {
428425
expressionsInfos[newNameWithNamespace] = copiedExpression->second;
429426
}
@@ -440,7 +437,7 @@ gd::ExpressionMetadata& PlatformExtension::AddDuplicatedStrExpression(
440437
auto copiedExpression = strExpressionsInfos.find(copiedNameWithNamespace);
441438
if (copiedExpression == strExpressionsInfos.end()) {
442439
gd::LogError("Could not find a string expression with name " +
443-
copiedNameWithNamespace + " to copy.");
440+
copiedNameWithNamespace + " to copy.");
444441
} else {
445442
strExpressionsInfos[newNameWithNamespace] = copiedExpression->second;
446443
}
@@ -468,15 +465,17 @@ PlatformExtension::GetAllStrExpressions() {
468465
return strExpressionsInfos;
469466
}
470467

471-
const std::vector<gd::DependencyMetadata>& PlatformExtension::GetAllDependencies() const {
468+
const std::vector<gd::DependencyMetadata>&
469+
PlatformExtension::GetAllDependencies() const {
472470
return extensionDependenciesMetadata;
473471
}
474472

475473
std::vector<gd::DependencyMetadata>& PlatformExtension::GetAllDependencies() {
476474
return extensionDependenciesMetadata;
477475
}
478476

479-
const std::vector<gd::SourceFileMetadata>& PlatformExtension::GetAllSourceFiles() const {
477+
const std::vector<gd::SourceFileMetadata>&
478+
PlatformExtension::GetAllSourceFiles() const {
480479
return extensionSourceFilesMetadata;
481480
}
482481

@@ -615,37 +614,6 @@ void PlatformExtension::SetNameSpace(gd::String nameSpace_) {
615614
nameSpace = nameSpace_ + GetNamespaceSeparator();
616615
}
617616

618-
std::vector<gd::String> PlatformExtension::GetBuiltinExtensionsNames() {
619-
std::vector<gd::String> builtinExtensions;
620-
builtinExtensions.push_back("Sprite");
621-
builtinExtensions.push_back("BuiltinObject");
622-
builtinExtensions.push_back("BuiltinAudio");
623-
builtinExtensions.push_back("BuiltinMouse");
624-
builtinExtensions.push_back("BuiltinKeyboard");
625-
builtinExtensions.push_back("BuiltinJoystick");
626-
builtinExtensions.push_back("BuiltinTime");
627-
builtinExtensions.push_back("BuiltinFile");
628-
builtinExtensions.push_back("BuiltinVariables");
629-
builtinExtensions.push_back("BuiltinCamera");
630-
builtinExtensions.push_back("BuiltinWindow");
631-
builtinExtensions.push_back("BuiltinNetwork");
632-
builtinExtensions.push_back("BuiltinScene");
633-
builtinExtensions.push_back("BuiltinAdvanced");
634-
builtinExtensions.push_back("BuiltinCommonConversions");
635-
builtinExtensions.push_back("BuiltinStringInstructions");
636-
builtinExtensions.push_back("BuiltinMathematicalTools");
637-
builtinExtensions.push_back("BuiltinExternalLayouts");
638-
builtinExtensions.push_back("BuiltinCommonInstructions");
639-
640-
return builtinExtensions;
641-
}
642-
643-
bool PlatformExtension::IsBuiltin() const {
644-
std::vector<gd::String> builtinExtensions = GetBuiltinExtensionsNames();
645-
return std::find(builtinExtensions.begin(), builtinExtensions.end(), name) !=
646-
builtinExtensions.end();
647-
}
648-
649617
void PlatformExtension::StripUnimplementedInstructionsAndExpressions() {
650618
for (std::map<gd::String, gd::InstructionMetadata>::iterator it =
651619
GetAllActions().begin();
@@ -791,41 +759,42 @@ void PlatformExtension::StripUnimplementedInstructionsAndExpressions() {
791759
}
792760
}
793761

794-
gd::String
795-
PlatformExtension::GetEventsFunctionFullType(const gd::String &extensionName,
796-
const gd::String &functionName) {
797-
const auto &separator = GetNamespaceSeparator();
762+
gd::String PlatformExtension::GetEventsFunctionFullType(
763+
const gd::String& extensionName, const gd::String& functionName) {
764+
const auto& separator = GetNamespaceSeparator();
798765
return extensionName + separator + functionName;
799766
}
800767

801768
gd::String PlatformExtension::GetBehaviorEventsFunctionFullType(
802-
const gd::String &extensionName, const gd::String &behaviorName,
803-
const gd::String &functionName) {
804-
const auto &separator = GetNamespaceSeparator();
769+
const gd::String& extensionName,
770+
const gd::String& behaviorName,
771+
const gd::String& functionName) {
772+
const auto& separator = GetNamespaceSeparator();
805773
return extensionName + separator + behaviorName + separator + functionName;
806774
}
807775

808-
gd::String
809-
PlatformExtension::GetBehaviorFullType(const gd::String &extensionName,
810-
const gd::String &behaviorName) {
811-
const auto &separator = GetNamespaceSeparator();
776+
gd::String PlatformExtension::GetBehaviorFullType(
777+
const gd::String& extensionName, const gd::String& behaviorName) {
778+
const auto& separator = GetNamespaceSeparator();
812779
return extensionName + separator + behaviorName;
813780
}
814781

815782
gd::String PlatformExtension::GetObjectEventsFunctionFullType(
816-
const gd::String &extensionName, const gd::String &objectName,
817-
const gd::String &functionName) {
818-
const auto &separator = GetNamespaceSeparator();
783+
const gd::String& extensionName,
784+
const gd::String& objectName,
785+
const gd::String& functionName) {
786+
const auto& separator = GetNamespaceSeparator();
819787
return extensionName + separator + objectName + separator + functionName;
820788
}
821789

822-
gd::String PlatformExtension::GetObjectFullType(const gd::String &extensionName,
823-
const gd::String &objectName) {
824-
const auto &separator = GetNamespaceSeparator();
790+
gd::String PlatformExtension::GetObjectFullType(const gd::String& extensionName,
791+
const gd::String& objectName) {
792+
const auto& separator = GetNamespaceSeparator();
825793
return extensionName + separator + objectName;
826794
}
827795

828-
gd::String PlatformExtension::GetExtensionFromFullObjectType(const gd::String& type) {
796+
gd::String PlatformExtension::GetExtensionFromFullObjectType(
797+
const gd::String& type) {
829798
const auto separatorIndex =
830799
type.find(PlatformExtension::GetNamespaceSeparator());
831800
if (separatorIndex == std::string::npos) {
@@ -834,7 +803,8 @@ gd::String PlatformExtension::GetExtensionFromFullObjectType(const gd::String& t
834803
return type.substr(0, separatorIndex);
835804
}
836805

837-
gd::String PlatformExtension::GetObjectNameFromFullObjectType(const gd::String& type) {
806+
gd::String PlatformExtension::GetObjectNameFromFullObjectType(
807+
const gd::String& type) {
838808
const auto separatorIndex =
839809
type.find(PlatformExtension::GetNamespaceSeparator());
840810
if (separatorIndex == std::string::npos) {

Core/GDCore/Extensions/PlatformExtension.h

+1-13
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
#include "GDCore/CommonTools.h"
1414
#include "GDCore/Extensions/Metadata/BehaviorMetadata.h"
1515
#include "GDCore/Extensions/Metadata/DependencyMetadata.h"
16-
#include "GDCore/Extensions/Metadata/SourceFileMetadata.h"
1716
#include "GDCore/Extensions/Metadata/EffectMetadata.h"
1817
#include "GDCore/Extensions/Metadata/EventMetadata.h"
1918
#include "GDCore/Extensions/Metadata/InstructionOrExpressionGroupMetadata.h"
2019
#include "GDCore/Extensions/Metadata/ObjectMetadata.h"
20+
#include "GDCore/Extensions/Metadata/SourceFileMetadata.h"
2121
#include "GDCore/Project/PropertyDescriptor.h"
2222
#include "GDCore/String.h"
2323
#include "GDCore/Tools/VersionPriv.h"
@@ -440,12 +440,6 @@ class GD_CORE_API PlatformExtension {
440440
*/
441441
bool IsDeprecated() const { return deprecated; }
442442

443-
/**
444-
* \brief Return true if the extension is a standard extension that cannot be
445-
* deactivated
446-
*/
447-
bool IsBuiltin() const;
448-
449443
/**
450444
* \brief Get the namespace of the extension.
451445
* \note The namespace is simply the name of the extension concatenated with
@@ -640,12 +634,6 @@ class GD_CORE_API PlatformExtension {
640634
}
641635
///@}
642636

643-
/**
644-
* \brief Return the name of all the extensions which are considered provided
645-
* by platforms.
646-
*/
647-
static std::vector<gd::String> GetBuiltinExtensionsNames();
648-
649637
/**
650638
* \brief Get the string used to separate the name of the
651639
* instruction/expression and the extension.

GDevelop.js/Bindings/Bindings.idl

-1
Original file line numberDiff line numberDiff line change
@@ -2238,7 +2238,6 @@ interface PlatformExtension {
22382238
[Const, Ref] DOMString GetLicense();
22392239
[Const, Ref] DOMString GetHelpPath();
22402240
[Const, Ref] DOMString GetIconUrl();
2241-
boolean IsBuiltin();
22422241
[Const, Ref] DOMString GetNameSpace();
22432242

22442243
[Ref] InstructionMetadata AddDuplicatedAction(

GDevelop.js/types.d.ts

-1
Original file line numberDiff line numberDiff line change
@@ -1701,7 +1701,6 @@ export class PlatformExtension extends EmscriptenObject {
17011701
getLicense(): string;
17021702
getHelpPath(): string;
17031703
getIconUrl(): string;
1704-
isBuiltin(): boolean;
17051704
getNameSpace(): string;
17061705
addDuplicatedAction(newActionName: string, copiedActionName: string): InstructionMetadata;
17071706
addDuplicatedCondition(newConditionName: string, copiedConditionName: string): InstructionMetadata;

GDevelop.js/types/gdplatformextension.js

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ declare class gdPlatformExtension {
2828
getLicense(): string;
2929
getHelpPath(): string;
3030
getIconUrl(): string;
31-
isBuiltin(): boolean;
3231
getNameSpace(): string;
3332
addDuplicatedAction(newActionName: string, copiedActionName: string): gdInstructionMetadata;
3433
addDuplicatedCondition(newConditionName: string, copiedConditionName: string): gdInstructionMetadata;

0 commit comments

Comments
 (0)