diff options
219 files changed, 276 insertions, 276 deletions
diff --git a/doc/changes.doc b/doc/changes.doc index 211f01f6..6ce47761 100644 --- a/doc/changes.doc +++ b/doc/changes.doc @@ -128,7 +128,7 @@ terms of Qt's signals/slots mechanism directly in TQt Designer. The TQLibrary class provides a platform independent wrapper for runtime loading of shared libraries. Access to the shared libraries uses a -COM-like interface. QPluginManager makes it trivial to implement +COM-like interface. TQPluginManager makes it trivial to implement plugin support in applications. The TQt library is able to load additional styles, database drivers and text codecs from plugins which implement the relevant interfaces, e.g. TQStyleFactoryInterface, @@ -146,7 +146,7 @@ component. \section2 Plugins The TQLibrary class provides a platform independent wrapper for runtime -loading of shared libraries. QPluginManager makes it trivial to implement +loading of shared libraries. TQPluginManager makes it trivial to implement plugin support in applications. The TQt library is able to load additional styles, database drivers and text codecs from plugins. diff --git a/doc/html/index b/doc/html/index index 681eade1..d9bd1fa4 100644 --- a/doc/html/index +++ b/doc/html/index @@ -4541,7 +4541,7 @@ "TQPlatinumStyle" tqplatinumstyle.html "TQPlatinumStyle::drawRiffles" tqplatinumstyle.html#drawRiffles "TQPlatinumStyle::mixedColor" tqplatinumstyle.html#mixedColor -"QPluginManager::queryInterface" qpluginmanager.html#queryInterface +"TQPluginManager::queryInterface" tqpluginmanager.html#queryInterface "TQPoint" tqpoint.html "TQPoint::isNull" tqpoint.html#isNull "TQPoint::manhattanLength" tqpoint.html#manhattanLength @@ -6085,14 +6085,14 @@ "TQStyleSheetItem::verticalAlignment" tqstylesheetitem.html#verticalAlignment "TQStyleSheetItem::whiteSpaceMode" tqstylesheetitem.html#whiteSpaceMode "TQStyleSheetItem::~TQStyleSheetItem" tqstylesheetitem.html#~TQStyleSheetItem -"QSvgDevice::boundingRect" qsvgdevice.html#boundingRect -"QSvgDevice::load" qsvgdevice.html#load -"QSvgDevice::metric" qsvgdevice.html#metric -"QSvgDevice::play" qsvgdevice.html#play -"QSvgDevice::save" qsvgdevice.html#save -"QSvgDevice::setBoundingRect" qsvgdevice.html#setBoundingRect -"QSvgDevice::toString" qsvgdevice.html#toString -"QSvgDevice::~QSvgDevice" qsvgdevice.html#~QSvgDevice +"TQSvgDevice::boundingRect" tqsvgdevice.html#boundingRect +"TQSvgDevice::load" tqsvgdevice.html#load +"TQSvgDevice::metric" tqsvgdevice.html#metric +"TQSvgDevice::play" tqsvgdevice.html#play +"TQSvgDevice::save" tqsvgdevice.html#save +"TQSvgDevice::setBoundingRect" tqsvgdevice.html#setBoundingRect +"TQSvgDevice::toString" tqsvgdevice.html#toString +"TQSvgDevice::~TQSvgDevice" tqsvgdevice.html#~TQSvgDevice "TQSyntaxHighlighter" tqsyntaxhighlighter.html "TQSyntaxHighlighter::currentParagraph" tqsyntaxhighlighter.html#currentParagraph "TQSyntaxHighlighter::highlightParagraph" tqsyntaxhighlighter.html#highlightParagraph diff --git a/doc/html/tqaccessible-h.html b/doc/html/tqaccessible-h.html index a8f91de1..10ceff02 100644 --- a/doc/html/tqaccessible-h.html +++ b/doc/html/tqaccessible-h.html @@ -77,7 +77,7 @@ body { background: #ffffff; color: black; } #ifndef QT_H #include "tqobject.h" -#include <private/qcom_p.h> +#include <private/tqcom_p.h> #include "tqrect.h" #include "tqguardedptr.h" #include "tqmemarray.h" diff --git a/doc/html/tqfont-h.html b/doc/html/tqfont-h.html index 211c0585..d05fe718 100644 --- a/doc/html/tqfont-h.html +++ b/doc/html/tqfont-h.html @@ -229,9 +229,9 @@ public: static void cleanup(); static void cacheStatistics(); - // a copy of this lives in qunicodetables.cpp, as we can't include + // a copy of this lives in tqunicodetables.cpp, as we can't include // tqfont.h it in tools/. Do not modify without changing the script - // enum in qunicodetable_p.h aswell. + // enum in tqunicodetable_p.h aswell. enum Script { // European Alphabetic Scripts Latin, diff --git a/include/private/qcom_p.h b/include/private/qcom_p.h deleted file mode 120000 index 6c63b4c8..00000000 --- a/include/private/qcom_p.h +++ /dev/null @@ -1 +0,0 @@ -../../src/tools/qcom_p.h
\ No newline at end of file diff --git a/include/private/qcomlibrary_p.h b/include/private/qcomlibrary_p.h deleted file mode 120000 index 895c52cb..00000000 --- a/include/private/qcomlibrary_p.h +++ /dev/null @@ -1 +0,0 @@ -../../src/tools/qcomlibrary_p.h
\ No newline at end of file diff --git a/include/private/qcriticalsection_p.h b/include/private/qcriticalsection_p.h deleted file mode 120000 index b8cdb3bc..00000000 --- a/include/private/qcriticalsection_p.h +++ /dev/null @@ -1 +0,0 @@ -../../src/tools/qcriticalsection_p.h
\ No newline at end of file diff --git a/include/private/qeffects_p.h b/include/private/qeffects_p.h deleted file mode 120000 index dddcf5a9..00000000 --- a/include/private/qeffects_p.h +++ /dev/null @@ -1 +0,0 @@ -../../src/widgets/qeffects_p.h
\ No newline at end of file diff --git a/include/private/qinternal_p.h b/include/private/qinternal_p.h deleted file mode 120000 index 26720c75..00000000 --- a/include/private/qinternal_p.h +++ /dev/null @@ -1 +0,0 @@ -../../src/kernel/qinternal_p.h
\ No newline at end of file diff --git a/include/private/qpluginmanager_p.h b/include/private/qpluginmanager_p.h deleted file mode 120000 index c1574c9a..00000000 --- a/include/private/qpluginmanager_p.h +++ /dev/null @@ -1 +0,0 @@ -../../src/tools/qpluginmanager_p.h
\ No newline at end of file diff --git a/include/private/qpsprinter_p.h b/include/private/qpsprinter_p.h deleted file mode 120000 index 399bc547..00000000 --- a/include/private/qpsprinter_p.h +++ /dev/null @@ -1 +0,0 @@ -../../src/kernel/qpsprinter_p.h
\ No newline at end of file diff --git a/include/private/qrichtext_p.h b/include/private/qrichtext_p.h deleted file mode 120000 index 19f04da6..00000000 --- a/include/private/qrichtext_p.h +++ /dev/null @@ -1 +0,0 @@ -../../src/kernel/qrichtext_p.h
\ No newline at end of file diff --git a/include/private/qscriptengine_p.h b/include/private/qscriptengine_p.h deleted file mode 120000 index eaeb684c..00000000 --- a/include/private/qscriptengine_p.h +++ /dev/null @@ -1 +0,0 @@ -../../src/kernel/qscriptengine_p.h
\ No newline at end of file diff --git a/include/private/qsvgdevice_p.h b/include/private/qsvgdevice_p.h deleted file mode 120000 index 91514333..00000000 --- a/include/private/qsvgdevice_p.h +++ /dev/null @@ -1 +0,0 @@ -../../src/xml/qsvgdevice_p.h
\ No newline at end of file diff --git a/include/private/qt_x11_p.h b/include/private/qt_x11_p.h deleted file mode 120000 index 4ff3ba1f..00000000 --- a/include/private/qt_x11_p.h +++ /dev/null @@ -1 +0,0 @@ -../../src/kernel/qt_x11_p.h
\ No newline at end of file diff --git a/include/private/qtitlebar_p.h b/include/private/qtitlebar_p.h deleted file mode 120000 index 7334f9d5..00000000 --- a/include/private/qtitlebar_p.h +++ /dev/null @@ -1 +0,0 @@ -../../src/widgets/qtitlebar_p.h
\ No newline at end of file diff --git a/include/private/qucom_p.h b/include/private/qucom_p.h deleted file mode 120000 index c26c7f2b..00000000 --- a/include/private/qucom_p.h +++ /dev/null @@ -1 +0,0 @@ -../../src/tools/qucom_p.h
\ No newline at end of file diff --git a/include/private/qucomextra_p.h b/include/private/qucomextra_p.h deleted file mode 120000 index e0dbd21c..00000000 --- a/include/private/qucomextra_p.h +++ /dev/null @@ -1 +0,0 @@ -../../src/kernel/qucomextra_p.h
\ No newline at end of file diff --git a/include/private/qunicodetables_p.h b/include/private/qunicodetables_p.h deleted file mode 120000 index cdc5ef8b..00000000 --- a/include/private/qunicodetables_p.h +++ /dev/null @@ -1 +0,0 @@ -../../src/tools/qunicodetables_p.h
\ No newline at end of file diff --git a/include/private/tqcom_p.h b/include/private/tqcom_p.h new file mode 120000 index 00000000..7df32dfb --- /dev/null +++ b/include/private/tqcom_p.h @@ -0,0 +1 @@ +../../src/tools/tqcom_p.h
\ No newline at end of file diff --git a/include/private/tqcomlibrary_p.h b/include/private/tqcomlibrary_p.h new file mode 120000 index 00000000..621dc9f7 --- /dev/null +++ b/include/private/tqcomlibrary_p.h @@ -0,0 +1 @@ +../../src/tools/tqcomlibrary_p.h
\ No newline at end of file diff --git a/include/private/tqcriticalsection_p.h b/include/private/tqcriticalsection_p.h new file mode 120000 index 00000000..6c11336c --- /dev/null +++ b/include/private/tqcriticalsection_p.h @@ -0,0 +1 @@ +../../src/tools/tqcriticalsection_p.h
\ No newline at end of file diff --git a/include/private/tqeffects_p.h b/include/private/tqeffects_p.h new file mode 120000 index 00000000..d3758036 --- /dev/null +++ b/include/private/tqeffects_p.h @@ -0,0 +1 @@ +../../src/widgets/tqeffects_p.h
\ No newline at end of file diff --git a/include/private/tqinternal_p.h b/include/private/tqinternal_p.h new file mode 120000 index 00000000..bdd99f01 --- /dev/null +++ b/include/private/tqinternal_p.h @@ -0,0 +1 @@ +../../src/kernel/tqinternal_p.h
\ No newline at end of file diff --git a/include/private/tqpluginmanager_p.h b/include/private/tqpluginmanager_p.h new file mode 120000 index 00000000..b661d039 --- /dev/null +++ b/include/private/tqpluginmanager_p.h @@ -0,0 +1 @@ +../../src/tools/tqpluginmanager_p.h
\ No newline at end of file diff --git a/include/private/tqpsprinter_p.h b/include/private/tqpsprinter_p.h new file mode 120000 index 00000000..9c1c61fd --- /dev/null +++ b/include/private/tqpsprinter_p.h @@ -0,0 +1 @@ +../../src/kernel/tqpsprinter_p.h
\ No newline at end of file diff --git a/include/private/tqrichtext_p.h b/include/private/tqrichtext_p.h new file mode 120000 index 00000000..72b48fc7 --- /dev/null +++ b/include/private/tqrichtext_p.h @@ -0,0 +1 @@ +../../src/kernel/tqrichtext_p.h
\ No newline at end of file diff --git a/include/private/tqscriptengine_p.h b/include/private/tqscriptengine_p.h new file mode 120000 index 00000000..f4a4687f --- /dev/null +++ b/include/private/tqscriptengine_p.h @@ -0,0 +1 @@ +../../src/kernel/tqscriptengine_p.h
\ No newline at end of file diff --git a/include/private/tqsvgdevice_p.h b/include/private/tqsvgdevice_p.h new file mode 120000 index 00000000..a659160f --- /dev/null +++ b/include/private/tqsvgdevice_p.h @@ -0,0 +1 @@ +../../src/xml/tqsvgdevice_p.h
\ No newline at end of file diff --git a/include/private/tqt_x11_p.h b/include/private/tqt_x11_p.h new file mode 120000 index 00000000..8c6e4c1d --- /dev/null +++ b/include/private/tqt_x11_p.h @@ -0,0 +1 @@ +../../src/kernel/tqt_x11_p.h
\ No newline at end of file diff --git a/include/private/tqtitlebar_p.h b/include/private/tqtitlebar_p.h new file mode 120000 index 00000000..6fedbb5d --- /dev/null +++ b/include/private/tqtitlebar_p.h @@ -0,0 +1 @@ +../../src/widgets/tqtitlebar_p.h
\ No newline at end of file diff --git a/include/private/tqucom_p.h b/include/private/tqucom_p.h new file mode 120000 index 00000000..bd307b7a --- /dev/null +++ b/include/private/tqucom_p.h @@ -0,0 +1 @@ +../../src/tools/tqucom_p.h
\ No newline at end of file diff --git a/include/private/tqucomextra_p.h b/include/private/tqucomextra_p.h new file mode 120000 index 00000000..ba9b4aa0 --- /dev/null +++ b/include/private/tqucomextra_p.h @@ -0,0 +1 @@ +../../src/kernel/tqucomextra_p.h
\ No newline at end of file diff --git a/include/private/tqunicodetables_p.h b/include/private/tqunicodetables_p.h new file mode 120000 index 00000000..3ad77b7e --- /dev/null +++ b/include/private/tqunicodetables_p.h @@ -0,0 +1 @@ +../../src/tools/tqunicodetables_p.h
\ No newline at end of file diff --git a/plugins/src/accessible/widgets/tqaccessiblewidget.cpp b/plugins/src/accessible/widgets/tqaccessiblewidget.cpp index 2aedf546..232ff05f 100644 --- a/plugins/src/accessible/widgets/tqaccessiblewidget.cpp +++ b/plugins/src/accessible/widgets/tqaccessiblewidget.cpp @@ -27,7 +27,7 @@ #include <tqiconview.h> #include <tqtextedit.h> #include <tqwidgetstack.h> -#include <private/qtitlebar_p.h> +#include <private/tqtitlebar_p.h> TQString buddyString( TQWidget *widget ) diff --git a/plugins/src/inputmethods/xim/qximinputcontext.h b/plugins/src/inputmethods/xim/qximinputcontext.h index 1471f831..3cef8dd8 100644 --- a/plugins/src/inputmethods/xim/qximinputcontext.h +++ b/plugins/src/inputmethods/xim/qximinputcontext.h @@ -65,7 +65,7 @@ class TQString; #ifdef TQ_WS_X11 #include "tqmemarray.h" #include "tqwindowdefs.h" -#include <private/qt_x11_p.h> +#include <private/tqt_x11_p.h> #endif class TQXIMInputContext : public TQInputContext diff --git a/qmake/Makefile.unix b/qmake/Makefile.unix index 88001569..cf47f314 100644 --- a/qmake/Makefile.unix +++ b/qmake/Makefile.unix @@ -9,7 +9,7 @@ QOBJS=tqstring.o tqtextstream.o tqiodevice.o tqglobal.o tqgdict.o tqcstring.o \ tqdatastream.o tqgarray.o tqbuffer.o tqglist.o tqptrcollection.o tqfile.o \ tqfile_unix.o tqregexp.o tqgvector.o tqgcache.o tqbitarray.o tqdir.o tquuid.o \ tqfileinfo_unix.o tqdir_unix.o tqfileinfo.o tqdatetime.o tqstringlist.o tqmap.o \ - qconfig.o qunicodetables.o tqsettings.o tqlocale.o @QMAKE_QTOBJS@ + qconfig.o tqunicodetables.o tqsettings.o tqlocale.o @QMAKE_QTOBJS@ #all sources, used for the depend target DEPEND_SRC=project.cpp property.cpp meta.cpp main.cpp qtmd5.cpp generators/makefile.cpp generators/unix/unixmake2.cpp \ @@ -93,8 +93,8 @@ tqlocale.o: @SOURCE_PATH@/src/tools/tqlocale.cpp tqdatastream.o: @SOURCE_PATH@/src/tools/tqdatastream.cpp $(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/tqdatastream.cpp -qunicodetables.o: @SOURCE_PATH@/src/tools/qunicodetables.cpp - $(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/qunicodetables.cpp +tqunicodetables.o: @SOURCE_PATH@/src/tools/tqunicodetables.cpp + $(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/tqunicodetables.cpp tqgarray.o: @SOURCE_PATH@/src/tools/tqgarray.cpp $(CXX) -c -o $@ $(CXXFLAGS) @SOURCE_PATH@/src/tools/tqgarray.cpp diff --git a/qmake/Makefile.win32-g++ b/qmake/Makefile.win32-g++ index dae71ed8..cfb7b43d 100644 --- a/qmake/Makefile.win32-g++ +++ b/qmake/Makefile.win32-g++ @@ -22,7 +22,7 @@ OBJS=project.o main.o makefile.o unixmake.o unixmake2.o borland_bmake.o mingw_ma QTOBJS=tqstring.o tquuid.o tqtextstream.o tqiodevice.o tqglobal.o tqgdict.o tqcstring.o tqdatastream.o \ tqgarray.o tqbuffer.o tqglist.o tqptrcollection.o tqfile.o tqfile_win.o tqregexp.o tqgvector.o \ tqgcache.o tqbitarray.o tqdir.o tqfileinfo_win.o tqdir_win.o tqfileinfo.o tqdatetime.o \ - tqstringlist.o tqmap.o tqlibrary.o tqlibrary_win.o qconfig.o tqsettings.o tqsettings_win.o qunicodetables.o \ + tqstringlist.o tqmap.o tqlibrary.o tqlibrary_win.o qconfig.o tqsettings.o tqsettings_win.o tqunicodetables.o \ tqlocale.o @@ -139,8 +139,8 @@ tqstringlist.o: ..\src\tools\tqstringlist.cpp tqmap.o: ..\src\tools\tqmap.cpp $(CXX) $(CXXFLAGS) ..\src\tools\tqmap.cpp -qunicodetables.o: ..\src\tools\qunicodetables.cpp - $(CXX) $(CXXFLAGS) ..\src\tools\qunicodetables.cpp +tqunicodetables.o: ..\src\tools\tqunicodetables.cpp + $(CXX) $(CXXFLAGS) ..\src\tools\tqunicodetables.cpp makefile.o: generators\makefile.cpp $(CXX) $(CXXFLAGS) generators\makefile.cpp diff --git a/src/codecs/tqtextcodecfactory.cpp b/src/codecs/tqtextcodecfactory.cpp index 9e081c51..36782644 100644 --- a/src/codecs/tqtextcodecfactory.cpp +++ b/src/codecs/tqtextcodecfactory.cpp @@ -45,7 +45,7 @@ #ifndef TQT_NO_COMPONENT #include "ntqapplication.h" #include "tqcleanuphandler.h" -#include <private/qpluginmanager_p.h> +#include <private/tqpluginmanager_p.h> #include "tqtextcodecinterface_p.h" #ifdef TQT_THREAD_SUPPORT diff --git a/src/codecs/tqtextcodecinterface_p.h b/src/codecs/tqtextcodecinterface_p.h index 541889e2..714c1567 100644 --- a/src/codecs/tqtextcodecinterface_p.h +++ b/src/codecs/tqtextcodecinterface_p.h @@ -44,7 +44,7 @@ // ------------- // // This file is not part of the TQt API. It exists for the convenience -// of qpsprinter.cpp and tqprinter_x11.cpp. +// of tqpsprinter.cpp and tqprinter_x11.cpp. // This header file may change from version to version without notice, // or even be removed. // @@ -53,7 +53,7 @@ // #ifndef QT_H -#include <private/qcom_p.h> +#include <private/tqcom_p.h> #endif // QT_H #ifndef TQT_NO_TEXTCODEC diff --git a/src/dialogs/tqdialog.cpp b/src/dialogs/tqdialog.cpp index 42853e00..919a1ed3 100644 --- a/src/dialogs/tqdialog.cpp +++ b/src/dialogs/tqdialog.cpp @@ -673,7 +673,7 @@ bool TQDialog::event( TQEvent *e ) #if defined(TQ_WS_X11) extern "C" { int XSetTransientForHint( Display *, unsigned long, unsigned long ); } -#include <private/qt_x11_p.h> +#include <private/tqt_x11_p.h> #undef FocusIn // defined in qapplication_x11.cpp extern Atom qt_net_wm_full_placement; diff --git a/src/inputmethod/tqinputcontextfactory.cpp b/src/inputmethod/tqinputcontextfactory.cpp index 95fc4076..e6f1fb3a 100644 --- a/src/inputmethod/tqinputcontextfactory.cpp +++ b/src/inputmethod/tqinputcontextfactory.cpp @@ -50,7 +50,7 @@ #include <stdlib.h> #include "tqcleanuphandler.h" -#include <private/qpluginmanager_p.h> +#include <private/tqpluginmanager_p.h> #ifndef TQT_NO_COMPONENT diff --git a/src/inputmethod/tqinputcontextinterface_p.h b/src/inputmethod/tqinputcontextinterface_p.h index 195be7fe..e21a016d 100644 --- a/src/inputmethod/tqinputcontextinterface_p.h +++ b/src/inputmethod/tqinputcontextinterface_p.h @@ -49,7 +49,7 @@ // #ifndef QT_H -#include <private/qcom_p.h> +#include <private/tqcom_p.h> #endif // QT_H #ifndef TQT_NO_IM diff --git a/src/kernel/makepsheader.pl b/src/kernel/makepsheader.pl index b842e146..4452b840 100755 --- a/src/kernel/makepsheader.pl +++ b/src/kernel/makepsheader.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl -open(INPUT, 'qpsprinter.ps') - or die "Can't open qpsprinter.ps"; +open(INPUT, 'tqpsprinter.ps') + or die "Can't open tqpsprinter.ps"; $dontcompress = 1; while(<INPUT>) { diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp index c1d8345b..ec94e78b 100644 --- a/src/kernel/qapplication_x11.cpp +++ b/src/kernel/qapplication_x11.cpp @@ -92,7 +92,7 @@ #ifndef TQT_NO_IM #include "tqinputcontext.h" #endif // TQT_NO_IM -#include "qinternal_p.h" // shared double buffer cleanup +#include "tqinternal_p.h" // shared double buffer cleanup #if defined(TQT_THREAD_SUPPORT) # include "tqthread.h" @@ -102,7 +102,7 @@ # include "tqfile.h" #endif -#include "qt_x11_p.h" +#include "tqt_x11_p.h" #if !defined(TQT_NO_XFTFREETYPE) // XFree86 4.0.3 implementation is missing XftInitFtLibrary forward @@ -849,7 +849,7 @@ void qt_x11_intern_atom( const char *name, Atom *result) } -static void qt_x11_process_intern_atoms() +static void tqt_x11_process_intern_atoms() { if ( atoms_to_be_created ) { #if defined(XlibSpecificationRelease) && (XlibSpecificationRelease >= 6) @@ -2084,7 +2084,7 @@ void tqt_init_internal( int *argcptr, char **argv, qt_x11_motifdnd_init(); // Finally create all atoms - qt_x11_process_intern_atoms(); + tqt_x11_process_intern_atoms(); // look for broken window managers qt_detect_broken_window_manager(); diff --git a/src/kernel/qdnd_x11.cpp b/src/kernel/qdnd_x11.cpp index 4d4dad5f..571045f4 100644 --- a/src/kernel/qdnd_x11.cpp +++ b/src/kernel/qdnd_x11.cpp @@ -55,7 +55,7 @@ #include "tqbitmap.h" #include "tqpainter.h" -#include "qt_x11_p.h" +#include "tqt_x11_p.h" // conflict resolution diff --git a/src/kernel/qt_kernel.pri b/src/kernel/qt_kernel.pri index 315b931f..84a383a5 100644 --- a/src/kernel/qt_kernel.pri +++ b/src/kernel/qt_kernel.pri @@ -4,7 +4,7 @@ kernel { KERNEL_P = kernel HEADERS += \ $$KERNEL_H/tqaccel.h \ - $$KERNEL_P/qucomextra_p.h \ + $$KERNEL_P/tqucomextra_p.h \ $$KERNEL_H/ntqapplication.h \ $$KERNEL_P/qapplication_p.h \ $$KERNEL_H/tqasyncimageio.h \ @@ -89,11 +89,11 @@ kernel { $$KERNEL_H/tqwindowdefs.h \ $$KERNEL_H/tqwmatrix.h \ $$KERNEL_H/tqvariant.h \ - $$KERNEL_P/qrichtext_p.h \ - $$KERNEL_P/qinternal_p.h \ + $$KERNEL_P/tqrichtext_p.h \ + $$KERNEL_P/tqinternal_p.h \ $$KERNEL_H/tqgplugin.h \ $$KERNEL_H/tqsimplerichtext.h \ - $$KERNEL_CPP/qscriptengine_p.h \ + $$KERNEL_CPP/tqscriptengine_p.h \ $$KERNEL_CPP/tqtextengine_p.h \ $$KERNEL_CPP/tqfontengine_p.h \ $$KERNEL_CPP/tqtextlayout_p.h @@ -182,7 +182,7 @@ kernel { DEFINES += QMAC_ONE_PIXEL_LOCK } else:unix { SOURCES += $$KERNEL_CPP/tqprinter_unix.cpp \ - $$KERNEL_CPP/qpsprinter.cpp + $$KERNEL_CPP/tqpsprinter.cpp glibmainloop { SOURCES += $$KERNEL_CPP/tqeventloop_unix_glib.cpp } else { @@ -194,7 +194,7 @@ kernel { $$KERNEL_CPP/tqthread_unix.cpp SOURCES += $$KERNEL_CPP/tqabstractlayout.cpp \ - $$KERNEL_CPP/qucomextra.cpp \ + $$KERNEL_CPP/tqucomextra.cpp \ $$KERNEL_CPP/tqaccel.cpp \ $$KERNEL_CPP/qapplication.cpp \ $$KERNEL_CPP/tqasyncimageio.cpp \ @@ -257,16 +257,16 @@ kernel { $$KERNEL_CPP/tqwidget.cpp \ $$KERNEL_CPP/tqwmatrix.cpp \ $$KERNEL_CPP/tqvariant.cpp \ - $$KERNEL_CPP/qrichtext.cpp \ - $$KERNEL_CPP/qinternal.cpp \ - $$KERNEL_CPP/qrichtext_p.cpp \ + $$KERNEL_CPP/tqrichtext.cpp \ + $$KERNEL_CPP/tqinternal.cpp \ + $$KERNEL_CPP/tqrichtext_p.cpp \ $$KERNEL_CPP/tqgplugin.cpp \ $$KERNEL_CPP/tqsimplerichtext.cpp \ - $$KERNEL_CPP/qscriptengine.cpp \ + $$KERNEL_CPP/tqscriptengine.cpp \ $$KERNEL_CPP/tqtextlayout.cpp \ $$KERNEL_CPP/tqtextengine.cpp - unix:HEADERS += $$KERNEL_P/qpsprinter_p.h \ + unix:HEADERS += $$KERNEL_P/tqpsprinter_p.h \ $$KERNEL_H/tqfontdatabase.h accessibility { diff --git a/src/kernel/qt_pch.h b/src/kernel/qt_pch.h index 690551eb..1420944e 100644 --- a/src/kernel/qt_pch.h +++ b/src/kernel/qt_pch.h @@ -22,7 +22,7 @@ # endif # endif #include <tqmap.h> // I must be first! -#include <private/qucomextra_p.h> // All moc genereated code has this include +#include <private/tqucomextra_p.h> // All moc genereated code has this include #include <ntqapplication.h> #include <tqbitmap.h> #include <tqcursor.h> diff --git a/src/kernel/qtaddons_x11.cpp b/src/kernel/qtaddons_x11.cpp index ad1ea7e0..089466ec 100644 --- a/src/kernel/qtaddons_x11.cpp +++ b/src/kernel/qtaddons_x11.cpp @@ -22,7 +22,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#include "qt_x11_p.h" +#include "tqt_x11_p.h" #if !defined(TQT_NO_XFTFREETYPE) && !defined(QT_XFT2) diff --git a/src/kernel/tqaccessible.cpp b/src/kernel/tqaccessible.cpp index 6cbe717e..5a43e402 100644 --- a/src/kernel/tqaccessible.cpp +++ b/src/kernel/tqaccessible.cpp @@ -42,7 +42,7 @@ #include "tqptrdict.h" #include "tqmetaobject.h" -#include <private/qpluginmanager_p.h> +#include <private/tqpluginmanager_p.h> #include "ntqapplication.h" #include <stdlib.h> diff --git a/src/kernel/tqaccessible.h b/src/kernel/tqaccessible.h index ead26b9b..8cedf1b2 100644 --- a/src/kernel/tqaccessible.h +++ b/src/kernel/tqaccessible.h @@ -41,7 +41,7 @@ #ifndef QT_H #include "tqobject.h" -#include <private/qcom_p.h> +#include <private/tqcom_p.h> #include "tqrect.h" #include "tqguardedptr.h" #include "tqmemarray.h" diff --git a/src/kernel/tqclipboard_x11.cpp b/src/kernel/tqclipboard_x11.cpp index e20708f5..16af49f8 100644 --- a/src/kernel/tqclipboard_x11.cpp +++ b/src/kernel/tqclipboard_x11.cpp @@ -73,7 +73,7 @@ #include "tqtextcodec.h" #include "tqvaluelist.h" #include "tqmap.h" -#include "qt_x11_p.h" +#include "tqt_x11_p.h" #include "qapplication_p.h" diff --git a/src/kernel/tqcolor_x11.cpp b/src/kernel/tqcolor_x11.cpp index f5cfc024..09a8b888 100644 --- a/src/kernel/tqcolor_x11.cpp +++ b/src/kernel/tqcolor_x11.cpp @@ -44,7 +44,7 @@ #include "tqpaintdevice.h" #include "ntqapplication.h" #include "qapplication_p.h" -#include "qt_x11_p.h" +#include "tqt_x11_p.h" // NOT REVISED diff --git a/src/kernel/tqcursor_x11.cpp b/src/kernel/tqcursor_x11.cpp index 9facf093..3724706c 100644 --- a/src/kernel/tqcursor_x11.cpp +++ b/src/kernel/tqcursor_x11.cpp @@ -44,7 +44,7 @@ #include "ntqapplication.h" #include "tqdatastream.h" #include "tqnamespace.h" -#include "qt_x11_p.h" +#include "tqt_x11_p.h" #include <X11/cursorfont.h> #ifndef TQT_NO_XCURSOR diff --git a/src/kernel/tqdesktopwidget_x11.cpp b/src/kernel/tqdesktopwidget_x11.cpp index 5adc611b..2a9e5bd9 100644 --- a/src/kernel/tqdesktopwidget_x11.cpp +++ b/src/kernel/tqdesktopwidget_x11.cpp @@ -39,7 +39,7 @@ #include "tqdesktopwidget.h" #include "ntqapplication.h" #include "tqobjectlist.h" -#include "qt_x11_p.h" +#include "tqt_x11_p.h" #include <cstdlib> // defined in tqwidget_x11.cpp diff --git a/src/kernel/tqeventloop_x11.cpp b/src/kernel/tqeventloop_x11.cpp index b90ce745..743d48e7 100644 --- a/src/kernel/tqeventloop_x11.cpp +++ b/src/kernel/tqeventloop_x11.cpp @@ -41,7 +41,7 @@ #include "ntqapplication.h" #include "tqbitarray.h" #include "tqcolor_p.h" -#include "qt_x11_p.h" +#include "tqt_x11_p.h" #if defined(TQT_THREAD_SUPPORT) # include "tqmutex.h" diff --git a/src/kernel/tqeventloop_x11_glib.cpp b/src/kernel/tqeventloop_x11_glib.cpp index f16fa101..28069fe1 100644 --- a/src/kernel/tqeventloop_x11_glib.cpp +++ b/src/kernel/tqeventloop_x11_glib.cpp @@ -44,7 +44,7 @@ #include "ntqapplication.h" #include "tqbitarray.h" #include "tqcolor_p.h" -#include "qt_x11_p.h" +#include "tqt_x11_p.h" #if defined(TQT_THREAD_SUPPORT) # include "tqmutex.h" diff --git a/src/kernel/tqfont.cpp b/src/kernel/tqfont.cpp index a3e21c65..e058e49d 100644 --- a/src/kernel/tqfont.cpp +++ b/src/kernel/tqfont.cpp @@ -55,7 +55,7 @@ #include "tqpaintdevicemetrics.h" #endif -#include <private/qunicodetables_p.h> +#include <private/tqunicodetables_p.h> #include "tqfontdata_p.h" #include "tqfontengine_p.h" #include "tqpainter_p.h" diff --git a/src/kernel/tqfont.h b/src/kernel/tqfont.h index 27f5269e..435b604d 100644 --- a/src/kernel/tqfont.h +++ b/src/kernel/tqfont.h @@ -193,9 +193,9 @@ public: static void cleanup(); static void cacheStatistics(); - // a copy of this lives in qunicodetables.cpp, as we can't include + // a copy of this lives in tqunicodetables.cpp, as we can't include // tqfont.h it in tools/. Do not modify without changing the script - // enum in qunicodetable_p.h aswell. + // enum in tqunicodetable_p.h aswell. enum Script { // European Alphabetic Scripts Latin, diff --git a/src/kernel/tqfont_x11.cpp b/src/kernel/tqfont_x11.cpp index a54e13dc..373a82a5 100644 --- a/src/kernel/tqfont_x11.cpp +++ b/src/kernel/tqfont_x11.cpp @@ -55,12 +55,12 @@ #include "tqtextcodec.h" #include <private/tqfontcodecs_p.h> -#include <private/qunicodetables_p.h> +#include <private/tqunicodetables_p.h> #include "tqfontdata_p.h" #include "tqfontengine_p.h" #include "tqtextengine_p.h" -#include "qt_x11_p.h" +#include "tqt_x11_p.h" #include <time.h> #include <stdlib.h> diff --git a/src/kernel/tqfontdatabase.cpp b/src/kernel/tqfontdatabase.cpp index 33f10900..0702bb67 100644 --- a/src/kernel/tqfontdatabase.cpp +++ b/src/kernel/tqfontdatabase.cpp @@ -45,7 +45,7 @@ #include <tqtl.h> #include <ntqapplication.h> -#include <private/qunicodetables_p.h> +#include <private/tqunicodetables_p.h> #include "tqfontengine_p.h" #include <tqcleanuphandler.h> diff --git a/src/kernel/tqfontdatabase_x11.cpp b/src/kernel/tqfontdatabase_x11.cpp index 49de442c..23f1f541 100644 --- a/src/kernel/tqfontdatabase_x11.cpp +++ b/src/kernel/tqfontdatabase_x11.cpp @@ -43,7 +43,7 @@ #include <tqdatetime.h> #include <tqpaintdevicemetrics.h> -#include "qt_x11_p.h" +#include "tqt_x11_p.h" #include <ctype.h> #include <stdlib.h> diff --git a/src/kernel/tqfontengine_p.h b/src/kernel/tqfontengine_p.h index 55997274..dcd306fc 100644 --- a/src/kernel/tqfontengine_p.h +++ b/src/kernel/tqfontengine_p.h @@ -219,7 +219,7 @@ private: #endif #ifdef TQ_WS_X11 -#include "qt_x11_p.h" +#include "tqt_x11_p.h" struct TransformedFont @@ -406,7 +406,7 @@ class TQTextEngine; #ifndef TQT_NO_XFTFREETYPE -#include "qscriptengine_p.h" +#include "tqscriptengine_p.h" #include "tqtextengine_p.h" #include <ft2build.h> #include FT_FREETYPE_H diff --git a/src/kernel/tqfontengine_x11.cpp b/src/kernel/tqfontengine_x11.cpp index 8002c42d..1157bbb5 100644 --- a/src/kernel/tqfontengine_x11.cpp +++ b/src/kernel/tqfontengine_x11.cpp @@ -51,12 +51,12 @@ #include "tqpainter.h" #include "tqimage.h" -#include "qt_x11_p.h" +#include "tqt_x11_p.h" #include "tqfont.h" #include "tqtextengine_p.h" -#include <private/qunicodetables_p.h> +#include <private/tqunicodetables_p.h> #include <limits.h> @@ -2234,7 +2234,7 @@ TQFontEngine::Type TQFontEngineXft::type() const #ifndef TQT_NO_XFTFREETYPE -#include "qscriptengine_p.h" +#include "tqscriptengine_p.h" //#define OT_DEBUG diff --git a/src/kernel/tqgplugin.cpp b/src/kernel/tqgplugin.cpp index c0cfd8f4..606e856f 100644 --- a/src/kernel/tqgplugin.cpp +++ b/src/kernel/tqgplugin.cpp @@ -40,7 +40,7 @@ #ifndef TQT_NO_COMPONENT -#include <private/qcom_p.h> +#include <private/tqcom_p.h> TQGPlugin::TQGPlugin() : _iface( 0 ) diff --git a/src/kernel/tqgplugin.h b/src/kernel/tqgplugin.h index 88212515..30e350cd 100644 --- a/src/kernel/tqgplugin.h +++ b/src/kernel/tqgplugin.h @@ -74,9 +74,9 @@ #define Q_PLUGIN_FLAGS_STRING "01" #endif -// this is duplicated at Q_UCM_VERIFICATION_DATA in qcom_p.h +// this is duplicated at Q_UCM_VERIFICATION_DATA in tqcom_p.h // NOTE: if you change pattern, you MUST change the pattern in -// qcomlibrary.cpp as well. changing the pattern will break all +// tqcomlibrary.cpp as well. changing the pattern will break all // backwards compatibility as well (no old plugins will be loaded). #ifndef Q_PLUGIN_VERIFICATION_DATA # define Q_PLUGIN_VERIFICATION_DATA \ diff --git a/src/kernel/tqimage.cpp b/src/kernel/tqimage.cpp index 0a2995ed..50ed5222 100644 --- a/src/kernel/tqimage.cpp +++ b/src/kernel/tqimage.cpp @@ -50,7 +50,7 @@ #include "tqmngio.h" #include "tqjpegio.h" #include "tqmap.h" -#include <private/qpluginmanager_p.h> +#include <private/tqpluginmanager_p.h> #include "tqimageformatinterface_p.h" #include "tqwmatrix.h" #include "ntqapplication.h" diff --git a/src/kernel/tqimageformatinterface_p.h b/src/kernel/tqimageformatinterface_p.h index 8abe49c2..685b9201 100644 --- a/src/kernel/tqimageformatinterface_p.h +++ b/src/kernel/tqimageformatinterface_p.h @@ -40,7 +40,7 @@ #define TQIMAGEFORMATINTERFACE_P_H #ifndef QT_H -#include <private/qcom_p.h> +#include <private/tqcom_p.h> #endif // QT_H #if __GNUC__ - 0 > 3 diff --git a/src/kernel/tqinputcontext_p.h b/src/kernel/tqinputcontext_p.h index e7b94e9c..b2df28c2 100644 --- a/src/kernel/tqinputcontext_p.h +++ b/src/kernel/tqinputcontext_p.h @@ -63,7 +63,7 @@ class TQString; #ifdef TQ_WS_X11 #include "tqmemarray.h" #include "tqwindowdefs.h" -#include "qt_x11_p.h" +#include "tqt_x11_p.h" #endif #ifdef TQ_WS_WIN diff --git a/src/kernel/tqinputcontext_x11.cpp b/src/kernel/tqinputcontext_x11.cpp index d0f8699b..7377b264 100644 --- a/src/kernel/tqinputcontext_x11.cpp +++ b/src/kernel/tqinputcontext_x11.cpp @@ -45,7 +45,7 @@ #include "ntqapplication.h" #include "tqwidget.h" -#include "qt_x11_p.h" +#include "tqt_x11_p.h" /*! This function may be overridden only if input method is depending diff --git a/src/kernel/qinternal.cpp b/src/kernel/tqinternal.cpp index 96297bb8..11243d1d 100644 --- a/src/kernel/qinternal.cpp +++ b/src/kernel/tqinternal.cpp @@ -38,7 +38,7 @@ ** **********************************************************************/ -#include "private/qinternal_p.h" +#include "private/tqinternal_p.h" #include "tqwidget.h" #include "tqpixmap.h" #include "tqpainter.h" diff --git a/src/kernel/qinternal_p.h b/src/kernel/tqinternal_p.h index d8c29cc6..d8c29cc6 100644 --- a/src/kernel/qinternal_p.h +++ b/src/kernel/tqinternal_p.h diff --git a/src/kernel/tqmotifdnd_x11.cpp b/src/kernel/tqmotifdnd_x11.cpp index 8bd2d8b8..cf5867ae 100644 --- a/src/kernel/tqmotifdnd_x11.cpp +++ b/src/kernel/tqmotifdnd_x11.cpp @@ -73,7 +73,7 @@ in doc/dnd.doc, where the documentation system can see it. */ #ifndef TQT_NO_DRAGANDDROP #include "tqwidget.h" -#include "qt_x11_p.h" +#include "tqt_x11_p.h" #include <stdlib.h> diff --git a/src/kernel/tqobject.cpp b/src/kernel/tqobject.cpp index 1e376c21..84361e50 100644 --- a/src/kernel/tqobject.cpp +++ b/src/kernel/tqobject.cpp @@ -45,8 +45,8 @@ #include "tqsignalslotimp.h" #include "tqregexp.h" #include "tqmetaobject.h" -#include <private/qucom_p.h> -#include "qucomextra_p.h" +#include <private/tqucom_p.h> +#include "tqucomextra_p.h" #include "tqptrvector.h" // TQStyleControlElementData diff --git a/src/kernel/tqpaintdevice_x11.cpp b/src/kernel/tqpaintdevice_x11.cpp index 5a1ce830..37bdfa83 100644 --- a/src/kernel/tqpaintdevice_x11.cpp +++ b/src/kernel/tqpaintdevice_x11.cpp @@ -44,7 +44,7 @@ #include "tqwidget.h" #include "tqbitmap.h" #include "ntqapplication.h" -#include "qt_x11_p.h" +#include "tqt_x11_p.h" /*! diff --git a/src/kernel/tqpainter.cpp b/src/kernel/tqpainter.cpp index b2c0d5fb..b66f16d2 100644 --- a/src/kernel/tqpainter.cpp +++ b/src/kernel/tqpainter.cpp @@ -48,7 +48,7 @@ #include "tqimage.h" #include "tqpaintdevicemetrics.h" #include "ntqapplication.h" -#include "qrichtext_p.h" +#include "tqrichtext_p.h" #include "tqregexp.h" #include "tqcleanuphandler.h" #include <string.h> diff --git a/src/kernel/tqpainter_x11.cpp b/src/kernel/tqpainter_x11.cpp index 22d892d1..d419b341 100644 --- a/src/kernel/tqpainter_x11.cpp +++ b/src/kernel/tqpainter_x11.cpp @@ -48,7 +48,7 @@ #include "tqtextcodec.h" #include "tqpaintdevicemetrics.h" -#include "qt_x11_p.h" +#include "tqt_x11_p.h" #include "tqtextlayout_p.h" #include "tqfontdata_p.h" diff --git a/src/kernel/tqpicture.cpp b/src/kernel/tqpicture.cpp index 3ab6a000..c0fb3d00 100644 --- a/src/kernel/tqpicture.cpp +++ b/src/kernel/tqpicture.cpp @@ -50,7 +50,7 @@ #include "tqpaintdevicemetrics.h" #ifndef TQT_NO_SVG -#include "private/qsvgdevice_p.h" +#include "private/tqsvgdevice_p.h" #endif /*! diff --git a/src/kernel/tqpixmap.cpp b/src/kernel/tqpixmap.cpp index 460dfc64..4a40d821 100644 --- a/src/kernel/tqpixmap.cpp +++ b/src/kernel/tqpixmap.cpp @@ -48,7 +48,7 @@ #include "tqbuffer.h" #include "tqobjectlist.h" #include "ntqapplication.h" -#include <private/qinternal_p.h> +#include <private/tqinternal_p.h> #include "tqmime.h" #include "tqdragobject.h" #include "tqfile.h" diff --git a/src/kernel/tqpixmap_x11.cpp b/src/kernel/tqpixmap_x11.cpp index b1e6c689..9f8c6b7d 100644 --- a/src/kernel/tqpixmap_x11.cpp +++ b/src/kernel/tqpixmap_x11.cpp @@ -72,7 +72,7 @@ #include "tqimage.h" #include "tqwmatrix.h" #include "ntqapplication.h" -#include "qt_x11_p.h" +#include "tqt_x11_p.h" #include <stdlib.h> diff --git a/src/kernel/tqprinter_unix.cpp b/src/kernel/tqprinter_unix.cpp index 06eeabbd..2899d86d 100644 --- a/src/kernel/tqprinter_unix.cpp +++ b/src/kernel/tqprinter_unix.cpp @@ -52,7 +52,7 @@ static inline int qt_open(const char *pathname, int flags, mode_t mode) #ifndef TQT_NO_PRINTER #include "tqpaintdevicemetrics.h" -#include "qpsprinter_p.h" +#include "tqpsprinter_p.h" #include "tqprintdialog.h" #include "ntqapplication.h" #include "tqprinter_p.h" diff --git a/src/kernel/tqprocess.cpp b/src/kernel/tqprocess.cpp index b3837d7d..db2318a3 100644 --- a/src/kernel/tqprocess.cpp +++ b/src/kernel/tqprocess.cpp @@ -46,7 +46,7 @@ #ifndef TQT_NO_PROCESS #include "ntqapplication.h" -#include "private/qinternal_p.h" +#include "private/tqinternal_p.h" //#define QT_QPROCESS_DEBUG diff --git a/src/kernel/tqprocess_unix.cpp b/src/kernel/tqprocess_unix.cpp index c3bb2ba7..d85b64d7 100644 --- a/src/kernel/tqprocess_unix.cpp +++ b/src/kernel/tqprocess_unix.cpp @@ -56,7 +56,7 @@ #include "tqtimer.h" #include "tqcleanuphandler.h" #include "tqregexp.h" -#include "private/qinternal_p.h" +#include "private/tqinternal_p.h" #include <stdlib.h> #include <errno.h> diff --git a/src/kernel/qpsprinter.cpp b/src/kernel/tqpsprinter.cpp index 3d18d600..80e00ae2 100644 --- a/src/kernel/qpsprinter.cpp +++ b/src/kernel/tqpsprinter.cpp @@ -50,7 +50,7 @@ # undef truncate #endif -#include "qpsprinter_p.h" +#include "tqpsprinter_p.h" #ifndef TQT_NO_PRINTER @@ -73,7 +73,7 @@ #include "tqfontdatabase.h" #include "tqregexp.h" #include "tqbitmap.h" -#include <private/qunicodetables_p.h> +#include <private/tqunicodetables_p.h> #if defined(Q_OS_WIN32) #include <io.h> @@ -86,7 +86,7 @@ #endif #ifdef TQ_WS_X11 -#include "qt_x11_p.h" +#include "tqt_x11_p.h" #ifdef None #undef None #endif diff --git a/src/kernel/qpsprinter.ps b/src/kernel/tqpsprinter.ps index 12a4c407..e73dd951 100644 --- a/src/kernel/qpsprinter.ps +++ b/src/kernel/tqpsprinter.ps @@ -1,6 +1,6 @@ -% the postscript header we use for our qpsprinter in uncompressed and commented form. +% the postscript header we use for our tqpsprinter in uncompressed and commented form. % use the makepsheader perl script to generate a compressed version of this header -% you can then paste into qpsprinter.cpp +% you can then paste into tqpsprinter.cpp % % some compression of the code is done by the makepsheader script, so we don't need to % write too criptically here. @@ -162,7 +162,7 @@ % % string uc string % -%%% Warning: if you change the method here, change the table in qpsprinter.cpp:compress()! +%%% Warning: if you change the method here, change the table in tqpsprinter.cpp:compress()! /uc { /rL 0 d 0 diff --git a/src/kernel/qpsprinter_p.h b/src/kernel/tqpsprinter_p.h index 46d93b4b..33e888c9 100644 --- a/src/kernel/qpsprinter_p.h +++ b/src/kernel/tqpsprinter_p.h @@ -48,7 +48,7 @@ // ------------- // // This file is not part of the TQt API. It exists for the convenience -// of qpsprinter.cpp and tqprinter_x11.cpp. +// of tqpsprinter.cpp and tqprinter_x11.cpp. // This header file may change from version to version without notice, // or even be removed. // diff --git a/src/kernel/tqregion_x11.cpp b/src/kernel/tqregion_x11.cpp index 801aadb6..a42b0f11 100644 --- a/src/kernel/tqregion_x11.cpp +++ b/src/kernel/tqregion_x11.cpp @@ -43,7 +43,7 @@ #include "tqbuffer.h" #include "tqimage.h" #include "tqbitmap.h" -#include "qt_x11_p.h" +#include "tqt_x11_p.h" #include <stdlib.h> diff --git a/src/kernel/qrichtext.cpp b/src/kernel/tqrichtext.cpp index 247e181d..9866a6c9 100644 --- a/src/kernel/qrichtext.cpp +++ b/src/kernel/tqrichtext.cpp @@ -38,7 +38,7 @@ ** **********************************************************************/ -#include "qrichtext_p.h" +#include "tqrichtext_p.h" #ifndef TQT_NO_RICHTEXT @@ -63,7 +63,7 @@ #include "tqstyle.h" #include "tqcleanuphandler.h" #include "tqtextengine_p.h" -#include <private/qunicodetables_p.h> +#include <private/tqunicodetables_p.h> #include <stdlib.h> diff --git a/src/kernel/qrichtext_p.cpp b/src/kernel/tqrichtext_p.cpp index 022eb13d..e9417d2a 100644 --- a/src/kernel/qrichtext_p.cpp +++ b/src/kernel/tqrichtext_p.cpp @@ -38,7 +38,7 @@ ** **********************************************************************/ -#include "qrichtext_p.h" +#include "tqrichtext_p.h" #ifndef TQT_NO_RICHTEXT diff --git a/src/kernel/qrichtext_p.h b/src/kernel/tqrichtext_p.h index 1032c74e..1032c74e 100644 --- a/src/kernel/qrichtext_p.h +++ b/src/kernel/tqrichtext_p.h diff --git a/src/kernel/qscriptengine.cpp b/src/kernel/tqscriptengine.cpp index bbf0f30b..2d97c84d 100644 --- a/src/kernel/qscriptengine.cpp +++ b/src/kernel/tqscriptengine.cpp @@ -34,12 +34,12 @@ ** **********************************************************************/ -#include "qscriptengine_p.h" +#include "tqscriptengine_p.h" #include "tqstring.h" #include "tqrect.h" #include "tqfont.h" -#include <private/qunicodetables_p.h> +#include <private/tqunicodetables_p.h> #include "tqtextengine_p.h" #include "tqfontengine_p.h" #include <stdlib.h> @@ -1614,9 +1614,9 @@ static bool arabic_shape(TQShaperItem *item) } #if defined(TQ_WS_X11) -# include "qscriptengine_x11.cpp" +# include "tqscriptengine_x11.cpp" #elif defined(TQ_WS_WIN) -# include "qscriptengine_win.cpp" +# include "tqscriptengine_win.cpp" #elif defined(TQ_WS_MAC) -# include "qscriptengine_mac.cpp" +# include "tqscriptengine_mac.cpp" #endif diff --git a/src/kernel/qscriptengine_p.h b/src/kernel/tqscriptengine_p.h index 77dd87b9..77dd87b9 100644 --- a/src/kernel/qscriptengine_p.h +++ b/src/kernel/tqscriptengine_p.h diff --git a/src/kernel/qscriptengine_x11.cpp b/src/kernel/tqscriptengine_x11.cpp index 5d22fdf4..5d22fdf4 100644 --- a/src/kernel/qscriptengine_x11.cpp +++ b/src/kernel/tqscriptengine_x11.cpp diff --git a/src/kernel/tqsimplerichtext.cpp b/src/kernel/tqsimplerichtext.cpp index eccf9190..4c98f1fd 100644 --- a/src/kernel/tqsimplerichtext.cpp +++ b/src/kernel/tqsimplerichtext.cpp @@ -41,7 +41,7 @@ #include "tqsimplerichtext.h" #ifndef TQT_NO_RICHTEXT -#include "qrichtext_p.h" +#include "tqrichtext_p.h" #include "ntqapplication.h" class TQSimpleRichTextData diff --git a/src/kernel/tqsizegrip.cpp b/src/kernel/tqsizegrip.cpp index 18ff03d2..017c3e6a 100644 --- a/src/kernel/tqsizegrip.cpp +++ b/src/kernel/tqsizegrip.cpp @@ -47,7 +47,7 @@ #include "tqstyle.h" #if defined(TQ_WS_X11) -#include "qt_x11_p.h" +#include "tqt_x11_p.h" extern Atom qt_sizegrip; // defined in qapplication_x11.cpp #elif defined (TQ_WS_WIN ) #include "tqobjectlist.h" diff --git a/src/kernel/tqstylesheet.cpp b/src/kernel/tqstylesheet.cpp index dbc8d467..c03cc792 100644 --- a/src/kernel/tqstylesheet.cpp +++ b/src/kernel/tqstylesheet.cpp @@ -42,7 +42,7 @@ #ifndef TQT_NO_RICHTEXT -#include "private/qrichtext_p.h" +#include "private/tqrichtext_p.h" #include "tqlayout.h" #include "tqpainter.h" #include "tqcleanuphandler.h" diff --git a/src/kernel/tqt3.h b/src/kernel/tqt3.h index 8a04bdf3..cff4b089 100644 --- a/src/kernel/tqt3.h +++ b/src/kernel/tqt3.h @@ -272,30 +272,30 @@ #include <tqxml.h> #if defined( QT_MOC_CPP ) || defined( QT_H_CPP ) || defined( Q_OS_MACX ) -#include <private/qcom_p.h> -#include <private/qucom_p.h> -#include "private/qcom_p.h" +#include <private/tqcom_p.h> +#include <private/tqucom_p.h> +#include "private/tqcom_p.h" #include "private/tqimageformatinterface_p.h" #include "private/tqisciicodec_p.h" #include "private/tqlayoutengine_p.h" -#include "private/qcomlibrary_p.h" -#include "private/qeffects_p.h" +#include "private/tqcomlibrary_p.h" +#include "private/tqeffects_p.h" #include "private/tqgpluginmanager_p.h" -#include "private/qinternal_p.h" +#include "private/tqinternal_p.h" #include "private/tqsqldriverinterface_p.h" #include "private/tqsqlmanager_p.h" #include "private/qlock_p.h" #include "private/tqcomponentfactory_p.h" #include "private/tqstyleinterface_p.h" -#include "private/qrichtext_p.h" -#include "private/qsvgdevice_p.h" +#include "private/tqrichtext_p.h" +#include "private/tqsvgdevice_p.h" #include "private/tqfontcodecs_p.h" #include "private/tqtextcodecinterface_p.h" -#include "private/qpsprinter_p.h" -#include "private/qtitlebar_p.h" -#include "private/qucom_p.h" -#include "private/qucomextra_p.h" -#include "private/qpluginmanager_p.h" +#include "private/tqpsprinter_p.h" +#include "private/tqtitlebar_p.h" +#include "private/tqucom_p.h" +#include "private/tqucomextra_p.h" +#include "private/tqpluginmanager_p.h" #include "private/tqdir_p.h" #include "private/tqsettings_p.h" #include "private/tqsqlextension_p.h" diff --git a/src/kernel/qt_x11.pri b/src/kernel/tqt_x11.pri index c81055eb..c81055eb 100644 --- a/src/kernel/qt_x11.pri +++ b/src/kernel/tqt_x11.pri diff --git a/src/kernel/qt_x11_p.h b/src/kernel/tqt_x11_p.h index 23bdb7ea..5d807238 100644 --- a/src/kernel/qt_x11_p.h +++ b/src/kernel/tqt_x11_p.h @@ -38,8 +38,8 @@ ** **********************************************************************/ -#ifndef QT_X11_H -#define QT_X11_H +#ifndef TQT_X11_H +#define TQT_X11_H // @@ -277,4 +277,4 @@ extern "C" char *XSetIMValues( XIM /* im */, ... ); #endif // QT_MITSHM -#endif // QT_X11_H +#endif // TQT_X11_H diff --git a/src/kernel/tqtextengine.cpp b/src/kernel/tqtextengine.cpp index 8280340c..6c046a5b 100644 --- a/src/kernel/tqtextengine.cpp +++ b/src/kernel/tqtextengine.cpp @@ -38,12 +38,12 @@ #include "tqtextengine_p.h" -#include "qscriptengine_p.h" +#include "tqscriptengine_p.h" #include <tqfont.h> #include "tqfontdata_p.h" #include "tqfontengine_p.h" #include <tqstring.h> -#include <private/qunicodetables_p.h> +#include <private/tqunicodetables_p.h> #include <stdlib.h> // ----------------------------------------------------------------------------------------------------- diff --git a/src/kernel/qucomextra.cpp b/src/kernel/tqucomextra.cpp index 4e0de283..f44355ad 100644 --- a/src/kernel/qucomextra.cpp +++ b/src/kernel/tqucomextra.cpp @@ -38,7 +38,7 @@ ** **********************************************************************/ -#include "qucomextra_p.h" +#include "tqucomextra_p.h" #include <tqvariant.h> diff --git a/src/kernel/qucomextra_p.h b/src/kernel/tqucomextra_p.h index ad4dacb5..57f6b37a 100644 --- a/src/kernel/qucomextra_p.h +++ b/src/kernel/tqucomextra_p.h @@ -54,7 +54,7 @@ // #ifndef QT_H -#include <private/qucom_p.h> +#include <private/tqucom_p.h> #endif // QT_H #if __GNUC__ - 0 > 3 diff --git a/src/kernel/tqwidget_x11.cpp b/src/kernel/tqwidget_x11.cpp index cc16871a..2f90c490 100644 --- a/src/kernel/tqwidget_x11.cpp +++ b/src/kernel/tqwidget_x11.cpp @@ -50,7 +50,7 @@ #include "tqtextcodec.h" #include "tqdatetime.h" #include "tqcursor.h" -#include "qt_x11_p.h" +#include "tqt_x11_p.h" #include <stdlib.h> // NOT REVISED diff --git a/src/kernel/tqwidgetcreate_x11.cpp b/src/kernel/tqwidgetcreate_x11.cpp index b34fe961..33ec8c20 100644 --- a/src/kernel/tqwidgetcreate_x11.cpp +++ b/src/kernel/tqwidgetcreate_x11.cpp @@ -39,7 +39,7 @@ **********************************************************************/ #include "tqwidget.h" -#include "qt_x11_p.h" +#include "tqt_x11_p.h" /* diff --git a/src/libqt.map b/src/libqt.map index 9134b563..fe788404 100644 --- a/src/libqt.map +++ b/src/libqt.map @@ -20,10 +20,10 @@ TQHttpResponseHeader::*; TQMainWindowLayout::*; Q*Private::*; # collides with TQGuardedPtrPrivate - QPSPrinter*; + TQPSPrinter*; Q*RegExpEngine::*; Q*SvgDevice::*; - *QSvgDeviceState*; + *TQSvgDeviceState*; ImgElement::*; PixElement::*; QRenameEdit::*; @@ -36,7 +36,7 @@ QSVChildRec::*; qt_xdnd_*; QTipLabel::*; - QUnicodeTables::*; + TQUnicodeTables::*; QViewportWidget::*; QWFlagWidget::*; TQWorkspaceChild::*; diff --git a/src/moc/moc.pro b/src/moc/moc.pro index e26c4893..b8ff335d 100644 --- a/src/moc/moc.pro +++ b/src/moc/moc.pro @@ -29,7 +29,7 @@ SOURCES = ../tools/tqbuffer.cpp \ ../tools/tqregexp.cpp \ ../tools/tqstring.cpp \ ../tools/tqlocale.cpp \ - ../tools/qunicodetables.cpp \ + ../tools/tqunicodetables.cpp \ ../tools/tqstringlist.cpp \ ../tools/tqtextstream.cpp \ ../tools/tqbitarray.cpp \ diff --git a/src/moc/moc.y b/src/moc/moc.y index 5f9ffa10..7eb66784 100644 --- a/src/moc/moc.y +++ b/src/moc/moc.y @@ -2906,7 +2906,7 @@ void generateClass() // generate C++ source code for a class } fprintf( out, "#include <%stqmetaobject.h>\n", (const char*)g->qtPath ); fprintf( out, "#include <%sntqapplication.h>\n\n", (const char*)g->qtPath ); - fprintf( out, "#include <%sprivate/qucomextra_p.h>\n", (const char*)g->qtPath ); + fprintf( out, "#include <%sprivate/tqucomextra_p.h>\n", (const char*)g->qtPath ); fprintf( out, "#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != %d)\n", formatRevision ); fprintf( out, "#error \"This file was generated using the moc from %s." " It\"\n#error \"cannot be used with the include files from" diff --git a/src/moc/moc_yacc.cpp b/src/moc/moc_yacc.cpp index d038c0b7..83994e26 100644 --- a/src/moc/moc_yacc.cpp +++ b/src/moc/moc_yacc.cpp @@ -5781,7 +5781,7 @@ void generateClass() // generate C++ source code for a class } fprintf( out, "#include <%stqmetaobject.h>\n", (const char*)g->qtPath ); fprintf( out, "#include <%sntqapplication.h>\n\n", (const char*)g->qtPath ); - fprintf( out, "#include <%sprivate/qucomextra_p.h>\n", (const char*)g->qtPath ); + fprintf( out, "#include <%sprivate/tqucomextra_p.h>\n", (const char*)g->qtPath ); fprintf( out, "#if !defined(Q_MOC_OUTPUT_REVISION) || (Q_MOC_OUTPUT_REVISION != %d)\n", formatRevision ); fprintf( out, "#error \"This file was generated using the moc from %s." " It\"\n#error \"cannot be used with the include files from" diff --git a/src/network/tqhttp.cpp b/src/network/tqhttp.cpp index 6bf6f174..389a731c 100644 --- a/src/network/tqhttp.cpp +++ b/src/network/tqhttp.cpp @@ -51,7 +51,7 @@ #include "tqbuffer.h" #include "tqurloperator.h" #include "tqtimer.h" -#include "private/qinternal_p.h" +#include "private/tqinternal_p.h" //#define TQHTTP_DEBUG diff --git a/src/network/tqsocket.cpp b/src/network/tqsocket.cpp index 3a088c51..9314318d 100644 --- a/src/network/tqsocket.cpp +++ b/src/network/tqsocket.cpp @@ -44,7 +44,7 @@ #include "tqtimer.h" #include "tqsocketdevice.h" #include "tqdns.h" -#include "private/qinternal_p.h" +#include "private/tqinternal_p.h" #include <string.h> #ifndef NO_ERRNO_H diff --git a/src/opengl/tqgl.cpp b/src/opengl/tqgl.cpp index 991d697a..4ec6dec3 100644 --- a/src/opengl/tqgl.cpp +++ b/src/opengl/tqgl.cpp @@ -49,7 +49,7 @@ static TQGLFormat* qgl_default_format = 0; static TQGLFormat* qgl_default_overlay_format = 0; #if defined(TQ_WS_X11) -#include "private/qt_x11_p.h" +#include "private/tqt_x11_p.h" #define INT32 dummy_INT32 #define INT8 dummy_INT8 #include <GL/glx.h> @@ -128,7 +128,7 @@ largefile { include($$KERNEL_CPP/qt_compat.pri) #platforms -x11:include($$KERNEL_CPP/qt_x11.pri) +x11:include($$KERNEL_CPP/tqt_x11.pri) mac:include($$KERNEL_CPP/qt_mac.pri) win32:include($$KERNEL_CPP/qt_win.pri) @@ -168,14 +168,14 @@ unix { wince-* { CONFIG -= incremental message( ...removing plugin stuff... (not permanent) ) - HEADERS -= $$TOOLS_CPP/qcomlibrary.h \ + HEADERS -= $$TOOLS_CPP/tqcomlibrary.h \ $$KERNEL_CPP/tqgplugin.h \ $$KERNEL_CPP/tqimageformatplugin.h \ $$STYLES_CPP/tqstyleplugin.h \ $$CODECS_CPP/tqtextcodecplugin.h \ $$WIDGETS_CPP/tqwidgetplugin.h - SOURCES -= $$TOOLS_CPP/qcomlibrary.cpp \ + SOURCES -= $$TOOLS_CPP/tqcomlibrary.cpp \ $$KERNEL_CPP/tqgplugin.cpp \ $$KERNEL_CPP/tqimageformatplugin.cpp \ $$STYLES_CPP/tqstyleplugin.cpp \ diff --git a/src/sql/drivers/odbc/tqsql_odbc.cpp b/src/sql/drivers/odbc/tqsql_odbc.cpp index a9a3aa46..82dd6247 100644 --- a/src/sql/drivers/odbc/tqsql_odbc.cpp +++ b/src/sql/drivers/odbc/tqsql_odbc.cpp @@ -47,7 +47,7 @@ #endif #include <tqdatetime.h> #include <private/tqsqlextension_p.h> -#include <private/qinternal_p.h> +#include <private/tqinternal_p.h> #include <stdlib.h> // undefine this to prevent initial check of the ODBC driver diff --git a/src/sql/tqsqldatabase.cpp b/src/sql/tqsqldatabase.cpp index 1f8cfe6c..ccdaea94 100644 --- a/src/sql/tqsqldatabase.cpp +++ b/src/sql/tqsqldatabase.cpp @@ -79,7 +79,7 @@ #include "tqsqlresult.h" #include "tqsqldriver.h" #include "tqsqldriverinterface_p.h" -#include <private/qpluginmanager_p.h> +#include <private/tqpluginmanager_p.h> #include <private/tqsqlextension_p.h> #include "tqobject.h" #include "tqguardedptr.h" diff --git a/src/sql/tqsqldriverinterface_p.h b/src/sql/tqsqldriverinterface_p.h index 85177036..c15efac5 100644 --- a/src/sql/tqsqldriverinterface_p.h +++ b/src/sql/tqsqldriverinterface_p.h @@ -54,7 +54,7 @@ // #ifndef QT_H -#include <private/qcom_p.h> +#include <private/tqcom_p.h> #endif // QT_H #if !defined( TQT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL ) diff --git a/src/styles/tqcommonstyle.cpp b/src/styles/tqcommonstyle.cpp index 287bc5e8..02b878c3 100644 --- a/src/styles/tqcommonstyle.cpp +++ b/src/styles/tqcommonstyle.cpp @@ -71,7 +71,7 @@ #include "private/tqdialogbuttons_p.h" #include <limits.h> #include <tqpixmap.h> -#include "../widgets/qtitlebar_p.h" +#include "../widgets/tqtitlebar_p.h" #include <tqtoolbox.h> /*! diff --git a/src/styles/tqstylefactory.cpp b/src/styles/tqstylefactory.cpp index 29a3ad5e..d66fbe72 100644 --- a/src/styles/tqstylefactory.cpp +++ b/src/styles/tqstylefactory.cpp @@ -68,7 +68,7 @@ TQString p2qstring(const unsigned char *c); //tqglobal.cpp #endif #include <stdlib.h> -#include <private/qpluginmanager_p.h> +#include <private/tqpluginmanager_p.h> #ifndef TQT_NO_COMPONENT class TQStyleFactoryPrivate : public TQObject { diff --git a/src/styles/tqstyleinterface_p.h b/src/styles/tqstyleinterface_p.h index 500dcfef..5c8bd42d 100644 --- a/src/styles/tqstyleinterface_p.h +++ b/src/styles/tqstyleinterface_p.h @@ -52,7 +52,7 @@ // #ifndef QT_H -#include <private/qcom_p.h> +#include <private/tqcom_p.h> #endif // QT_H #ifndef TQT_NO_STYLE diff --git a/src/tools/qt_tools.pri b/src/tools/qt_tools.pri index c8eacaee..36c144e9 100644 --- a/src/tools/qt_tools.pri +++ b/src/tools/qt_tools.pri @@ -10,7 +10,7 @@ tools { $$TOOLS_H/tqcache.h \ $$TOOLS_H/tqcleanuphandler.h \ $$TOOLS_P/tqcomponentfactory_p.h \ - $$TOOLS_P/qcomlibrary_p.h \ + $$TOOLS_P/tqcomlibrary_p.h \ $$TOOLS_H/tqcstring.h \ $$TOOLS_H/tqdatastream.h \ $$TOOLS_H/tqdatetime.h \ @@ -40,7 +40,7 @@ tools { $$TOOLS_H/tqmutex.h \ $$TOOLS_P/tqmutex_p.h \ $$TOOLS_P/tqmutexpool_p.h \ - $$TOOLS_P/qpluginmanager_p.h \ + $$TOOLS_P/tqpluginmanager_p.h \ $$TOOLS_H/tqptrcollection.h \ $$TOOLS_H/tqptrdict.h \ $$TOOLS_H/tqptrqueue.h \ @@ -57,14 +57,14 @@ tools { $$TOOLS_H/tqtextstream.h \ $$TOOLS_P/tqthreadinstance_p.h \ $$TOOLS_H/tqthreadstorage.h\ - $$TOOLS_P/qunicodetables_p.h \ + $$TOOLS_P/tqunicodetables_p.h \ $$TOOLS_H/tqptrvector.h \ $$TOOLS_H/tqvaluelist.h \ $$TOOLS_H/tqvaluestack.h \ $$TOOLS_H/tqvaluevector.h \ $$TOOLS_H/tqwaitcondition.h \ - $$TOOLS_P/qcom_p.h \ - $$TOOLS_P/qucom_p.h \ + $$TOOLS_P/tqcom_p.h \ + $$TOOLS_P/tqucom_p.h \ $$TOOLS_H/tquuid.h win32:SOURCES += $$TOOLS_CPP/tqdir_win.cpp \ @@ -75,7 +75,7 @@ tools { $$TOOLS_CPP/tqmutex_win.cpp \ $$TOOLS_CPP/tqwaitcondition_win.cpp \ $$TOOLS_CPP/tqthreadstorage_win.cpp \ - $$TOOLS_CPP/qcriticalsection_p.cpp + $$TOOLS_CPP/tqcriticalsection_p.cpp win32-borland:SOURCES += $$TOOLS_CPP/tqwinexport.cpp @@ -108,7 +108,7 @@ tools { SOURCES += $$TOOLS_CPP/tqbitarray.cpp \ $$TOOLS_CPP/tqbuffer.cpp \ $$TOOLS_CPP/tqcomponentfactory.cpp \ - $$TOOLS_CPP/qcomlibrary.cpp \ + $$TOOLS_CPP/tqcomlibrary.cpp \ $$TOOLS_CPP/tqcstring.cpp \ $$TOOLS_CPP/tqdatastream.cpp \ $$TOOLS_CPP/tqdatetime.cpp \ @@ -135,8 +135,8 @@ tools { $$TOOLS_CPP/tqsettings.cpp \ $$TOOLS_CPP/tqstringlist.cpp \ $$TOOLS_CPP/tqtextstream.cpp \ - $$TOOLS_CPP/qunicodetables.cpp \ - $$TOOLS_CPP/qucom.cpp \ + $$TOOLS_CPP/tqunicodetables.cpp \ + $$TOOLS_CPP/tqucom.cpp \ $$TOOLS_CPP/tquuid.cpp irix-cc* { diff --git a/src/tools/qcom_p.h b/src/tools/tqcom_p.h index 0c9d60d0..9ff7ece6 100644 --- a/src/tools/qcom_p.h +++ b/src/tools/tqcom_p.h @@ -291,7 +291,7 @@ public: \ // this is duplicated at Q_PLUGIN_VERIFICATION_DATA in tqgplugin.h // NOTE: if you change pattern, you MUST change the pattern in -// qcomlibrary.cpp as well. changing the pattern will break all +// tqcomlibrary.cpp as well. changing the pattern will break all // backwards compatibility as well (no old plugins will be loaded). #ifndef Q_UCM_VERIFICATION_DATA # define Q_UCM_VERIFICATION_DATA \ diff --git a/src/tools/qcomlibrary.cpp b/src/tools/tqcomlibrary.cpp index 5f40bdc9..5c251013 100644 --- a/src/tools/qcomlibrary.cpp +++ b/src/tools/tqcomlibrary.cpp @@ -36,7 +36,7 @@ ** **********************************************************************/ -#include "qcomlibrary_p.h" +#include "tqcomlibrary_p.h" #ifndef TQT_NO_COMPONENT #include <ntqapplication.h> diff --git a/src/tools/qcomlibrary_p.h b/src/tools/tqcomlibrary_p.h index ede72419..e803a236 100644 --- a/src/tools/qcomlibrary_p.h +++ b/src/tools/tqcomlibrary_p.h @@ -52,7 +52,7 @@ // #ifndef QT_H -#include "qcom_p.h" +#include "tqcom_p.h" #include "tqlibrary.h" #endif // QT_H diff --git a/src/tools/tqcomponentfactory.cpp b/src/tools/tqcomponentfactory.cpp index 6bac4b61..3b05e94d 100644 --- a/src/tools/tqcomponentfactory.cpp +++ b/src/tools/tqcomponentfactory.cpp @@ -42,7 +42,7 @@ #ifndef TQT_NO_COMPONENT #include "tqsettings.h" -#include <private/qcomlibrary_p.h> +#include <private/tqcomlibrary_p.h> #include "tqdir.h" #include "ntqapplication.h" diff --git a/src/tools/tqcomponentfactory_p.h b/src/tools/tqcomponentfactory_p.h index 89399152..ea45d745 100644 --- a/src/tools/tqcomponentfactory_p.h +++ b/src/tools/tqcomponentfactory_p.h @@ -42,7 +42,7 @@ #define TQCOMPONENTFACTORY_P_H #ifndef QT_H -#include "qcom_p.h" +#include "tqcom_p.h" #endif // QT_H // diff --git a/src/tools/qcriticalsection_p.cpp b/src/tools/tqcriticalsection_p.cpp index 20c2127b..a6203b0c 100644 --- a/src/tools/qcriticalsection_p.cpp +++ b/src/tools/tqcriticalsection_p.cpp @@ -40,7 +40,7 @@ #include "qt_windows.h" -#include <private/qcriticalsection_p.h> +#include <private/tqcriticalsection_p.h> class TQCriticalSectionPrivate { diff --git a/src/tools/qcriticalsection_p.h b/src/tools/tqcriticalsection_p.h index 330e141e..330e141e 100644 --- a/src/tools/qcriticalsection_p.h +++ b/src/tools/tqcriticalsection_p.h diff --git a/src/tools/tqgpluginmanager.cpp b/src/tools/tqgpluginmanager.cpp index d53e4f5f..94b5a643 100644 --- a/src/tools/tqgpluginmanager.cpp +++ b/src/tools/tqgpluginmanager.cpp @@ -38,7 +38,7 @@ #include "tqgpluginmanager_p.h" #ifndef TQT_NO_COMPONENT -#include "qcomlibrary_p.h" +#include "tqcomlibrary_p.h" #include "tqmap.h" #include "tqdir.h" @@ -205,7 +205,7 @@ static int similarity( const TQString& s1, const TQString& s2 ) } /*! - \class TQPluginManager qpluginmanager.h + \class TQPluginManager tqpluginmanager.h \reentrant \brief The TQPluginManager class provides basic functions to access a certain kind of functionality in libraries. \ingroup componentmodel diff --git a/src/tools/tqgpluginmanager_p.h b/src/tools/tqgpluginmanager_p.h index 946fe3bc..12393662 100644 --- a/src/tools/tqgpluginmanager_p.h +++ b/src/tools/tqgpluginmanager_p.h @@ -44,7 +44,7 @@ #include "tqlibrary.h" #include "tquuid.h" #include "tqstringlist.h" -#include "qcom_p.h" +#include "tqcom_p.h" #endif // QT_H // diff --git a/src/tools/qpluginmanager_p.h b/src/tools/tqpluginmanager_p.h index 4e42eed0..4e42eed0 100644 --- a/src/tools/qpluginmanager_p.h +++ b/src/tools/tqpluginmanager_p.h diff --git a/src/tools/tqstring.cpp b/src/tools/tqstring.cpp index 5247289d..318f1aa7 100644 --- a/src/tools/tqstring.cpp +++ b/src/tools/tqstring.cpp @@ -59,7 +59,7 @@ #include "tqlocale.h" #include "tqlocale_p.h" -#include "qunicodetables_p.h" +#include "tqunicodetables_p.h" #include <limits.h> #include <stdarg.h> #include <stdio.h> diff --git a/src/tools/qucom.cpp b/src/tools/tqucom.cpp index 8444c7f3..3ab50a7a 100644 --- a/src/tools/qucom.cpp +++ b/src/tools/tqucom.cpp @@ -38,8 +38,8 @@ ** **********************************************************************/ -#include "private/qucom_p.h" -#include "private/qucomextra_p.h" +#include "private/tqucom_p.h" +#include "private/tqucomextra_p.h" #include "tqvariant.h" diff --git a/src/tools/qucom_p.h b/src/tools/tqucom_p.h index 761d5cee..761d5cee 100644 --- a/src/tools/qucom_p.h +++ b/src/tools/tqucom_p.h diff --git a/src/tools/qunicodetables.cpp b/src/tools/tqunicodetables.cpp index b442bcbf..ee3ed918 100644 --- a/src/tools/qunicodetables.cpp +++ b/src/tools/tqunicodetables.cpp @@ -36,7 +36,7 @@ ** **********************************************************************/ -#include "qunicodetables_p.h" +#include "tqunicodetables_p.h" /* ------------------------------------------------------------------------- * unicode information @@ -64,7 +64,7 @@ and using perl-5.10 * ------------------------------------------------------------------------- */ -/* Perl script to generate (run perl -x tools/qunicodetables.cpp) +/* Perl script to generate (run perl -x tools/tqunicodetables.cpp) #!perl diff --git a/src/tools/qunicodetables_p.h b/src/tools/tqunicodetables_p.h index 18045f47..18045f47 100644 --- a/src/tools/qunicodetables_p.h +++ b/src/tools/tqunicodetables_p.h diff --git a/src/widgets/qt_widgets.pri b/src/widgets/qt_widgets.pri index 9cb2f4b5..48927927 100644 --- a/src/widgets/qt_widgets.pri +++ b/src/widgets/qt_widgets.pri @@ -46,7 +46,7 @@ widgets { $$WIDGETS_H/tqsyntaxhighlighter.h \ $$WIDGETS_P/tqsyntaxhighlighter_p.h \ $$WIDGETS_H/tqtabwidget.h \ - $$WIDGETS_P/qtitlebar_p.h \ + $$WIDGETS_P/tqtitlebar_p.h \ $$WIDGETS_H/tqtoolbar.h \ $$WIDGETS_H/tqtoolbox.h \ $$WIDGETS_H/tqtoolbutton.h \ @@ -108,7 +108,7 @@ widgets { $$WIDGETS_CPP/tqsyntaxhighlighter.cpp \ $$WIDGETS_CPP/tqtabbar.cpp \ $$WIDGETS_CPP/tqtabwidget.cpp \ - $$WIDGETS_CPP/qtitlebar.cpp \ + $$WIDGETS_CPP/tqtitlebar.cpp \ $$WIDGETS_CPP/tqtoolbar.cpp \ $$WIDGETS_CPP/tqtoolbox.cpp \ $$WIDGETS_CPP/tqtoolbutton.cpp \ @@ -121,7 +121,7 @@ widgets { $$WIDGETS_CPP/tqwidgetstack.cpp \ $$WIDGETS_CPP/tqaction.cpp \ $$WIDGETS_CPP/tqdatetimeedit.cpp \ - $$WIDGETS_CPP/qeffects.cpp \ + $$WIDGETS_CPP/tqeffects.cpp \ $$WIDGETS_CPP/tqtextview.cpp \ $$WIDGETS_CPP/tqtextbrowser.cpp \ $$WIDGETS_CPP/tqtextedit.cpp \ diff --git a/src/widgets/tqbutton.cpp b/src/widgets/tqbutton.cpp index 333ff627..088f9cc6 100644 --- a/src/widgets/tqbutton.cpp +++ b/src/widgets/tqbutton.cpp @@ -50,7 +50,7 @@ #include "tqpushbutton.h" #include "tqradiobutton.h" #include "tqguardedptr.h" -#include "../kernel/qinternal_p.h" +#include "../kernel/tqinternal_p.h" #if defined(QT_ACCESSIBILITY_SUPPORT) #include "tqaccessible.h" diff --git a/src/widgets/tqcombobox.cpp b/src/widgets/tqcombobox.cpp index cc97ffed..1f0ff2e9 100644 --- a/src/widgets/tqcombobox.cpp +++ b/src/widgets/tqcombobox.cpp @@ -50,7 +50,7 @@ #include "ntqapplication.h" #include "tqlineedit.h" #include "tqbitmap.h" -#include "qeffects_p.h" +#include "tqeffects_p.h" #include "tqstringlist.h" #include "tqcombobox.h" #include "tqstyle.h" diff --git a/src/widgets/tqdatetimeedit.cpp b/src/widgets/tqdatetimeedit.cpp index 6e32d3aa..a01a1469 100644 --- a/src/widgets/tqdatetimeedit.cpp +++ b/src/widgets/tqdatetimeedit.cpp @@ -42,8 +42,8 @@ #ifndef TQT_NO_DATETIMEEDIT -#include "../kernel/qinternal_p.h" -#include "../kernel/qrichtext_p.h" +#include "../kernel/tqinternal_p.h" +#include "../kernel/tqrichtext_p.h" #include "tqrangecontrol.h" #include "ntqapplication.h" #include "tqpixmap.h" diff --git a/src/widgets/tqdockwindow.cpp b/src/widgets/tqdockwindow.cpp index 4bfe58a8..e07a550a 100644 --- a/src/widgets/tqdockwindow.cpp +++ b/src/widgets/tqdockwindow.cpp @@ -44,7 +44,7 @@ #include "tqdesktopwidget.h" #include "tqdockarea.h" #include "tqwidgetresizehandler_p.h" -#include "qtitlebar_p.h" +#include "tqtitlebar_p.h" #include "tqpainter.h" #include "ntqapplication.h" #include "tqtoolbutton.h" diff --git a/src/widgets/qeffects.cpp b/src/widgets/tqeffects.cpp index 5fce0e85..79245611 100644 --- a/src/widgets/qeffects.cpp +++ b/src/widgets/tqeffects.cpp @@ -41,7 +41,7 @@ #include "ntqapplication.h" #ifndef TQT_NO_EFFECTS #include "tqwidget.h" -#include "qeffects_p.h" +#include "tqeffects_p.h" #include "tqpixmap.h" #include "tqimage.h" #include "tqtimer.h" @@ -620,7 +620,7 @@ void TQRollEffect::scroll() Delete this after timeout */ -#include "qeffects.moc" +#include "tqeffects.moc" /*! Scroll widget \a w in \a time ms. \a orient may be 1 (vertical), 2 diff --git a/src/widgets/qeffects_p.h b/src/widgets/tqeffects_p.h index 4d9845c0..6dad1b23 100644 --- a/src/widgets/qeffects_p.h +++ b/src/widgets/tqeffects_p.h @@ -47,7 +47,7 @@ // ------------- // // This file is not part of the TQt API. It exists for the convenience -// of qeffects.cpp, tqcombobox.cpp, tqpopupmenu.cpp and tqtooltip.cpp. +// of tqeffects.cpp, tqcombobox.cpp, tqpopupmenu.cpp and tqtooltip.cpp. // This header file may change from version to version without notice, // or even be removed. // diff --git a/src/widgets/tqiconview.cpp b/src/widgets/tqiconview.cpp index 35b144b8..7af1babc 100644 --- a/src/widgets/tqiconview.cpp +++ b/src/widgets/tqiconview.cpp @@ -69,7 +69,7 @@ #include "tqptrdict.h" #include "tqstringlist.h" #include "tqcleanuphandler.h" -#include "private/qrichtext_p.h" +#include "private/tqrichtext_p.h" #include "tqstyle.h" #include <limits.h> diff --git a/src/widgets/tqlineedit.cpp b/src/widgets/tqlineedit.cpp index 150e7f1d..46b1df64 100644 --- a/src/widgets/tqlineedit.cpp +++ b/src/widgets/tqlineedit.cpp @@ -60,7 +60,7 @@ #include "tqguardedptr.h" #include "tqstyle.h" #include "tqwhatsthis.h" -#include "../kernel/qinternal_p.h" +#include "../kernel/tqinternal_p.h" #include "private/tqtextlayout_p.h" #include "tqvaluevector.h" #if defined(Q_OS_LINUX) diff --git a/src/widgets/tqlistview.cpp b/src/widgets/tqlistview.cpp index 54473b6c..477743c2 100644 --- a/src/widgets/tqlistview.cpp +++ b/src/widgets/tqlistview.cpp @@ -63,7 +63,7 @@ #include "tqtooltip.h" #include "tqstyle.h" #include "tqstylesheet.h" -#include "../kernel/qinternal_p.h" +#include "../kernel/tqinternal_p.h" #if defined(QT_ACCESSIBILITY_SUPPORT) #include "tqaccessible.h" #endif diff --git a/src/widgets/tqmenubar.cpp b/src/widgets/tqmenubar.cpp index 8bedca7a..8577bda5 100644 --- a/src/widgets/tqmenubar.cpp +++ b/src/widgets/tqmenubar.cpp @@ -52,7 +52,7 @@ #include "tqguardedptr.h" #include "tqlayout.h" #include "tqcleanuphandler.h" -#include "../kernel/qinternal_p.h" +#include "../kernel/tqinternal_p.h" #include "tqstyle.h" #include "tqtimer.h" #if defined(QT_ACCESSIBILITY_SUPPORT) diff --git a/src/widgets/tqmultilineedit.cpp b/src/widgets/tqmultilineedit.cpp index 8311291b..1ee4b712 100644 --- a/src/widgets/tqmultilineedit.cpp +++ b/src/widgets/tqmultilineedit.cpp @@ -51,7 +51,7 @@ #include "tqpopupmenu.h" #include "tqtimer.h" #include "tqdict.h" -#include "../kernel/qrichtext_p.h" +#include "../kernel/tqrichtext_p.h" /*! diff --git a/src/widgets/tqpopupmenu.cpp b/src/widgets/tqpopupmenu.cpp index 2e68598d..e614a328 100644 --- a/src/widgets/tqpopupmenu.cpp +++ b/src/widgets/tqpopupmenu.cpp @@ -51,7 +51,7 @@ #include "tqwhatsthis.h" #include "tqobjectlist.h" #include "tqguardedptr.h" -#include "qeffects_p.h" +#include "tqeffects_p.h" #include "tqcursor.h" #include "tqstyle.h" #include "tqtimer.h" diff --git a/src/widgets/tqprogressbar.cpp b/src/widgets/tqprogressbar.cpp index 7efa4ce4..2b3f5074 100644 --- a/src/widgets/tqprogressbar.cpp +++ b/src/widgets/tqprogressbar.cpp @@ -45,7 +45,7 @@ #include "tqpixmap.h" #include "tqstyle.h" #include "tqwmatrix.h" -#include "../kernel/qinternal_p.h" +#include "../kernel/tqinternal_p.h" #if defined(QT_ACCESSIBILITY_SUPPORT) #include "tqaccessible.h" #endif diff --git a/src/widgets/tqsyntaxhighlighter.cpp b/src/widgets/tqsyntaxhighlighter.cpp index 223f7930..f124b7ce 100644 --- a/src/widgets/tqsyntaxhighlighter.cpp +++ b/src/widgets/tqsyntaxhighlighter.cpp @@ -42,7 +42,7 @@ #include "private/tqsyntaxhighlighter_p.h" #ifndef TQT_NO_SYNTAXHIGHLIGHTER -#include "../kernel/qrichtext_p.h" +#include "../kernel/tqrichtext_p.h" #include "tqtextedit.h" #include "tqtimer.h" diff --git a/src/widgets/tqsyntaxhighlighter_p.h b/src/widgets/tqsyntaxhighlighter_p.h index c4d7deab..c72094f9 100644 --- a/src/widgets/tqsyntaxhighlighter_p.h +++ b/src/widgets/tqsyntaxhighlighter_p.h @@ -43,7 +43,7 @@ #ifndef TQT_NO_SYNTAXHIGHLIGHTER #include "tqsyntaxhighlighter.h" -#include "private/qrichtext_p.h" +#include "private/tqrichtext_p.h" class TQSyntaxHighlighterPrivate { diff --git a/src/widgets/tqtabbar.cpp b/src/widgets/tqtabbar.cpp index 7c9ebb2c..cba1906c 100644 --- a/src/widgets/tqtabbar.cpp +++ b/src/widgets/tqtabbar.cpp @@ -47,7 +47,7 @@ #include "tqpainter.h" #include "tqiconset.h" #include "tqcursor.h" -#include "../kernel/qinternal_p.h" +#include "../kernel/tqinternal_p.h" #if defined(QT_ACCESSIBILITY_SUPPORT) #include "tqaccessible.h" #endif diff --git a/src/widgets/tqtextbrowser.cpp b/src/widgets/tqtextbrowser.cpp index 69ae10d5..161757d1 100644 --- a/src/widgets/tqtextbrowser.cpp +++ b/src/widgets/tqtextbrowser.cpp @@ -40,7 +40,7 @@ #include "tqtextbrowser.h" #ifndef TQT_NO_TEXTBROWSER -#include "../kernel/qrichtext_p.h" +#include "../kernel/tqrichtext_p.h" #include "ntqapplication.h" #include "tqlayout.h" diff --git a/src/widgets/tqtextedit.cpp b/src/widgets/tqtextedit.cpp index 2c8bf3ba..baddd23c 100644 --- a/src/widgets/tqtextedit.cpp +++ b/src/widgets/tqtextedit.cpp @@ -47,7 +47,7 @@ #include "tqinputcontext.h" #endif -#include "../kernel/qrichtext_p.h" +#include "../kernel/tqrichtext_p.h" #include "tqpainter.h" #include "tqpen.h" #include "tqbrush.h" @@ -74,7 +74,7 @@ #include "tqptrstack.h" #include "tqmetaobject.h" #include "tqtextbrowser.h" -#include <private/qucom_p.h> +#include <private/tqucom_p.h> #include "private/tqsyntaxhighlighter_p.h" #include <tqguardedptr.h> diff --git a/src/widgets/qtitlebar.cpp b/src/widgets/tqtitlebar.cpp index f0aa7bce..83bb8c12 100644 --- a/src/widgets/qtitlebar.cpp +++ b/src/widgets/tqtitlebar.cpp @@ -40,7 +40,7 @@ #include "qplatformdefs.h" -#include "qtitlebar_p.h" +#include "tqtitlebar_p.h" #ifndef TQT_NO_TITLEBAR @@ -54,7 +54,7 @@ #include "tqtimer.h" #include "tqpainter.h" #include "tqstyle.h" -#include "private/qinternal_p.h" +#include "private/tqinternal_p.h" #ifndef TQT_NO_WORKSPACE #include "tqworkspace.h" #endif diff --git a/src/widgets/qtitlebar_p.h b/src/widgets/tqtitlebar_p.h index e3d20023..e3d20023 100644 --- a/src/widgets/qtitlebar_p.h +++ b/src/widgets/tqtitlebar_p.h diff --git a/src/widgets/tqtooltip.cpp b/src/widgets/tqtooltip.cpp index ee0a097f..e044be6e 100644 --- a/src/widgets/tqtooltip.cpp +++ b/src/widgets/tqtooltip.cpp @@ -43,7 +43,7 @@ #include "ntqapplication.h" #include "tqguardedptr.h" #include "tqtimer.h" -#include "qeffects_p.h" +#include "tqeffects_p.h" static bool globally_enabled = TRUE; diff --git a/src/widgets/tqwidgetinterface_p.h b/src/widgets/tqwidgetinterface_p.h index 28986af3..81a158cc 100644 --- a/src/widgets/tqwidgetinterface_p.h +++ b/src/widgets/tqwidgetinterface_p.h @@ -52,7 +52,7 @@ // #ifndef QT_H -#include <private/qcom_p.h> +#include <private/tqcom_p.h> #include "tqiconset.h" #endif // QT_H diff --git a/src/workspace/tqworkspace.cpp b/src/workspace/tqworkspace.cpp index 2ab27811..1677b3a4 100644 --- a/src/workspace/tqworkspace.cpp +++ b/src/workspace/tqworkspace.cpp @@ -41,7 +41,7 @@ #include "tqworkspace.h" #ifndef TQT_NO_WORKSPACE #include "ntqapplication.h" -#include "../widgets/qtitlebar_p.h" +#include "../widgets/tqtitlebar_p.h" #include "tqobjectlist.h" #include "tqlayout.h" #include "tqtoolbutton.h" diff --git a/src/xml/qt_xml.pri b/src/xml/qt_xml.pri index 82fb0c4e..9adf0448 100644 --- a/src/xml/qt_xml.pri +++ b/src/xml/qt_xml.pri @@ -1,8 +1,8 @@ # TQt xml module xml { - HEADERS += $$XML_H/tqxml.h $$XML_H/tqdom.h $$XML_CPP/qsvgdevice_p.h - SOURCES += $$XML_CPP/tqxml.cpp $$XML_CPP/tqdom.cpp $$XML_CPP/qsvgdevice.cpp + HEADERS += $$XML_H/tqxml.h $$XML_H/tqdom.h $$XML_CPP/tqsvgdevice_p.h + SOURCES += $$XML_CPP/tqxml.cpp $$XML_CPP/tqdom.cpp $$XML_CPP/tqsvgdevice.cpp win32-borland { QMAKE_CFLAGS_WARN_ON += -w-use QMAKE_CXXFLAGS_WARN_ON += -w-use diff --git a/src/xml/qsvgdevice.cpp b/src/xml/tqsvgdevice.cpp index e6dfb86a..1b92d8d6 100644 --- a/src/xml/qsvgdevice.cpp +++ b/src/xml/tqsvgdevice.cpp @@ -36,7 +36,7 @@ ** *****************************************************************************/ -#include <private/qsvgdevice_p.h> +#include <private/tqsvgdevice_p.h> #ifndef TQT_NO_SVG @@ -117,7 +117,7 @@ static TQSvgTypeMap *qSvgTypeMap=0; // element types static TQMap<TQString,TQString> *qSvgColMap=0; // recognized color keyword names /*! - \class TQSvgDevice qsvgdevice.h + \class TQSvgDevice tqsvgdevice.h \brief The TQSvgDevice class provides a paint device for SVG vector graphics. \if defined(commercial) It is part of the <a href="commercialeditions.html">TQt Enterprise Edition</a>. diff --git a/src/xml/qsvgdevice_p.h b/src/xml/tqsvgdevice_p.h index ffdec75f..ffdec75f 100644 --- a/src/xml/qsvgdevice_p.h +++ b/src/xml/tqsvgdevice_p.h diff --git a/tools/designer/designer/designer.pro b/tools/designer/designer/designer.pro index 5c5e0f35..da8c8cf2 100644 --- a/tools/designer/designer/designer.pro +++ b/tools/designer/designer/designer.pro @@ -64,7 +64,7 @@ SOURCES += command.cpp \ paletteeditoradvancedimpl.cpp \ sourcefile.cpp \ wizardeditorimpl.cpp \ - qcompletionedit.cpp \ + tqcompletionedit.cpp \ timestamp.cpp \ formfile.cpp \ widgetaction.cpp \ @@ -127,7 +127,7 @@ HEADERS += command.h \ pixmapcollection.h \ sourcefile.h \ wizardeditorimpl.h \ - qcompletionedit.h \ + tqcompletionedit.h \ timestamp.h \ formfile.h \ widgetaction.h \ diff --git a/tools/designer/designer/designer_pch.h b/tools/designer/designer/designer_pch.h index c65faea1..fd4fbe75 100644 --- a/tools/designer/designer/designer_pch.h +++ b/tools/designer/designer/designer_pch.h @@ -8,7 +8,7 @@ #if defined __cplusplus -#include <private/qucomextra_p.h> +#include <private/tqucomextra_p.h> #include <tqaction.h> #include <ntqapplication.h> #include <tqcheckbox.h> diff --git a/tools/designer/designer/hierarchyview.h b/tools/designer/designer/hierarchyview.h index 370eb41b..03911555 100644 --- a/tools/designer/designer/hierarchyview.h +++ b/tools/designer/designer/hierarchyview.h @@ -38,7 +38,7 @@ #include <tqlistview.h> #include <tqtabwidget.h> #include <tqguardedptr.h> -#include <private/qcom_p.h> +#include <private/tqcom_p.h> #include "../interfaces/classbrowserinterface.h" class FormWindow; diff --git a/tools/designer/designer/mainwindow.cpp b/tools/designer/designer/mainwindow.cpp index 06ade5a3..4cbca113 100644 --- a/tools/designer/designer/mainwindow.cpp +++ b/tools/designer/designer/mainwindow.cpp @@ -56,7 +56,7 @@ #include "projectsettingsimpl.h" #include "tqwidgetfactory.h" #include "pixmapcollection.h" -#include "qcompletionedit.h" +#include "tqcompletionedit.h" #include "sourcefile.h" #include "orderindicator.h" #include <tqtoolbox.h> diff --git a/tools/designer/designer/mainwindow.h b/tools/designer/designer/mainwindow.h index ddc99c07..9e20f52a 100644 --- a/tools/designer/designer/mainwindow.h +++ b/tools/designer/designer/mainwindow.h @@ -50,7 +50,7 @@ #include <tqmainwindow.h> #include <tqmap.h> #include <tqguardedptr.h> -#include <private/qpluginmanager_p.h> +#include <private/tqpluginmanager_p.h> #include <tqobjectlist.h> class TQToolBox; diff --git a/tools/designer/designer/metadatabase.cpp b/tools/designer/designer/metadatabase.cpp index 1ff6a1c5..b8385d05 100644 --- a/tools/designer/designer/metadatabase.cpp +++ b/tools/designer/designer/metadatabase.cpp @@ -51,7 +51,7 @@ #include <tqwidgetlist.h> #include <tqmainwindow.h> #include <tqregexp.h> -#include <private/qpluginmanager_p.h> +#include <private/tqpluginmanager_p.h> #include <tqdatetime.h> #include <tqfile.h> #include <tqfileinfo.h> diff --git a/tools/designer/designer/multilineeditorimpl.cpp b/tools/designer/designer/multilineeditorimpl.cpp index 9e9ecce3..cea8ad72 100644 --- a/tools/designer/designer/multilineeditorimpl.cpp +++ b/tools/designer/designer/multilineeditorimpl.cpp @@ -40,7 +40,7 @@ #include "widgetfactory.h" #include <tqtextedit.h> -#include <./private/qrichtext_p.h> +#include <./private/tqrichtext_p.h> #include <tqpushbutton.h> #include <tqlayout.h> #include <tqtoolbutton.h> diff --git a/tools/designer/designer/multilineeditorimpl.h b/tools/designer/designer/multilineeditorimpl.h index 22075a99..1e5dd821 100644 --- a/tools/designer/designer/multilineeditorimpl.h +++ b/tools/designer/designer/multilineeditorimpl.h @@ -36,7 +36,7 @@ #include <tqaction.h> #include <tqtextedit.h> -#include <private/qrichtext_p.h> +#include <private/tqrichtext_p.h> #include "multilineeditor.h" class FormWindow; diff --git a/tools/designer/designer/project.h b/tools/designer/designer/project.h index 80bdb505..54819511 100644 --- a/tools/designer/designer/project.h +++ b/tools/designer/designer/project.h @@ -40,7 +40,7 @@ #include <tqstringlist.h> #include <tqptrlist.h> #include <tqmap.h> -#include <private/qpluginmanager_p.h> +#include <private/tqpluginmanager_p.h> #include "../interfaces/projectsettingsiface.h" #include "sourcefile.h" #include "formfile.h" diff --git a/tools/designer/designer/resource.cpp b/tools/designer/designer/resource.cpp index 278b0715..d2f913b0 100644 --- a/tools/designer/designer/resource.cpp +++ b/tools/designer/designer/resource.cpp @@ -86,7 +86,7 @@ #include <tqworkspace.h> #include <tqworkspace.h> #include <tqsplitter.h> -#include <private/qucom_p.h> +#include <private/tqucom_p.h> static TQString makeIndent( int indent ) { diff --git a/tools/designer/designer/syntaxhighlighter_html.h b/tools/designer/designer/syntaxhighlighter_html.h index 6173b6d5..fb208c8b 100644 --- a/tools/designer/designer/syntaxhighlighter_html.h +++ b/tools/designer/designer/syntaxhighlighter_html.h @@ -34,7 +34,7 @@ #ifndef SYNTAXHIGHLIGHTER_HTML_H #define SYNTAXHIGHLIGHTER_HTML_H -#include <./private/qrichtext_p.h> +#include <./private/tqrichtext_p.h> class SyntaxHighlighter_HTML : public TQTextPreProcessor { diff --git a/tools/designer/designer/qcompletionedit.cpp b/tools/designer/designer/tqcompletionedit.cpp index aba4dc87..02c3af5c 100644 --- a/tools/designer/designer/qcompletionedit.cpp +++ b/tools/designer/designer/tqcompletionedit.cpp @@ -31,7 +31,7 @@ ** **********************************************************************/ -#include "qcompletionedit.h" +#include "tqcompletionedit.h" #include <tqlistbox.h> #include <tqsizegrip.h> #include <ntqapplication.h> diff --git a/tools/designer/designer/qcompletionedit.h b/tools/designer/designer/tqcompletionedit.h index 792f7400..792f7400 100644 --- a/tools/designer/designer/qcompletionedit.h +++ b/tools/designer/designer/tqcompletionedit.h diff --git a/tools/designer/designer/workspace.cpp b/tools/designer/designer/workspace.cpp index d09328ce..485f02ea 100644 --- a/tools/designer/designer/workspace.cpp +++ b/tools/designer/designer/workspace.cpp @@ -53,7 +53,7 @@ #include <tqworkspace.h> #include <tqpopupmenu.h> #include <tqtextstream.h> -#include "qcompletionedit.h" +#include "tqcompletionedit.h" WorkspaceItem::WorkspaceItem( TQListView *parent, Project* p ) : TQListViewItem( parent ) diff --git a/tools/designer/editor/browser.cpp b/tools/designer/editor/browser.cpp index d32e8551..1ec24ffb 100644 --- a/tools/designer/editor/browser.cpp +++ b/tools/designer/editor/browser.cpp @@ -33,7 +33,7 @@ #include "browser.h" #include "editor.h" -#include <private/qrichtext_p.h> +#include <private/tqrichtext_p.h> EditorBrowser::EditorBrowser( Editor *e ) diff --git a/tools/designer/editor/cindent.h b/tools/designer/editor/cindent.h index d5b98ddf..6e7e1224 100644 --- a/tools/designer/editor/cindent.h +++ b/tools/designer/editor/cindent.h @@ -34,7 +34,7 @@ #ifndef CINDENT_H #define CINDENT_H -#include <private/qrichtext_p.h> +#include <private/tqrichtext_p.h> class CIndent : public TQTextIndent { diff --git a/tools/designer/editor/completion.cpp b/tools/designer/editor/completion.cpp index ee9d7733..b8e71233 100644 --- a/tools/designer/editor/completion.cpp +++ b/tools/designer/editor/completion.cpp @@ -37,7 +37,7 @@ #include <tqlistbox.h> #include <tqvbox.h> #include <tqmap.h> -#include <private/qrichtext_p.h> +#include <private/tqrichtext_p.h> #include <ntqapplication.h> #include <tqregexp.h> #include "arghintwidget.h" diff --git a/tools/designer/editor/editor.cpp b/tools/designer/editor/editor.cpp index fdf5f106..86af8836 100644 --- a/tools/designer/editor/editor.cpp +++ b/tools/designer/editor/editor.cpp @@ -34,7 +34,7 @@ #include "editor.h" #include "parenmatcher.h" #include <tqfile.h> -#include <private/qrichtext_p.h> +#include <private/tqrichtext_p.h> #include "conf.h" #include <ntqapplication.h> #include <tqpopupmenu.h> diff --git a/tools/designer/editor/markerwidget.cpp b/tools/designer/editor/markerwidget.cpp index c393d9c3..3ce1ae3f 100644 --- a/tools/designer/editor/markerwidget.cpp +++ b/tools/designer/editor/markerwidget.cpp @@ -33,7 +33,7 @@ #include "markerwidget.h" #include "viewmanager.h" -#include <private/qrichtext_p.h> +#include <private/tqrichtext_p.h> #include "editor.h" #include <tqpainter.h> #include <tqpopupmenu.h> diff --git a/tools/designer/editor/paragdata.h b/tools/designer/editor/paragdata.h index 772aaede..23ed6b52 100644 --- a/tools/designer/editor/paragdata.h +++ b/tools/designer/editor/paragdata.h @@ -35,7 +35,7 @@ #define PARAGDATA_H #include "parenmatcher.h" -#include <private/qrichtext_p.h> +#include <private/tqrichtext_p.h> struct ParagData : public TQTextParagraphData { diff --git a/tools/designer/editor/parenmatcher.cpp b/tools/designer/editor/parenmatcher.cpp index 9f72a65d..5976fc0f 100644 --- a/tools/designer/editor/parenmatcher.cpp +++ b/tools/designer/editor/parenmatcher.cpp @@ -35,7 +35,7 @@ #include "paragdata.h" #include "tqtextedit.h" -#include <private/qrichtext_p.h> +#include <private/tqrichtext_p.h> #include <ntqapplication.h> ParenMatcher::ParenMatcher() diff --git a/tools/designer/editor/viewmanager.cpp b/tools/designer/editor/viewmanager.cpp index a57f2ddb..a897b8ba 100644 --- a/tools/designer/editor/viewmanager.cpp +++ b/tools/designer/editor/viewmanager.cpp @@ -35,7 +35,7 @@ #include "editor.h" #include "markerwidget.h" #include <tqlayout.h> -#include <private/qrichtext_p.h> +#include <private/tqrichtext_p.h> #include "paragdata.h" #include <tqobjectlist.h> #include <tqlabel.h> diff --git a/tools/designer/interfaces/actioninterface.h b/tools/designer/interfaces/actioninterface.h index ab2c4e9b..bf77e59d 100644 --- a/tools/designer/interfaces/actioninterface.h +++ b/tools/designer/interfaces/actioninterface.h @@ -34,7 +34,7 @@ #ifndef ACTIONINTERFACE_H #define ACTIONINTERFACE_H -#include <private/qcom_p.h> +#include <private/tqcom_p.h> class TQAction; class TQObject; diff --git a/tools/designer/interfaces/classbrowserinterface.h b/tools/designer/interfaces/classbrowserinterface.h index 2b95e067..6af8755f 100644 --- a/tools/designer/interfaces/classbrowserinterface.h +++ b/tools/designer/interfaces/classbrowserinterface.h @@ -47,7 +47,7 @@ // // -#include <private/qcom_p.h> +#include <private/tqcom_p.h> #include <tqobject.h> class TQListView; diff --git a/tools/designer/interfaces/designerinterface.h b/tools/designer/interfaces/designerinterface.h index 982d8314..05b82938 100644 --- a/tools/designer/interfaces/designerinterface.h +++ b/tools/designer/interfaces/designerinterface.h @@ -47,7 +47,7 @@ // // -#include <private/qcom_p.h> +#include <private/tqcom_p.h> #include <tqptrlist.h> #include <tqstring.h> #include <tqmap.h> diff --git a/tools/designer/interfaces/editorinterface.h b/tools/designer/interfaces/editorinterface.h index e14d563d..2349cc05 100644 --- a/tools/designer/interfaces/editorinterface.h +++ b/tools/designer/interfaces/editorinterface.h @@ -47,7 +47,7 @@ // // -#include <private/qcom_p.h> +#include <private/tqcom_p.h> #include <tqmap.h> #include <tqvaluelist.h> diff --git a/tools/designer/interfaces/filterinterface.h b/tools/designer/interfaces/filterinterface.h index 42e6cf99..7db2155c 100644 --- a/tools/designer/interfaces/filterinterface.h +++ b/tools/designer/interfaces/filterinterface.h @@ -34,7 +34,7 @@ #ifndef FILTERINTERFACE_H #define FILTERINTERFACE_H -#include <private/qcom_p.h> +#include <private/tqcom_p.h> // {ea8cb381-59b5-44a8-bae5-9bea8295762a} #ifndef IID_ImportFilter diff --git a/tools/designer/interfaces/interpreterinterface.h b/tools/designer/interfaces/interpreterinterface.h index 2bf3f008..b88461e0 100644 --- a/tools/designer/interfaces/interpreterinterface.h +++ b/tools/designer/interfaces/interpreterinterface.h @@ -47,7 +47,7 @@ // // -#include <private/qcom_p.h> +#include <private/tqcom_p.h> class TQObject; diff --git a/tools/designer/interfaces/languageinterface.h b/tools/designer/interfaces/languageinterface.h index 58f6d5dc..5c586eed 100644 --- a/tools/designer/interfaces/languageinterface.h +++ b/tools/designer/interfaces/languageinterface.h @@ -47,7 +47,7 @@ // // -#include <private/qcom_p.h> +#include <private/tqcom_p.h> #include <tqvaluelist.h> #include <tqstringlist.h> #include <tqmap.h> diff --git a/tools/designer/interfaces/preferenceinterface.h b/tools/designer/interfaces/preferenceinterface.h index 222a054e..22e4f36d 100644 --- a/tools/designer/interfaces/preferenceinterface.h +++ b/tools/designer/interfaces/preferenceinterface.h @@ -47,7 +47,7 @@ // // -#include <private/qcom_p.h> +#include <private/tqcom_p.h> #include <tqwidgetlist.h> #include <tqcstring.h> diff --git a/tools/designer/interfaces/projectsettingsiface.h b/tools/designer/interfaces/projectsettingsiface.h index c6f6a2c2..203d7966 100644 --- a/tools/designer/interfaces/projectsettingsiface.h +++ b/tools/designer/interfaces/projectsettingsiface.h @@ -47,7 +47,7 @@ // // -#include <private/qcom_p.h> +#include <private/tqcom_p.h> #include <tqwidgetlist.h> #include <tqcstring.h> diff --git a/tools/designer/interfaces/sourcetemplateiface.h b/tools/designer/interfaces/sourcetemplateiface.h index 5757f4f1..48925454 100644 --- a/tools/designer/interfaces/sourcetemplateiface.h +++ b/tools/designer/interfaces/sourcetemplateiface.h @@ -47,7 +47,7 @@ // // -#include <private/qcom_p.h> +#include <private/tqcom_p.h> #include <tqstring.h> // {1b3446a4-1c71-424b-8789-1f34eb5697d8} diff --git a/tools/designer/interfaces/templatewizardiface.h b/tools/designer/interfaces/templatewizardiface.h index 7f882e23..1cd80eb8 100644 --- a/tools/designer/interfaces/templatewizardiface.h +++ b/tools/designer/interfaces/templatewizardiface.h @@ -47,7 +47,7 @@ // // -#include <private/qcom_p.h> +#include <private/tqcom_p.h> class TQWidget; struct DesignerFormWindow; diff --git a/tools/designer/plugins/cppeditor/cppbrowser.cpp b/tools/designer/plugins/cppeditor/cppbrowser.cpp index 2e05dd07..85d15155 100644 --- a/tools/designer/plugins/cppeditor/cppbrowser.cpp +++ b/tools/designer/plugins/cppeditor/cppbrowser.cpp @@ -33,7 +33,7 @@ **********************************************************************/ #include "cppbrowser.h" -#include <private/qrichtext_p.h> +#include <private/tqrichtext_p.h> #include <tqprocess.h> #include <tqmainwindow.h> #include <tqstatusbar.h> diff --git a/tools/designer/plugins/cppeditor/editorinterfaceimpl.cpp b/tools/designer/plugins/cppeditor/editorinterfaceimpl.cpp index f58b66b4..a7b60eae 100644 --- a/tools/designer/plugins/cppeditor/editorinterfaceimpl.cpp +++ b/tools/designer/plugins/cppeditor/editorinterfaceimpl.cpp @@ -35,7 +35,7 @@ #include "editorinterfaceimpl.h" #include <viewmanager.h> #include "cppeditor.h" -#include <private/qrichtext_p.h> +#include <private/tqrichtext_p.h> #include <ntqapplication.h> #include "completion.h" #include <designerinterface.h> diff --git a/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.h b/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.h index 45cd0135..92f0e4e7 100644 --- a/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.h +++ b/tools/designer/plugins/cppeditor/syntaxhighliter_cpp.h @@ -35,7 +35,7 @@ #ifndef TQCPPSYNTAXHIGHLIGHTER_H #define TQCPPSYNTAXHIGHLIGHTER_H -#include <private/qrichtext_p.h> +#include <private/tqrichtext_p.h> #include <conf.h> class SyntaxHighlighter_CPP : public TQTextPreProcessor diff --git a/tools/designer/shared/widgetdatabase.h b/tools/designer/shared/widgetdatabase.h index 234c7c97..9b083ba4 100644 --- a/tools/designer/shared/widgetdatabase.h +++ b/tools/designer/shared/widgetdatabase.h @@ -37,7 +37,7 @@ #include <tqiconset.h> #include <tqstring.h> #include "../interfaces/widgetinterface.h" // up here for GCC 2.7.* compatibility -#include <private/qpluginmanager_p.h> +#include <private/tqpluginmanager_p.h> extern TQPluginManager<WidgetInterface> *widgetManager(); diff --git a/tools/designer/tools/tqtconv2ui/main.cpp b/tools/designer/tools/tqtconv2ui/main.cpp index 9ae6c558..4044e1e4 100644 --- a/tools/designer/tools/tqtconv2ui/main.cpp +++ b/tools/designer/tools/tqtconv2ui/main.cpp @@ -32,7 +32,7 @@ **********************************************************************/ #include <ntqapplication.h> -#include <private/qpluginmanager_p.h> +#include <private/tqpluginmanager_p.h> #include <tqstringlist.h> #include <tqdir.h> #include <stdio.h> diff --git a/tools/designer/uilib/tqwidgetfactory.cpp b/tools/designer/uilib/tqwidgetfactory.cpp index 7b47cbf0..a608eeaf 100644 --- a/tools/designer/uilib/tqwidgetfactory.cpp +++ b/tools/designer/uilib/tqwidgetfactory.cpp @@ -48,7 +48,7 @@ #include <tqtooltip.h> #include <tqwhatsthis.h> #include <tqobjectlist.h> -#include <private/qpluginmanager_p.h> +#include <private/tqpluginmanager_p.h> #include <tqmime.h> #include <tqdragobject.h> diff --git a/tools/linguist/linguist/msgedit.cpp b/tools/linguist/linguist/msgedit.cpp index 4de407bc..06689d4a 100644 --- a/tools/linguist/linguist/msgedit.cpp +++ b/tools/linguist/linguist/msgedit.cpp @@ -62,7 +62,7 @@ #include <tqscrollview.h> #include <tqfont.h> #include <tqaccel.h> -#include <private/qrichtext_p.h> +#include <private/tqrichtext_p.h> static const int MaxCandidates = 5; diff --git a/translations/qt_ar.ts b/translations/qt_ar.ts index ad788413..4aaaca45 100644 --- a/translations/qt_ar.ts +++ b/translations/qt_ar.ts @@ -1657,7 +1657,7 @@ to </message> </context> <context> - <name>QTitleBar</name> + <name>TQTitleBar</name> <message> <source>System Menu</source> <translation>قائمة خيارات النّظام</translation> diff --git a/translations/qt_ca.ts b/translations/qt_ca.ts index e1991281..45603755 100644 --- a/translations/qt_ca.ts +++ b/translations/qt_ca.ts @@ -1665,7 +1665,7 @@ per a més informació.</p></translation> </message> </context> <context> - <name>QTitleBar</name> + <name>TQTitleBar</name> <message> <source>System Menu</source> <translation>Menú del sistema</translation> diff --git a/translations/qt_cs.ts b/translations/qt_cs.ts index 747b0268..54c88118 100644 --- a/translations/qt_cs.ts +++ b/translations/qt_cs.ts @@ -1665,7 +1665,7 @@ dalšími verzemi Unixu s grafickým prostředím X11. </message> </context> <context> - <name>QTitleBar</name> + <name>TQTitleBar</name> <message> <source>System Menu</source> <translation>Systémová nabídka</translation> diff --git a/translations/qt_de.ts b/translations/qt_de.ts index f997b036..a97c8f3d 100644 --- a/translations/qt_de.ts +++ b/translations/qt_de.ts @@ -1756,7 +1756,7 @@ nach </message> </context> <context> - <name>QTitleBar</name> + <name>TQTitleBar</name> <message> <source>System Menu</source> <translation>System-Menü</translation> diff --git a/translations/qt_es.ts b/translations/qt_es.ts index 2570cb1b..e220ddb2 100644 --- a/translations/qt_es.ts +++ b/translations/qt_es.ts @@ -1659,7 +1659,7 @@ a </message> </context> <context> - <name>QTitleBar</name> + <name>TQTitleBar</name> <message> <source>System Menu</source> <translation>Menú sistema</translation> diff --git a/translations/qt_fr.ts b/translations/qt_fr.ts index 9618ae8d..45d2fa17 100644 --- a/translations/qt_fr.ts +++ b/translations/qt_fr.ts @@ -1782,7 +1782,7 @@ en </message> </context> <context> - <name>QTitleBar</name> + <name>TQTitleBar</name> <message> <source>System Menu</source> <translation>Menu système</translation> diff --git a/translations/qt_he.ts b/translations/qt_he.ts index 48bec70a..f46b6d54 100644 --- a/translations/qt_he.ts +++ b/translations/qt_he.ts @@ -1753,7 +1753,7 @@ to </message>
</context>
<context>
- <name>QTitleBar</name>
+ <name>TQTitleBar</name>
<message>
<source>System Menu</source>
<translation>תפריט מערכת</translation>
diff --git a/translations/qt_it.ts b/translations/qt_it.ts index 905b5711..9a38a7ec 100644 --- a/translations/qt_it.ts +++ b/translations/qt_it.ts @@ -1659,7 +1659,7 @@ in </message> </context> <context> - <name>QTitleBar</name> + <name>TQTitleBar</name> <message> <source>System Menu</source> <translation>Menu di sistema</translation> diff --git a/translations/qt_ja.ts b/translations/qt_ja.ts index efed9078..ea7b2065 100644 --- a/translations/qt_ja.ts +++ b/translations/qt_ja.ts @@ -1657,7 +1657,7 @@ to </message> </context> <context> - <name>QTitleBar</name> + <name>TQTitleBar</name> <message> <source>System Menu</source> <translation>システムメニュー</translation> diff --git a/translations/qt_nb.ts b/translations/qt_nb.ts index 37397bff..29d1e7db 100644 --- a/translations/qt_nb.ts +++ b/translations/qt_nb.ts @@ -1659,7 +1659,7 @@ til </message> </context> <context> - <name>QTitleBar</name> + <name>TQTitleBar</name> <message> <source>System Menu</source> <translation>Systemmeny</translation> diff --git a/translations/qt_pt-br.ts b/translations/qt_pt-br.ts index 90ed5a4c..298d3e37 100644 --- a/translations/qt_pt-br.ts +++ b/translations/qt_pt-br.ts @@ -1659,7 +1659,7 @@ para </message> </context> <context> - <name>QTitleBar</name> + <name>TQTitleBar</name> <message> <source>System Menu</source> <translation>Menu do Sistema</translation> diff --git a/translations/qt_pt.ts b/translations/qt_pt.ts index aa728eb6..bcb9e215 100644 --- a/translations/qt_pt.ts +++ b/translations/qt_pt.ts @@ -1659,7 +1659,7 @@ para </message> </context> <context> - <name>QTitleBar</name> + <name>TQTitleBar</name> <message> <source>System Menu</source> <translation>Menu do Sistema</translation> diff --git a/translations/qt_ru.ts b/translations/qt_ru.ts index e76288ff..5cb9a411 100644 --- a/translations/qt_ru.ts +++ b/translations/qt_ru.ts @@ -1880,7 +1880,7 @@ to </message> </context> <context> - <name>QTitleBar</name> + <name>TQTitleBar</name> <message> <source>System Menu</source> <translation>Системное меню</translation> diff --git a/translations/qt_sk.ts b/translations/qt_sk.ts index 0f8a78b6..67386a60 100644 --- a/translations/qt_sk.ts +++ b/translations/qt_sk.ts @@ -1666,7 +1666,7 @@ Mac&nbsp;OS&nbsp;X, Linux, a mnohé ďalšie komerčné verzie Unixu. </message> </context> <context> - <name>QTitleBar</name> + <name>TQTitleBar</name> <message> <source>System Menu</source> <translation>Systémová ponuka</translation> diff --git a/translations/qt_tr.ts b/translations/qt_tr.ts index 7ef64db1..7b6c4e6d 100644 --- a/translations/qt_tr.ts +++ b/translations/qt_tr.ts @@ -1640,7 +1640,7 @@ to </message> </context> <context> - <name>QTitleBar</name> + <name>TQTitleBar</name> <message> <source>System Menu</source> <translation type="unfinished"></translation> diff --git a/translations/qt_zh-cn.ts b/translations/qt_zh-cn.ts index dd132e36..4a762215 100644 --- a/translations/qt_zh-cn.ts +++ b/translations/qt_zh-cn.ts @@ -1656,7 +1656,7 @@ to </message> </context> <context> - <name>QTitleBar</name> + <name>TQTitleBar</name> <message> <source>System Menu</source> <translation>系统菜单</translation> diff --git a/translations/qt_zh-tw.ts b/translations/qt_zh-tw.ts index 18e42dbd..7848b454 100644 --- a/translations/qt_zh-tw.ts +++ b/translations/qt_zh-tw.ts @@ -1657,7 +1657,7 @@ to </message> </context> <context> - <name>QTitleBar</name> + <name>TQTitleBar</name> <message> <source>System Menu</source> <translation>系統功能表</translation> diff --git a/translations/template.ts b/translations/template.ts index 07432c42..61bc14dc 100644 --- a/translations/template.ts +++ b/translations/template.ts @@ -1638,7 +1638,7 @@ to </message> </context> <context> - <name>QTitleBar</name> + <name>TQTitleBar</name> <message> <source>System Menu</source> <translation type="unfinished"></translation> |