From 27f453ad1b1e4db0f84f1792e2b61ae72f469186 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 20 Oct 2018 21:47:56 +0900 Subject: Removed obsolete Qt2's TQVector class and replaced with TQt3's TQPtrVector. Signed-off-by: Michele Calgaro --- lib/libchmfile/libchmfile.h | 9 +-------- lib/libchmfile/qt34.h | 15 ++------------- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/lib/libchmfile/libchmfile.h b/lib/libchmfile/libchmfile.h index f5707d2..8a5a232 100644 --- a/lib/libchmfile/libchmfile.h +++ b/lib/libchmfile/libchmfile.h @@ -29,16 +29,9 @@ #include #include #include - #include "libchmtextencoding.h" -// TQt3/TQt4 compatibility: in TQt3 TQVector stores pointers, not values - so TQValueVector should be used. -// In TQt4 TQVector stores values, so we can use TQVector -#if defined (USE_TQT_4) - #define QT34VECTOR TQVector -#else - #define QT34VECTOR TQValueVector -#endif +#define QT34VECTOR TQValueVector //! Contains different (non-standard) image types diff --git a/lib/libchmfile/qt34.h b/lib/libchmfile/qt34.h index d37c3a2..19233bb 100644 --- a/lib/libchmfile/qt34.h +++ b/lib/libchmfile/qt34.h @@ -24,21 +24,10 @@ #include #include - -// TQt3/TQt4 compatibility: in TQt3 TQVector stores pointers, not values - so TQValueVector should be used. -// In TQt4 TQVector stores values, so we can use TQVector -#if defined (USE_TQT_4) - #define LIBCHMVector TQVector -#else #include - #define LIBCHMVector TQValueVector -#endif -#if defined (USE_TQT_4) - #define LIBCHMMemArray TQVector -#else - #define LIBCHMMemArray TQMemArray -#endif +#define LIBCHMVector TQValueVector +#define LIBCHMMemArray TQMemArray class LIBCHMCString { -- cgit v1.2.3