Revert "rename Tutorial to TutorialManager"

This reverts commit 0bbd813.

Author: niknal357

src/computerAPI/tutorialLoader.h

@@ -2,7 +2,7 @@
 #define tutorialloader_h
 
 #include <vector>
-#include "gui/viewportManager/circuitView/tutorialManager.h"
+#include "gui/viewportManager/circuitView/tutorial.h"
 
 void parseTutorialFile(std::string& fileName);
 

src/gui/viewportManager/circuitView/circuitView.h

@@ -4,7 +4,7 @@
 #include "events/eventRegister.h"
 #include "renderer/circuitRenderManager.h"
 #include "tools/toolManager.h"
-#include "tutorialManager.h"
+#include "tutorial.h"
 #include "viewManager/viewManager.h"
 
 #include "gpu/mainRendererDefs.h"
@@ -32,8 +32,8 @@ class CircuitView {
 	ToolManager& getToolManager() { return toolManager; }
 	const ToolManager& getToolManager() const { return toolManager; }
 
-	TutorialManager& getTutorialManager() { return tutorialManager; }
-	const TutorialManager& getTutorialManager() const { return tutorialManager; }
+	Tutorial& getTutorialManager() { return tutorialManager; }
+	const Tutorial& getTutorialManager() const { return tutorialManager; }
 
 	ViewManager& getViewManager() { return viewManager; }
 	const ViewManager& getViewManager() const { return viewManager; }
@@ -67,7 +67,7 @@ class CircuitView {
 	EventRegister eventRegister;
 	ViewManager viewManager;
 	ToolManager toolManager;
-	TutorialManager tutorialManager;
+	Tutorial tutorialManager;
 };
 
 #endif /* circuitView_h */

…tManager/circuitView/tutorialManager.cpp …viewportManager/circuitView/tutorial.cppsrc/gui/viewportManager/circuitView/tutorialManager.cpp renamed to src/gui/viewportManager/circuitView/tutorial.cpp src/gui/viewportManager/circuitView/tutorialManager.cpp renamed to src/gui/viewportManager/circuitView/tutorial.cpp

@@ -1,15 +1,15 @@
-#include "tutorialManager.h"
+#include "tutorial.h"
 
 #include "circuitView.h"
 #include "environment/environment.h"
 #include "events/customEvents.h"
 
 std::vector<TutorialStep> basicTutorialInitialize();
 
-TutorialManager::TutorialManager(Environment& environment, CircuitView& circuitView) :
+Tutorial::Tutorial(Environment& environment, CircuitView& circuitView) :
 	circuitView(&circuitView), elementCreator(circuitView.getViewportId()), environment(environment), tutorialRunning(false), tutorialState(0) { }
 
-void TutorialManager::StartTutorial() {
+void Tutorial::StartTutorial() {
 	if (tutorialRunning) return;
 	tutorialRunning = true;
 	tutorialState = 0;
@@ -21,7 +21,7 @@ void TutorialManager::StartTutorial() {
 	evaluator = circuitView->getBackend().getEvaluator(evaluatorId.value());
 	SharedCircuit circuit = circuitView->getBackend().getCircuitManager().getCircuit(circuitId);
 	curentCircuit = circuitView->getBackend().getCircuitManager().getCircuit(circuitId);
-	curentCircuit->connectListener(this, std::bind(&TutorialManager::checkTutorial, this, std::placeholders::_1, std::placeholders::_2));
+	curentCircuit->connectListener(this, std::bind(&Tutorial::checkTutorial, this, std::placeholders::_1, std::placeholders::_2));
 	circuitView->getEventRegister().registerFunction("CircuitStateSet", [this](const Event* event) -> bool {
 		const StateSetEvent* stateSetEvent = event->cast<StateSetEvent>();
 		if (!stateSetEvent) return false;
@@ -34,20 +34,20 @@ void TutorialManager::StartTutorial() {
 	runCurrentStep();
 }
 
-void TutorialManager::Stop() {
+void Tutorial::Stop() {
 	if (!tutorialRunning) return;
 	if (curentCircuit) {
 		curentCircuit->disconnectListener(this);
 	}
 	elementCreator.clear();
 	tutorialRunning = false;
 }
-void TutorialManager::checkTutorial(DifferenceSharedPtr, circuit_id_t) { advanceTutorial(); }
-void TutorialManager::checkTutorialState(Position pos, bool state) { advanceTutorial(); }
+void Tutorial::checkTutorial(DifferenceSharedPtr, circuit_id_t) { advanceTutorial(); }
+void Tutorial::checkTutorialState(Position pos, bool state) { advanceTutorial(); }
 
-void TutorialManager::setTutorial(const std::vector<TutorialStep>& steps) { tutorialSteps = steps; }
+void Tutorial::setTutorial(const std::vector<TutorialStep>& steps) { tutorialSteps = steps; }
 
-void TutorialManager::advanceTutorial() {
+void Tutorial::advanceTutorial() {
 	if (!tutorialRunning) return;
 	if (tutorialState >= tutorialSteps.size()) return;
 	if (isCurrentStepComplete()) {
@@ -61,7 +61,7 @@ void TutorialManager::advanceTutorial() {
 	}
 }
 
-bool TutorialManager::isCurrentStepComplete() const {
+bool Tutorial::isCurrentStepComplete() const {
 	if (tutorialState >= tutorialSteps.size()) return false;
 	TutorialStep currentStep = tutorialSteps[tutorialState];
 	BlockContainer blockContainer = curentCircuit->getBlockContainer();
@@ -94,7 +94,7 @@ bool TutorialManager::isCurrentStepComplete() const {
 	return true;
 }
 
-void TutorialManager::runCurrentStep() {
+void Tutorial::runCurrentStep() {
 	if (tutorialState >= tutorialSteps.size()) return;
 	TutorialStep currentStep = tutorialSteps[tutorialState];
 	BlockContainer blockContainer = curentCircuit->getBlockContainer();

…ortManager/circuitView/tutorialManager.h …i/viewportManager/circuitView/tutorial.hsrc/gui/viewportManager/circuitView/tutorialManager.h renamed to src/gui/viewportManager/circuitView/tutorial.h src/gui/viewportManager/circuitView/tutorialManager.h renamed to src/gui/viewportManager/circuitView/tutorial.h

@@ -48,9 +48,9 @@ struct TutorialStep {
 	TutorialAction action;
 };
 
-class TutorialManager {
+class Tutorial {
 public:
-	TutorialManager(Environment& environment, CircuitView& circuitView);
+	Tutorial(Environment& environment, CircuitView& circuitView);
 	void StartTutorial();
 	void Stop();
 	void setTutorial(const std::vector<TutorialStep>& steps);
@@ -75,4 +75,4 @@ class TutorialManager {
 	std::vector<TutorialStep> tutorialSteps;
 };
 
-#endif /*tutorialManager_h*/
+#endif /*tutorialManager_h*/