From 9689d714545115dde7861de2365a894be65d3574 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 16 Feb 2024 19:57:03 +0900 Subject: Replace Qt with TQt Signed-off-by: Michele Calgaro (cherry picked from commit 92c834cf92ff78f768ec2bf2b698e3353bca5910) --- Doxyfile | 2 +- all.pro | 4 ++-- man/piklab-coff.1 | 6 +++--- man/piklab-prog.1 | 6 +++--- man/piklab.1x | 6 +++--- piklab.tdevelop | 2 +- src/common/global/about.cpp | 2 +- src/common/nokde/nokde_tdecmdlineargs.cpp | 14 +++++++------- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Doxyfile b/Doxyfile index f263322..0132d23 100644 --- a/Doxyfile +++ b/Doxyfile @@ -134,7 +134,7 @@ SHORT_NAMES = NO # If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen # will interpret the first line (until the first dot) of a JavaDoc-style # comment as the brief description. If set to NO, the JavaDoc -# comments will behave just like the Qt-style comments (thus requiring an +# comments will behave just like the TQt-style comments (thus requiring an # explicit @brief command for a brief description. JAVADOC_AUTOBRIEF = NO diff --git a/all.pro b/all.pro index fec234c..779368e 100644 --- a/all.pro +++ b/all.pro @@ -10,8 +10,8 @@ win32: LIBUSB_PATH = "C:\Progra~1\LibUSB-Win32" DEFINES += NO_KDE TQT_NO_ASCII_CAST OBJECTS_DIR = .libs MOC_DIR = .libs -QT = qt3support core xml network -CONFIG += qt thread warn_on console +TQT = qt3support core xml network +CONFIG += tqt thread warn_on console unix:CONFIG += release #debug win32:CONFIG += release INCLUDEPATH += $${STOPDIR}/src $${STOPDIR} diff --git a/man/piklab-coff.1 b/man/piklab-coff.1 index 2a903a1..42a7126 100644 --- a/man/piklab-coff.1 +++ b/man/piklab-coff.1 @@ -17,7 +17,7 @@ .SH "NAME" piklab\-coff \- Command\-line utility to view COFF files. .SH "SYNOPSIS" -.B piklab\-coff [Qt\-options] [KDE\-options] [options] [file] +.B piklab\-coff [TQt\-options] [KDE\-options] [options] [file] .RI .SH "DESCRIPTION" @@ -42,8 +42,8 @@ Show summary of options. .B \-v, \-\-version Show version of program. .TP -.B \-\-help\-qt - Show Qt specific options +.B \-\-help\-tqt + Show TQt specific options .TP .B \-\-help\-kde Show KDE specific options diff --git a/man/piklab-prog.1 b/man/piklab-prog.1 index c64213e..e0d6340 100644 --- a/man/piklab-prog.1 +++ b/man/piklab-prog.1 @@ -16,7 +16,7 @@ .\" for manpage-specific macros, see man(7) .SH PIKLAB-PROG \- Commandline program for PIC-microcontroller programming. .SH SYNOPSIS -.B piklab-prog [Qt-options] [KDE-options] [options] [file] +.B piklab-prog [TQt-options] [KDE-options] [options] [file] .RI .br @@ -40,8 +40,8 @@ A summary of options is included below. .B \-v, \-\-version Show version of program. .TP -.B \-\-help-qt - Show Qt specific options +.B \-\-help-tqt + Show TQt specific options .TP .B \-\-help-kde Show KDE specific options diff --git a/man/piklab.1x b/man/piklab.1x index 83bf689..65d9e2c 100644 --- a/man/piklab.1x +++ b/man/piklab.1x @@ -19,7 +19,7 @@ .TP .SH SYNOPSIS -.B piklab [Qt-options] [KDE-options] [file] +.B piklab [TQt-options] [KDE-options] [file] .br .\" TeX users may be more comfortable with the \fB\fP and @@ -41,8 +41,8 @@ Show summary of options. .B \-v, \-\-version Show version of program. .TP -.B \-\-help-qt - Show Qt specific options +.B \-\-help-tqt + Show TQt specific options .TP .B \-\-help-kde Show KDE specific options diff --git a/piklab.tdevelop b/piklab.tdevelop index 4fa5366..34b9ad0 100644 --- a/piklab.tdevelop +++ b/piklab.tdevelop @@ -7,7 +7,7 @@ C++ KDE - Qt + TQt . false diff --git a/src/common/global/about.cpp b/src/common/global/about.cpp index e0567dc..5f1942f 100644 --- a/src/common/global/about.cpp +++ b/src/common/global/about.cpp @@ -48,7 +48,7 @@ void Piklab::init(TDEAboutData *about, int argc, char **argv, bool gui, const TD # if defined(Q_OS_WIN) printf("%s \"win32\": version %s\n", about->appName(), VERSION); # else - printf("%s \"qt-only\": version %s (rev. %s)\n", about->appName(), VERSION, SVN_REVISION); + printf("%s \"tqt-only\": version %s (rev. %s)\n", about->appName(), VERSION, SVN_REVISION); # endif Q_UNUSED(gui); Q_ASSERT( !gui ); diff --git a/src/common/nokde/nokde_tdecmdlineargs.cpp b/src/common/nokde/nokde_tdecmdlineargs.cpp index 613a118..25b8a9d 100644 --- a/src/common/nokde/nokde_tdecmdlineargs.cpp +++ b/src/common/nokde/nokde_tdecmdlineargs.cpp @@ -258,7 +258,7 @@ TDECmdLineArgs::saveAppArgs( TQDataStream &ds) parseAllArgs(); // Remove TQt and KDE options. - removeArgs("qt"); + removeArgs("tqt"); removeArgs("kde"); TQCString qCwd = mCwd; @@ -281,7 +281,7 @@ void TDECmdLineArgs::loadAppArgs( TQDataStream &ds) { // Remove TQt and KDE options. - removeArgs("qt"); + removeArgs("tqt"); removeArgs("kde"); TDECmdLineArgs *args; @@ -699,8 +699,8 @@ TDECmdLineArgs::tqt_argc() if( tqt_argc != -1 ) return &tqt_argc; - TDECmdLineArgs *args = parsedArgs("qt"); - assert(args); // No qt options have been added! + TDECmdLineArgs *args = parsedArgs("tqt"); + assert(args); // No tqt options have been added! if (!argv) { fprintf(stderr, "\n\nFAILURE (TDECmdLineArgs):\n"); @@ -730,8 +730,8 @@ TDECmdLineArgs::tqt_argv() if( tqt_argv != NULL ) return &tqt_argv; - TDECmdLineArgs *args = parsedArgs("qt"); - assert(args); // No qt options have been added! + TDECmdLineArgs *args = parsedArgs("tqt"); + assert(args); // No tqt options have been added! if (!argv) { fprintf(stderr, "\n\nFAILURE (TDECmdLineArgs):\n"); @@ -1018,7 +1018,7 @@ TDECmdLineArgs::TDECmdLineArgs( const TDECmdLineOptions *_options, { parsedOptionList = 0; parsedArgList = 0; - isTQt = (::qstrcmp(id, "qt") == 0); + isTQt = (::qstrcmp(id, "tqt") == 0); } /** -- cgit v1.2.1