onvif: Make CI happy

- Re-flow settings.cpp / ptz-onvif.cpp / onvif-discovery.cpp through
  clang-format and CMakeLists.txt through gersemi to match the
  project's formatting rules.
- Add `override` to every PTZOnvif override (description, set_config,
  get_config, get_obs_properties, do_update, pantilt_rel/abs/home,
  zoom_abs, set_autofocus, memory_set/recall/reset). Apple Clang
  treats -Winconsistent-missing-override as an error and the previous
  partial annotations failed the macOS build.
- Replace the (QDate, QTime, Qt::TimeSpec) QDateTime constructor with
  setTimeZone(QTimeZone::utc()). The 3-arg form was deprecated in Qt
  6.5 and MSVC's /WX in the Windows job turns the deprecation warning
  into a hard error.

No behavior change.

Signed-off-by: Jonatã Bolzan Loss <jonata@jonata.org>

Author: jonata

CMakeLists.txt

@@ -127,11 +127,7 @@ if(ENABLE_ONVIF)
   add_compile_definitions(ENABLE_ONVIF)
   target_sources(
     ${CMAKE_PROJECT_NAME}
-    PRIVATE
-      src/ptz-onvif.cpp
-      src/ptz-onvif.hpp
-      src/onvif-discovery.cpp
-      src/onvif-discovery.hpp
+    PRIVATE src/ptz-onvif.cpp src/ptz-onvif.hpp src/onvif-discovery.cpp src/onvif-discovery.hpp
   )
 endif()
 

src/onvif-discovery.cpp

@@ -31,6 +31,7 @@
 #include <QSplitter>
 #include <QTableWidget>
 #include <QTableWidgetItem>
+#include <QTimeZone>
 #include <QtXml/QDomDocument>
 #include <QUrl>
 #include <QUuid>
@@ -49,8 +50,7 @@ static constexpr quint16 WSD_PORT = 3702;
  * — none of our authored payloads contain bare ampersands. */
 static QByteArray sanitizeXmlAmpersands(const QByteArray &xml)
 {
-	static const QRegularExpression re(QStringLiteral(
-		"&(?!(?:amp|lt|gt|quot|apos|#[0-9]+|#x[0-9a-fA-F]+);)"));
+	static const QRegularExpression re(QStringLiteral("&(?!(?:amp|lt|gt|quot|apos|#[0-9]+|#x[0-9a-fA-F]+);)"));
 	QString s = QString::fromUtf8(xml);
 	s.replace(re, "&amp;");
 	return s.toUtf8();
@@ -94,8 +94,7 @@ void OnvifDiscovery::start(int timeoutMs)
 	 * unicast responses sent back to our source port. ShareAddress lets
 	 * multiple processes on the host discover concurrently. */
 	if (m_socket.state() != QAbstractSocket::BoundState) {
-		if (!m_socket.bind(QHostAddress::AnyIPv4, 0,
-				   QUdpSocket::ShareAddress | QUdpSocket::ReuseAddressHint)) {
+		if (!m_socket.bind(QHostAddress::AnyIPv4, 0, QUdpSocket::ShareAddress | QUdpSocket::ReuseAddressHint)) {
 			emit errorOccurred(m_socket.errorString());
 			m_running = false;
 			emit finished();
@@ -208,8 +207,8 @@ void OnvifDiscovery::parseProbeMatch(const QByteArray &payload, const QHostAddre
 			 * even when reached via NAT or a different subnet), keep
 			 * the first XAddr's path but rewrite its host to the
 			 * responder. ODM and most other ONVIF clients do this. */
-			QStringList urls = xaddrs.at(0).toElement().text().split(QRegularExpression("\\s+"),
-									      Qt::SkipEmptyParts);
+			QStringList urls =
+				xaddrs.at(0).toElement().text().split(QRegularExpression("\\s+"), Qt::SkipEmptyParts);
 			QString chosen;
 			for (const auto &u : urls) {
 				QUrl url(u);
@@ -235,13 +234,13 @@ void OnvifDiscovery::parseProbeMatch(const QByteArray &payload, const QHostAddre
 
 		auto typesEl = m.elementsByTagNameNS(nsDisco, "Types");
 		if (typesEl.length() > 0)
-			info.types = typesEl.at(0).toElement().text().split(QRegularExpression("\\s+"),
-									    Qt::SkipEmptyParts);
+			info.types =
+				typesEl.at(0).toElement().text().split(QRegularExpression("\\s+"), Qt::SkipEmptyParts);
 
 		auto scopesEl = m.elementsByTagNameNS(nsDisco, "Scopes");
 		if (scopesEl.length() > 0)
-			info.scopes = scopesEl.at(0).toElement().text().split(QRegularExpression("\\s+"),
-									      Qt::SkipEmptyParts);
+			info.scopes =
+				scopesEl.at(0).toElement().text().split(QRegularExpression("\\s+"), Qt::SkipEmptyParts);
 
 		/* Extract manufacturer / model / name / location from scopes.
 		 * Scopes look like onvif://www.onvif.org/hardware/MODEL or
@@ -299,8 +298,8 @@ QString envelope(const QString &security, const QString &action, const QString &
 			      "</s:Header>"
 			      "<s:Body>%10</s:Body>"
 			      "</s:Envelope>")
-		.arg(kNsSoap, kNsAddrSoap, kNsWsse, kNsWsu, kNsOnvifDevice, kNsOnvifMedia,
-		     kNsOnvifSchema, action, security, body);
+		.arg(kNsSoap, kNsAddrSoap, kNsWsse, kNsWsu, kNsOnvifDevice, kNsOnvifMedia, kNsOnvifSchema, action,
+		     security, body);
 }
 } // namespace
 
@@ -392,8 +391,8 @@ void OnvifMediaProbe::requestSystemDateAndTime()
 {
 	/* Unauthenticated per spec; gives us the camera's clock for the rest
 	 * of the probe's WS-Security timestamps. */
-	sendRequest(m_deviceXAddr, kNsOnvifDevice + "/GetSystemDateAndTime",
-		    "<tds:GetSystemDateAndTime/>", /*authenticated=*/false);
+	sendRequest(m_deviceXAddr, kNsOnvifDevice + "/GetSystemDateAndTime", "<tds:GetSystemDateAndTime/>",
+		    /*authenticated=*/false);
 }
 
 void OnvifMediaProbe::requestCapabilities()
@@ -415,14 +414,13 @@ void OnvifMediaProbe::requestNextStreamUri()
 		return;
 	}
 	const QString token = m_profileTokens.at(m_profileIdx);
-	const QString body = QStringLiteral(
-				     "<trt:GetStreamUri>"
-				     "<trt:StreamSetup>"
-				     "<tt:Stream>RTP-Unicast</tt:Stream>"
-				     "<tt:Transport><tt:Protocol>RTSP</tt:Protocol></tt:Transport>"
-				     "</trt:StreamSetup>"
-				     "<trt:ProfileToken>%1</trt:ProfileToken>"
-				     "</trt:GetStreamUri>")
+	const QString body = QStringLiteral("<trt:GetStreamUri>"
+					    "<trt:StreamSetup>"
+					    "<tt:Stream>RTP-Unicast</tt:Stream>"
+					    "<tt:Transport><tt:Protocol>RTSP</tt:Protocol></tt:Transport>"
+					    "</trt:StreamSetup>"
+					    "<trt:ProfileToken>%1</trt:ProfileToken>"
+					    "</trt:GetStreamUri>")
 				     .arg(token);
 	sendRequest(m_mediaXAddr, kNsOnvifMedia + "/GetStreamUri", body, /*authenticated=*/true);
 }
@@ -512,7 +510,11 @@ void OnvifMediaProbe::onReplyFinished(QNetworkReply *reply)
 				int h = timeEl.firstChildElement("Hour", kNsOnvifSchema).text().toInt();
 				int mi = timeEl.firstChildElement("Minute", kNsOnvifSchema).text().toInt();
 				int se = timeEl.firstChildElement("Second", kNsOnvifSchema).text().toInt();
-				QDateTime cameraTime(QDate(y, mo, d), QTime(h, mi, se), Qt::UTC);
+				/* See PTZOnvif::handleGetSystemDateAndTimeResponse — the
+				 * (date, time, Qt::TimeSpec) constructor is deprecated
+				 * in Qt 6.5. */
+				QDateTime cameraTime(QDate(y, mo, d), QTime(h, mi, se));
+				cameraTime.setTimeZone(QTimeZone::utc());
 				if (cameraTime.isValid())
 					m_timeOffsetSecs = QDateTime::currentDateTimeUtc().secsTo(cameraTime);
 			}

src/ptz-onvif.cpp

@@ -14,6 +14,7 @@
 #include <QtXml/QDomDocument>
 #include <QXmlStreamWriter>
 #include <QRegularExpression>
+#include <QTimeZone>
 
 void PTZOnvif::sendRequest(QString url, QString req)
 {
@@ -332,8 +333,7 @@ void PTZOnvif::handleResponse(QString response)
 	 * GetStreamUri responses with `&channel=`/`&protocol=`). That's
 	 * invalid XML and Qt's QDomDocument rejects the whole document.
 	 * Replace any bare '&' not starting a known entity with '&amp;'. */
-	static const QRegularExpression ampFix(QStringLiteral(
-		"&(?!(?:amp|lt|gt|quot|apos|#[0-9]+|#x[0-9a-fA-F]+);)"));
+	static const QRegularExpression ampFix(QStringLiteral("&(?!(?:amp|lt|gt|quot|apos|#[0-9]+|#x[0-9a-fA-F]+);)"));
 	response.replace(ampFix, "&amp;");
 
 	QDomDocument doc;
@@ -394,7 +394,12 @@ void PTZOnvif::handleGetSystemDateAndTimeResponse(QDomNode node)
 		int h = timeEl.firstChildElement("Hour", nsOnvifSchema).text().toInt();
 		int mi = timeEl.firstChildElement("Minute", nsOnvifSchema).text().toInt();
 		int se = timeEl.firstChildElement("Second", nsOnvifSchema).text().toInt();
-		QDateTime cameraTime(QDate(y, mo, d), QTime(h, mi, se), Qt::UTC);
+		/* Construct as local-naive then re-anchor to UTC. The
+		 * (QDate, QTime, Qt::TimeSpec) constructor was deprecated in
+		 * Qt 6.5 (MSVC -Werror flags it); setTimeZone(QTimeZone::utc())
+		 * does the same thing and is portable back to Qt 5.2. */
+		QDateTime cameraTime(QDate(y, mo, d), QTime(h, mi, se));
+		cameraTime.setTimeZone(QTimeZone::utc());
 		if (cameraTime.isValid()) {
 			m_timeOffsetSecs = QDateTime::currentDateTimeUtc().secsTo(cameraTime);
 			if (m_timeOffsetSecs > 60 || m_timeOffsetSecs < -60)
@@ -707,8 +712,7 @@ void PTZOnvif::requestFinished(QNetworkReply *reply)
 	if (reply->error() > 0) {
 		QByteArray body = reply->readAll();
 		ptz_info("request to %s failed; error: %s, http: %i, body(<=200): %.200s", QT_TO_UTF8(url),
-			 QT_TO_UTF8(reply->errorString()), statusCodeV,
-			 QT_TO_UTF8(QString::fromUtf8(body).left(200)));
+			 QT_TO_UTF8(reply->errorString()), statusCodeV, QT_TO_UTF8(QString::fromUtf8(body).left(200)));
 		++m_consecutiveFailures;
 		if (m_consecutiveFailures >= 3 && isConnected())
 			setConnected(false);
@@ -866,8 +870,8 @@ obs_properties_t *PTZOnvif::get_obs_properties()
 	obs_properties_add_float_slider(config, "speed_boost", obs_module_text("PTZ.ONVIF.SpeedBoost"), 0.1, 10.0,
 					0.01);
 	obs_property_t *prof = obs_properties_add_list(config, "profile_token",
-						       obs_module_text("PTZ.ONVIF.MediaProfile"),
-						       OBS_COMBO_TYPE_LIST, OBS_COMBO_FORMAT_STRING);
+						       obs_module_text("PTZ.ONVIF.MediaProfile"), OBS_COMBO_TYPE_LIST,
+						       OBS_COMBO_FORMAT_STRING);
 	if (m_mediaProfiles.isEmpty()) {
 		obs_property_list_add_string(prof, obs_module_text("PTZ.ONVIF.NoProfilesYet"), "");
 		obs_property_set_enabled(prof, false);

src/ptz-onvif.hpp

@@ -114,22 +114,22 @@ private slots:
 
 public:
 	PTZOnvif(OBSData config);
-	virtual QString description();
+	QString description() override;
 
-	void set_config(OBSData ptz_data);
-	OBSData get_config();
+	void set_config(OBSData ptz_data) override;
+	OBSData get_config() override;
 
-	obs_properties_t *get_obs_properties();
+	obs_properties_t *get_obs_properties() override;
 
-	void do_update();
-	void pantilt_rel(double pan, double tilt);
-	void pantilt_abs(double pan, double tilt);
-	void pantilt_home();
+	void do_update() override;
+	void pantilt_rel(double pan, double tilt) override;
+	void pantilt_abs(double pan, double tilt) override;
+	void pantilt_home() override;
 	void pantilt_set_home() override;
 	bool supportsSetHome() const override { return true; }
-	void zoom_abs(double pos);
-	void set_autofocus(bool enabled);
-	void memory_reset(int i);
-	void memory_set(int i);
-	void memory_recall(int i);
+	void zoom_abs(double pos) override;
+	void set_autofocus(bool enabled) override;
+	void memory_reset(int i) override;
+	void memory_set(int i) override;
+	void memory_recall(int i) override;
 };

src/settings.cpp

@@ -442,9 +442,7 @@ void PTZSettings::on_addPTZ_clicked()
 					if (!p.isEmpty())
 						url.setPassword(p);
 				}
-				QString sourceName = cam.name.isEmpty()
-							     ? QString("ONVIF %1").arg(cam.host)
-							     : cam.name;
+				QString sourceName = cam.name.isEmpty() ? QString("ONVIF %1").arg(cam.host) : cam.name;
 				OBSData settings = obs_data_create();
 				obs_data_release(settings);
 				obs_data_set_string(settings, "input", QT_TO_UTF8(url.toString()));
@@ -456,12 +454,11 @@ void PTZSettings::on_addPTZ_clicked()
 				 * default is UDP. */
 				obs_data_set_string(settings, "input_format", "");
 
-				OBSSourceAutoRelease source = obs_source_create(
-					"ffmpeg_source", QT_TO_UTF8(sourceName), settings, nullptr);
+				OBSSourceAutoRelease source =
+					obs_source_create("ffmpeg_source", QT_TO_UTF8(sourceName), settings, nullptr);
 				if (source) {
 					OBSSourceAutoRelease sceneSrc = obs_frontend_get_current_scene();
-					obs_scene_t *scene = sceneSrc ? obs_scene_from_source(sceneSrc)
-								      : nullptr;
+					obs_scene_t *scene = sceneSrc ? obs_scene_from_source(sceneSrc) : nullptr;
 					if (scene)
 						obs_scene_add(scene, source);
 				}