diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-09-16 22:30:57 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-09-16 22:30:57 +0900 |
| commit | 02964eb384e1b5a73a198d04262497607d81e38f (patch) | |
| tree | 56b694b9d973c7906f9960a2029068dc44791c2b /src/tools/qregexp.cpp | |
| parent | 1fb89fa15488ff396623fc275242b8ed149f4c1e (diff) | |
| download | tqt3-02964eb384e1b5a73a198d04262497607d81e38f.tar.gz tqt3-02964eb384e1b5a73a198d04262497607d81e38f.zip | |
Conversion QT_THREAD_SUPPORT -> TQT_THREAD_SUPPORT. This is part of the
qt->tqt conversion and is required to align to corresponding patch for
common/admin module.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'src/tools/qregexp.cpp')
| -rw-r--r-- | src/tools/qregexp.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/tools/qregexp.cpp b/src/tools/qregexp.cpp index 7330f4f1a..d5598c4db 100644 --- a/src/tools/qregexp.cpp +++ b/src/tools/qregexp.cpp @@ -52,10 +52,10 @@ #include "ntqstring.h" #include "ntqtl.h" -#ifdef QT_THREAD_SUPPORT +#ifdef TQT_THREAD_SUPPORT #include "ntqthreadstorage.h" #include <private/qthreadinstance_p.h> -#endif // QT_THREAD_SUPPORT +#endif // TQT_THREAD_SUPPORT #undef QT_TRANSLATE_NOOP #define QT_TRANSLATE_NOOP( context, sourceText ) sourceText @@ -3212,25 +3212,25 @@ struct TQRegExpPrivate #ifndef QT_NO_REGEXP_OPTIM static TQSingleCleanupHandler<TQCache<TQRegExpEngine> > cleanup_cache; -# ifndef QT_THREAD_SUPPORT +# ifndef TQT_THREAD_SUPPORT static TQCache<TQRegExpEngine> *engineCache = 0; -# endif // QT_THREAD_SUPPORT +# endif // TQT_THREAD_SUPPORT #endif // QT_NO_REGEXP_OPTIM static void regexpEngine( TQRegExpEngine *&eng, const TQString &pattern, bool caseSensitive, bool deref ) { -# ifdef QT_THREAD_SUPPORT +# ifdef TQT_THREAD_SUPPORT static TQThreadStorage<TQCache<TQRegExpEngine> *> engineCaches; TQCache<TQRegExpEngine> *engineCache = 0; TQThreadInstance *currentThread = TQThreadInstance::current(); if (currentThread) engineCache = engineCaches.localData(); -#endif // QT_THREAD_SUPPORT +#endif // TQT_THREAD_SUPPORT if ( !deref ) { #ifndef QT_NO_REGEXP_OPTIM -# ifdef QT_THREAD_SUPPORT +# ifdef TQT_THREAD_SUPPORT if ( currentThread ) # endif { @@ -3251,18 +3251,18 @@ static void regexpEngine( TQRegExpEngine *&eng, const TQString &pattern, if ( eng->deref() ) { #ifndef QT_NO_REGEXP_OPTIM -# ifdef QT_THREAD_SUPPORT +# ifdef TQT_THREAD_SUPPORT if ( currentThread ) # endif { if ( engineCache == 0 ) { engineCache = new TQCache<TQRegExpEngine>; engineCache->setAutoDelete( TRUE ); -# ifdef QT_THREAD_SUPPORT +# ifdef TQT_THREAD_SUPPORT engineCaches.setLocalData(engineCache); # else cleanup_cache.set( &engineCache ); -# endif // !QT_THREAD_SUPPORT +# endif // !TQT_THREAD_SUPPORT } if ( !pattern.isNull() && engineCache->insert(pattern, eng, 4 + pattern.length() / 4) ) |