diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2023-04-12 01:36:36 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2023-04-13 01:21:38 +0200 |
| commit | 6781ec107ae60e5af90ed8009a8ed4766c64de32 (patch) | |
| tree | d9a1cda6442f4aa373161fc3395147412bab953a | |
| parent | 760e8bbab490f8413ec2291278b9ac13c44dd5c3 (diff) | |
| download | bibletime-6781ec10.tar.gz bibletime-6781ec10.zip | |
Enforce the use of TQt with STL only where it is necessary.
This resolves issue #6.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
| -rw-r--r-- | bibletime/frontend/keychooser/clexiconkeychooser.cpp | 11 | ||||
| -rw-r--r-- | bibletime/frontend/mainindex/cindexitem.cpp | 10 |
2 files changed, 21 insertions, 0 deletions
diff --git a/bibletime/frontend/keychooser/clexiconkeychooser.cpp b/bibletime/frontend/keychooser/clexiconkeychooser.cpp index 94988f7..22cdebc 100644 --- a/bibletime/frontend/keychooser/clexiconkeychooser.cpp +++ b/bibletime/frontend/keychooser/clexiconkeychooser.cpp @@ -7,6 +7,11 @@ * **********/ +// force to use TQt with STL +#if defined(TQT_NO_STL) +# define DISABLE_TQT_NO_STL +# undef TQT_NO_STL +#endif #include "clexiconkeychooser.h" @@ -176,3 +181,9 @@ void CLexiconKeyChooser::setModules( const ListCSwordModuleInfo& modules, const void CLexiconKeyChooser::updateKey(CSwordKey*) {} #include "clexiconkeychooser.moc" + +// restore TQT_NO_STL +#if defined(DISABLE_TQT_NO_STL) +# undef DISABLE_TQT_NO_STL +# define TQT_NO_STL +#endif diff --git a/bibletime/frontend/mainindex/cindexitem.cpp b/bibletime/frontend/mainindex/cindexitem.cpp index ec177b9..78594eb 100644 --- a/bibletime/frontend/mainindex/cindexitem.cpp +++ b/bibletime/frontend/mainindex/cindexitem.cpp @@ -7,6 +7,11 @@ * **********/ +// force to use TQt with STL +#if defined(TQT_NO_STL) +# define DISABLE_TQT_NO_STL +# undef TQT_NO_STL +#endif //BibleTime includes @@ -1226,3 +1231,8 @@ void CGlossaryFolder::addGroup(const Type type, const TQString& fromLanguage, co } } +// restore TQT_NO_STL +#if defined(DISABLE_TQT_NO_STL) +# undef DISABLE_TQT_NO_STL +# define TQT_NO_STL +#endif |