From 9e92fd21f5b74808560b830b51d1a2f84af5b8cf Mon Sep 17 00:00:00 2001 From: gg Date: Mon, 12 Jan 2026 21:18:04 -0500 Subject: [PATCH] conditional Qt6.4 vs. 6.5 vs. 6.10 stanzas --- src/model/AddressBookProxyModel.h | 6 ++++++ src/model/SubaddressProxyModel.h | 7 +++++++ src/model/TransactionHistoryProxyModel.h | 6 ++++++ src/utils/WebsocketClient.cpp | 6 ++++++ 4 files changed, 25 insertions(+) diff --git a/src/model/AddressBookProxyModel.h b/src/model/AddressBookProxyModel.h index 4ea5565a..3de09274 100644 --- 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 38069ed1..c54ff1bd 100644 --- 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 8217efbe..f10f03af 100644 --- 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 fe96fb81..13bb3428 100644 --- 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::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::of(&QWebSocket::error), this, &WebsocketClient::onError); +#endif connect(webSocket, &QWebSocket::binaryMessageReceived, this, &WebsocketClient::onbinaryMessageReceived); -- 2.52.0