diff options
Diffstat (limited to 'src/codecs')
-rw-r--r-- | src/codecs/qtextcodec.cpp | 12 | ||||
-rw-r--r-- | src/codecs/qtextcodecfactory.cpp | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/codecs/qtextcodec.cpp b/src/codecs/qtextcodec.cpp index b85f5e9..80d0093 100644 --- a/src/codecs/qtextcodec.cpp +++ b/src/codecs/qtextcodec.cpp @@ -75,9 +75,9 @@ # include "qfontcodecs_p.h" #endif -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT # include <private/qmutexpool_p.h> -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT #include <stdlib.h> #include <ctype.h> @@ -121,12 +121,12 @@ void QTextCodec::deleteAllCodecs() if ( !all ) return; -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT QMutexLocker locker( qt_global_mutexpool ? qt_global_mutexpool->get( &all ) : 0 ); if ( !all ) return; -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT destroying_is_ok = TRUE; @@ -151,11 +151,11 @@ static inline void setup() { if ( all ) return; -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT QMutexLocker locker( qt_global_mutexpool ? qt_global_mutexpool->get( &all ) : 0 ); if ( all ) return; -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT realSetup(); } diff --git a/src/codecs/qtextcodecfactory.cpp b/src/codecs/qtextcodecfactory.cpp index 6a7766e..85a5d00 100644 --- a/src/codecs/qtextcodecfactory.cpp +++ b/src/codecs/qtextcodecfactory.cpp @@ -48,9 +48,9 @@ #include <private/qpluginmanager_p.h> #include "qtextcodecinterface_p.h" -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT # include <private/qmutexpool_p.h> -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT #include <stdlib.h> @@ -63,7 +63,7 @@ static void create_manager() if ( manager ) // already created return; -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT // protect manager creation QMutexLocker locker( qt_global_mutexpool ? qt_global_mutexpool->get( &manager ) : 0); |