Remove #if ENGINE_MAJOR_VERSION and just use the old MakeShareable()

SRombauts · Jan 8, 2024 · 7fd8de3 · 7fd8de3
1 parent 88f2b84
commit 7fd8de3
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 9 deletions.
diff --git a/Source/PlasticSourceControl/Private/PlasticSourceControlParsers.cpp b/Source/PlasticSourceControl/Private/PlasticSourceControlParsers.cpp
@@ -704,11 +704,7 @@ static bool ParseHistoryResults(const bool bInUpdateHistory, const FXmlFile& InX
 		{
 			if (const FXmlNode* RevisionNode = RevisionNodes[Index])
 			{
-#if ENGINE_MAJOR_VERSION == 4
 				const TSharedRef<FPlasticSourceControlRevision, ESPMode::ThreadSafe> SourceControlRevision = MakeShareable(new FPlasticSourceControlRevision);
-#elif ENGINE_MAJOR_VERSION == 5
-				const TSharedRef<FPlasticSourceControlRevision, ESPMode::ThreadSafe> SourceControlRevision = MakeShared<FPlasticSourceControlRevision>();
-#endif
 				SourceControlRevision->State = &InOutState;
 				SourceControlRevision->Filename = Filename;
 

diff --git a/Source/PlasticSourceControl/Private/PlasticSourceControlProvider.cpp b/Source/PlasticSourceControl/Private/PlasticSourceControlProvider.cpp
@@ -182,11 +182,7 @@ TSharedRef<FPlasticSourceControlState, ESPMode::ThreadSafe> FPlasticSourceContro
 	else
 	{
 		// cache an unknown state for this item
-#if ENGINE_MAJOR_VERSION == 4
 		TSharedRef<FPlasticSourceControlState, ESPMode::ThreadSafe> NewState = MakeShareable(new FPlasticSourceControlState(FString(InFilename)));
-#elif ENGINE_MAJOR_VERSION == 5
-		TSharedRef<FPlasticSourceControlState, ESPMode::ThreadSafe> NewState = MakeShared<FPlasticSourceControlState>(FString(InFilename));
-#endif
 		StateCache.Add(InFilename, NewState);
 		return NewState;
 	}

diff --git a/Source/PlasticSourceControl/Private/PlasticSourceControlProvider.h b/Source/PlasticSourceControl/Private/PlasticSourceControlProvider.h
@@ -64,7 +64,7 @@ class FPlasticSourceControlProvider : public ISourceControlProvider
 	virtual TOptional<bool> IsAtLatestRevision() const; /* override	NOTE: added in UE5.1 */
 	virtual TOptional<int> GetNumLocalChanges() const; /* override	NOTE: added in UE5.1 */
 	virtual void Tick() override;
-	virtual TArray< TSharedRef<class ISourceControlLabel> > GetLabels(const FString& InMatchingSpec) const override;
+	virtual TArray<TSharedRef<class ISourceControlLabel>> GetLabels(const FString& InMatchingSpec) const override;
 #if ENGINE_MAJOR_VERSION == 5
 	virtual TArray<FSourceControlChangelistRef> GetChangelists(EStateCacheUsage::Type InStateCacheUsage) override;
 #endif