diff options
Diffstat (limited to 'lib/libchmfile')
| -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 { |