From 77c18c3fabbb1e81db72c70044f68ddb78d18581 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 4 Nov 2023 22:03:33 +0900 Subject: Replace Qt with TQt Signed-off-by: Michele Calgaro --- src/difftextwindow.cpp | 4 ++-- src/directorymergewindow.cpp | 2 +- src/kdiff3.cpp | 4 ++-- src/kdiff3.h | 2 +- src/mergeresultwindow.cpp | 10 +++++----- src/optiondialog.cpp | 6 +++--- src/pdiff.cpp | 16 ++++++++-------- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/difftextwindow.cpp b/src/difftextwindow.cpp index 0be3f42..0e4a0f7 100644 --- a/src/difftextwindow.cpp +++ b/src/difftextwindow.cpp @@ -398,7 +398,7 @@ void DiffTextWindow::focusInEvent(TQFocusEvent* e) void DiffTextWindow::mousePressEvent ( TQMouseEvent* e ) { - if ( e->button() == Qt::LeftButton ) + if ( e->button() == TQt::LeftButton ) { int line; int pos; @@ -458,7 +458,7 @@ void DiffTextWindow::mouseDoubleClickEvent( TQMouseEvent* e ) { d->m_bSelectionInProgress = false; d->m_lastKnownMousePos = e->pos(); - if ( e->button() == Qt::LeftButton ) + if ( e->button() == TQt::LeftButton ) { int line; int pos; diff --git a/src/directorymergewindow.cpp b/src/directorymergewindow.cpp index ed00a15..28ac2bf 100644 --- a/src/directorymergewindow.cpp +++ b/src/directorymergewindow.cpp @@ -1580,7 +1580,7 @@ void DirectoryMergeWindow::onClick( int button, TQListViewItem* lvi, const TQPoi if (!itemPath.isEmpty()) { - selectItemAndColumn( pDMI, c, button==Qt::RightButton ); + selectItemAndColumn( pDMI, c, button==TQt::RightButton ); } } } diff --git a/src/kdiff3.cpp b/src/kdiff3.cpp index 7343e1e..3efd817 100644 --- a/src/kdiff3.cpp +++ b/src/kdiff3.cpp @@ -272,10 +272,10 @@ KDiff3App::KDiff3App(TQWidget* pParent, const char* name, KDiff3Part* pKDiff3Par slotRefresh(); m_pMainSplitter = this; //new TQSplitter(this); - m_pMainSplitter->setOrientation(Qt::Vertical ); + m_pMainSplitter->setOrientation(TQt::Vertical ); // setCentralWidget( m_pMainSplitter ); m_pDirectoryMergeSplitter = new TQSplitter( m_pMainSplitter ); - m_pDirectoryMergeSplitter->setOrientation(Qt::Horizontal ); + m_pDirectoryMergeSplitter->setOrientation(TQt::Horizontal ); m_pDirectoryMergeWindow = new DirectoryMergeWindow( m_pDirectoryMergeSplitter, m_pOptionDialog, TDEApplication::kApplication()->iconLoader() ); m_pDirectoryMergeInfo = new DirectoryMergeInfo( m_pDirectoryMergeSplitter ); diff --git a/src/kdiff3.h b/src/kdiff3.h index dea8594..fedff6a 100644 --- a/src/kdiff3.h +++ b/src/kdiff3.h @@ -67,7 +67,7 @@ class ReversibleScrollBar : public TQScrollBar bool* m_pbRightToLeftLanguage; int m_realVal; public: - ReversibleScrollBar( Qt::Orientation o, TQWidget* pParent, bool* pbRightToLeftLanguage ) + ReversibleScrollBar( TQt::Orientation o, TQWidget* pParent, bool* pbRightToLeftLanguage ) : TQScrollBar( o, pParent ) { m_pbRightToLeftLanguage=pbRightToLeftLanguage; diff --git a/src/mergeresultwindow.cpp b/src/mergeresultwindow.cpp index 293df49..646e700 100644 --- a/src/mergeresultwindow.cpp +++ b/src/mergeresultwindow.cpp @@ -1929,9 +1929,9 @@ void MergeResultWindow::mousePressEvent ( TQMouseEvent* e ) int pos; convertToLinePos( e->x(), e->y(), line, pos ); - bool bLMB = e->button() == Qt::LeftButton; - bool bMMB = e->button() == Qt::MidButton; - bool bRMB = e->button() == Qt::RightButton; + bool bLMB = e->button() == TQt::LeftButton; + bool bMMB = e->button() == TQt::MidButton; + bool bRMB = e->button() == TQt::RightButton; if ( bLMB && pos < m_firstColumn || bRMB ) // Fast range selection { @@ -1999,7 +1999,7 @@ void MergeResultWindow::mousePressEvent ( TQMouseEvent* e ) void MergeResultWindow::mouseDoubleClickEvent( TQMouseEvent* e ) { - if ( e->button() == Qt::LeftButton ) + if ( e->button() == TQt::LeftButton ) { int line; int pos; @@ -2033,7 +2033,7 @@ void MergeResultWindow::mouseDoubleClickEvent( TQMouseEvent* e ) void MergeResultWindow::mouseReleaseEvent ( TQMouseEvent * e ) { - if ( e->button() == Qt::LeftButton ) + if ( e->button() == TQt::LeftButton ) { killTimer(m_delayedDrawTimer); m_delayedDrawTimer = 0; diff --git a/src/optiondialog.cpp b/src/optiondialog.cpp index 324edbe..42a589e 100644 --- a/src/optiondialog.cpp +++ b/src/optiondialog.cpp @@ -847,7 +847,7 @@ void OptionDialog::setupMergePage( void ) ); ++line; - TQGroupBox* pGroupBox = new TQGroupBox( 2, Qt::Horizontal, i18n("Automatic Merge Regular Expression"), page); + TQGroupBox* pGroupBox = new TQGroupBox( 2, TQt::Horizontal, i18n("Automatic Merge Regular Expression"), page); gbox->addMultiCellWidget( pGroupBox, line,line,0,1); ++line; { @@ -873,7 +873,7 @@ void OptionDialog::setupMergePage( void ) ++line; } - pGroupBox = new TQGroupBox( 2, Qt::Horizontal, i18n("Version Control History Merging"), page); + pGroupBox = new TQGroupBox( 2, TQt::Horizontal, i18n("Version Control History Merging"), page); gbox->addMultiCellWidget( pGroupBox, line,line,0,1); ++line; { @@ -922,7 +922,7 @@ void OptionDialog::setupMergePage( void ) //int year = newHistoryEntry.cap(4).toInt(); //TQString time = newHistoryEntry.cap(5); //TQString name = newHistoryEntry.cap(6); - TQString defaultSortKeyOrder = "4,3,2,5,1,6"; //TQDate(year,month,day).toString(Qt::ISODate) +" "+ time + " " + branch + " " + name; + TQString defaultSortKeyOrder = "4,3,2,5,1,6"; //TQDate(year,month,day).toString(TQt::ISODate) +" "+ time + " " + branch + " " + name; label = new TQLabel( i18n("History entry start sort key order:"), page ); gbox->addWidget( label, line, 0 ); diff --git a/src/pdiff.cpp b/src/pdiff.cpp index b5799c6..c1684ef 100644 --- a/src/pdiff.cpp +++ b/src/pdiff.cpp @@ -638,14 +638,14 @@ void KDiff3App::initView() TQVBoxLayout* pVLayout = new TQVBoxLayout(m_pMainWidget,0,0); TQSplitter* pVSplitter = new TQSplitter( m_pMainWidget ); - pVSplitter->setOrientation( Qt::Vertical ); + pVSplitter->setOrientation( TQt::Vertical ); pVLayout->addWidget( pVSplitter ); TQWidget* pDiffWindowFrame = new TQWidget( pVSplitter ); TQHBoxLayout* pDiffHLayout = new TQHBoxLayout( pDiffWindowFrame,0,0 ); m_pDiffWindowSplitter = new TQSplitter( pDiffWindowFrame ); - m_pDiffWindowSplitter->setOrientation( m_pOptionDialog->m_bHorizDiffWindowSplitting ? Qt::Horizontal : Qt::Vertical ); + m_pDiffWindowSplitter->setOrientation( m_pOptionDialog->m_bHorizDiffWindowSplitting ? TQt::Horizontal : TQt::Vertical ); pDiffHLayout->addWidget( m_pDiffWindowSplitter ); m_pOverview = new Overview( pDiffWindowFrame, m_pOptionDialog ); @@ -653,7 +653,7 @@ void KDiff3App::initView() connect( m_pOverview, TQT_SIGNAL(setLine(int)), this, TQT_SLOT(setDiff3Line(int)) ); //connect( m_pOverview, TQT_SIGNAL(afterFirstPaint()), this, TQT_SLOT(slotAfterFirstPaint())); - m_pDiffVScrollBar = new TQScrollBar( Qt::Vertical, pDiffWindowFrame ); + m_pDiffVScrollBar = new TQScrollBar( TQt::Vertical, pDiffWindowFrame ); pDiffHLayout->addWidget( m_pDiffVScrollBar ); m_pDiffTextWindowFrame1 = new DiffTextWindowFrame( m_pDiffWindowSplitter, statusBar(), m_pOptionDialog, 1 ); @@ -679,7 +679,7 @@ void KDiff3App::initView() m_pMergeResultWindow = new MergeResultWindow( m_pMergeWindowFrame, m_pOptionDialog, statusBar() ); pMergeVLayout->addWidget( m_pMergeResultWindow, 1 ); - m_pMergeVScrollBar = new TQScrollBar( Qt::Vertical, m_pMergeWindowFrame ); + m_pMergeVScrollBar = new TQScrollBar( TQt::Vertical, m_pMergeWindowFrame ); pMergeHLayout->addWidget( m_pMergeVScrollBar ); autoAdvance->setEnabled(true); @@ -693,7 +693,7 @@ void KDiff3App::initView() m_pMergeResultWindow->installEventFilter( m_pMergeResultWindowTitle ); // for focus tracking TQHBoxLayout* pHScrollBarLayout = new TQHBoxLayout( pVLayout ); - m_pHScrollBar = new ReversibleScrollBar( Qt::Horizontal, m_pMainWidget, &m_pOptionDialog->m_bRightToLeftLanguage ); + m_pHScrollBar = new ReversibleScrollBar( TQt::Horizontal, m_pMainWidget, &m_pOptionDialog->m_bRightToLeftLanguage ); pHScrollBarLayout->addWidget( m_pHScrollBar ); m_pCornerWidget = new TQWidget( m_pMainWidget ); pHScrollBarLayout->addWidget( m_pCornerWidget ); @@ -1434,7 +1434,7 @@ void KDiff3App::slotRefresh() } if ( m_pDiffWindowSplitter!=0 ) { - m_pDiffWindowSplitter->setOrientation( m_pOptionDialog->m_bHorizDiffWindowSplitting ? Qt::Horizontal : Qt::Vertical ); + m_pDiffWindowSplitter->setOrientation( m_pOptionDialog->m_bHorizDiffWindowSplitting ? TQt::Horizontal : TQt::Vertical ); } if ( m_pDirectoryMergeWindow ) { @@ -2032,10 +2032,10 @@ void KDiff3App::slotWinToggleSplitterOrientation() if ( m_pDiffWindowSplitter!=0 ) { m_pDiffWindowSplitter->setOrientation( - m_pDiffWindowSplitter->orientation()==Qt::Vertical ? Qt::Horizontal : Qt::Vertical + m_pDiffWindowSplitter->orientation()==TQt::Vertical ? TQt::Horizontal : TQt::Vertical ); - m_pOptionDialog->m_bHorizDiffWindowSplitting = m_pDiffWindowSplitter->orientation()==Qt::Horizontal; + m_pOptionDialog->m_bHorizDiffWindowSplitting = m_pDiffWindowSplitter->orientation()==TQt::Horizontal; } } -- cgit v1.2.3