From f26c3dbf1041ff04c5cfc8b0d683dae1f4464e3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 4 Nov 2018 12:37:46 +0100 Subject: [PATCH] Removed obsolete TQCollection and replaced with TQPtrCollection. 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 76fb9f08873a6808bd4d07d327549b7441b7758d) --- CMakeLists.txt | 2 +- kdirstat/kdirtreeiterators.cpp | 2 +- kdirstat/kdirtreeiterators.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 58a2236..e1a9e36 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,7 +58,7 @@ include( ConfigureChecks.cmake ) ###### global compiler settings -add_definitions( -DHAVE_CONFIG_H -UQT_NO_COMPAT -UQT_NO_ASCII_CAST ) +add_definitions( -DHAVE_CONFIG_H -UQT_NO_ASCII_CAST ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" ) set( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined" ) diff --git a/kdirstat/kdirtreeiterators.cpp b/kdirstat/kdirtreeiterators.cpp index aac4a90..7c55c2a 100644 --- a/kdirstat/kdirtreeiterators.cpp +++ b/kdirstat/kdirtreeiterators.cpp @@ -380,7 +380,7 @@ KFileInfoList::sumTotalSizes() int -KFileInfoList::compareItems( TQCollection::Item it1, TQCollection::Item it2 ) +KFileInfoList::compareItems( TQPtrCollection::Item it1, TQPtrCollection::Item it2 ) { if ( it1 == it2 ) return 0; diff --git a/kdirstat/kdirtreeiterators.h b/kdirstat/kdirtreeiterators.h index f7a3ae8..f211e2f 100644 --- a/kdirstat/kdirtreeiterators.h +++ b/kdirstat/kdirtreeiterators.h @@ -349,7 +349,7 @@ namespace KDirStat /** * Comparison function. This is why this class is needed at all. **/ - virtual int compareItems( TQCollection::Item it1, TQCollection::Item it2 ); + virtual int compareItems( TQPtrCollection::Item it1, TQPtrCollection::Item it2 ); KFileInfoSortOrder _sortOrder; bool _ascending;