From 666baa7c515febb89f9f228a768312fddbf266b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 1 Jan 2019 19:30:49 +0100 Subject: [PATCH] Change from TQRegExp::match to TQRegExp::search. The definition of -UTQT_NO_COMPAT is no longer needed. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit 900873575600d6d7a6c5765cf444fdfe04608173) --- CMakeLists.txt | 2 +- src/parsers/policy.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 80409e0..9a243fc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,7 +57,7 @@ include( ConfigureChecks.cmake ) ###### global compiler settings -add_definitions( -DHAVE_CONFIG_H -UQT_NO_COMPAT ) +add_definitions( -DHAVE_CONFIG_H ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" ) set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" ) diff --git a/src/parsers/policy.cpp b/src/parsers/policy.cpp index 72ccadf..38c9576 100644 --- a/src/parsers/policy.cpp +++ b/src/parsers/policy.cpp @@ -89,7 +89,7 @@ void Policy::operator() (AptProtocol* slave, const TQString& type, const TQStrin received_sth = true; attribute_begin(*stream, i18n("Installed")); - if (rx_notinstalled.match(value) >= 0) + if (rx_notinstalled.search(value) >= 0) { m_installed = TQString(); *stream << i18n("no"); @@ -105,7 +105,7 @@ void Policy::operator() (AptProtocol* slave, const TQString& type, const TQStrin { received_sth = true; - bool has_candidate = (rx_notinstalled.match(value) == -1); + bool has_candidate = (rx_notinstalled.search(value) == -1); if (m_act && has_candidate) {