diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-09-18 01:19:46 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-09-18 01:19:46 +0900 |
| commit | 2df70f03d493f5226821dd2e1da3759e3abceb02 (patch) | |
| tree | f105d7829be7401bd27b833e0e26cf64c6a62ad1 /src/tools/qregexp.cpp | |
| parent | f849f22528ee9eb5eeb1f9aa92822846b2b3e01f (diff) | |
| download | qt3-2df70f03d493f5226821dd2e1da3759e3abceb02.tar.gz qt3-2df70f03d493f5226821dd2e1da3759e3abceb02.zip | |
Revert "QT_THREAD_SUPPORT -> TQT_THREAD_SUPPORT conversion to align to updated admin module"
The original commit was a mistake and should not have been pushed.
This reverts commit f849f22528ee9eb5eeb1f9aa92822846b2b3e01f.
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 6d6790b..5b990f8 100644 --- a/src/tools/qregexp.cpp +++ b/src/tools/qregexp.cpp @@ -52,10 +52,10 @@ #include "qstring.h" #include "qtl.h" -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT #include "qthreadstorage.h" #include <private/qthreadinstance_p.h> -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT #undef QT_TRANSLATE_NOOP #define QT_TRANSLATE_NOOP( context, sourceText ) sourceText @@ -3212,25 +3212,25 @@ struct QRegExpPrivate #ifndef QT_NO_REGEXP_OPTIM static QSingleCleanupHandler<QCache<QRegExpEngine> > cleanup_cache; -# ifndef TQT_THREAD_SUPPORT +# ifndef QT_THREAD_SUPPORT static QCache<QRegExpEngine> *engineCache = 0; -# endif // TQT_THREAD_SUPPORT +# endif // QT_THREAD_SUPPORT #endif // QT_NO_REGEXP_OPTIM static void regexpEngine( QRegExpEngine *&eng, const QString &pattern, bool caseSensitive, bool deref ) { -# ifdef TQT_THREAD_SUPPORT +# ifdef QT_THREAD_SUPPORT static QThreadStorage<QCache<QRegExpEngine> *> engineCaches; QCache<QRegExpEngine> *engineCache = 0; QThreadInstance *currentThread = QThreadInstance::current(); if (currentThread) engineCache = engineCaches.localData(); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT if ( !deref ) { #ifndef QT_NO_REGEXP_OPTIM -# ifdef TQT_THREAD_SUPPORT +# ifdef QT_THREAD_SUPPORT if ( currentThread ) # endif { @@ -3251,18 +3251,18 @@ static void regexpEngine( QRegExpEngine *&eng, const QString &pattern, if ( eng->deref() ) { #ifndef QT_NO_REGEXP_OPTIM -# ifdef TQT_THREAD_SUPPORT +# ifdef QT_THREAD_SUPPORT if ( currentThread ) # endif { if ( engineCache == 0 ) { engineCache = new QCache<QRegExpEngine>; engineCache->setAutoDelete( TRUE ); -# ifdef TQT_THREAD_SUPPORT +# ifdef QT_THREAD_SUPPORT engineCaches.setLocalData(engineCache); # else cleanup_cache.set( &engineCache ); -# endif // !TQT_THREAD_SUPPORT +# endif // !QT_THREAD_SUPPORT } if ( !pattern.isNull() && engineCache->insert(pattern, eng, 4 + pattern.length() / 4) ) |