From 55a579ea50c1bacbc8552397d0481a9ad1a73e35 Mon Sep 17 00:00:00 2001 From: Krad Date: Tue, 24 May 2022 10:36:12 +0800 Subject: [PATCH] Code clean and class constructor refactor. --- src/device/DeviceManager.cpp | 1 - src/device/DeviceManager.h | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/device/DeviceManager.cpp b/src/device/DeviceManager.cpp index d0e8a67..fdd53a9 100644 --- a/src/device/DeviceManager.cpp +++ b/src/device/DeviceManager.cpp @@ -7,7 +7,6 @@ #include #include #include -#include #include #include "appvals/AppGlobalValues.h" #include "json/ScanJson.h" diff --git a/src/device/DeviceManager.h b/src/device/DeviceManager.h index 5149a6a..6e7b64a 100644 --- a/src/device/DeviceManager.h +++ b/src/device/DeviceManager.h @@ -15,6 +15,10 @@ public: static DeviceManager manager; return &manager; } + DeviceManager() = default; + ~DeviceManager() override = default ; + DeviceManager(const DeviceManager&) = delete; + DeviceManager operator=(const DeviceManager&) = delete; /** * init device, include Shimlib and it's error call back, * deviceInfTimer to get temperature of water, and the @@ -94,7 +98,7 @@ private: bool previewing = false; volatile bool endLoop = false; bool errorOccurred = false; - QThread* previewDataCaller; + QThread* previewDataCaller = nullptr; };