Another destructor cleanup

cziter15 · Feb 15, 2025 · eb71566 · eb71566
1 parent c191ebb
commit eb71566
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 14 deletions.
diff --git a/src/ksf/comp/ksMqttConnector.cpp b/src/ksf/comp/ksMqttConnector.cpp
@@ -32,8 +32,6 @@ using namespace std::placeholders;
 
 namespace ksf::comps
 {
-	ksMqttConnector::~ksMqttConnector() = default;
-
 	ksMqttConnector::ksMqttConnector(bool sendConnectionStatus, bool usePersistentSession)
 		: reconnectTimer(KSF_MQTT_RECONNECT_DELAY_MS)
 	{

diff --git a/src/ksf/comp/ksMqttConnector.h b/src/ksf/comp/ksMqttConnector.h
@@ -195,10 +195,5 @@ namespace ksf::comps
 				@param fingerprint MQTT broker certificate fingerprint - if empty, secure connection won't be used
 			*/
 			void setupConnection(const std::string broker, const std::string& port, std::string login, std::string password, std::string prefix, const std::string& fingerprint);
-
-			/*!
-				@brief Destructor (for uniqueptr purposes).
-			*/
-			virtual ~ksMqttConnector();
 	};
 }
diff --git a/src/ksf/evt/ksEventInterface.h b/src/ksf/evt/ksEventInterface.h
@@ -27,5 +27,8 @@ namespace ksf::evt
 				@param callbackUID Unique callback ID
 			*/
 			virtual void unbind(std::size_t callbackUID) = 0;
+
+		public:
+			virtual ~ksEventInterface() = default;
 	};
 }
diff --git a/src/ksf/ksComponent.cpp b/src/ksf/ksComponent.cpp
@@ -11,8 +11,6 @@
 
 namespace ksf 
 {
-	ksComponent::~ksComponent() = default;
-
 	bool ksComponent::init(ksApplication* app)
 	{
 		return true;

diff --git a/src/ksf/ksComponent.h b/src/ksf/ksComponent.h
@@ -57,11 +57,6 @@ namespace ksf
 			ksComponentState::TYPE componentState { ksComponentState::NotInitialized };
 
 		public:
-			/*! 
-				@brief  Destructor. 
-			*/
-			virtual ~ksComponent();
-
 			/*!
 				@brief Initializes component.
 				@param app Pointer to the parent ksApplication.

diff --git a/src/ksf/misc/ksSimpleTimer.cpp b/src/ksf/misc/ksSimpleTimer.cpp
@@ -18,6 +18,8 @@ namespace ksf::misc
 		setInterval(intervalMs);
 	}
 
+	ksSimpleTimer::~ksSimpleTimer() = default;
+
 	void ksSimpleTimer::setInterval(uint32_t intervalMs)
 	{
 		this->intervalMs = intervalMs;

diff --git a/src/ksf/misc/ksSimpleTimer.h b/src/ksf/misc/ksSimpleTimer.h
@@ -36,6 +36,11 @@ namespace ksf::misc
 			*/
 			ksSimpleTimer(uint32_t intervalMs);
 
+			/*!
+				@brief Destructs timer.
+			*/
+			virtual ~ksSimpleTimer();
+
 			/*!
 				@brief Sets timer interval (milliseconds) and restarts the timer.
 				@param intervalMs Timer interval in milliseconds. If 0 then timer is disabled.