diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-06-06 13:44:12 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2024-06-06 13:52:29 +0900 |
| commit | e6077c30d14e9d662e8843c554db86c0d366d0b6 (patch) | |
| tree | 672319afee32f0316bad258c0e9a1e0dd737bd61 /src | |
| parent | 8c029298d9d3f1f84b65ac4a3a16cd1fa28d9cde (diff) | |
| download | tqt3-e6077c30d14e9d662e8843c554db86c0d366d0b6.tar.gz tqt3-e6077c30d14e9d662e8843c554db86c0d366d0b6.zip | |
Rename str nt* related files to equivalent tq*
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'src')
145 files changed, 185 insertions, 185 deletions
diff --git a/src/codecs/ntqtextcodec.h b/src/codecs/ntqtextcodec.h index 6d0267603..f5554d261 100644 --- a/src/codecs/ntqtextcodec.h +++ b/src/codecs/ntqtextcodec.h @@ -42,7 +42,7 @@ #define TQTEXTCODEC_H #ifndef QT_H -#include "ntqstring.h" +#include "tqstring.h" #endif // QT_H #ifndef TQT_NO_TEXTCODEC diff --git a/src/codecs/ntqtextcodecfactory.h b/src/codecs/ntqtextcodecfactory.h index 621e2e01b..74cca82ca 100644 --- a/src/codecs/ntqtextcodecfactory.h +++ b/src/codecs/ntqtextcodecfactory.h @@ -40,7 +40,7 @@ #define TQTEXTCODECFACTORY_H #ifndef QT_H -#include "ntqstringlist.h" +#include "tqstringlist.h" #endif // QT_H #ifndef TQT_NO_TEXTCODEC diff --git a/src/codecs/ntqtextcodecplugin.h b/src/codecs/ntqtextcodecplugin.h index 094290545..13a83733d 100644 --- a/src/codecs/ntqtextcodecplugin.h +++ b/src/codecs/ntqtextcodecplugin.h @@ -43,7 +43,7 @@ #ifndef QT_H #include "ntqgplugin.h" -#include "ntqstringlist.h" +#include "tqstringlist.h" #endif // QT_H #ifndef TQT_NO_TEXTCODECPLUGIN diff --git a/src/codecs/qtextcodec.cpp b/src/codecs/qtextcodec.cpp index 6c83640fd..632dface1 100644 --- a/src/codecs/qtextcodec.cpp +++ b/src/codecs/qtextcodec.cpp @@ -67,8 +67,8 @@ #include "ntqsjiscodec.h" #endif // TQT_NO_BIG_CODECS #include "ntqfile.h" -#include "ntqstrlist.h" -#include "ntqstring.h" +#include "tqstrlist.h" +#include "tqstring.h" #include "../tools/qlocale_p.h" #if !defined(TQT_NO_CODECS) && !defined(TQT_NO_BIG_CODECS) && defined(TQ_WS_X11) diff --git a/src/dialogs/ntqinputdialog.h b/src/dialogs/ntqinputdialog.h index 125b3556d..32ba9c2ba 100644 --- a/src/dialogs/ntqinputdialog.h +++ b/src/dialogs/ntqinputdialog.h @@ -43,7 +43,7 @@ #ifndef QT_H #include "ntqdialog.h" -#include "ntqstring.h" +#include "tqstring.h" #include "ntqlineedit.h" #endif // QT_H diff --git a/src/dialogs/qerrormessage.cpp b/src/dialogs/qerrormessage.cpp index 5fe1b9bf6..9d27e023a 100644 --- a/src/dialogs/qerrormessage.cpp +++ b/src/dialogs/qerrormessage.cpp @@ -49,7 +49,7 @@ #include "ntqlayout.h" #include "ntqmessagebox.h" #include "ntqpushbutton.h" -#include "ntqstringlist.h" +#include "tqstringlist.h" #include "ntqstylesheet.h" #include "ntqtextview.h" diff --git a/src/dialogs/qfiledialog.cpp b/src/dialogs/qfiledialog.cpp index 911b22c28..db7b5cbe5 100644 --- a/src/dialogs/qfiledialog.cpp +++ b/src/dialogs/qfiledialog.cpp @@ -86,7 +86,7 @@ #include "ntqpushbutton.h" #include "ntqregexp.h" #include "ntqsplitter.h" -#include "ntqstrlist.h" +#include "tqstrlist.h" #include "ntqstyle.h" #include "ntqtimer.h" #include "ntqtoolbutton.h" diff --git a/src/dialogs/qprintdialog.cpp b/src/dialogs/qprintdialog.cpp index 72e84e1dc..0e37e8615 100644 --- a/src/dialogs/qprintdialog.cpp +++ b/src/dialogs/qprintdialog.cpp @@ -59,7 +59,7 @@ #include "ntqapplication.h" #include "ntqheader.h" #include "ntqstyle.h" -#include "ntqstring.h" +#include "tqstring.h" #include "ntqregexp.h" #if !defined(TQT_NO_CUPS) || !defined(TQT_NO_NIS) #include "ntqlibrary.h" diff --git a/src/inputmethod/ntqinputcontextfactory.h b/src/inputmethod/ntqinputcontextfactory.h index ed3536f10..ddebf25b8 100644 --- a/src/inputmethod/ntqinputcontextfactory.h +++ b/src/inputmethod/ntqinputcontextfactory.h @@ -37,7 +37,7 @@ #define TQINPUTCONTEXTFACTORY_H #ifndef QT_H -#include "ntqstringlist.h" +#include "tqstringlist.h" #endif // QT_H #ifndef TQT_NO_IM diff --git a/src/inputmethod/ntqinputcontextplugin.h b/src/inputmethod/ntqinputcontextplugin.h index 4026b9cf3..ed1f2eaf4 100644 --- a/src/inputmethod/ntqinputcontextplugin.h +++ b/src/inputmethod/ntqinputcontextplugin.h @@ -40,7 +40,7 @@ #ifndef QT_H #include "ntqgplugin.h" -#include "ntqstringlist.h" +#include "tqstringlist.h" #endif // QT_H #ifndef TQT_NO_IM diff --git a/src/kernel/ntqapplication.h b/src/kernel/ntqapplication.h index 4696b290e..a475fb991 100644 --- a/src/kernel/ntqapplication.h +++ b/src/kernel/ntqapplication.h @@ -46,8 +46,8 @@ #include "ntqasciidict.h" #include "ntqpalette.h" #include "ntqtranslator.h" -#include "ntqstrlist.h" -#include "ntqstringlist.h" +#include "tqstrlist.h" +#include "tqstringlist.h" #endif // QT_H class TQSessionManager; diff --git a/src/kernel/ntqcolor.h b/src/kernel/ntqcolor.h index 5c32307ea..0fca55097 100644 --- a/src/kernel/ntqcolor.h +++ b/src/kernel/ntqcolor.h @@ -43,7 +43,7 @@ #ifndef QT_H #include "ntqwindowdefs.h" -#include "ntqstringlist.h" +#include "tqstringlist.h" #endif // QT_H const TQRgb TQT_RGB_MASK = 0x00ffffff; // masks RGB values diff --git a/src/kernel/ntqdragobject.h b/src/kernel/ntqdragobject.h index 5f6147409..af4a8a995 100644 --- a/src/kernel/ntqdragobject.h +++ b/src/kernel/ntqdragobject.h @@ -48,7 +48,7 @@ class TQImageDragData; #ifndef QT_H #include "tqobject.h" #include "tqimage.h" -#include "ntqstrlist.h" +#include "tqstrlist.h" #include "ntqcolor.h" #endif // QT_H diff --git a/src/kernel/ntqdrawutil.h b/src/kernel/ntqdrawutil.h index fb6f70257..d8e2703d2 100644 --- a/src/kernel/ntqdrawutil.h +++ b/src/kernel/ntqdrawutil.h @@ -43,7 +43,7 @@ #ifndef QT_H #include "ntqnamespace.h" -#include "ntqstring.h" // char*->TQString conversion +#include "tqstring.h" // char*->TQString conversion #endif // QT_H class TQPainter; diff --git a/src/kernel/ntqfont.h b/src/kernel/ntqfont.h index d2a45c981..08297a189 100644 --- a/src/kernel/ntqfont.h +++ b/src/kernel/ntqfont.h @@ -43,7 +43,7 @@ #ifndef QT_H #include "ntqwindowdefs.h" -#include "ntqstring.h" +#include "tqstring.h" #endif // QT_H diff --git a/src/kernel/ntqfontdatabase.h b/src/kernel/ntqfontdatabase.h index 1894c5598..06807d02c 100644 --- a/src/kernel/ntqfontdatabase.h +++ b/src/kernel/ntqfontdatabase.h @@ -43,8 +43,8 @@ #ifndef QT_H #include "ntqwindowdefs.h" -#include "ntqstring.h" -#include "ntqstringlist.h" +#include "tqstring.h" +#include "tqstringlist.h" #include "ntqfont.h" #include "tqvaluelist.h" #endif // QT_H diff --git a/src/kernel/ntqinputcontext.h b/src/kernel/ntqinputcontext.h index f782c1f7c..2486fc3a9 100644 --- a/src/kernel/ntqinputcontext.h +++ b/src/kernel/ntqinputcontext.h @@ -42,7 +42,7 @@ #include "tqobject.h" #include "ntqglobal.h" #include "ntqevent.h" -#include "ntqstring.h" +#include "tqstring.h" #include "tqptrlist.h" #endif diff --git a/src/kernel/ntqkeysequence.h b/src/kernel/ntqkeysequence.h index 5036e69d3..e4800839d 100644 --- a/src/kernel/ntqkeysequence.h +++ b/src/kernel/ntqkeysequence.h @@ -44,7 +44,7 @@ #ifndef QT_H #ifndef QT_H #include "ntqnamespace.h" -#include "ntqstring.h" +#include "tqstring.h" #endif // QT_H #endif diff --git a/src/kernel/ntqmetaobject.h b/src/kernel/ntqmetaobject.h index d4ed34e14..857b491c5 100644 --- a/src/kernel/ntqmetaobject.h +++ b/src/kernel/ntqmetaobject.h @@ -43,7 +43,7 @@ #ifndef QT_H #include "ntqconnection.h" -#include "ntqstrlist.h" +#include "tqstrlist.h" #endif // QT_H #ifndef Q_MOC_OUTPUT_REVISION diff --git a/src/kernel/ntqnamespace.h b/src/kernel/ntqnamespace.h index c540c549b..8bdc0a374 100644 --- a/src/kernel/ntqnamespace.h +++ b/src/kernel/ntqnamespace.h @@ -988,7 +988,7 @@ public: typedef uint ComparisonFlags; - // Documented in qstring.cpp + // Documented in tqstring.cpp enum StringComparisonMode { CaseSensitive = 0x00001, // 0 0001 BeginsWith = 0x00002, // 0 0010 diff --git a/src/kernel/ntqnetworkprotocol.h b/src/kernel/ntqnetworkprotocol.h index 3872ffb3c..f41d14c4d 100644 --- a/src/kernel/ntqnetworkprotocol.h +++ b/src/kernel/ntqnetworkprotocol.h @@ -43,7 +43,7 @@ #ifndef QT_H #include "ntqurlinfo.h" -#include "ntqstring.h" +#include "tqstring.h" #include "ntqdict.h" #include "tqobject.h" #endif // QT_H diff --git a/src/kernel/ntqpixmap.h b/src/kernel/ntqpixmap.h index e6e5e529b..340e5b7f9 100644 --- a/src/kernel/ntqpixmap.h +++ b/src/kernel/ntqpixmap.h @@ -44,7 +44,7 @@ #ifndef QT_H #include "ntqpaintdevice.h" #include "ntqcolor.h" // char*->TQColor conversion -#include "ntqstring.h" // char*->TQString conversion +#include "tqstring.h" // char*->TQString conversion #include "ntqnamespace.h" #endif // QT_H diff --git a/src/kernel/ntqprinter.h b/src/kernel/ntqprinter.h index f7175bb51..90070c115 100644 --- a/src/kernel/ntqprinter.h +++ b/src/kernel/ntqprinter.h @@ -43,8 +43,8 @@ #ifndef QT_H #include "ntqpaintdevice.h" -#include "ntqstring.h" -#include "ntqstringlist.h" +#include "tqstring.h" +#include "tqstringlist.h" #endif // QT_H #ifndef TQT_NO_PRINTER diff --git a/src/kernel/ntqprocess.h b/src/kernel/ntqprocess.h index e3e189af0..69dba4d6c 100644 --- a/src/kernel/ntqprocess.h +++ b/src/kernel/ntqprocess.h @@ -43,7 +43,7 @@ #ifndef QT_H #include "tqobject.h" -#include "ntqstringlist.h" +#include "tqstringlist.h" #include "ntqdir.h" #endif // QT_H diff --git a/src/kernel/ntqsessionmanager.h b/src/kernel/ntqsessionmanager.h index 600b2950e..ae79dd30b 100644 --- a/src/kernel/ntqsessionmanager.h +++ b/src/kernel/ntqsessionmanager.h @@ -44,8 +44,8 @@ #ifndef QT_H #include "tqobject.h" #include "ntqwindowdefs.h" -#include "ntqstring.h" -#include "ntqstringlist.h" +#include "tqstring.h" +#include "tqstringlist.h" #endif // QT_H #ifndef TQT_NO_SESSIONMANAGER diff --git a/src/kernel/ntqsimplerichtext.h b/src/kernel/ntqsimplerichtext.h index f4b11e650..0f19a3971 100644 --- a/src/kernel/ntqsimplerichtext.h +++ b/src/kernel/ntqsimplerichtext.h @@ -43,7 +43,7 @@ #ifndef QT_H #include "ntqnamespace.h" -#include "ntqstring.h" +#include "tqstring.h" #include "ntqregion.h" #endif // QT_H diff --git a/src/kernel/ntqstylesheet.h b/src/kernel/ntqstylesheet.h index dbf5fd6ef..1c12775cc 100644 --- a/src/kernel/ntqstylesheet.h +++ b/src/kernel/ntqstylesheet.h @@ -42,7 +42,7 @@ #define TQSTYLESHEET_H #ifndef QT_H -#include "ntqstring.h" +#include "tqstring.h" #include "tqvaluelist.h" #include "tqptrvector.h" #include "ntqdict.h" diff --git a/src/kernel/ntqt.h b/src/kernel/ntqt.h index a11383bb5..876d07c1f 100644 --- a/src/kernel/ntqt.h +++ b/src/kernel/ntqt.h @@ -25,7 +25,7 @@ #include "ntqgarray.h" #include "ntqmemarray.h" #include "ntqcstring.h" -#include "ntqstring.h" +#include "tqstring.h" #include "tqptrlist.h" #include "ntqiodevice.h" #include "ntqkeysequence.h" @@ -45,7 +45,7 @@ #include "ntqbitarray.h" #include "ntqregion.h" #include "tqsql.h" -#include "ntqstrlist.h" +#include "tqstrlist.h" #include "tqvaluelist.h" #include "tqmap.h" #include "ntqdatetime.h" @@ -56,7 +56,7 @@ #include "ntqdict.h" #include "ntqevent.h" #include "ntqhostaddress.h" -#include "ntqstringlist.h" +#include "tqstringlist.h" #include "ntqcolor.h" #include <tqdom.h> #include "tqobject.h" @@ -220,7 +220,7 @@ #include <ntqmenubar.h> #include <tqcanvas.h> #include "ntqtranslator.h" -#include <ntqstrvec.h> +#include <tqstrvec.h> #include <ntqinterlacestyle.h> #include <ntqstylefactory.h> #include <ntqstyleplugin.h> diff --git a/src/kernel/ntqurl.h b/src/kernel/ntqurl.h index c984788f5..741719d44 100644 --- a/src/kernel/ntqurl.h +++ b/src/kernel/ntqurl.h @@ -42,7 +42,7 @@ #define TQURL_H #ifndef QT_H -#include "ntqstring.h" +#include "tqstring.h" #endif // QT_H #ifndef TQT_NO_URL diff --git a/src/kernel/ntqurlinfo.h b/src/kernel/ntqurlinfo.h index 9a2f35a8c..b9fa36eae 100644 --- a/src/kernel/ntqurlinfo.h +++ b/src/kernel/ntqurlinfo.h @@ -43,7 +43,7 @@ #ifndef QT_H #include "ntqdatetime.h" -#include "ntqstring.h" +#include "tqstring.h" #endif // QT_H class TQUrlOperator; diff --git a/src/kernel/ntqurloperator.h b/src/kernel/ntqurloperator.h index f290b37f3..eedc6bb29 100644 --- a/src/kernel/ntqurloperator.h +++ b/src/kernel/ntqurloperator.h @@ -46,7 +46,7 @@ #include "ntqurl.h" #include "tqptrlist.h" #include "ntqnetworkprotocol.h" -#include "ntqstringlist.h" // TQString->TQStringList conversion +#include "tqstringlist.h" // TQString->TQStringList conversion #endif // QT_H #ifndef TQT_NO_NETWORKPROTOCOL diff --git a/src/kernel/ntqvariant.h b/src/kernel/ntqvariant.h index 5e4801520..2a6eeec19 100644 --- a/src/kernel/ntqvariant.h +++ b/src/kernel/ntqvariant.h @@ -43,8 +43,8 @@ #ifndef QT_H #include "tqmap.h" -#include "ntqstring.h" -#include "ntqstringlist.h" +#include "tqstring.h" +#include "tqstringlist.h" #include "tqvaluelist.h" #endif // QT_H diff --git a/src/kernel/ntqwindowdefs.h b/src/kernel/ntqwindowdefs.h index 17593a715..543df7d40 100644 --- a/src/kernel/ntqwindowdefs.h +++ b/src/kernel/ntqwindowdefs.h @@ -44,7 +44,7 @@ #ifndef QT_H #include "tqobjectdefs.h" -#include "ntqstring.h" +#include "tqstring.h" #include "ntqnamespace.h" #endif // QT_H diff --git a/src/kernel/qfont.cpp b/src/kernel/qfont.cpp index 44168a1fa..b442a3253 100644 --- a/src/kernel/qfont.cpp +++ b/src/kernel/qfont.cpp @@ -50,7 +50,7 @@ #include "ntqdatastream.h" #include "ntqapplication.h" #include "ntqcleanuphandler.h" -#include "ntqstringlist.h" +#include "tqstringlist.h" #ifdef TQ_WS_MAC #include "ntqpaintdevicemetrics.h" #endif diff --git a/src/kernel/qlock_p.h b/src/kernel/qlock_p.h index 5fb1526ca..53d0ddbf3 100644 --- a/src/kernel/qlock_p.h +++ b/src/kernel/qlock_p.h @@ -52,7 +52,7 @@ // #ifndef QT_H -#include "ntqstring.h" +#include "tqstring.h" #endif // QT_H class TQLockData; diff --git a/src/kernel/qmime.cpp b/src/kernel/qmime.cpp index 9b2b2a4ae..de6dc3403 100644 --- a/src/kernel/qmime.cpp +++ b/src/kernel/qmime.cpp @@ -41,7 +41,7 @@ #ifndef TQT_NO_MIME #include "tqmap.h" -#include "ntqstringlist.h" +#include "tqstringlist.h" #include "ntqfileinfo.h" #include "ntqdir.h" #include "ntqdragobject.h" diff --git a/src/kernel/qprinter_p.h b/src/kernel/qprinter_p.h index b7f6d68c4..0c75668a3 100644 --- a/src/kernel/qprinter_p.h +++ b/src/kernel/qprinter_p.h @@ -45,7 +45,7 @@ #ifndef QT_H #include <ntqprinter.h> #include <ntqshared.h> -#include <ntqstring.h> +#include <tqstring.h> #include <ntqsize.h> #endif // QT_H diff --git a/src/kernel/qpsprinter.cpp b/src/kernel/qpsprinter.cpp index d845f8c30..6974fdf6c 100644 --- a/src/kernel/qpsprinter.cpp +++ b/src/kernel/qpsprinter.cpp @@ -61,7 +61,7 @@ #include "ntqpaintdevicemetrics.h" #include "tqimage.h" #include "ntqdatetime.h" -#include "ntqstring.h" +#include "tqstring.h" #include "ntqdict.h" #include "ntqmemarray.h" #include "ntqfile.h" diff --git a/src/kernel/qrichtext.cpp b/src/kernel/qrichtext.cpp index c5e4be5e3..484553d3e 100644 --- a/src/kernel/qrichtext.cpp +++ b/src/kernel/qrichtext.cpp @@ -43,7 +43,7 @@ #ifndef TQT_NO_RICHTEXT -#include "ntqstringlist.h" +#include "tqstringlist.h" #include "ntqfont.h" #include "ntqtextstream.h" #include "ntqfile.h" diff --git a/src/kernel/qrichtext_p.h b/src/kernel/qrichtext_p.h index 1d0c7627c..52762c6b4 100644 --- a/src/kernel/qrichtext_p.h +++ b/src/kernel/qrichtext_p.h @@ -54,13 +54,13 @@ // #ifndef QT_H -#include "ntqstring.h" +#include "tqstring.h" #include "tqptrlist.h" #include "ntqrect.h" #include "ntqfontmetrics.h" #include "ntqintdict.h" #include "tqmap.h" -#include "ntqstringlist.h" +#include "tqstringlist.h" #include "ntqfont.h" #include "ntqcolor.h" #include "ntqsize.h" diff --git a/src/kernel/qscriptengine.cpp b/src/kernel/qscriptengine.cpp index 19ca36e97..08cac102f 100644 --- a/src/kernel/qscriptengine.cpp +++ b/src/kernel/qscriptengine.cpp @@ -36,7 +36,7 @@ #include "qscriptengine_p.h" -#include "ntqstring.h" +#include "tqstring.h" #include "ntqrect.h" #include "ntqfont.h" #include <private/qunicodetables_p.h> diff --git a/src/kernel/qsharedmemory_p.h b/src/kernel/qsharedmemory_p.h index 30cd171ee..949450930 100644 --- a/src/kernel/qsharedmemory_p.h +++ b/src/kernel/qsharedmemory_p.h @@ -52,7 +52,7 @@ // #ifndef QT_H -#include "ntqstring.h" +#include "tqstring.h" #endif // QT_H #if !defined (QT_QWS_NO_SHM) diff --git a/src/kernel/qt_pch.h b/src/kernel/qt_pch.h index 49f0cf73d..4041d1847 100644 --- a/src/kernel/qt_pch.h +++ b/src/kernel/qt_pch.h @@ -35,8 +35,8 @@ #include <ntqpixmap.h> #include <qplatformdefs.h> #include <tqptrlist.h> -#include <ntqstring.h> -#include <ntqstringlist.h> +#include <tqstring.h> +#include <tqstringlist.h> #include <ntqstyle.h> #include <ntqtimer.h> #include <tqwidget.h> diff --git a/src/kernel/qtextengine.cpp b/src/kernel/qtextengine.cpp index 48839b5c8..e1a806f52 100644 --- a/src/kernel/qtextengine.cpp +++ b/src/kernel/qtextengine.cpp @@ -42,7 +42,7 @@ #include <ntqfont.h> #include "qfontdata_p.h" #include "qfontengine_p.h" -#include <ntqstring.h> +#include <tqstring.h> #include <private/qunicodetables_p.h> #include <stdlib.h> diff --git a/src/kernel/qtextengine_p.h b/src/kernel/qtextengine_p.h index 751cdf043..774302a07 100644 --- a/src/kernel/qtextengine_p.h +++ b/src/kernel/qtextengine_p.h @@ -39,7 +39,7 @@ #ifndef QT_H #include "ntqglobal.h" -#include "ntqstring.h" +#include "tqstring.h" #include "ntqnamespace.h" #include <private/qfontdata_p.h> #endif // QT_H diff --git a/src/kernel/qtextlayout_p.h b/src/kernel/qtextlayout_p.h index b2430e055..64c7f64db 100644 --- a/src/kernel/qtextlayout_p.h +++ b/src/kernel/qtextlayout_p.h @@ -38,7 +38,7 @@ #define TQTEXTLAYOUT_P_H #ifndef QT_H -#include "ntqstring.h" +#include "tqstring.h" #include "ntqnamespace.h" #include "ntqrect.h" #endif // QT_H diff --git a/src/kernel/qtranslator.cpp b/src/kernel/qtranslator.cpp index 4cc41ae00..ce01453fe 100644 --- a/src/kernel/qtranslator.cpp +++ b/src/kernel/qtranslator.cpp @@ -59,7 +59,7 @@ static inline int qt_open(const char *pathname, int flags, mode_t mode) #include "ntqfileinfo.h" #include "tqwidgetlist.h" #include "ntqintdict.h" -#include "ntqstring.h" +#include "tqstring.h" #include "ntqapplication.h" #include "ntqfile.h" #include "ntqbuffer.h" diff --git a/src/kernel/qvariant.cpp b/src/kernel/qvariant.cpp index 991dfcd35..3665062c1 100644 --- a/src/kernel/qvariant.cpp +++ b/src/kernel/qvariant.cpp @@ -42,7 +42,7 @@ #include "ntqvariant.h" #ifndef TQT_NO_VARIANT -#include "ntqstring.h" +#include "tqstring.h" #include "ntqcstring.h" #include "ntqfont.h" #include "ntqpixmap.h" diff --git a/src/kernel/tqimage.h b/src/kernel/tqimage.h index 32f20b23f..ae5b69ff1 100644 --- a/src/kernel/tqimage.h +++ b/src/kernel/tqimage.h @@ -43,8 +43,8 @@ #ifndef QT_H #include "ntqpixmap.h" -#include "ntqstrlist.h" -#include "ntqstringlist.h" +#include "tqstrlist.h" +#include "tqstringlist.h" #endif // QT_H class TQImageDataMisc; // internal diff --git a/src/kernel/tqimageformatplugin.h b/src/kernel/tqimageformatplugin.h index 237817e9f..6940f18b6 100644 --- a/src/kernel/tqimageformatplugin.h +++ b/src/kernel/tqimageformatplugin.h @@ -41,7 +41,7 @@ #ifndef QT_H #include "ntqgplugin.h" -#include "ntqstringlist.h" +#include "tqstringlist.h" #endif // QT_H #ifndef TQT_NO_IMAGEFORMATPLUGIN diff --git a/src/kernel/tqobject.h b/src/kernel/tqobject.h index 0d63af0a3..2d72bfa25 100644 --- a/src/kernel/tqobject.h +++ b/src/kernel/tqobject.h @@ -44,7 +44,7 @@ #ifndef QT_H #include "tqobjectdefs.h" #include "ntqwindowdefs.h" -#include "ntqstring.h" +#include "tqstring.h" #include "ntqevent.h" #include "ntqmutex.h" #include "ntqnamespace.h" diff --git a/src/kernel/tqttdeintegration_x11_p.h b/src/kernel/tqttdeintegration_x11_p.h index fe8c23028..235af2453 100644 --- a/src/kernel/tqttdeintegration_x11_p.h +++ b/src/kernel/tqttdeintegration_x11_p.h @@ -4,7 +4,7 @@ #ifndef TQTDEINTEGRATION_H #define TQTDEINTEGRATION_H -#include <ntqstringlist.h> +#include <tqstringlist.h> class TQLibrary; class TQWidget; diff --git a/src/kernel/tqwidget_x11.cpp b/src/kernel/tqwidget_x11.cpp index 8329bf7a8..ff33dddbf 100644 --- a/src/kernel/tqwidget_x11.cpp +++ b/src/kernel/tqwidget_x11.cpp @@ -1238,7 +1238,7 @@ void TQWidget::unsetCursor() } static XTextProperty* -qstring_to_xtp( const TQString& s ) +tqstring_to_xtp( const TQString& s ) { static XTextProperty tp = { 0, 0, 0, 0 }; static bool free_prop = TRUE; // we can't free tp.value in case it references @@ -1261,7 +1261,7 @@ qstring_to_xtp( const TQString& s ) tl, 1, XStdICCTextStyle, &tp ); #if defined(QT_DEBUG) if ( errCode < 0 ) - tqDebug( "qstring_to_xtp result code %d", errCode ); + tqDebug( "tqstring_to_xtp result code %d", errCode ); #endif } if ( !mapper || errCode < 0 ) { @@ -1292,7 +1292,7 @@ void TQWidget::setCaption( const TQString &caption ) return; topData()->caption = caption; - XSetWMName( x11Display(), winId(), qstring_to_xtp(caption) ); + XSetWMName( x11Display(), winId(), tqstring_to_xtp(caption) ); TQCString net_wm_name = caption.utf8(); XChangeProperty(x11Display(), winId(), qt_net_wm_name, qt_utf8_string, 8, @@ -1377,7 +1377,7 @@ void TQWidget::setIconText( const TQString &iconText ) return; topData()->iconText = iconText; - XSetWMIconName( x11Display(), winId(), qstring_to_xtp(iconText) ); + XSetWMIconName( x11Display(), winId(), tqstring_to_xtp(iconText) ); TQCString net_wm_icon_name = iconText.utf8(); XChangeProperty(x11Display(), winId(), qt_net_wm_icon_name, qt_utf8_string, 8, PropModeReplace, diff --git a/src/moc/moc.l b/src/moc/moc.l index 868f9c0a6..b5388077f 100644 --- a/src/moc/moc.l +++ b/src/moc/moc.l @@ -65,7 +65,7 @@ long buf_size_total = 0, buf_index = 0; } #endif -#include "ntqstring.h" +#include "tqstring.h" #define input yyinput // yyinput in C++ diff --git a/src/moc/moc.pro b/src/moc/moc.pro index f053ae338..e2f92ef17 100644 --- a/src/moc/moc.pro +++ b/src/moc/moc.pro @@ -27,10 +27,10 @@ SOURCES = ../tools/qbuffer.cpp \ ../tools/qgvector.cpp \ ../tools/qiodevice.cpp \ ../tools/qregexp.cpp \ - ../tools/qstring.cpp \ + ../tools/tqstring.cpp \ ../tools/qlocale.cpp \ ../tools/qunicodetables.cpp \ - ../tools/qstringlist.cpp \ + ../tools/tqstringlist.cpp \ ../tools/qtextstream.cpp \ ../tools/qbitarray.cpp \ ../tools/tqmap.cpp \ diff --git a/src/moc/moc.y b/src/moc/moc.y index 222ff3f27..0d675fbc7 100644 --- a/src/moc/moc.y +++ b/src/moc/moc.y @@ -66,7 +66,7 @@ void yyerror( const char *msg ); #include "ntqdir.h" #include "tqptrlist.h" #include "ntqregexp.h" -#include "ntqstrlist.h" +#include "tqstrlist.h" #ifdef MOC_MWERKS_PLUGIN # ifdef Q_OS_MACX # undef OLD_DEBUG diff --git a/src/moc/moc_lex.cpp b/src/moc/moc_lex.cpp index c5f29d5fc..0fcd62c21 100644 --- a/src/moc/moc_lex.cpp +++ b/src/moc/moc_lex.cpp @@ -1010,7 +1010,7 @@ long buf_size_total = 0, buf_index = 0; } #endif -#include "ntqstring.h" +#include "tqstring.h" #define input yyinput // yyinput in C++ diff --git a/src/moc/moc_yacc.cpp b/src/moc/moc_yacc.cpp index 07406ceda..d070c4230 100644 --- a/src/moc/moc_yacc.cpp +++ b/src/moc/moc_yacc.cpp @@ -79,7 +79,7 @@ void yyerror( const char *msg ); #include "ntqdir.h" #include "tqptrlist.h" #include "ntqregexp.h" -#include "ntqstrlist.h" +#include "tqstrlist.h" #ifdef MOC_MWERKS_PLUGIN # ifdef Q_OS_MACX # undef OLD_DEBUG diff --git a/src/network/ntqdns.h b/src/network/ntqdns.h index 7201c3043..491b6fce5 100644 --- a/src/network/ntqdns.h +++ b/src/network/ntqdns.h @@ -45,7 +45,7 @@ #include "tqobject.h" #include "ntqhostaddress.h" #include "ntqsocketnotifier.h" -#include "ntqstringlist.h" +#include "tqstringlist.h" #endif // QT_H #if !defined( TQT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK ) diff --git a/src/network/ntqftp.h b/src/network/ntqftp.h index dd375b696..91100e39d 100644 --- a/src/network/ntqftp.h +++ b/src/network/ntqftp.h @@ -42,7 +42,7 @@ #define TQFTP_H #ifndef QT_H -#include "ntqstring.h" // char*->TQString conversion +#include "tqstring.h" // char*->TQString conversion #include "ntqurlinfo.h" #include "ntqnetworkprotocol.h" #endif // QT_H diff --git a/src/network/ntqhostaddress.h b/src/network/ntqhostaddress.h index d1c686edb..0d5a884df 100644 --- a/src/network/ntqhostaddress.h +++ b/src/network/ntqhostaddress.h @@ -42,7 +42,7 @@ #define TQHOSTADDRESS_H #ifndef QT_H -#include "ntqstring.h" +#include "tqstring.h" #endif // QT_H #if !defined( TQT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK ) diff --git a/src/network/ntqhttp.h b/src/network/ntqhttp.h index f201363c8..9a2667d7b 100644 --- a/src/network/ntqhttp.h +++ b/src/network/ntqhttp.h @@ -44,7 +44,7 @@ #ifndef QT_H #include "tqobject.h" #include "ntqnetworkprotocol.h" -#include "ntqstringlist.h" +#include "tqstringlist.h" #endif // QT_H #if !defined( TQT_MODULE_NETWORK ) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_NETWORK ) diff --git a/src/network/qdns.cpp b/src/network/qdns.cpp index db93c4e92..4be302d5a 100644 --- a/src/network/qdns.cpp +++ b/src/network/qdns.cpp @@ -67,11 +67,11 @@ #include "ntqdatetime.h" #include "ntqdict.h" #include "tqptrlist.h" -#include "ntqstring.h" +#include "tqstring.h" #include "ntqtimer.h" #include "ntqapplication.h" #include "tqptrvector.h" -#include "ntqstrlist.h" +#include "tqstrlist.h" #include "tqptrdict.h" #include "ntqfile.h" #include "ntqtextstream.h" diff --git a/src/network/qftp.cpp b/src/network/qftp.cpp index bdbfe47b5..ac4d442e0 100644 --- a/src/network/qftp.cpp +++ b/src/network/qftp.cpp @@ -46,7 +46,7 @@ #include "ntqsocketdevice.h" #include "ntqurlinfo.h" #include "ntqurloperator.h" -#include "ntqstringlist.h" +#include "tqstringlist.h" #include "ntqregexp.h" #include "ntqtimer.h" #include "ntqfileinfo.h" diff --git a/src/network/qhostaddress.cpp b/src/network/qhostaddress.cpp index be6cb3ba6..5ea478175 100644 --- a/src/network/qhostaddress.cpp +++ b/src/network/qhostaddress.cpp @@ -39,7 +39,7 @@ **********************************************************************/ #include "ntqhostaddress.h" -#include "ntqstringlist.h" +#include "tqstringlist.h" #ifndef TQT_NO_NETWORK class TQHostAddressPrivate diff --git a/src/network/qhttp.cpp b/src/network/qhttp.cpp index 54c21fcc1..8f88e0340 100644 --- a/src/network/qhttp.cpp +++ b/src/network/qhttp.cpp @@ -45,8 +45,8 @@ #include "ntqsocket.h" #include "ntqtextstream.h" #include "tqmap.h" -#include "ntqstring.h" -#include "ntqstringlist.h" +#include "tqstring.h" +#include "tqstringlist.h" #include "ntqcstring.h" #include "ntqbuffer.h" #include "ntqurloperator.h" diff --git a/src/sql/drivers/odbc/tqsql_odbc.h b/src/sql/drivers/odbc/tqsql_odbc.h index f64d3e902..7a395eeb7 100644 --- a/src/sql/drivers/odbc/tqsql_odbc.h +++ b/src/sql/drivers/odbc/tqsql_odbc.h @@ -42,7 +42,7 @@ #define TQSQL_ODBC_H #include <tqmap.h> -#include <ntqstring.h> +#include <tqstring.h> #include <tqsqldriver.h> #include <tqsqlfield.h> #include <tqsqlresult.h> diff --git a/src/sql/tqdatabrowser.h b/src/sql/tqdatabrowser.h index fe5b9e623..c1d715a3a 100644 --- a/src/sql/tqdatabrowser.h +++ b/src/sql/tqdatabrowser.h @@ -43,8 +43,8 @@ #ifndef QT_H #include "tqwidget.h" -#include "ntqstring.h" -#include "ntqstringlist.h" +#include "tqstring.h" +#include "tqstringlist.h" #include "tqsql.h" #include "tqsqlindex.h" #include "tqsqlcursor.h" diff --git a/src/sql/tqdatatable.h b/src/sql/tqdatatable.h index e0cbb2658..59fdc9757 100644 --- a/src/sql/tqdatatable.h +++ b/src/sql/tqdatatable.h @@ -42,7 +42,7 @@ #define TQDATATABLE_H #ifndef QT_H -#include "ntqstring.h" +#include "tqstring.h" #include "ntqvariant.h" #include "ntqtable.h" #include "tqsql.h" diff --git a/src/sql/tqsqlcursor.h b/src/sql/tqsqlcursor.h index f9eaa3bdf..a8530ec53 100644 --- a/src/sql/tqsqlcursor.h +++ b/src/sql/tqsqlcursor.h @@ -43,7 +43,7 @@ #ifndef QT_H #include "tqsqlrecord.h" -#include "ntqstringlist.h" +#include "tqstringlist.h" #include "tqsqlquery.h" #include "tqsqlindex.h" #endif // QT_H diff --git a/src/sql/tqsqldatabase.h b/src/sql/tqsqldatabase.h index fd5a291de..84e0b1baa 100644 --- a/src/sql/tqsqldatabase.h +++ b/src/sql/tqsqldatabase.h @@ -43,9 +43,9 @@ #ifndef QT_H #include "tqobject.h" -#include "ntqstring.h" +#include "tqstring.h" #include "tqsqlquery.h" -#include "ntqstringlist.h" +#include "tqstringlist.h" #endif // QT_H #if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) diff --git a/src/sql/tqsqldriver.h b/src/sql/tqsqldriver.h index 10548880c..34309ff37 100644 --- a/src/sql/tqsqldriver.h +++ b/src/sql/tqsqldriver.h @@ -44,12 +44,12 @@ #ifndef QT_H #include "tqobject.h" #include "tqptrdict.h" -#include "ntqstring.h" +#include "tqstring.h" #include "tqsqlerror.h" #include "tqsqlquery.h" #include "tqsqlfield.h" #include "tqsqlindex.h" -#include "ntqstringlist.h" +#include "tqstringlist.h" #include "tqmap.h" #endif // QT_H diff --git a/src/sql/tqsqldriverplugin.h b/src/sql/tqsqldriverplugin.h index 97e7addb3..81c4958a8 100644 --- a/src/sql/tqsqldriverplugin.h +++ b/src/sql/tqsqldriverplugin.h @@ -43,7 +43,7 @@ #ifndef QT_H #include "ntqgplugin.h" -#include "ntqstringlist.h" +#include "tqstringlist.h" #endif // QT_H #ifndef TQT_NO_SQL diff --git a/src/sql/tqsqlerror.h b/src/sql/tqsqlerror.h index 2d60c2f21..5eb219d94 100644 --- a/src/sql/tqsqlerror.h +++ b/src/sql/tqsqlerror.h @@ -42,7 +42,7 @@ #define TQSQLERROR_H #ifndef QT_H -#include "ntqstring.h" +#include "tqstring.h" #endif // QT_H #if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) diff --git a/src/sql/tqsqlextension_p.h b/src/sql/tqsqlextension_p.h index 9989b3a31..c46e86c5c 100644 --- a/src/sql/tqsqlextension_p.h +++ b/src/sql/tqsqlextension_p.h @@ -56,7 +56,7 @@ #ifndef QT_H #include "tqmap.h" #include "tqvaluevector.h" -#include "ntqstring.h" +#include "tqstring.h" #include "ntqvariant.h" #include "tqsql.h" #endif // QT_H diff --git a/src/sql/tqsqlfield.h b/src/sql/tqsqlfield.h index a9d5e8947..4582cff12 100644 --- a/src/sql/tqsqlfield.h +++ b/src/sql/tqsqlfield.h @@ -42,7 +42,7 @@ #define TQSQLFIELD_H #ifndef QT_H -#include "ntqstring.h" +#include "tqstring.h" #include "ntqvariant.h" #endif // QT_H diff --git a/src/sql/tqsqlform.cpp b/src/sql/tqsqlform.cpp index 5977d2033..8584645e4 100644 --- a/src/sql/tqsqlform.cpp +++ b/src/sql/tqsqlform.cpp @@ -45,7 +45,7 @@ #include "tqsqlfield.h" #include "tqsqlpropertymap.h" #include "tqsqlrecord.h" -#include "ntqstringlist.h" +#include "tqstringlist.h" #include "tqwidget.h" #include "ntqdict.h" diff --git a/src/sql/tqsqlindex.h b/src/sql/tqsqlindex.h index ef860b735..3f08f3e4e 100644 --- a/src/sql/tqsqlindex.h +++ b/src/sql/tqsqlindex.h @@ -42,8 +42,8 @@ #define TQSQLINDEX_H #ifndef QT_H -#include "ntqstring.h" -#include "ntqstringlist.h" +#include "tqstring.h" +#include "tqstringlist.h" #include "tqsqlfield.h" #include "tqsqlrecord.h" #endif // QT_H diff --git a/src/sql/tqsqlmanager_p.cpp b/src/sql/tqsqlmanager_p.cpp index 3e8b9d5bd..012747efe 100644 --- a/src/sql/tqsqlmanager_p.cpp +++ b/src/sql/tqsqlmanager_p.cpp @@ -47,7 +47,7 @@ #include "tqsqlcursor.h" #include "tqsqlform.h" #include "tqsqldriver.h" -#include "ntqstring.h" +#include "tqstring.h" #include "ntqmessagebox.h" #include "ntqbitarray.h" diff --git a/src/sql/tqsqlmanager_p.h b/src/sql/tqsqlmanager_p.h index 2a81115b6..bb3010f2b 100644 --- a/src/sql/tqsqlmanager_p.h +++ b/src/sql/tqsqlmanager_p.h @@ -55,8 +55,8 @@ #ifndef QT_H #include "ntqglobal.h" -#include "ntqstring.h" -#include "ntqstringlist.h" +#include "tqstring.h" +#include "tqstringlist.h" #include "tqsql.h" #include "tqsqlerror.h" #include "tqsqlindex.h" diff --git a/src/sql/tqsqlpropertymap.h b/src/sql/tqsqlpropertymap.h index c7bff6eb7..bc21b69bf 100644 --- a/src/sql/tqsqlpropertymap.h +++ b/src/sql/tqsqlpropertymap.h @@ -43,7 +43,7 @@ #ifndef QT_H #include "ntqvariant.h" -#include "ntqstring.h" +#include "tqstring.h" #endif // QT_H #ifndef TQT_NO_SQL_FORM diff --git a/src/sql/tqsqlquery.h b/src/sql/tqsqlquery.h index 39df825aa..e7e7674c1 100644 --- a/src/sql/tqsqlquery.h +++ b/src/sql/tqsqlquery.h @@ -43,7 +43,7 @@ #ifndef QT_H #include "tqobject.h" -#include "ntqstring.h" +#include "tqstring.h" #include "ntqvariant.h" #include "tqvaluelist.h" #include "tqsqlerror.h" diff --git a/src/sql/tqsqlrecord.h b/src/sql/tqsqlrecord.h index 5f141abfe..569f031f8 100644 --- a/src/sql/tqsqlrecord.h +++ b/src/sql/tqsqlrecord.h @@ -42,8 +42,8 @@ #define TQSQLRECORD_H #ifndef QT_H -#include "ntqstring.h" -#include "ntqstringlist.h" +#include "tqstring.h" +#include "tqstringlist.h" #include "ntqvariant.h" #include "tqsqlfield.h" #endif // QT_H diff --git a/src/sql/tqsqlresult.h b/src/sql/tqsqlresult.h index 0075ed3fe..6a11443c7 100644 --- a/src/sql/tqsqlresult.h +++ b/src/sql/tqsqlresult.h @@ -42,7 +42,7 @@ #define TQSQLRESULT_H #ifndef QT_H -#include "ntqstring.h" +#include "tqstring.h" #include "ntqvariant.h" #include "tqsqlerror.h" #include "tqsqlfield.h" diff --git a/src/styles/ntqstylefactory.h b/src/styles/ntqstylefactory.h index b715c19b8..bfab3153c 100644 --- a/src/styles/ntqstylefactory.h +++ b/src/styles/ntqstylefactory.h @@ -40,7 +40,7 @@ #define TQSTYLEFACTORY_H #ifndef QT_H -#include "ntqstringlist.h" +#include "tqstringlist.h" #endif // QT_H #ifndef TQT_NO_STYLE diff --git a/src/styles/ntqstyleplugin.h b/src/styles/ntqstyleplugin.h index 4acd2b11a..13d83c453 100644 --- a/src/styles/ntqstyleplugin.h +++ b/src/styles/ntqstyleplugin.h @@ -43,7 +43,7 @@ #ifndef QT_H #include "ntqgplugin.h" -#include "ntqstringlist.h" +#include "tqstringlist.h" #endif // QT_H #ifndef TQT_NO_STYLE diff --git a/src/table/ntqtable.h b/src/table/ntqtable.h index 0e890df2c..20d30e742 100644 --- a/src/table/ntqtable.h +++ b/src/table/ntqtable.h @@ -51,7 +51,7 @@ #include "ntqguardedptr.h" #include "ntqshared.h" #include "ntqintdict.h" -#include "ntqstringlist.h" +#include "tqstringlist.h" #endif // QT_H 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 diff --git a/src/widgets/ntqaction.h b/src/widgets/ntqaction.h index 326b5236d..656e77560 100644 --- a/src/widgets/ntqaction.h +++ b/src/widgets/ntqaction.h @@ -44,7 +44,7 @@ #ifndef QT_H #include "tqobject.h" #include "ntqiconset.h" -#include "ntqstring.h" +#include "tqstring.h" #include "ntqkeysequence.h" #endif // QT_H diff --git a/src/widgets/ntqdatetimeedit.h b/src/widgets/ntqdatetimeedit.h index 75a0ef4d2..f125c673a 100644 --- a/src/widgets/ntqdatetimeedit.h +++ b/src/widgets/ntqdatetimeedit.h @@ -43,7 +43,7 @@ #ifndef QT_H #include "tqwidget.h" -#include "ntqstring.h" +#include "tqstring.h" #include "ntqdatetime.h" #endif // QT_H diff --git a/src/widgets/ntqheader.h b/src/widgets/ntqheader.h index 9fe9917a5..6ded79b70 100644 --- a/src/widgets/ntqheader.h +++ b/src/widgets/ntqheader.h @@ -43,7 +43,7 @@ #ifndef QT_H #include "tqwidget.h" -#include "ntqstring.h" +#include "tqstring.h" #include "ntqiconset.h" // conversion TQPixmap->TQIconset #endif // QT_H diff --git a/src/widgets/ntqiconview.h b/src/widgets/ntqiconview.h index c7ebd66dd..4575afbb0 100644 --- a/src/widgets/ntqiconview.h +++ b/src/widgets/ntqiconview.h @@ -43,7 +43,7 @@ #ifndef QT_H #include "ntqscrollview.h" -#include "ntqstring.h" +#include "tqstring.h" #include "ntqrect.h" #include "ntqpoint.h" #include "ntqsize.h" diff --git a/src/widgets/ntqlineedit.h b/src/widgets/ntqlineedit.h index 0748a5d23..f5bf18c68 100644 --- a/src/widgets/ntqlineedit.h +++ b/src/widgets/ntqlineedit.h @@ -48,7 +48,7 @@ class TQPopupMenu; #ifndef QT_H #include "ntqframe.h" -#include "ntqstring.h" +#include "tqstring.h" #endif // QT_H #ifndef TQT_NO_LINEEDIT diff --git a/src/widgets/ntqmenudata.h b/src/widgets/ntqmenudata.h index 063392333..3d20175cf 100644 --- a/src/widgets/ntqmenudata.h +++ b/src/widgets/ntqmenudata.h @@ -45,7 +45,7 @@ #include "ntqglobal.h" #include "ntqiconset.h" // conversion TQPixmap->TQIconset #include "ntqkeysequence.h" -#include "ntqstring.h" +#include "tqstring.h" #include "ntqsignal.h" #include "ntqfont.h" #endif // QT_H diff --git a/src/widgets/ntqsyntaxhighlighter.h b/src/widgets/ntqsyntaxhighlighter.h index 7ecb07403..aa4c1ada2 100644 --- a/src/widgets/ntqsyntaxhighlighter.h +++ b/src/widgets/ntqsyntaxhighlighter.h @@ -44,7 +44,7 @@ #ifndef QT_H #include "ntqfont.h" #include "ntqcolor.h" -#include "ntqstring.h" +#include "tqstring.h" #endif // QT_H class TQTextEdit; diff --git a/src/widgets/ntqtoolbutton.h b/src/widgets/ntqtoolbutton.h index 144ac8074..e84d8ff9e 100644 --- a/src/widgets/ntqtoolbutton.h +++ b/src/widgets/ntqtoolbutton.h @@ -43,7 +43,7 @@ #ifndef QT_H #include "ntqbutton.h" -#include "ntqstring.h" +#include "tqstring.h" #include "ntqpixmap.h" #include "ntqiconset.h" #endif // QT_H diff --git a/src/widgets/ntqvalidator.h b/src/widgets/ntqvalidator.h index 406d210f0..d8a5ca8ad 100644 --- a/src/widgets/ntqvalidator.h +++ b/src/widgets/ntqvalidator.h @@ -43,7 +43,7 @@ #ifndef QT_H #include "tqobject.h" -#include "ntqstring.h" // char*->TQString conversion +#include "tqstring.h" // char*->TQString conversion #include "ntqregexp.h" // TQString->TQRegExp conversion #endif // QT_H diff --git a/src/widgets/qcombobox.cpp b/src/widgets/qcombobox.cpp index 213ba4b91..ad2cb9df9 100644 --- a/src/widgets/qcombobox.cpp +++ b/src/widgets/qcombobox.cpp @@ -44,14 +44,14 @@ #include "ntqlistbox.h" #include "ntqpainter.h" #include "ntqdrawutil.h" -#include "ntqstrlist.h" +#include "tqstrlist.h" #include "ntqpixmap.h" #include "ntqtimer.h" #include "ntqapplication.h" #include "ntqlineedit.h" #include "ntqbitmap.h" #include "qeffects_p.h" -#include "ntqstringlist.h" +#include "tqstringlist.h" #include "ntqcombobox.h" #include "ntqstyle.h" #include <limits.h> diff --git a/src/widgets/qdatetimeedit.cpp b/src/widgets/qdatetimeedit.cpp index c8ebee765..98be1d2a7 100644 --- a/src/widgets/qdatetimeedit.cpp +++ b/src/widgets/qdatetimeedit.cpp @@ -49,7 +49,7 @@ #include "ntqpixmap.h" #include "ntqapplication.h" #include "tqvaluelist.h" -#include "ntqstring.h" +#include "tqstring.h" #include "ntqstyle.h" #if defined(TQ_WS_WIN) diff --git a/src/widgets/qiconview.cpp b/src/widgets/qiconview.cpp index 049338708..36e1529c3 100644 --- a/src/widgets/qiconview.cpp +++ b/src/widgets/qiconview.cpp @@ -67,7 +67,7 @@ #include "ntqbitmap.h" #include "ntqpixmapcache.h" #include "tqptrdict.h" -#include "ntqstringlist.h" +#include "tqstringlist.h" #include "ntqcleanuphandler.h" #include "private/qrichtext_p.h" #include "ntqstyle.h" diff --git a/src/widgets/qlineedit.cpp b/src/widgets/qlineedit.cpp index 3fb88d21e..6ed133729 100644 --- a/src/widgets/qlineedit.cpp +++ b/src/widgets/qlineedit.cpp @@ -56,7 +56,7 @@ #include "ntqdragobject.h" #include "ntqtimer.h" #include "ntqpopupmenu.h" -#include "ntqstringlist.h" +#include "tqstringlist.h" #include "ntqguardedptr.h" #include "ntqstyle.h" #include "ntqwhatsthis.h" diff --git a/src/widgets/qlistbox.cpp b/src/widgets/qlistbox.cpp index e4b4f8066..5b040fad7 100644 --- a/src/widgets/qlistbox.cpp +++ b/src/widgets/qlistbox.cpp @@ -49,12 +49,12 @@ #include "ntqmemarray.h" #include "ntqfontmetrics.h" #include "ntqpainter.h" -#include "ntqstrlist.h" +#include "tqstrlist.h" #include "ntqpixmap.h" #include "ntqapplication.h" #include "tqptrdict.h" #include "ntqtimer.h" -#include "ntqstringlist.h" +#include "tqstringlist.h" #include "ntqstyle.h" #include "ntqpopupmenu.h" #include "ntqguardedptr.h" diff --git a/src/widgets/qlistview.cpp b/src/widgets/qlistview.cpp index 91a62c7de..14dbb1f35 100644 --- a/src/widgets/qlistview.cpp +++ b/src/widgets/qlistview.cpp @@ -46,7 +46,7 @@ #include "ntqcursor.h" #include "tqptrstack.h" #include "tqptrlist.h" -#include "ntqstrlist.h" +#include "tqstrlist.h" #include "ntqapplication.h" #include "ntqbitmap.h" #include "ntqdatetime.h" diff --git a/src/widgets/qmainwindow.cpp b/src/widgets/qmainwindow.cpp index da20228b6..ff88e71d5 100644 --- a/src/widgets/qmainwindow.cpp +++ b/src/widgets/qmainwindow.cpp @@ -60,7 +60,7 @@ #include "ntqwhatsthis.h" #include "ntqbitmap.h" #include "ntqdockarea.h" -#include "ntqstringlist.h" +#include "tqstringlist.h" #include "ntqstyle.h" #ifdef TQ_WS_MACX # include "qt_mac.h" diff --git a/src/widgets/tqwidgetplugin.h b/src/widgets/tqwidgetplugin.h index cd40860d3..fa5270d0a 100644 --- a/src/widgets/tqwidgetplugin.h +++ b/src/widgets/tqwidgetplugin.h @@ -43,7 +43,7 @@ #ifndef QT_H #include "ntqgplugin.h" -#include "ntqstringlist.h" +#include "tqstringlist.h" #include "ntqiconset.h" #endif // QT_H #ifndef TQT_NO_WIDGETPLUGIN diff --git a/src/xml/tqdom.h b/src/xml/tqdom.h index 1a7089a81..2bc76eb99 100644 --- a/src/xml/tqdom.h +++ b/src/xml/tqdom.h @@ -42,7 +42,7 @@ #define TQDOM_H #ifndef QT_H -#include "ntqstring.h" +#include "tqstring.h" #endif // QT_H #if !defined(TQT_MODULE_XML) || defined( QT_LICENSE_PROFESSIONAL ) || defined( QT_INTERNAL_XML ) diff --git a/src/xml/tqxml.h b/src/xml/tqxml.h index caff6f125..fb685a21e 100644 --- a/src/xml/tqxml.h +++ b/src/xml/tqxml.h @@ -44,8 +44,8 @@ #ifndef QT_H #include "ntqtextstream.h" #include "ntqfile.h" -#include "ntqstring.h" -#include "ntqstringlist.h" +#include "tqstring.h" +#include "tqstringlist.h" #include "tqvaluevector.h" #endif // QT_H |