diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-10-20 21:47:56 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-10-20 21:47:56 +0900 |
| commit | 27f453ad1b1e4db0f84f1792e2b61ae72f469186 (patch) | |
| tree | 6c4ca12d8d476c5d190176824c17aad8313b7e97 | |
| parent | d645e29e682e9ab16d21e2e78f414a9816ab7b34 (diff) | |
| download | kchmviewer-27f453ad1b1e4db0f84f1792e2b61ae72f469186.tar.gz kchmviewer-27f453ad1b1e4db0f84f1792e2b61ae72f469186.zip | |
Removed obsolete Qt2's TQVector class and replaced
with TQt3's TQPtrVector.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
| -rw-r--r-- | lib/libchmfile/libchmfile.h | 9 | ||||
| -rw-r--r-- | 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 <tqmap.h> #include <tqvaluevector.h> #include <tqtextcodec.h> - #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 <tqregexp.h> #include <tqstring.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 LIBCHMVector TQVector -#else #include <tqvaluevector.h> - #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 { |