Refactor to use smart pointers

momokotomoko · May 27, 2023 · baee0c4 · baee0c4
1 parent 25579e2
commit baee0c4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 26 deletions.
diff --git a/Sources/FFXIVOceanFishingTrackerPlugin.cpp b/Sources/FFXIVOceanFishingTrackerPlugin.cpp
@@ -22,44 +22,28 @@
 
 FFXIVOceanFishingTrackerPlugin::FFXIVOceanFishingTrackerPlugin()
 {
-	mFFXIVOceanFishingHelper = new FFXIVOceanFishingHelper(
-		{
+	mFFXIVOceanFishingHelper = std::make_unique<FFXIVOceanFishingHelper>(
+		std::vector <std::string>({
 			"oceanFishingDatabase - Indigo Route.json",
 			"oceanFishingDatabase - Ruby Route.json"
-		}
+		})
 	);
 
 	// timer that is called on certain minutes of the hour
-	mTimer = new CallBackTimer();
+	mTimer = std::make_unique <CallBackTimer>();
 	//timer that is called every half a second to update UI
-	mSecondsTimer = new CallBackTimer();
+	mSecondsTimer = std::make_unique <CallBackTimer>();
 
 	startTimers();
 }
 
 FFXIVOceanFishingTrackerPlugin::~FFXIVOceanFishingTrackerPlugin()
 {
-	if(mTimer != nullptr)
-	{
+	if(mTimer)
 		mTimer->stop();
-
-		delete mTimer;
-		mTimer = nullptr;
-	}
 
-	if (mSecondsTimer != nullptr)
-	{
+	if (mSecondsTimer)
 		mSecondsTimer->stop();
-
-		delete mSecondsTimer;
-		mSecondsTimer = nullptr;
-	}
-
-	if(mFFXIVOceanFishingHelper != nullptr)
-	{
-		delete mFFXIVOceanFishingHelper;
-		mFFXIVOceanFishingHelper = nullptr;
-	}
 }
 
 /**

diff --git a/Sources/FFXIVOceanFishingTrackerPlugin.h b/Sources/FFXIVOceanFishingTrackerPlugin.h
@@ -71,9 +71,9 @@ class FFXIVOceanFishingTrackerPlugin : public ESDBasePlugin
 
 	void updateImage(std::string pngfile, const std::string& inContext);
 
-	FFXIVOceanFishingHelper *mFFXIVOceanFishingHelper = nullptr;
-	CallBackTimer *mTimer = nullptr;
-	CallBackTimer* mSecondsTimer = nullptr;
+	std::unique_ptr<FFXIVOceanFishingHelper> mFFXIVOceanFishingHelper;
+	std::unique_ptr <CallBackTimer> mTimer;
+	std::unique_ptr <CallBackTimer> mSecondsTimer;
 
 	void startTimers();
 };