From f5c200ccf0f8066dbbbc38cf36af10bdc54f5a45 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 25 Feb 2024 14:22:05 +0900 Subject: [PATCH] Replace Qt with TQt Signed-off-by: Michele Calgaro --- RELEASE_HOWTO | 2 +- doc/man/k3b.1 | 8 ++++---- libk3b/projects/audiocd/k3baudiodoc.cpp | 2 +- libk3b/projects/datacd/k3bfileitem.cpp | 2 +- libk3b/projects/k3bdoc.h | 2 +- libk3b/projects/videocd/k3bvcddoc.cpp | 2 +- libk3b/projects/videocd/k3bvcddoc.h | 2 +- libk3b/projects/videocd/k3bvcdoptions.cpp | 2 +- libk3b/projects/videocd/k3bvcdtrack.h | 2 +- libk3bdevice/k3bcdtext.cpp | 2 +- libk3bdevice/k3bconnection.h | 2 +- src/k3b.cpp | 2 +- src/k3bdebuggingoutputdialog.cpp | 2 +- src/k3bdebuggingoutputfile.cpp | 2 +- src/k3bdirview.cpp | 2 +- src/k3bwelcomewidget.cpp | 2 +- src/projects/k3baudiotrackview.cpp | 2 +- src/projects/k3baudioview.cpp | 2 +- src/projects/k3bvcdtrackdialog.cpp | 2 +- src/projects/k3bvcdview.cpp | 2 +- src/rip/k3bvideocdrippingdialog.cpp | 2 +- src/rip/k3bvideocdview.cpp | 10 +--------- 22 files changed, 25 insertions(+), 33 deletions(-) diff --git a/RELEASE_HOWTO b/RELEASE_HOWTO index 7346b6a..1710bcd 100644 --- a/RELEASE_HOWTO +++ b/RELEASE_HOWTO @@ -11,7 +11,7 @@ Howto create a K3b release (stable branch) 3. Create the tarball. 4. Test the tarball. That includes removing any trace of K3b from the test system before and in the ideal - case compile on a minimal system meaning minimal KDE/QT versions. + case compile on a minimal system meaning minimal TDE/TQt versions. 5. Upload the tarball to upload.sf.net/incoming and create a release on www.sourceforge.net (or use releaseforge, a nice little application which automates the whole sourceforge release thing). diff --git a/doc/man/k3b.1 b/doc/man/k3b.1 index 08ca27b..afe7f14 100644 --- a/doc/man/k3b.1 +++ b/doc/man/k3b.1 @@ -24,8 +24,8 @@ file(s) to open .B \-\-help Show help about options .TP -.B \-\-help\-qt -Show Qt specific options +.B \-\-help\-tqt +Show TQt specific options .TP .B \-\-help\-tde Show TDE specific options @@ -83,7 +83,7 @@ Format a DVD-RW or DVD+RW .TP .BI \-\-lang \ language Set the GUI language -.SS "Qt options:" +.SS "TQt options:" .TP .BI \-\-display \ displayname Use the X-server display \fIdisplayname\fP. @@ -102,7 +102,7 @@ using the QApplication::ManyColor color specification. .TP .B \-\-nograb -tells Qt to never grab the mouse or the keyboard. +tells TQt to never grab the mouse or the keyboard. .TP .B \-\-dograb running under a debugger can cause an implicit diff --git a/libk3b/projects/audiocd/k3baudiodoc.cpp b/libk3b/projects/audiocd/k3baudiodoc.cpp index 82e09f6..b9f812a 100644 --- a/libk3b/projects/audiocd/k3baudiodoc.cpp +++ b/libk3b/projects/audiocd/k3baudiodoc.cpp @@ -28,7 +28,7 @@ #include -// QT-includes +// TQt includes #include #include #include diff --git a/libk3b/projects/datacd/k3bfileitem.cpp b/libk3b/projects/datacd/k3bfileitem.cpp index 3e20982..8474aeb 100644 --- a/libk3b/projects/datacd/k3bfileitem.cpp +++ b/libk3b/projects/datacd/k3bfileitem.cpp @@ -68,7 +68,7 @@ K3bFileItem::K3bFileItem( const TQString& filePath, K3bDataDoc* doc, K3bDirItem* m_k3bName = k3bName; // we determine the size here to avoid problems with removed or renamed files - // we need to use lstat here since for symlinks both KDE and QT return the size of the file pointed to + // we need to use lstat here since for symlinks both TDE and TQt return the size of the file pointed to // instead the size of the link. k3b_struct_stat statBuf; if( k3b_lstat( TQFile::encodeName(filePath), &statBuf ) ) { diff --git a/libk3b/projects/k3bdoc.h b/libk3b/projects/k3bdoc.h index ddced08..63bf836 100644 --- a/libk3b/projects/k3bdoc.h +++ b/libk3b/projects/k3bdoc.h @@ -21,7 +21,7 @@ #include #endif -// include files for QT +// include files for TQt #include #include #include diff --git a/libk3b/projects/videocd/k3bvcddoc.cpp b/libk3b/projects/videocd/k3bvcddoc.cpp index 590ef6b..c11aac2 100644 --- a/libk3b/projects/videocd/k3bvcddoc.cpp +++ b/libk3b/projects/videocd/k3bvcddoc.cpp @@ -13,7 +13,7 @@ * See the file "COPYING" for the exact licensing terms. */ -// QT-includes +// TQt includes #include #include #include diff --git a/libk3b/projects/videocd/k3bvcddoc.h b/libk3b/projects/videocd/k3bvcddoc.h index e29b975..335b084 100644 --- a/libk3b/projects/videocd/k3bvcddoc.h +++ b/libk3b/projects/videocd/k3bvcddoc.h @@ -16,7 +16,7 @@ #ifndef K3BVCDDOC_H #define K3BVCDDOC_H -// TQt Includes +// TQt includes #include #include #include diff --git a/libk3b/projects/videocd/k3bvcdoptions.cpp b/libk3b/projects/videocd/k3bvcdoptions.cpp index b0d60cf..4a252be 100644 --- a/libk3b/projects/videocd/k3bvcdoptions.cpp +++ b/libk3b/projects/videocd/k3bvcdoptions.cpp @@ -20,7 +20,7 @@ #include #include -// TQt Includes +// TQt includes #include #include diff --git a/libk3b/projects/videocd/k3bvcdtrack.h b/libk3b/projects/videocd/k3bvcdtrack.h index f529275..ff4b48d 100644 --- a/libk3b/projects/videocd/k3bvcdtrack.h +++ b/libk3b/projects/videocd/k3bvcdtrack.h @@ -16,7 +16,7 @@ #ifndef K3BVCDTRACK_H #define K3BVCDTRACK_H -// TQt Includes +// TQt includes #include #include #include diff --git a/libk3bdevice/k3bcdtext.cpp b/libk3bdevice/k3bcdtext.cpp index e195eb1..34dd909 100644 --- a/libk3bdevice/k3bcdtext.cpp +++ b/libk3bdevice/k3bcdtext.cpp @@ -556,7 +556,7 @@ TQCString K3bDevice::encodeCdText( const TQString& s, bool* illegalChars ) if( illegalChars ) *illegalChars = false; - // TODO: do this without QT + // TODO: do this without TQt TQTextCodec* codec = TQTextCodec::codecForName("ISO8859-1"); if( codec ) { TQCString encoded = codec->fromUnicode( s ); diff --git a/libk3bdevice/k3bconnection.h b/libk3bdevice/k3bconnection.h index 532fd46..9deb458 100644 --- a/libk3bdevice/k3bconnection.h +++ b/libk3bdevice/k3bconnection.h @@ -38,7 +38,7 @@ namespace K3bDevice { class Device; /** - * This is a simple wrapper which creates QT signals whenever a new optical + * This is a simple wrapper which creates TQt signals whenever a new optical * drive is plugged into the system or one is unplugged. * * The Connection class also handles media changes. Whenever a new medium is inserted diff --git a/src/k3b.cpp b/src/k3b.cpp index e91591d..d4ada12 100644 --- a/src/k3b.cpp +++ b/src/k3b.cpp @@ -16,7 +16,7 @@ #include -// include files for QT +// include files for TQt #include #include #include diff --git a/src/k3bdebuggingoutputdialog.cpp b/src/k3bdebuggingoutputdialog.cpp index 4be80bc..08d861d 100644 --- a/src/k3bdebuggingoutputdialog.cpp +++ b/src/k3bdebuggingoutputdialog.cpp @@ -114,7 +114,7 @@ void K3bDebuggingOutputDialog::clear() addOutput( "System", "K3b Version: " + k3bcore->version() ); addOutput( "System", "KDE Version: " + TQString(KDE::versionString()) ); - addOutput( "System", "QT Version: " + TQString(tqVersion()) ); + addOutput( "System", "TQt Version: " + TQString(tqVersion()) ); addOutput( "System", "Kernel: " + K3b::kernelVersion() ); // devices in the logfile diff --git a/src/k3bdebuggingoutputfile.cpp b/src/k3bdebuggingoutputfile.cpp index 614c512..54dbda6 100644 --- a/src/k3bdebuggingoutputfile.cpp +++ b/src/k3bdebuggingoutputfile.cpp @@ -42,7 +42,7 @@ bool K3bDebuggingOutputFile::open() addOutput( "System", "K3b Version: " + k3bcore->version() ); addOutput( "System", "KDE Version: " + TQString(KDE::versionString()) ); - addOutput( "System", "QT Version: " + TQString(tqVersion()) ); + addOutput( "System", "TQt Version: " + TQString(tqVersion()) ); addOutput( "System", "Kernel: " + K3b::kernelVersion() ); // devices in the logfile diff --git a/src/k3bdirview.cpp b/src/k3bdirview.cpp index d57247a..8d72ffe 100644 --- a/src/k3bdirview.cpp +++ b/src/k3bdirview.cpp @@ -36,7 +36,7 @@ #include #include -// QT-includes +// TQt includes #include #include #include diff --git a/src/k3bwelcomewidget.cpp b/src/k3bwelcomewidget.cpp index 66b5a7b..8541996 100644 --- a/src/k3bwelcomewidget.cpp +++ b/src/k3bwelcomewidget.cpp @@ -438,7 +438,7 @@ void K3bWelcomeWidget::contentsMousePressEvent( TQMouseEvent* e ) } } - // menu identifiers in QT are always < 0 (when automatically generated) + // menu identifiers in TQt are always < 0 (when automatically generated) // and unique throughout the entire application! int r = 0; int removeAction = 0; diff --git a/src/projects/k3baudiotrackview.cpp b/src/projects/k3baudiotrackview.cpp index 523be5a..d20658e 100644 --- a/src/projects/k3baudiotrackview.cpp +++ b/src/projects/k3baudiotrackview.cpp @@ -451,7 +451,7 @@ K3bAudioTrackViewItem* K3bAudioTrackView::getTrackViewItem( K3bAudioTrack* track // so the user may not change the cd-text until the one from the // file is loaded. // - // Since for some reason QT thinks it's bad to open disabled items + // Since for some reason TQt thinks it's bad to open disabled items // we need to open it before disabling it // newItem->showSources( track->numberSources() != 1 ); diff --git a/src/projects/k3baudioview.cpp b/src/projects/k3baudioview.cpp index 17e47eb..7c46e04 100644 --- a/src/projects/k3baudioview.cpp +++ b/src/projects/k3baudioview.cpp @@ -37,7 +37,7 @@ #include #include -// QT-includes +// TQt includes #include #include diff --git a/src/projects/k3bvcdtrackdialog.cpp b/src/projects/k3bvcdtrackdialog.cpp index 0016e2a..1db26c7 100644 --- a/src/projects/k3bvcdtrackdialog.cpp +++ b/src/projects/k3bvcdtrackdialog.cpp @@ -13,7 +13,7 @@ * See the file "COPYING" for the exact licensing terms. */ -// TQt Includes +// TQt includes #include #include #include diff --git a/src/projects/k3bvcdview.cpp b/src/projects/k3bvcdview.cpp index 82397c2..ac562b3 100644 --- a/src/projects/k3bvcdview.cpp +++ b/src/projects/k3bvcdview.cpp @@ -13,7 +13,7 @@ * See the file "COPYING" for the exact licensing terms. */ -// QT-includes +// TQt includes #include #include diff --git a/src/rip/k3bvideocdrippingdialog.cpp b/src/rip/k3bvideocdrippingdialog.cpp index 2e47005..00f52f3 100644 --- a/src/rip/k3bvideocdrippingdialog.cpp +++ b/src/rip/k3bvideocdrippingdialog.cpp @@ -23,7 +23,7 @@ #include #include -// qt includes +// TQt includes #include #include #include diff --git a/src/rip/k3bvideocdview.cpp b/src/rip/k3bvideocdview.cpp index ff056b7..2e5595c 100644 --- a/src/rip/k3bvideocdview.cpp +++ b/src/rip/k3bvideocdview.cpp @@ -24,7 +24,7 @@ #include #include -// qt includes +// TQt includes #include #include #include @@ -368,14 +368,6 @@ void K3bVideoCdView::slotTrackSelectionChanged( TQListViewItem* item ) void K3bVideoCdView::slotStateChanged( TQListViewItem* item ) { - /* > QT 3.1 - if ( !item == 0 && item ->isSelectable() ) { - if ( ( ( VideoTrackViewCheckItem* ) item) ->state() == TQCheckListItem::On) - slotSelect(); - else if ( ( ( VideoTrackViewCheckItem* ) item) ->state() == TQCheckListItem::Off) - slotDeselect(); - } - */ if ( !item == 0 && item ->isSelectable() ) { if ( ( ( VideoTrackViewCheckItem* ) item) ->isOn() ) slotSelect();