diff options
Diffstat (limited to 'src/tools')
-rw-r--r-- | src/tools/qcomlibrary.cpp | 2 | ||||
-rw-r--r-- | src/tools/qcstring.cpp | 2 | ||||
-rw-r--r-- | src/tools/qdir_unix.cpp | 2 | ||||
-rw-r--r-- | src/tools/qgarray.cpp | 2 | ||||
-rw-r--r-- | src/tools/qglist.cpp | 2 | ||||
-rw-r--r-- | src/tools/qgvector.cpp | 2 | ||||
-rw-r--r-- | src/tools/qlocale.cpp | 4 | ||||
-rw-r--r-- | src/tools/qregexp.cpp | 4 | ||||
-rw-r--r-- | src/tools/qt_tools.pri | 30 | ||||
-rw-r--r-- | src/tools/tqmutex.h (renamed from src/tools/ntqmutex.h) | 0 | ||||
-rw-r--r-- | src/tools/tqmutex_p.h (renamed from src/tools/qmutex_p.h) | 2 | ||||
-rw-r--r-- | src/tools/tqmutex_unix.cpp (renamed from src/tools/qmutex_unix.cpp) | 8 | ||||
-rw-r--r-- | src/tools/tqmutexpool.cpp (renamed from src/tools/qmutexpool.cpp) | 6 | ||||
-rw-r--r-- | src/tools/tqmutexpool_p.h (renamed from src/tools/qmutexpool_p.h) | 2 | ||||
-rw-r--r-- | src/tools/tqsemaphore.cpp (renamed from src/tools/qsemaphore.cpp) | 8 | ||||
-rw-r--r-- | src/tools/tqsemaphore.h (renamed from src/tools/ntqsemaphore.h) | 0 | ||||
-rw-r--r-- | src/tools/tqstring.cpp | 2 | ||||
-rw-r--r-- | src/tools/tqthreadinstance_p.h (renamed from src/tools/qthreadinstance_p.h) | 2 | ||||
-rw-r--r-- | src/tools/tqthreadstorage.h (renamed from src/tools/ntqthreadstorage.h) | 0 | ||||
-rw-r--r-- | src/tools/tqthreadstorage_unix.cpp (renamed from src/tools/qthreadstorage_unix.cpp) | 8 | ||||
-rw-r--r-- | src/tools/tqwaitcondition.h (renamed from src/tools/ntqwaitcondition.h) | 0 | ||||
-rw-r--r-- | src/tools/tqwaitcondition_unix.cpp (renamed from src/tools/qwaitcondition_unix.cpp) | 8 |
22 files changed, 48 insertions, 48 deletions
diff --git a/src/tools/qcomlibrary.cpp b/src/tools/qcomlibrary.cpp index 27ffbb8ce..cc7647da9 100644 --- a/src/tools/qcomlibrary.cpp +++ b/src/tools/qcomlibrary.cpp @@ -49,7 +49,7 @@ #endif // NO_ERROR_H #ifdef TQT_THREAD_SUPPORT -# include "qmutexpool_p.h" +# include "tqmutexpool_p.h" #endif // TQT_THREAD_SUPPORT #ifndef QT_DEBUG_COMPONENT diff --git a/src/tools/qcstring.cpp b/src/tools/qcstring.cpp index 80381e8b9..d35b06e3e 100644 --- a/src/tools/qcstring.cpp +++ b/src/tools/qcstring.cpp @@ -44,7 +44,7 @@ #include "ntqdatastream.h" #ifdef TQT_THREAD_SUPPORT -# include <private/qmutexpool_p.h> +# include <private/tqmutexpool_p.h> #endif // TQT_THREAD_SUPPORT #include <stdio.h> diff --git a/src/tools/qdir_unix.cpp b/src/tools/qdir_unix.cpp index 19e03e642..8019d7b16 100644 --- a/src/tools/qdir_unix.cpp +++ b/src/tools/qdir_unix.cpp @@ -49,7 +49,7 @@ #include "tqstringlist.h" #ifdef TQT_THREAD_SUPPORT -# include <private/qmutexpool_p.h> +# include <private/tqmutexpool_p.h> #endif // TQT_THREAD_SUPPORT #include <stdlib.h> diff --git a/src/tools/qgarray.cpp b/src/tools/qgarray.cpp index ff1f7b08b..1470d100e 100644 --- a/src/tools/qgarray.cpp +++ b/src/tools/qgarray.cpp @@ -53,7 +53,7 @@ #include <string.h> #ifdef TQT_THREAD_SUPPORT -# include <private/qmutexpool_p.h> +# include <private/tqmutexpool_p.h> #endif // TQT_THREAD_SUPPORT /* diff --git a/src/tools/qglist.cpp b/src/tools/qglist.cpp index 1afa67b41..95e66b38f 100644 --- a/src/tools/qglist.cpp +++ b/src/tools/qglist.cpp @@ -44,7 +44,7 @@ #include "tqvaluelist.h" #if defined(TQT_THREAD_SUPPORT) - #include "ntqmutex.h" + #include "tqmutex.h" #endif // defined(TQT_THREAD_SUPPORT) /*! diff --git a/src/tools/qgvector.cpp b/src/tools/qgvector.cpp index 81b7a2006..1c6c8669e 100644 --- a/src/tools/qgvector.cpp +++ b/src/tools/qgvector.cpp @@ -52,7 +52,7 @@ #include <stdlib.h> #ifdef TQT_THREAD_SUPPORT -# include <private/qmutexpool_p.h> +# include <private/tqmutexpool_p.h> #endif // TQT_THREAD_SUPPORT #define USE_MALLOC // comment to use new/delete diff --git a/src/tools/qlocale.cpp b/src/tools/qlocale.cpp index d7716a1a7..fc02f8ef2 100644 --- a/src/tools/qlocale.cpp +++ b/src/tools/qlocale.cpp @@ -48,8 +48,8 @@ #include "ntqnamespace.h" #ifdef QT_QLOCALE_USES_FCVT -# include <ntqmutex.h> -# include <private/qmutexpool_p.h> +# include <tqmutex.h> +# include <private/tqmutexpool_p.h> #endif #if defined (Q_OS_WIN) diff --git a/src/tools/qregexp.cpp b/src/tools/qregexp.cpp index 612e31194..e6447cdf1 100644 --- a/src/tools/qregexp.cpp +++ b/src/tools/qregexp.cpp @@ -53,8 +53,8 @@ #include "ntqtl.h" #ifdef TQT_THREAD_SUPPORT -#include "ntqthreadstorage.h" -#include <private/qthreadinstance_p.h> +#include "tqthreadstorage.h" +#include <private/tqthreadinstance_p.h> #endif // TQT_THREAD_SUPPORT #undef TQT_TRANSLATE_NOOP diff --git a/src/tools/qt_tools.pri b/src/tools/qt_tools.pri index b57e00435..d52bbd339 100644 --- a/src/tools/qt_tools.pri +++ b/src/tools/qt_tools.pri @@ -38,15 +38,15 @@ tools { $$TOOLS_P/qlocale_p.h \ $$TOOLS_H/tqptrlist.h \ $$TOOLS_H/tqmap.h \ - $$TOOLS_H/ntqmutex.h \ - $$TOOLS_P/qmutex_p.h \ - $$TOOLS_P/qmutexpool_p.h \ + $$TOOLS_H/tqmutex.h \ + $$TOOLS_P/tqmutex_p.h \ + $$TOOLS_P/tqmutexpool_p.h \ $$TOOLS_P/qpluginmanager_p.h \ $$TOOLS_H/tqptrcollection.h \ $$TOOLS_H/tqptrdict.h \ $$TOOLS_H/tqptrqueue.h \ $$TOOLS_H/ntqregexp.h \ - $$TOOLS_H/ntqsemaphore.h \ + $$TOOLS_H/tqsemaphore.h \ $$TOOLS_H/ntqsettings.h \ $$TOOLS_P/qsettings_p.h \ $$TOOLS_H/ntqshared.h \ @@ -56,14 +56,14 @@ tools { $$TOOLS_H/tqstrlist.h \ $$TOOLS_H/tqstrvec.h \ $$TOOLS_H/tqtextstream.h \ - $$TOOLS_P/qthreadinstance_p.h \ - $$TOOLS_H/ntqthreadstorage.h\ + $$TOOLS_P/tqthreadinstance_p.h \ + $$TOOLS_H/tqthreadstorage.h\ $$TOOLS_P/qunicodetables_p.h \ $$TOOLS_H/tqptrvector.h \ $$TOOLS_H/tqvaluelist.h \ $$TOOLS_H/tqvaluestack.h \ $$TOOLS_H/tqvaluevector.h \ - $$TOOLS_H/ntqwaitcondition.h \ + $$TOOLS_H/tqwaitcondition.h \ $$TOOLS_P/qcom_p.h \ $$TOOLS_P/qucom_p.h \ $$TOOLS_H/ntquuid.h @@ -73,9 +73,9 @@ tools { $$TOOLS_CPP/qfileinfo_win.cpp \ $$TOOLS_CPP/qlibrary_win.cpp \ $$TOOLS_CPP/qsettings_win.cpp \ - $$TOOLS_CPP/qmutex_win.cpp \ - $$TOOLS_CPP/qwaitcondition_win.cpp \ - $$TOOLS_CPP/qthreadstorage_win.cpp \ + $$TOOLS_CPP/tqmutex_win.cpp \ + $$TOOLS_CPP/tqwaitcondition_win.cpp \ + $$TOOLS_CPP/tqthreadstorage_win.cpp \ $$TOOLS_CPP/qcriticalsection_p.cpp win32-borland:SOURCES += $$TOOLS_CPP/qwinexport.cpp @@ -95,9 +95,9 @@ tools { else:unix:SOURCES += $$TOOLS_CPP/qdir_unix.cpp \ $$TOOLS_CPP/qfile_unix.cpp \ $$TOOLS_CPP/qfileinfo_unix.cpp \ - $$TOOLS_CPP/qmutex_unix.cpp \ - $$TOOLS_CPP/qthreadstorage_unix.cpp \ - $$TOOLS_CPP/qwaitcondition_unix.cpp + $$TOOLS_CPP/tqmutex_unix.cpp \ + $$TOOLS_CPP/tqthreadstorage_unix.cpp \ + $$TOOLS_CPP/tqwaitcondition_unix.cpp mac:!x11:!embedded:SOURCES += $$TOOLS_CPP/qsettings_mac.cpp mac { @@ -128,11 +128,11 @@ tools { $$TOOLS_CPP/qlibrary.cpp \ $$TOOLS_CPP/qlocale.cpp \ $$TOOLS_CPP/tqmap.cpp \ - $$TOOLS_CPP/qmutexpool.cpp \ + $$TOOLS_CPP/tqmutexpool.cpp \ $$TOOLS_CPP/tqptrcollection.cpp \ $$TOOLS_CPP/qregexp.cpp \ $$TOOLS_CPP/tqstring.cpp \ - $$TOOLS_CPP/qsemaphore.cpp \ + $$TOOLS_CPP/tqsemaphore.cpp \ $$TOOLS_CPP/qsettings.cpp \ $$TOOLS_CPP/tqstringlist.cpp \ $$TOOLS_CPP/tqtextstream.cpp \ diff --git a/src/tools/ntqmutex.h b/src/tools/tqmutex.h index c517c6355..c517c6355 100644 --- a/src/tools/ntqmutex.h +++ b/src/tools/tqmutex.h diff --git a/src/tools/qmutex_p.h b/src/tools/tqmutex_p.h index 3e9de8e5c..ee841f5e2 100644 --- a/src/tools/qmutex_p.h +++ b/src/tools/tqmutex_p.h @@ -49,7 +49,7 @@ // ------------- // // This file is not part of the TQt API. It exists for the convenience -// of qmutex_unix.cpp and qmutex_win.cpp. This header file may change +// of tqmutex_unix.cpp and tqmutex_win.cpp. This header file may change // from version to version without notice, or even be removed. // // We mean it. diff --git a/src/tools/qmutex_unix.cpp b/src/tools/tqmutex_unix.cpp index 597d3e628..9c793a02d 100644 --- a/src/tools/qmutex_unix.cpp +++ b/src/tools/tqmutex_unix.cpp @@ -51,8 +51,8 @@ typedef pthread_mutex_t Q_MUTEX_T; #endif #define Q_RECURSIVE_MUTEX_TYPE PTHREAD_MUTEX_RECURSIVE -#include "ntqmutex.h" -#include "qmutex_p.h" +#include "tqmutex.h" +#include "tqmutex_p.h" #include <errno.h> #include <string.h> @@ -163,7 +163,7 @@ int TQRealMutexPrivate::level() /*! - \class TQMutex ntqmutex.h + \class TQMutex tqmutex.h \threadsafe \brief The TQMutex class provides access serialization between threads. @@ -352,7 +352,7 @@ int TQMutex::level() } /*! - \class TQMutexLocker ntqmutex.h + \class TQMutexLocker tqmutex.h \brief The TQMutexLocker class simplifies locking and unlocking TQMutexes. \threadsafe diff --git a/src/tools/qmutexpool.cpp b/src/tools/tqmutexpool.cpp index 72c66c8ca..a7b17da3d 100644 --- a/src/tools/qmutexpool.cpp +++ b/src/tools/tqmutexpool.cpp @@ -36,17 +36,17 @@ ** **********************************************************************/ -#include "qmutexpool_p.h" +#include "tqmutexpool_p.h" #ifdef TQT_THREAD_SUPPORT -#include <ntqthread.h> +#include <tqthread.h> TQ_EXPORT TQMutexPool *tqt_global_mutexpool = 0; /*! - \class TQMutexPool qmutexpool_p.h + \class TQMutexPool tqmutexpool_p.h \brief The TQMutexPool class provides a pool of TQMutex objects. \internal diff --git a/src/tools/qmutexpool_p.h b/src/tools/tqmutexpool_p.h index a0bb28562..28a7ac63a 100644 --- a/src/tools/qmutexpool_p.h +++ b/src/tools/tqmutexpool_p.h @@ -54,7 +54,7 @@ #ifdef TQT_THREAD_SUPPORT #ifndef QT_H -#include "ntqmutex.h" +#include "tqmutex.h" #include "ntqmemarray.h" #endif // QT_H diff --git a/src/tools/qsemaphore.cpp b/src/tools/tqsemaphore.cpp index 810837b4c..a5cdfc630 100644 --- a/src/tools/qsemaphore.cpp +++ b/src/tools/tqsemaphore.cpp @@ -40,13 +40,13 @@ #if defined(TQT_THREAD_SUPPORT) -#include "ntqsemaphore.h" -#include "ntqmutex.h" -#include "ntqwaitcondition.h" +#include "tqsemaphore.h" +#include "tqmutex.h" +#include "tqwaitcondition.h" /*! - \class TQSemaphore ntqsemaphore.h + \class TQSemaphore tqsemaphore.h \threadsafe \brief The TQSemaphore class provides a robust integer semaphore. diff --git a/src/tools/ntqsemaphore.h b/src/tools/tqsemaphore.h index 0dc8e81de..0dc8e81de 100644 --- a/src/tools/ntqsemaphore.h +++ b/src/tools/tqsemaphore.h diff --git a/src/tools/tqstring.cpp b/src/tools/tqstring.cpp index dbf179404..71eced17d 100644 --- a/src/tools/tqstring.cpp +++ b/src/tools/tqstring.cpp @@ -94,7 +94,7 @@ #endif #if defined(TQT_THREAD_SUPPORT) && defined(MAKE_QSTRING_THREAD_SAFE) -#include "ntqmutex.h" +#include "tqmutex.h" #endif // TQT_THREAD_SUPPORT && MAKE_QSTRING_THREAD_SAFE extern TQMutex *tqt_sharedStringMutex; diff --git a/src/tools/qthreadinstance_p.h b/src/tools/tqthreadinstance_p.h index 076c2ba19..1cc0d083e 100644 --- a/src/tools/qthreadinstance_p.h +++ b/src/tools/tqthreadinstance_p.h @@ -54,7 +54,7 @@ #ifdef TQT_THREAD_SUPPORT #ifndef QT_H -#include "ntqmutex.h" +#include "tqmutex.h" #include "ntqwindowdefs.h" #endif // QT_H diff --git a/src/tools/ntqthreadstorage.h b/src/tools/tqthreadstorage.h index 588621237..588621237 100644 --- a/src/tools/ntqthreadstorage.h +++ b/src/tools/tqthreadstorage.h diff --git a/src/tools/qthreadstorage_unix.cpp b/src/tools/tqthreadstorage_unix.cpp index 86192868e..9a7e179b2 100644 --- a/src/tools/qthreadstorage_unix.cpp +++ b/src/tools/tqthreadstorage_unix.cpp @@ -39,18 +39,18 @@ #ifdef TQT_THREAD_SUPPORT #include "ntqapplication.h" -#include "ntqthread.h" +#include "tqthread.h" #include "qplatformdefs.h" -#include "ntqthreadstorage.h" -#include <private/qthreadinstance_p.h> +#include "tqthreadstorage.h" +#include <private/tqthreadinstance_p.h> #include <string.h> // #define TQTHREADSTORAGE_DEBUG -// keep this in sync with the implementation in qthreadstorage.cpp +// keep this in sync with the implementation in tqthreadstorage.cpp static const int MAX_THREAD_STORAGE = 257; // 256 maximum + 1 used in TQRegExp static pthread_mutex_t thread_storage_mutex = PTHREAD_MUTEX_INITIALIZER; diff --git a/src/tools/ntqwaitcondition.h b/src/tools/tqwaitcondition.h index 503d5d6c9..503d5d6c9 100644 --- a/src/tools/ntqwaitcondition.h +++ b/src/tools/tqwaitcondition.h diff --git a/src/tools/qwaitcondition_unix.cpp b/src/tools/tqwaitcondition_unix.cpp index 62038bae5..78fdb16bc 100644 --- a/src/tools/qwaitcondition_unix.cpp +++ b/src/tools/tqwaitcondition_unix.cpp @@ -44,9 +44,9 @@ typedef pthread_mutex_t Q_MUTEX_T; -#include "ntqwaitcondition.h" -#include "ntqmutex.h" -#include "qmutex_p.h" +#include "tqwaitcondition.h" +#include "tqmutex.h" +#include "tqmutex_p.h" #include <errno.h> #include <string.h> @@ -58,7 +58,7 @@ struct TQWaitConditionPrivate { /*! - \class TQWaitCondition ntqwaitcondition.h + \class TQWaitCondition tqwaitcondition.h \threadsafe \brief The TQWaitCondition class allows waiting/waking for conditions between threads. |