From 2d93adac246295107d502524fb1c88d87288c5b7 Mon Sep 17 00:00:00 2001 From: Alexander Golubev Date: Mon, 6 Apr 2026 16:51:16 +0300 Subject: q => tq rebranding: rename mentiones of qt_{win,windows,mac} Rename mentions of qt_{win,mac}.pri and of qt_{windows,mac}.h for consistency with current naming schema. We don't provide the files, so no functional changes here. The rename was done with next script: find * -type f -exec sed -ri 's!\!t&!g' '{}' \+ Signed-off-by: Alexander Golubev --- doc/html/tqgl-h.html | 2 +- src/dialogs/tqdialog.cpp | 2 +- src/dialogs/tqfiledialog.cpp | 2 +- src/kernel/tqfontengine_p.h | 4 ++-- src/kernel/tqinputcontext_p.h | 2 +- src/kernel/tqrichtext.cpp | 2 +- src/kernel/tqsizegrip.cpp | 2 +- src/kernel/tqwidget.cpp | 2 +- src/opengl/tqgl.h | 2 +- src/qt.pro | 4 ++-- src/sql/drivers/mysql/tqsql_mysql.h | 2 +- src/sql/drivers/odbc/tqsql_odbc.cpp | 2 +- src/sql/drivers/odbc/tqsql_odbc.h | 2 +- src/sql/drivers/sqlite/tqsql_sqlite.h | 2 +- src/sql/drivers/sqlite3/tqsql_sqlite3.h | 2 +- src/styles/tqstylefactory.cpp | 2 +- src/tools/tqcriticalsection_p.cpp | 2 +- src/tools/tqdatastream.cpp | 2 +- src/tools/tqfileinfo_unix.cpp | 2 +- src/tools/tqgarray.cpp | 2 +- src/tools/tqglobal.cpp | 4 ++-- src/tools/tqsettings.cpp | 2 +- src/tools/tqstring.cpp | 2 +- src/tools/tqtextstream.cpp | 2 +- src/widgets/tqdatetimeedit.cpp | 2 +- src/widgets/tqmainwindow.cpp | 2 +- src/widgets/tqscrollview.cpp | 2 +- src/widgets/tqtitlebar.cpp | 2 +- src/widgets/tqwhatsthis.cpp | 2 +- src/widgets/tqwidgetresizehandler.cpp | 2 +- tools/designer/app/main.cpp | 2 +- tools/designer/designer/designerapp.cpp | 2 +- tools/designer/designer/formwindow.cpp | 2 +- tools/designer/designer/mainwindow.cpp | 2 +- 34 files changed, 37 insertions(+), 37 deletions(-) diff --git a/doc/html/tqgl-h.html b/doc/html/tqgl-h.html index 8b003314b..e1e4acdb7 100644 --- a/doc/html/tqgl-h.html +++ b/doc/html/tqgl-h.html @@ -97,7 +97,7 @@ TQM_EXPORT_OPENGL inline const char *qGLVersion() { #endif #if defined(TQ_WS_WIN) -# include "qt_windows.h" +# include "tqt_windows.h" #endif #if defined(TQ_WS_MAC) diff --git a/src/dialogs/tqdialog.cpp b/src/dialogs/tqdialog.cpp index 57e8386b3..c9d83006b 100644 --- a/src/dialogs/tqdialog.cpp +++ b/src/dialogs/tqdialog.cpp @@ -56,7 +56,7 @@ #include "tqaccessible.h" #endif #if defined( Q_OS_TEMP ) -#include "qt_windows.h" +#include "tqt_windows.h" #endif /*! diff --git a/src/dialogs/tqfiledialog.cpp b/src/dialogs/tqfiledialog.cpp index 472dd8f46..1b456af98 100644 --- a/src/dialogs/tqfiledialog.cpp +++ b/src/dialogs/tqfiledialog.cpp @@ -114,7 +114,7 @@ #include #ifdef TQ_WS_MAC -#include "qt_mac.h" +#include "tqt_mac.h" extern TQString qt_mac_precomposeFileName(const TQString &); // tqglobal.cpp #undef check #endif diff --git a/src/kernel/tqfontengine_p.h b/src/kernel/tqfontengine_p.h index 52bc66d7c..428866ba7 100644 --- a/src/kernel/tqfontengine_p.h +++ b/src/kernel/tqfontengine_p.h @@ -42,7 +42,7 @@ #endif // QT_H #ifdef TQ_WS_WIN -#include "qt_windows.h" +#include "tqt_windows.h" #include "tqptrdict.h" #endif @@ -462,7 +462,7 @@ private: #endif // TQT_NO_XFTFREETYPE #elif defined( TQ_WS_MAC ) -#include "qt_mac.h" +#include "tqt_mac.h" #include #include diff --git a/src/kernel/tqinputcontext_p.h b/src/kernel/tqinputcontext_p.h index b2df28c2b..9261ae909 100644 --- a/src/kernel/tqinputcontext_p.h +++ b/src/kernel/tqinputcontext_p.h @@ -67,7 +67,7 @@ class TQString; #endif #ifdef TQ_WS_WIN -#include "qt_windows.h" +#include "tqt_windows.h" #endif class TQInputContext diff --git a/src/kernel/tqrichtext.cpp b/src/kernel/tqrichtext.cpp index a4a80e0dd..7c700bfc0 100644 --- a/src/kernel/tqrichtext.cpp +++ b/src/kernel/tqrichtext.cpp @@ -75,7 +75,7 @@ class TQTextFormatCollection; const int border_tolerance = 2; #ifdef TQ_WS_WIN -#include "qt_windows.h" +#include "tqt_windows.h" #endif #define TQChar_linesep TQChar(0x2028U) diff --git a/src/kernel/tqsizegrip.cpp b/src/kernel/tqsizegrip.cpp index f2fb7fea4..ead2494be 100644 --- a/src/kernel/tqsizegrip.cpp +++ b/src/kernel/tqsizegrip.cpp @@ -51,7 +51,7 @@ extern Atom tqt_sizegrip; // defined in tqapplication_x11.cpp #elif defined (TQ_WS_WIN ) #include "tqobjectlist.h" -#include "qt_windows.h" +#include "tqt_windows.h" #elif defined(TQ_WS_MAC) bool qt_mac_update_sizer(TQWidget *, int); //tqwidget_mac.cpp #endif diff --git a/src/kernel/tqwidget.cpp b/src/kernel/tqwidget.cpp index 7ab03a0bd..38333aef4 100644 --- a/src/kernel/tqwidget.cpp +++ b/src/kernel/tqwidget.cpp @@ -63,7 +63,7 @@ #include "tqaccessible.h" #endif #if defined(TQ_WS_WIN) -#include "qt_windows.h" +#include "tqt_windows.h" #include "tqinputcontext_p.h" #endif #include "tqfontdata_p.h" diff --git a/src/opengl/tqgl.h b/src/opengl/tqgl.h index 604dfee1d..4befb1b83 100644 --- a/src/opengl/tqgl.h +++ b/src/opengl/tqgl.h @@ -62,7 +62,7 @@ TQM_EXPORT_OPENGL inline const char *qGLVersion() { #endif #if defined(TQ_WS_WIN) -# include "qt_windows.h" +# include "tqt_windows.h" #endif #if defined(TQ_WS_MAC) diff --git a/src/qt.pro b/src/qt.pro index 24302751b..e2e71f611 100644 --- a/src/qt.pro +++ b/src/qt.pro @@ -118,8 +118,8 @@ include($$KERNEL_CPP/qt_compat.pri) #platforms x11:include($$KERNEL_CPP/tqt_x11.pri) -mac:include($$KERNEL_CPP/qt_mac.pri) -win32:include($$KERNEL_CPP/qt_win.pri) +mac:include($$KERNEL_CPP/tqt_mac.pri) +win32:include($$KERNEL_CPP/tqt_win.pri) #modules include($$KERNEL_CPP/qt_kernel.pri) diff --git a/src/sql/drivers/mysql/tqsql_mysql.h b/src/sql/drivers/mysql/tqsql_mysql.h index 09211c9aa..880fa804f 100644 --- a/src/sql/drivers/mysql/tqsql_mysql.h +++ b/src/sql/drivers/mysql/tqsql_mysql.h @@ -47,7 +47,7 @@ #include #if defined (Q_OS_WIN32) -#include +#include #endif #include diff --git a/src/sql/drivers/odbc/tqsql_odbc.cpp b/src/sql/drivers/odbc/tqsql_odbc.cpp index bc09fb28b..2263f747a 100644 --- a/src/sql/drivers/odbc/tqsql_odbc.cpp +++ b/src/sql/drivers/odbc/tqsql_odbc.cpp @@ -42,7 +42,7 @@ #include #if defined (Q_OS_WIN32) -#include +#include #include #endif #include diff --git a/src/sql/drivers/odbc/tqsql_odbc.h b/src/sql/drivers/odbc/tqsql_odbc.h index ff6e33341..9a1a377f1 100644 --- a/src/sql/drivers/odbc/tqsql_odbc.h +++ b/src/sql/drivers/odbc/tqsql_odbc.h @@ -49,7 +49,7 @@ #include #if defined (Q_OS_WIN32) -#include +#include #endif #if defined (Q_OS_MAC) diff --git a/src/sql/drivers/sqlite/tqsql_sqlite.h b/src/sql/drivers/sqlite/tqsql_sqlite.h index 35af38a62..d1b66df22 100644 --- a/src/sql/drivers/sqlite/tqsql_sqlite.h +++ b/src/sql/drivers/sqlite/tqsql_sqlite.h @@ -26,7 +26,7 @@ typedef TQVariant TQSqlVariant; #endif #if defined (Q_OS_WIN32) -# include +# include #endif class TQSQLiteDriverPrivate; diff --git a/src/sql/drivers/sqlite3/tqsql_sqlite3.h b/src/sql/drivers/sqlite3/tqsql_sqlite3.h index ba60879e3..a9f1d711a 100644 --- a/src/sql/drivers/sqlite3/tqsql_sqlite3.h +++ b/src/sql/drivers/sqlite3/tqsql_sqlite3.h @@ -26,7 +26,7 @@ typedef TQVariant TQSqlVariant; #endif #if defined (Q_OS_WIN32) -# include +# include #endif class TQSQLite3DriverPrivate; diff --git a/src/styles/tqstylefactory.cpp b/src/styles/tqstylefactory.cpp index ed697dd8c..8f5280264 100644 --- a/src/styles/tqstylefactory.cpp +++ b/src/styles/tqstylefactory.cpp @@ -63,7 +63,7 @@ #if !defined( TQT_NO_STYLE_MAC ) && defined( TQ_WS_MAC ) TQString p2qstring(const unsigned char *c); //tqglobal.cpp -#include "qt_mac.h" +#include "tqt_mac.h" #include "tqmacstyle_mac.h" #endif #include diff --git a/src/tools/tqcriticalsection_p.cpp b/src/tools/tqcriticalsection_p.cpp index a6203b0c8..ed6ead874 100644 --- a/src/tools/tqcriticalsection_p.cpp +++ b/src/tools/tqcriticalsection_p.cpp @@ -38,7 +38,7 @@ #if defined(TQT_THREAD_SUPPORT) -#include "qt_windows.h" +#include "tqt_windows.h" #include diff --git a/src/tools/tqdatastream.cpp b/src/tools/tqdatastream.cpp index 30ee6e37e..8db36f92c 100644 --- a/src/tools/tqdatastream.cpp +++ b/src/tools/tqdatastream.cpp @@ -48,7 +48,7 @@ #ifndef Q_OS_TEMP #include #else -#include "qt_windows.h" +#include "tqt_windows.h" #endif /*! diff --git a/src/tools/tqfileinfo_unix.cpp b/src/tools/tqfileinfo_unix.cpp index c2925f5c8..c199ef578 100644 --- a/src/tools/tqfileinfo_unix.cpp +++ b/src/tools/tqfileinfo_unix.cpp @@ -46,7 +46,7 @@ #include #if defined(Q_OS_MAC) -# include +# include #endif #if defined(Q_OS_HURD) # include diff --git a/src/tools/tqgarray.cpp b/src/tools/tqgarray.cpp index 6a5528ddf..17dfdc8f2 100644 --- a/src/tools/tqgarray.cpp +++ b/src/tools/tqgarray.cpp @@ -41,7 +41,7 @@ #include "tqglobal.h" #if defined(TQ_WS_WIN) // needed for bsearch on some platforms -# include "qt_windows.h" +# include "tqt_windows.h" #endif #define TQGARRAY_CPP diff --git a/src/tools/tqglobal.cpp b/src/tools/tqglobal.cpp index 49459fe08..3509f8407 100644 --- a/src/tools/tqglobal.cpp +++ b/src/tools/tqglobal.cpp @@ -167,7 +167,7 @@ bool tqSysInfo( int *wordSize, bool *bigEndian ) #if defined(Q_OS_MAC) -#include "qt_mac.h" +#include "tqt_mac.h" // This function has descended from Apple Source Code (FSpLocationFromFullPath), // but changes have been made. [Creates a minimal alias from the full pathname] @@ -257,7 +257,7 @@ bool qt_winunicode; DWORD tqt_cever = 0; # endif // Q_OS_TEMP -#include "qt_windows.h" +#include "tqt_windows.h" int qWinVersion() { diff --git a/src/tools/tqsettings.cpp b/src/tools/tqsettings.cpp index 76b3faa61..90ee84fc5 100644 --- a/src/tools/tqsettings.cpp +++ b/src/tools/tqsettings.cpp @@ -447,7 +447,7 @@ void TQSettingsHeading::parseLine(TQTextStream &stream) } #ifdef TQ_WS_WIN // for homedirpath reading from registry -#include "qt_windows.h" +#include "tqt_windows.h" #include "tqlibrary.h" #ifndef CSIDL_APPDATA diff --git a/src/tools/tqstring.cpp b/src/tools/tqstring.cpp index 254c1ad01..5e3007f8a 100644 --- a/src/tools/tqstring.cpp +++ b/src/tools/tqstring.cpp @@ -69,7 +69,7 @@ #include #endif #if defined(TQ_WS_WIN) -#include "qt_windows.h" +#include "tqt_windows.h" #endif #if defined(Q_OS_LINUX) #include diff --git a/src/tools/tqtextstream.cpp b/src/tools/tqtextstream.cpp index 5fe14e28b..2fbc9ae36 100644 --- a/src/tools/tqtextstream.cpp +++ b/src/tools/tqtextstream.cpp @@ -53,7 +53,7 @@ #endif #if defined(Q_OS_WIN32) -#include "qt_windows.h" +#include "tqt_windows.h" #endif /*! diff --git a/src/widgets/tqdatetimeedit.cpp b/src/widgets/tqdatetimeedit.cpp index 4159f66e8..aa533ebf5 100644 --- a/src/widgets/tqdatetimeedit.cpp +++ b/src/widgets/tqdatetimeedit.cpp @@ -52,7 +52,7 @@ #include "tqstyle.h" #if defined(TQ_WS_WIN) -#include "qt_windows.h" +#include "tqt_windows.h" #endif #define TQDATETIMEEDIT_HIDDEN_CHAR '0' diff --git a/src/widgets/tqmainwindow.cpp b/src/widgets/tqmainwindow.cpp index bfee884c5..2eebbe782 100644 --- a/src/widgets/tqmainwindow.cpp +++ b/src/widgets/tqmainwindow.cpp @@ -63,7 +63,7 @@ #include "tqstringlist.h" #include "tqstyle.h" #ifdef TQ_WS_MACX -# include "qt_mac.h" +# include "tqt_mac.h" #endif class TQHideDock; diff --git a/src/widgets/tqscrollview.cpp b/src/widgets/tqscrollview.cpp index ec062eece..b3c1db768 100644 --- a/src/widgets/tqscrollview.cpp +++ b/src/widgets/tqscrollview.cpp @@ -53,7 +53,7 @@ #include "tqstyle.h" #include "tqlistview.h" #ifdef TQ_WS_MAC -# include "qt_mac.h" +# include "tqt_mac.h" #endif static const int coord_limit = 4000; diff --git a/src/widgets/tqtitlebar.cpp b/src/widgets/tqtitlebar.cpp index 0fd67803c..2611c36b7 100644 --- a/src/widgets/tqtitlebar.cpp +++ b/src/widgets/tqtitlebar.cpp @@ -59,7 +59,7 @@ #include "tqworkspace.h" #endif #if defined(TQ_WS_WIN) -#include "qt_windows.h" +#include "tqt_windows.h" #endif #ifndef TQT_NO_TOOLTIP diff --git a/src/widgets/tqwhatsthis.cpp b/src/widgets/tqwhatsthis.cpp index d4906554e..08d7396d7 100644 --- a/src/widgets/tqwhatsthis.cpp +++ b/src/widgets/tqwhatsthis.cpp @@ -55,7 +55,7 @@ #include "tqaccessible.h" #endif #if defined(TQ_WS_WIN) -#include "qt_windows.h" +#include "tqt_windows.h" #ifndef SPI_GETDROPSHADOW #define SPI_GETDROPSHADOW 0x1024 #endif diff --git a/src/widgets/tqwidgetresizehandler.cpp b/src/widgets/tqwidgetresizehandler.cpp index 7f664d868..2b11fab90 100644 --- a/src/widgets/tqwidgetresizehandler.cpp +++ b/src/widgets/tqwidgetresizehandler.cpp @@ -46,7 +46,7 @@ #include "tqcursor.h" #include "tqsizegrip.h" #if defined(TQ_WS_WIN) -#include "qt_windows.h" +#include "tqt_windows.h" #endif #define RANGE 4 diff --git a/tools/designer/app/main.cpp b/tools/designer/app/main.cpp index a464c51bd..64d432aeb 100644 --- a/tools/designer/app/main.cpp +++ b/tools/designer/app/main.cpp @@ -48,7 +48,7 @@ #include #if defined(TQ_WS_WIN) -#include +#include #include #endif diff --git a/tools/designer/designer/designerapp.cpp b/tools/designer/designer/designerapp.cpp index 40b1fef0c..fefa38eff 100644 --- a/tools/designer/designer/designerapp.cpp +++ b/tools/designer/designer/designerapp.cpp @@ -42,7 +42,7 @@ #include #ifdef TQ_WS_WIN -#include +#include #include #endif diff --git a/tools/designer/designer/formwindow.cpp b/tools/designer/designer/formwindow.cpp index 20ee71eff..c6ced066d 100644 --- a/tools/designer/designer/formwindow.cpp +++ b/tools/designer/designer/formwindow.cpp @@ -111,7 +111,7 @@ static void restoreCursors( TQWidget *start, FormWindow *fw ) } #if defined(TQ_WS_WIN32) // #### needed for the workaround for repaint problem on windows -#include +#include static void flickerfree_update( TQWidget *w ) { InvalidateRect( w->winId(), 0, false ); diff --git a/tools/designer/designer/mainwindow.cpp b/tools/designer/designer/mainwindow.cpp index 58bfb5914..a4fbef91a 100644 --- a/tools/designer/designer/mainwindow.cpp +++ b/tools/designer/designer/mainwindow.cpp @@ -825,7 +825,7 @@ void MainWindow::helpAboutTQt() } #if defined(_WS_WIN_) -#include +#include #include #endif -- cgit v1.2.3