diff options
Diffstat (limited to 'src/tools/qdir_unix.cpp')
| -rw-r--r-- | src/tools/qdir_unix.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/tools/qdir_unix.cpp b/src/tools/qdir_unix.cpp index 05b434c..5c0c393 100644 --- a/src/tools/qdir_unix.cpp +++ b/src/tools/qdir_unix.cpp @@ -48,9 +48,9 @@ #include "qregexp.h" #include "qstringlist.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> #include <limits.h> @@ -237,7 +237,7 @@ bool QDir::readDirEntries( const QString &nameFilter, if ( !dir ) return FALSE; // cannot read the directory -#if defined(TQT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_CYGWIN) +#if defined(QT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_CYGWIN) union { struct dirent mt_file; char b[sizeof(struct dirent) + MAXNAMLEN + 1]; @@ -245,7 +245,7 @@ bool QDir::readDirEntries( const QString &nameFilter, while ( readdir_r(dir, &u.mt_file, &file ) == 0 && file ) #else while ( (file = readdir(dir)) ) -#endif // TQT_THREAD_SUPPORT && _POSIX_THREAD_SAFE_FUNCTIONS +#endif // QT_THREAD_SUPPORT && _POSIX_THREAD_SAFE_FUNCTIONS { QString fn = QFile::decodeName(file->d_name); fi.setFile( *this, fn ); @@ -311,10 +311,10 @@ const QFileInfoList * QDir::drives() if ( !knownMemoryLeak ) { -#ifdef TQT_THREAD_SUPPORT +#ifdef QT_THREAD_SUPPORT QMutexLocker locker( qt_global_mutexpool ? qt_global_mutexpool->get( &knownMemoryLeak ) : 0 ); -#endif // TQT_THREAD_SUPPORT +#endif // QT_THREAD_SUPPORT if ( !knownMemoryLeak ) { knownMemoryLeak = new QFileInfoList; |