Explorar o código

Rename parameter in setTimer from timer to timerInterface - fix #1612 (#1632)

Rene Beckmann %!s(int64=8) %!d(string=hai) anos
pai
achega
7e7c9049b1

+ 1 - 1
plugins/org.yakindu.sct.generator.cpp/src/org/yakindu/sct/generator/cpp/StatemachineHeader.xtend

@@ -303,7 +303,7 @@ class StatemachineHeader extends org.yakindu.sct.generator.c.StatemachineHeader
 		/*
 		 * Functions inherited from TimedStatemachineInterface
 		 */
-		virtual void setTimer(«timerInterface»* timer);
+		virtual void setTimer(«timerInterface»* timerInterface);
 		
 		virtual «timerInterface»* getTimer();
 		

+ 3 - 3
plugins/org.yakindu.sct.generator.cpp/src/org/yakindu/sct/generator/cpp/StatemachineImplementation.xtend

@@ -213,7 +213,7 @@ class StatemachineImplementation implements IContentTemplate {
 			switch (stateConfVector[stateConfVectorPosition])
 			{
 			«FOR state : states»
-				«IF state.reactSequence!=null»
+				«IF state.reactSequence !== null»
 				case «state.shortName.asEscapedIdentifier» :
 				{
 					«state.reactSequence.shortName»();
@@ -231,9 +231,9 @@ class StatemachineImplementation implements IContentTemplate {
 	def timedStatemachineFunctions(ExecutionFlow it) '''
 		«IF timed»
 			
-			void «module»::setTimer(«timerInterface»* timer)
+			void «module»::setTimer(«timerInterface»* timerInterface)
 			{
-				this->«timerInstance» = timer;
+				this->«timerInstance» = timerInterface;
 			}
 			
 			«timerInterface»* «module»::getTimer()

+ 1 - 1
plugins/org.yakindu.sct.generator.cpp/src/org/yakindu/sct/generator/cpp/TimedStatemachineInterface.xtend

@@ -45,7 +45,7 @@ class TimedStatemachineInterface implements IContentTemplate {
 				    externally on a timed state machine before a run cycle can be correct
 				    executed.
 				*/
-				virtual void setTimer(«timerInterface»* timer) = 0;
+				virtual void setTimer(«timerInterface»* timerInterface) = 0;
 				
 				/*! Returns the currently used timer service.
 				*/