conditional Qt6.4 vs. 6.5 vs. 6.10 stanzas

diff --git a/src/model/AddressBookProxyModel.h b/src/model/AddressBookProxyModel.h
index 4ea5565ae50ea77943eb69d86b718fac4f29b58b..3de09274f2ce6605b73ac88b253e5a8bb01f4eaf 100644 (file)
--- a/src/model/AddressBookProxyModel.h
+++ b/src/model/AddressBookProxyModel.h
@@ -17,8 +17,14 @@ public:
 
 public slots:
     void setSearchFilter(const QString& searchString){
+#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0)
+        beginFilterChange();
+        m_searchRegExp.setPattern(searchString);
+        endFilterChange();
+#else
         m_searchRegExp.setPattern(searchString);
         invalidateFilter();
+#endif
     }
 
 private:

diff --git a/src/model/SubaddressProxyModel.h b/src/model/SubaddressProxyModel.h
index 38069ed1e41b96651d8346d70ea2530835576fae..c54ff1bddb6f9e82226138c359a08e624cc7eaa5 100644 (file)
--- a/src/model/SubaddressProxyModel.h
+++ b/src/model/SubaddressProxyModel.h
@@ -18,9 +18,16 @@ public:
 
 public slots:
     void setSearchFilter(const QString& searchString){
+#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0)
+        beginFilterChange();
+        m_searchRegExp.setPattern(searchString);
+        m_searchCaseSensitiveRegExp.setPattern(searchString);
+        endFilterChange();
+#else
         m_searchRegExp.setPattern(searchString);
         m_searchCaseSensitiveRegExp.setPattern(searchString);
         invalidateFilter();
+#endif
     }
 
 private:

diff --git a/src/model/TransactionHistoryProxyModel.h b/src/model/TransactionHistoryProxyModel.h
index 8217efbe569eb87aed8e96e0aa2add555ad07b6f..f10f03af1a019032a3207d990ffe485375097611 100644 (file)
--- a/src/model/TransactionHistoryProxyModel.h
+++ b/src/model/TransactionHistoryProxyModel.h
@@ -19,8 +19,14 @@ public:
 
 public slots:
     void setSearchFilter(const QString& searchString){
+#if QT_VERSION >= QT_VERSION_CHECK(6, 10, 0)
+        beginFilterChange();
+        m_searchRegExp.setPattern(searchString);
+        endFilterChange();
+#else
         m_searchRegExp.setPattern(searchString);
         invalidateFilter();
+#endif
     }
 
 private:

diff --git a/src/utils/WebsocketClient.cpp b/src/utils/WebsocketClient.cpp
index fe96fb81b828e1fc674c6ce1bdb281b3f8ea2bd8..13bb3428c4f4bc03d761b162768410d77fba648c 100644 (file)
--- a/src/utils/WebsocketClient.cpp
+++ b/src/utils/WebsocketClient.cpp
@@ -20,7 +20,13 @@ WebsocketClient::WebsocketClient(QObject *parent)
     connect(webSocket, &QWebSocket::stateChanged, this, &WebsocketClient::onStateChanged);
     connect(webSocket, &QWebSocket::connected, this, &WebsocketClient::onConnected);
     connect(webSocket, &QWebSocket::disconnected, this, &WebsocketClient::onDisconnected);
+    // one liner: for both Qt 6.4 (older) and Qt 6.5+ (newer)
+    // connect(webSocket, QOverload<QAbstractSocket::SocketError>::of(&QWebSocket::error), this, &WebsocketClient::onError);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)
     connect(webSocket, &QWebSocket::errorOccurred, this, &WebsocketClient::onError);
+#else
+    connect(webSocket, QOverload<QAbstractSocket::SocketError>::of(&QWebSocket::error), this, &WebsocketClient::onError);
+#endif
 
     connect(webSocket, &QWebSocket::binaryMessageReceived, this, &WebsocketClient::onbinaryMessageReceived);