diff options
Diffstat (limited to 'src/tools')
39 files changed, 52 insertions, 52 deletions
diff --git a/src/tools/ntqbitarray.h b/src/tools/ntqbitarray.h index b6e6e545d..65b2cdbe7 100644 --- a/src/tools/ntqbitarray.h +++ b/src/tools/ntqbitarray.h @@ -42,7 +42,7 @@ #define TQBITARRAY_H #ifndef QT_H -#include "ntqstring.h" +#include "tqstring.h" #endif // QT_H diff --git a/src/tools/ntqbuffer.h b/src/tools/ntqbuffer.h index e4ba24115..66f84e86f 100644 --- a/src/tools/ntqbuffer.h +++ b/src/tools/ntqbuffer.h @@ -43,7 +43,7 @@ #ifndef QT_H #include "ntqiodevice.h" -#include "ntqstring.h" +#include "tqstring.h" #endif // QT_H diff --git a/src/tools/ntqdatastream.h b/src/tools/ntqdatastream.h index 9cd74f66d..2d4063475 100644 --- a/src/tools/ntqdatastream.h +++ b/src/tools/ntqdatastream.h @@ -43,7 +43,7 @@ #ifndef QT_H #include "ntqiodevice.h" -#include "ntqstring.h" +#include "tqstring.h" #endif // QT_H #ifndef TQT_NO_DATASTREAM diff --git a/src/tools/ntqdatetime.h b/src/tools/ntqdatetime.h index f64a86ecc..545f1f56b 100644 --- a/src/tools/ntqdatetime.h +++ b/src/tools/ntqdatetime.h @@ -42,7 +42,7 @@ #define TQDATETIME_H #ifndef QT_H -#include "ntqstring.h" +#include "tqstring.h" #include "ntqnamespace.h" #endif // QT_H diff --git a/src/tools/ntqdir.h b/src/tools/ntqdir.h index 657f1f7ec..04bd409ea 100644 --- a/src/tools/ntqdir.h +++ b/src/tools/ntqdir.h @@ -43,7 +43,7 @@ #ifndef QT_H #include "ntqglobal.h" -#include "ntqstrlist.h" +#include "tqstrlist.h" #include "ntqfileinfo.h" #endif // QT_H diff --git a/src/tools/ntqfile.h b/src/tools/ntqfile.h index 0fc684b94..ba2d9e103 100644 --- a/src/tools/ntqfile.h +++ b/src/tools/ntqfile.h @@ -43,7 +43,7 @@ #ifndef QT_H #include "ntqiodevice.h" -#include "ntqstring.h" +#include "tqstring.h" #include <stdio.h> #endif // QT_H diff --git a/src/tools/ntqgdict.h b/src/tools/ntqgdict.h index 0e29a51eb..9a941ecb7 100644 --- a/src/tools/ntqgdict.h +++ b/src/tools/ntqgdict.h @@ -43,7 +43,7 @@ #ifndef QT_H #include "tqptrcollection.h" -#include "ntqstring.h" +#include "tqstring.h" #endif // QT_H class TQGDictIterator; diff --git a/src/tools/ntqlibrary.h b/src/tools/ntqlibrary.h index df9af20b1..d8b5f4ba5 100644 --- a/src/tools/ntqlibrary.h +++ b/src/tools/ntqlibrary.h @@ -42,7 +42,7 @@ #define TQLIBRARY_H #ifndef QT_H -#include "ntqstring.h" +#include "tqstring.h" #endif // QT_H #ifndef TQT_NO_LIBRARY diff --git a/src/tools/ntqlocale.h b/src/tools/ntqlocale.h index 1cbc54bad..d3a578d1c 100644 --- a/src/tools/ntqlocale.h +++ b/src/tools/ntqlocale.h @@ -39,7 +39,7 @@ #ifndef TQLOCALE_H #define TQLOCALE_H -#include "ntqstring.h" +#include "tqstring.h" struct TQLocalePrivate; diff --git a/src/tools/ntqregexp.h b/src/tools/ntqregexp.h index 4588263ae..d8aca02c0 100644 --- a/src/tools/ntqregexp.h +++ b/src/tools/ntqregexp.h @@ -42,7 +42,7 @@ #define TQREGEXP_H #ifndef QT_H -#include "ntqstringlist.h" +#include "tqstringlist.h" #endif // QT_H #ifndef TQT_NO_REGEXP diff --git a/src/tools/ntqsettings.h b/src/tools/ntqsettings.h index a9d5cd29b..f5804e89f 100644 --- a/src/tools/ntqsettings.h +++ b/src/tools/ntqsettings.h @@ -43,7 +43,7 @@ #ifndef QT_H #include "ntqdatetime.h" -#include "ntqstringlist.h" +#include "tqstringlist.h" #endif // QT_H #ifndef TQT_NO_SETTINGS diff --git a/src/tools/ntqtextstream.h b/src/tools/ntqtextstream.h index 5277c960b..ab2366b39 100644 --- a/src/tools/ntqtextstream.h +++ b/src/tools/ntqtextstream.h @@ -43,7 +43,7 @@ #ifndef QT_H #include "ntqiodevice.h" -#include "ntqstring.h" +#include "tqstring.h" #include <stdio.h> #endif // QT_H diff --git a/src/tools/ntqtl.h b/src/tools/ntqtl.h index 6a47802b0..8b8724f9e 100644 --- a/src/tools/ntqtl.h +++ b/src/tools/ntqtl.h @@ -44,7 +44,7 @@ #ifndef QT_H #include "ntqglobal.h" #include "ntqtextstream.h" -#include "ntqstring.h" +#include "tqstring.h" #endif // QT_H #ifndef TQT_NO_TEXTSTREAM diff --git a/src/tools/ntquuid.h b/src/tools/ntquuid.h index 1403c364e..69092a5d7 100644 --- a/src/tools/ntquuid.h +++ b/src/tools/ntquuid.h @@ -42,7 +42,7 @@ #define TQUUID_H #ifndef QT_H -#include "ntqstring.h" +#include "tqstring.h" #endif // QT_H #include <string.h> diff --git a/src/tools/qcom_p.h b/src/tools/qcom_p.h index e11d63f27..e0c31a67d 100644 --- a/src/tools/qcom_p.h +++ b/src/tools/qcom_p.h @@ -52,7 +52,7 @@ // #ifndef QT_H -#include "ntqstringlist.h" +#include "tqstringlist.h" #include "ntquuid.h" #endif // QT_H diff --git a/src/tools/qcstring.cpp b/src/tools/qcstring.cpp index 83e351a23..80381e8b9 100644 --- a/src/tools/qcstring.cpp +++ b/src/tools/qcstring.cpp @@ -39,7 +39,7 @@ ** **********************************************************************/ -#include "ntqstring.h" +#include "tqstring.h" #include "ntqregexp.h" #include "ntqdatastream.h" diff --git a/src/tools/qdir.cpp b/src/tools/qdir.cpp index 9c22ff39f..1a2f654f5 100644 --- a/src/tools/qdir.cpp +++ b/src/tools/qdir.cpp @@ -45,7 +45,7 @@ #include <private/qdir_p.h> #include "ntqfileinfo.h" #include "ntqregexp.h" -#include "ntqstringlist.h" +#include "tqstringlist.h" #include "ntqdeepcopy.h" #include <limits.h> diff --git a/src/tools/qdir_unix.cpp b/src/tools/qdir_unix.cpp index dcf01a861..19e03e642 100644 --- a/src/tools/qdir_unix.cpp +++ b/src/tools/qdir_unix.cpp @@ -46,7 +46,7 @@ #include "qdir_p.h" #include "ntqfileinfo.h" #include "ntqregexp.h" -#include "ntqstringlist.h" +#include "tqstringlist.h" #ifdef TQT_THREAD_SUPPORT # include <private/qmutexpool_p.h> diff --git a/src/tools/qfeatures.txt b/src/tools/qfeatures.txt index f528e8e74..3c14ef270 100644 --- a/src/tools/qfeatures.txt +++ b/src/tools/qfeatures.txt @@ -74,7 +74,7 @@ SeeAlso: ??? Feature: STRINGLIST Section: Data structures Requires: -Name: QStringList +Name: TQStringList SeeAlso: ??? Feature: REGEXP diff --git a/src/tools/qgcache.cpp b/src/tools/qgcache.cpp index 9cde4b24e..452128890 100644 --- a/src/tools/qgcache.cpp +++ b/src/tools/qgcache.cpp @@ -41,7 +41,7 @@ #include "ntqgcache.h" #include "tqptrlist.h" #include "ntqdict.h" -#include "ntqstring.h" +#include "tqstring.h" /*! \class TQGCache ntqgcache.h diff --git a/src/tools/qgdict.cpp b/src/tools/qgdict.cpp index 639014870..50d2816ee 100644 --- a/src/tools/qgdict.cpp +++ b/src/tools/qgdict.cpp @@ -40,7 +40,7 @@ #include "ntqgdict.h" #include "tqptrlist.h" -#include "ntqstring.h" +#include "tqstring.h" #include "ntqdatastream.h" #include <ctype.h> diff --git a/src/tools/qglist.cpp b/src/tools/qglist.cpp index 979297870..1afa67b41 100644 --- a/src/tools/qglist.cpp +++ b/src/tools/qglist.cpp @@ -92,7 +92,7 @@ customize the subclasses, namely compareItems(), read() and write. Normally, you do not have to reimplement any of these functions. If you still want to reimplement them, see the TQStrList - class (ntqstrlist.h) for an example. + class (tqstrlist.h) for an example. */ diff --git a/src/tools/qglobal.cpp b/src/tools/qglobal.cpp index 3a3317915..84b26a6bc 100644 --- a/src/tools/qglobal.cpp +++ b/src/tools/qglobal.cpp @@ -181,7 +181,7 @@ OSErr qt_mac_create_fsspec(const TQString &file, FSSpec *spec) return ret; } -CFStringRef qstring2cfstring(const TQString &str) +CFStringRef tqstring2cfstring(const TQString &str) { return CFStringCreateWithCharacters(0, (UniChar *)str.unicode(), str.length()); } @@ -203,7 +203,7 @@ TQString cfstring2qstring(CFStringRef str) unsigned char *p_str(const TQString &s) { - CFStringRef cfstr = qstring2cfstring(s); + CFStringRef cfstr = tqstring2cfstring(s); uchar *p = (uchar*)malloc(256); CFStringGetPascalString(cfstr, p, 256, CFStringGetSystemEncoding()); CFRelease(cfstr); diff --git a/src/tools/qgpluginmanager_p.h b/src/tools/qgpluginmanager_p.h index c531b1ab1..982970131 100644 --- a/src/tools/qgpluginmanager_p.h +++ b/src/tools/qgpluginmanager_p.h @@ -43,7 +43,7 @@ #include "ntqdict.h" #include "ntqlibrary.h" #include "ntquuid.h" -#include "ntqstringlist.h" +#include "tqstringlist.h" #include "qcom_p.h" #endif // QT_H diff --git a/src/tools/qgvector.cpp b/src/tools/qgvector.cpp index ea1e2018a..81b7a2006 100644 --- a/src/tools/qgvector.cpp +++ b/src/tools/qgvector.cpp @@ -47,7 +47,7 @@ #define TQGVECTOR_CPP #include "ntqgvector.h" #include "ntqglist.h" -#include "ntqstring.h" +#include "tqstring.h" #include "ntqdatastream.h" #include <stdlib.h> diff --git a/src/tools/qlibrary.cpp b/src/tools/qlibrary.cpp index 2773f066c..002f33215 100644 --- a/src/tools/qlibrary.cpp +++ b/src/tools/qlibrary.cpp @@ -40,7 +40,7 @@ #include "qplatformdefs.h" #include <private/qlibrary_p.h> -#include <ntqstringlist.h> +#include <tqstringlist.h> #include <ntqfile.h> #ifndef TQT_NO_LIBRARY diff --git a/src/tools/qlocale_p.h b/src/tools/qlocale_p.h index dbe14ca0f..8d562d22c 100644 --- a/src/tools/qlocale_p.h +++ b/src/tools/qlocale_p.h @@ -51,7 +51,7 @@ // // -#include <ntqstring.h> +#include <tqstring.h> struct TQLocalePrivate { diff --git a/src/tools/qregexp.cpp b/src/tools/qregexp.cpp index ab6f0ee89..612e31194 100644 --- a/src/tools/qregexp.cpp +++ b/src/tools/qregexp.cpp @@ -49,7 +49,7 @@ #include "ntqintdict.h" #include "tqmap.h" #include "tqptrvector.h" -#include "ntqstring.h" +#include "tqstring.h" #include "ntqtl.h" #ifdef TQT_THREAD_SUPPORT diff --git a/src/tools/qsettings_p.h b/src/tools/qsettings_p.h index 303466cd5..3ffd743d7 100644 --- a/src/tools/qsettings_p.h +++ b/src/tools/qsettings_p.h @@ -54,7 +54,7 @@ // #ifndef QT_H -#include "ntqstringlist.h" +#include "tqstringlist.h" #include "tqmap.h" #include "tqvaluestack.h" #endif // QT_H diff --git a/src/tools/qt_tools.pri b/src/tools/qt_tools.pri index e5e7a7af4..283d7c5ed 100644 --- a/src/tools/qt_tools.pri +++ b/src/tools/qt_tools.pri @@ -51,10 +51,10 @@ tools { $$TOOLS_P/qsettings_p.h \ $$TOOLS_H/ntqshared.h \ $$TOOLS_H/tqptrstack.h \ - $$TOOLS_H/ntqstring.h \ - $$TOOLS_H/ntqstringlist.h \ - $$TOOLS_H/ntqstrlist.h \ - $$TOOLS_H/ntqstrvec.h \ + $$TOOLS_H/tqstring.h \ + $$TOOLS_H/tqstringlist.h \ + $$TOOLS_H/tqstrlist.h \ + $$TOOLS_H/tqstrvec.h \ $$TOOLS_H/ntqtextstream.h \ $$TOOLS_P/qthreadinstance_p.h \ $$TOOLS_H/ntqthreadstorage.h\ @@ -131,10 +131,10 @@ tools { $$TOOLS_CPP/qmutexpool.cpp \ $$TOOLS_CPP/tqptrcollection.cpp \ $$TOOLS_CPP/qregexp.cpp \ - $$TOOLS_CPP/qstring.cpp \ + $$TOOLS_CPP/tqstring.cpp \ $$TOOLS_CPP/qsemaphore.cpp \ $$TOOLS_CPP/qsettings.cpp \ - $$TOOLS_CPP/qstringlist.cpp \ + $$TOOLS_CPP/tqstringlist.cpp \ $$TOOLS_CPP/qtextstream.cpp \ $$TOOLS_CPP/qunicodetables.cpp \ $$TOOLS_CPP/qucom.cpp \ diff --git a/src/tools/qucom_p.h b/src/tools/qucom_p.h index db752560f..ce4db1f00 100644 --- a/src/tools/qucom_p.h +++ b/src/tools/qucom_p.h @@ -54,7 +54,7 @@ // #ifndef QT_H -#include "ntqstring.h" +#include "tqstring.h" #include "ntquuid.h" #endif // QT_H diff --git a/src/tools/qunicodetables_p.h b/src/tools/qunicodetables_p.h index ab6d2e1c5..18045f470 100644 --- a/src/tools/qunicodetables_p.h +++ b/src/tools/qunicodetables_p.h @@ -52,7 +52,7 @@ // #ifndef QT_H -#include "ntqstring.h" +#include "tqstring.h" #endif // QT_H #ifdef TQT_NO_UNICODETABLES diff --git a/src/tools/qwinexport.cpp b/src/tools/qwinexport.cpp index 12d8832da..8bd5fd0f4 100644 --- a/src/tools/qwinexport.cpp +++ b/src/tools/qwinexport.cpp @@ -24,7 +24,7 @@ #include <ntqmemarray.h> #include <tqptrlist.h> #include <tqptrvector.h> -#include <ntqstring.h> +#include <tqstring.h> #include <tqvaluelist.h> #include <tqvaluevector.h> #include <ntqdockarea.h> diff --git a/src/tools/qstring.cpp b/src/tools/tqstring.cpp index 28b9c520c..a48af12fc 100644 --- a/src/tools/qstring.cpp +++ b/src/tools/tqstring.cpp @@ -50,7 +50,7 @@ // TQString is thread unsafe in many other areas; perhaps this option is not even useful? // #define MAKE_QSTRING_THREAD_SAFE 1 -#include "ntqstring.h" +#include "tqstring.h" #include "ntqregexp.h" #include "ntqdatastream.h" #ifndef TQT_NO_TEXTCODEC @@ -168,7 +168,7 @@ static char qToLower(char c) } /*! - \class TQCharRef ntqstring.h + \class TQCharRef tqstring.h \reentrant \brief The TQCharRef class is a helper class for TQString. @@ -187,7 +187,7 @@ static char qToLower(char c) */ /*! - \class TQChar ntqstring.h + \class TQChar tqstring.h \reentrant \brief The TQChar class provides a lightweight Unicode character. @@ -1176,7 +1176,7 @@ void TQString::compose() // These macros are used for efficient allocation of TQChar strings. // IMPORTANT! If you change these, make sure you also change the -// "delete unicode" statement in ~TQStringData() in ntqstring.h correspondingly! +// "delete unicode" statement in ~TQStringData() in tqstring.h correspondingly! #define QT_ALLOC_QCHAR_VEC( N ) (TQChar*) new char[ sizeof(TQChar)*( N ) ] #define QT_DELETE_QCHAR_VEC( P ) delete[] ((char*)( P )) @@ -1331,7 +1331,7 @@ char* TQString::unicodeToLatin1(const TQChar *uc, uint l, bool unpaged) *****************************************************************************/ /*! - \class TQString ntqstring.h + \class TQString tqstring.h \reentrant \brief The TQString class provides an abstraction of Unicode text @@ -7242,7 +7242,7 @@ TQDataStream &operator>>( TQDataStream &s, TQString &str ) *****************************************************************************/ /*! - \class TQConstString ntqstring.h + \class TQConstString tqstring.h \reentrant \ingroup text \brief The TQConstString class provides string objects using constant Unicode data. diff --git a/src/tools/ntqstring.h b/src/tools/tqstring.h index ce9ccf108..ce9ccf108 100644 --- a/src/tools/ntqstring.h +++ b/src/tools/tqstring.h diff --git a/src/tools/qstringlist.cpp b/src/tools/tqstringlist.cpp index 732bd7cf3..48bbbd541 100644 --- a/src/tools/qstringlist.cpp +++ b/src/tools/tqstringlist.cpp @@ -38,16 +38,16 @@ ** **********************************************************************/ -#include "ntqstringlist.h" +#include "tqstringlist.h" #ifndef TQT_NO_STRINGLIST #include "ntqregexp.h" -#include "ntqstrlist.h" +#include "tqstrlist.h" #include "ntqdatastream.h" #include "ntqtl.h" /*! - \class TQStringList ntqstringlist.h + \class TQStringList tqstringlist.h \reentrant \brief The TQStringList class provides a list of strings. diff --git a/src/tools/ntqstringlist.h b/src/tools/tqstringlist.h index 219af2bf5..664d205f6 100644 --- a/src/tools/ntqstringlist.h +++ b/src/tools/tqstringlist.h @@ -43,8 +43,8 @@ #ifndef QT_H #include "tqvaluelist.h" -#include "ntqstring.h" -#include "ntqstrlist.h" +#include "tqstring.h" +#include "tqstrlist.h" #endif // QT_H #ifndef TQT_NO_STRINGLIST diff --git a/src/tools/ntqstrlist.h b/src/tools/tqstrlist.h index e8eb3d3f3..4bbcc2ca0 100644 --- a/src/tools/ntqstrlist.h +++ b/src/tools/tqstrlist.h @@ -42,7 +42,7 @@ #define TQSTRLIST_H #ifndef QT_H -#include "ntqstring.h" +#include "tqstring.h" #include "tqptrlist.h" #include "ntqdatastream.h" #endif // QT_H diff --git a/src/tools/ntqstrvec.h b/src/tools/tqstrvec.h index 82fea5e97..d80bfb979 100644 --- a/src/tools/ntqstrvec.h +++ b/src/tools/tqstrvec.h @@ -42,7 +42,7 @@ #define TQSTRVEC_H #ifndef QT_H -#include "ntqstring.h" +#include "tqstring.h" #include "tqptrvector.h" #include "ntqdatastream.h" #endif // QT_H |