Merge pull request #4440 from neheb/bool

misc clang-tidy fixes

Author: gizmocuz

hardware/MySensorsMQTT.cpp

@@ -68,7 +68,7 @@ MySensorsMQTT::MySensorsMQTT(
 		// And remove it from the CAfilename string.
 		m_CAFilename.erase(nextPiece, m_CAFilename.length());
 
-	} while (0);
+	} while (false);
 
 	switch (PublishScheme) {
 		case 2:

hardware/PanasonicTV.cpp

@@ -451,7 +451,7 @@ int CPanasonicNode::handleMessage(std::string pMessage)
 	iPosBegin = 0;
 	iPosEnd = 0;
 
-	while (1)
+	while (true)
 	{
 		iPosBegin = pMessage.find(begin, iPosBegin);
 		if (iPosBegin == std::string::npos)

hardware/PhilipsHue/PhilipsHueHelper.cpp

@@ -100,7 +100,7 @@ static point get_closest_point_to_line(point A, point B, point P)
 	else if (t > 1.0)
 		t = 1.0;
 
-	return point(A.x + AB.x * t, A.y + AB.y * t);
+	return { A.x + AB.x * t, A.y + AB.y * t };
 }
 
 static double get_distance_between_two_points(point p1, point p2)
@@ -145,7 +145,7 @@ static point get_closest_point_to_point(point xy_point, const std::string &model
 	double cx = closest_point.x;
 	double cy = closest_point.y;
 
-	return point(cx, cy);
+	return { cx, cy };
 }
 
 void CPhilipsHue::RgbFromXY(const double x, const double y, const double bri, const std::string &modelid, uint8_t &r8, uint8_t &g8, uint8_t &b8)

hardware/SatelIntegra.cpp

@@ -1284,5 +1284,5 @@ std::pair<unsigned char*, unsigned int> SatelIntegra::getFullFrame(const unsigne
 		pResult[index] = *it;
 	}
 
-	return std::pair<unsigned char*, unsigned int>(pResult, resultSize);
+	return { pResult, resultSize };
 }

hardware/TE923.cpp

@@ -184,7 +184,7 @@ void CTE923::GetSensorDetails()
 		tsen.WIND.packetlength=sizeof(tsen.WIND)-1;
 		tsen.WIND.packettype=pTypeWIND;
 		tsen.WIND.subtype=sTypeWINDNoTemp;
-		dev.batteryWind = 1;
+		dev.batteryWind = true;
 		if (dev.batteryWind)
 			tsen.WIND.battery_level=9;
 		else

hardware/serial/serial.cpp

@@ -42,11 +42,11 @@ class Serial::ScopedReadLock {
   ~ScopedReadLock() {
     this->pimpl_->readUnlock();
   }
-private:
   // Disable copy constructors
-  ScopedReadLock(const ScopedReadLock&);
-  const ScopedReadLock& operator=(ScopedReadLock);
+  ScopedReadLock(const ScopedReadLock &) = delete;
+  const ScopedReadLock &operator=(ScopedReadLock) = delete;
 
+private:
   SerialImpl *pimpl_;
 };
 
@@ -58,10 +58,11 @@ class Serial::ScopedWriteLock {
   ~ScopedWriteLock() {
     this->pimpl_->writeUnlock();
   }
-private:
   // Disable copy constructors
-  ScopedWriteLock(const ScopedWriteLock&);
-  const ScopedWriteLock& operator=(ScopedWriteLock);
+  ScopedWriteLock(const ScopedWriteLock &) = delete;
+  const ScopedWriteLock &operator=(ScopedWriteLock) = delete;
+
+private:
   SerialImpl *pimpl_;
 };
 

hardware/serial/serial.h

@@ -644,11 +644,11 @@ class Serial {
   bool
   getCD ();
 
-private:
   // Disable copy constructors
-  Serial(const Serial&);
-  Serial& operator=(const Serial&);
+  Serial(const Serial &) = delete;
+  Serial &operator=(const Serial &) = delete;
 
+private:
   // Pimpl idiom, d_pointer
   class SerialImpl;
   SerialImpl *pimpl_;
@@ -668,10 +668,11 @@ class Serial {
 
 class SerialException : public std::exception
 {
-  // Disable copy constructors
-  SerialException& operator=(const SerialException&);
   std::string e_what_;
 public:
+  // Disable copy constructors
+  SerialException &operator=(const SerialException &) = delete;
+
   explicit SerialException (const char *description) {
       std::stringstream ss;
       ss << "SerialException " << description << " failed.";
@@ -686,13 +687,14 @@ class SerialException : public std::exception
 
 class IOException : public std::exception
 {
-  // Disable copy constructors
-  IOException& operator=(const IOException&);
   std::string file_;
   int line_;
   std::string e_what_;
   int errno_;
 public:
+  // Disable copy constructors
+  IOException &operator=(const IOException &) = delete;
+
   explicit IOException (std::string file, int line, int errnum)
     : file_(file), line_(line), errno_(errnum) {
       std::stringstream ss;
@@ -725,10 +727,11 @@ class IOException : public std::exception
 
 class PortNotOpenedException : public std::exception
 {
-  // Disable copy constructors
-  const PortNotOpenedException& operator=(PortNotOpenedException);
   std::string e_what_;
 public:
+  // Disable copy constructors
+  const PortNotOpenedException &operator=(PortNotOpenedException) = delete;
+
   explicit PortNotOpenedException (const char * description)  {
       std::stringstream ss;
       ss << "PortNotOpenedException " << description << " failed.";

main/EventSystem.cpp

@@ -2124,7 +2124,7 @@ std::string CEventSystem::ParseBlocklyString(const std::string &oString)
 {
 	std::string retString = oString;
 
-	while (1)
+	while (true)
 	{
 		size_t pos1, pos2;
 		pos1 = retString.find("{{");

main/HTMLSanitizer.cpp

@@ -81,7 +81,7 @@ std::string HTMLSanitizer::Sanitize(const std::string& szText)
 		}
 		if (!bHaveForbiddenTag)
 			ret += org_tag;
-	} while (1);
+	} while (true);
 	//will never be reached
 	return ret;
 }
@@ -132,7 +132,7 @@ std::wstring HTMLSanitizer::Sanitize(const std::wstring& szText)
 		}
 		if (!bHaveForbiddenTag)
 			ret += org_tag;
-	} while (1);
+	} while (true);
 	//will never be reached
 	return ret;
 }

main/RFXNames.cpp

@@ -1576,7 +1576,7 @@ void GetLightStatus(
 		case fs20_sDimlevel_14:
 		case fs20_sDimlevel_15:
 			lstatus = "Set Level";
-			bHaveDimmer = 1;
+			bHaveDimmer = true;
 			llevel = nValue - fs20_sDimlevel_1 + 1;
 			llevel = (int)float((100.0f / float(maxDimLevel)) * llevel);
 			break;