diff options
Diffstat (limited to 'src/pdiff.cpp')
| -rw-r--r-- | src/pdiff.cpp | 102 |
1 files changed, 51 insertions, 51 deletions
diff --git a/src/pdiff.cpp b/src/pdiff.cpp index c1684ef..7e7dffb 100644 --- a/src/pdiff.cpp +++ b/src/pdiff.cpp @@ -533,7 +533,7 @@ void KDiff3App::init( bool bAuto, TotalDiffStatus* pTotalDiffStatus, bool bLoadF } } - TQTimer::singleShot( 10, this, TQT_SLOT(slotAfterFirstPaint()) ); + TQTimer::singleShot( 10, this, TQ_SLOT(slotAfterFirstPaint()) ); if ( bVisibleMergeResultWindow && m_pMergeResultWindow ) { @@ -650,8 +650,8 @@ void KDiff3App::initView() m_pOverview = new Overview( pDiffWindowFrame, m_pOptionDialog ); pDiffHLayout->addWidget(m_pOverview); - connect( m_pOverview, TQT_SIGNAL(setLine(int)), this, TQT_SLOT(setDiff3Line(int)) ); - //connect( m_pOverview, TQT_SIGNAL(afterFirstPaint()), this, TQT_SLOT(slotAfterFirstPaint())); + connect( m_pOverview, TQ_SIGNAL(setLine(int)), this, TQ_SLOT(setDiff3Line(int)) ); + //connect( m_pOverview, TQ_SIGNAL(afterFirstPaint()), this, TQ_SLOT(slotAfterFirstPaint())); m_pDiffVScrollBar = new TQScrollBar( TQt::Vertical, pDiffWindowFrame ); pDiffHLayout->addWidget( m_pDiffVScrollBar ); @@ -662,9 +662,9 @@ void KDiff3App::initView() m_pDiffTextWindow1 = m_pDiffTextWindowFrame1->getDiffTextWindow(); m_pDiffTextWindow2 = m_pDiffTextWindowFrame2->getDiffTextWindow(); m_pDiffTextWindow3 = m_pDiffTextWindowFrame3->getDiffTextWindow(); - connect(m_pDiffTextWindowFrame1, TQT_SIGNAL(fileNameChanged(const TQString&,int)), this, TQT_SLOT(slotFileNameChanged(const TQString&,int))); - connect(m_pDiffTextWindowFrame2, TQT_SIGNAL(fileNameChanged(const TQString&,int)), this, TQT_SLOT(slotFileNameChanged(const TQString&,int))); - connect(m_pDiffTextWindowFrame3, TQT_SIGNAL(fileNameChanged(const TQString&,int)), this, TQT_SLOT(slotFileNameChanged(const TQString&,int))); + connect(m_pDiffTextWindowFrame1, TQ_SIGNAL(fileNameChanged(const TQString&,int)), this, TQ_SLOT(slotFileNameChanged(const TQString&,int))); + connect(m_pDiffTextWindowFrame2, TQ_SIGNAL(fileNameChanged(const TQString&,int)), this, TQ_SLOT(slotFileNameChanged(const TQString&,int))); + connect(m_pDiffTextWindowFrame3, TQ_SIGNAL(fileNameChanged(const TQString&,int)), this, TQ_SLOT(slotFileNameChanged(const TQString&,int))); // Merge window m_pMergeWindowFrame = new TQWidget( pVSplitter ); @@ -699,61 +699,61 @@ void KDiff3App::initView() pHScrollBarLayout->addWidget( m_pCornerWidget ); - connect( m_pDiffVScrollBar, TQT_SIGNAL(valueChanged(int)), m_pOverview, TQT_SLOT(setFirstLine(int))); - connect( m_pDiffVScrollBar, TQT_SIGNAL(valueChanged(int)), m_pDiffTextWindow1, TQT_SLOT(setFirstLine(int))); - connect( m_pHScrollBar, TQT_SIGNAL(valueChanged2(int)), m_pDiffTextWindow1, TQT_SLOT(setFirstColumn(int))); - connect( m_pDiffTextWindow1, TQT_SIGNAL(newSelection()), this, TQT_SLOT(slotSelectionStart())); - connect( m_pDiffTextWindow1, TQT_SIGNAL(selectionEnd()), this, TQT_SLOT(slotSelectionEnd())); - connect( m_pDiffTextWindow1, TQT_SIGNAL(scroll(int,int)), this, TQT_SLOT(scrollDiffTextWindow(int,int))); + connect( m_pDiffVScrollBar, TQ_SIGNAL(valueChanged(int)), m_pOverview, TQ_SLOT(setFirstLine(int))); + connect( m_pDiffVScrollBar, TQ_SIGNAL(valueChanged(int)), m_pDiffTextWindow1, TQ_SLOT(setFirstLine(int))); + connect( m_pHScrollBar, TQ_SIGNAL(valueChanged2(int)), m_pDiffTextWindow1, TQ_SLOT(setFirstColumn(int))); + connect( m_pDiffTextWindow1, TQ_SIGNAL(newSelection()), this, TQ_SLOT(slotSelectionStart())); + connect( m_pDiffTextWindow1, TQ_SIGNAL(selectionEnd()), this, TQ_SLOT(slotSelectionEnd())); + connect( m_pDiffTextWindow1, TQ_SIGNAL(scroll(int,int)), this, TQ_SLOT(scrollDiffTextWindow(int,int))); m_pDiffTextWindow1->installEventFilter( this ); - connect( m_pDiffVScrollBar, TQT_SIGNAL(valueChanged(int)), m_pDiffTextWindow2, TQT_SLOT(setFirstLine(int))); - connect( m_pHScrollBar, TQT_SIGNAL(valueChanged2(int)), m_pDiffTextWindow2, TQT_SLOT(setFirstColumn(int))); - connect( m_pDiffTextWindow2, TQT_SIGNAL(newSelection()), this, TQT_SLOT(slotSelectionStart())); - connect( m_pDiffTextWindow2, TQT_SIGNAL(selectionEnd()), this, TQT_SLOT(slotSelectionEnd())); - connect( m_pDiffTextWindow2, TQT_SIGNAL(scroll(int,int)), this, TQT_SLOT(scrollDiffTextWindow(int,int))); + connect( m_pDiffVScrollBar, TQ_SIGNAL(valueChanged(int)), m_pDiffTextWindow2, TQ_SLOT(setFirstLine(int))); + connect( m_pHScrollBar, TQ_SIGNAL(valueChanged2(int)), m_pDiffTextWindow2, TQ_SLOT(setFirstColumn(int))); + connect( m_pDiffTextWindow2, TQ_SIGNAL(newSelection()), this, TQ_SLOT(slotSelectionStart())); + connect( m_pDiffTextWindow2, TQ_SIGNAL(selectionEnd()), this, TQ_SLOT(slotSelectionEnd())); + connect( m_pDiffTextWindow2, TQ_SIGNAL(scroll(int,int)), this, TQ_SLOT(scrollDiffTextWindow(int,int))); m_pDiffTextWindow2->installEventFilter( this ); - connect( m_pDiffVScrollBar, TQT_SIGNAL(valueChanged(int)), m_pDiffTextWindow3, TQT_SLOT(setFirstLine(int))); - connect( m_pHScrollBar, TQT_SIGNAL(valueChanged2(int)), m_pDiffTextWindow3, TQT_SLOT(setFirstColumn(int))); - connect( m_pDiffTextWindow3, TQT_SIGNAL(newSelection()), this, TQT_SLOT(slotSelectionStart())); - connect( m_pDiffTextWindow3, TQT_SIGNAL(selectionEnd()), this, TQT_SLOT(slotSelectionEnd())); - connect( m_pDiffTextWindow3, TQT_SIGNAL(scroll(int,int)), this, TQT_SLOT(scrollDiffTextWindow(int,int))); + connect( m_pDiffVScrollBar, TQ_SIGNAL(valueChanged(int)), m_pDiffTextWindow3, TQ_SLOT(setFirstLine(int))); + connect( m_pHScrollBar, TQ_SIGNAL(valueChanged2(int)), m_pDiffTextWindow3, TQ_SLOT(setFirstColumn(int))); + connect( m_pDiffTextWindow3, TQ_SIGNAL(newSelection()), this, TQ_SLOT(slotSelectionStart())); + connect( m_pDiffTextWindow3, TQ_SIGNAL(selectionEnd()), this, TQ_SLOT(slotSelectionEnd())); + connect( m_pDiffTextWindow3, TQ_SIGNAL(scroll(int,int)), this, TQ_SLOT(scrollDiffTextWindow(int,int))); m_pDiffTextWindow3->installEventFilter( this ); MergeResultWindow* p = m_pMergeResultWindow; - connect( m_pMergeVScrollBar, TQT_SIGNAL(valueChanged(int)), p, TQT_SLOT(setFirstLine(int))); - - connect( m_pHScrollBar, TQT_SIGNAL(valueChanged2(int)), p, TQT_SLOT(setFirstColumn(int))); - connect( p, TQT_SIGNAL(scroll(int,int)), this, TQT_SLOT(scrollMergeResultWindow(int,int))); - connect( p, TQT_SIGNAL(sourceMask(int,int)), this, TQT_SLOT(sourceMask(int,int))); - connect( p, TQT_SIGNAL( resizeSignal() ),this, TQT_SLOT(resizeMergeResultWindow())); - connect( p, TQT_SIGNAL( selectionEnd() ), this, TQT_SLOT( slotSelectionEnd() ) ); - connect( p, TQT_SIGNAL( newSelection() ), this, TQT_SLOT( slotSelectionStart() ) ); - connect( p, TQT_SIGNAL( modifiedChanged(bool) ), this, TQT_SLOT( slotOutputModified(bool) ) ); - connect( p, TQT_SIGNAL( modifiedChanged(bool) ), m_pMergeResultWindowTitle, TQT_SLOT( slotSetModified(bool) ) ); - connect( p, TQT_SIGNAL( updateAvailabilities() ), this, TQT_SLOT( slotUpdateAvailabilities() ) ); - connect( p, TQT_SIGNAL( showPopupMenu(const TQPoint&) ), this, TQT_SLOT(showPopupMenu(const TQPoint&))); - connect( p, TQT_SIGNAL( noRelevantChangesDetected() ), this, TQT_SLOT(slotNoRelevantChangesDetected())); + connect( m_pMergeVScrollBar, TQ_SIGNAL(valueChanged(int)), p, TQ_SLOT(setFirstLine(int))); + + connect( m_pHScrollBar, TQ_SIGNAL(valueChanged2(int)), p, TQ_SLOT(setFirstColumn(int))); + connect( p, TQ_SIGNAL(scroll(int,int)), this, TQ_SLOT(scrollMergeResultWindow(int,int))); + connect( p, TQ_SIGNAL(sourceMask(int,int)), this, TQ_SLOT(sourceMask(int,int))); + connect( p, TQ_SIGNAL( resizeSignal() ),this, TQ_SLOT(resizeMergeResultWindow())); + connect( p, TQ_SIGNAL( selectionEnd() ), this, TQ_SLOT( slotSelectionEnd() ) ); + connect( p, TQ_SIGNAL( newSelection() ), this, TQ_SLOT( slotSelectionStart() ) ); + connect( p, TQ_SIGNAL( modifiedChanged(bool) ), this, TQ_SLOT( slotOutputModified(bool) ) ); + connect( p, TQ_SIGNAL( modifiedChanged(bool) ), m_pMergeResultWindowTitle, TQ_SLOT( slotSetModified(bool) ) ); + connect( p, TQ_SIGNAL( updateAvailabilities() ), this, TQ_SLOT( slotUpdateAvailabilities() ) ); + connect( p, TQ_SIGNAL( showPopupMenu(const TQPoint&) ), this, TQ_SLOT(showPopupMenu(const TQPoint&))); + connect( p, TQ_SIGNAL( noRelevantChangesDetected() ), this, TQ_SLOT(slotNoRelevantChangesDetected())); sourceMask(0,0); - connect( p, TQT_SIGNAL(setFastSelectorRange(int,int)), m_pDiffTextWindow1, TQT_SLOT(setFastSelectorRange(int,int))); - connect( p, TQT_SIGNAL(setFastSelectorRange(int,int)), m_pDiffTextWindow2, TQT_SLOT(setFastSelectorRange(int,int))); - connect( p, TQT_SIGNAL(setFastSelectorRange(int,int)), m_pDiffTextWindow3, TQT_SLOT(setFastSelectorRange(int,int))); - connect(m_pDiffTextWindow1, TQT_SIGNAL(setFastSelectorLine(int)), p, TQT_SLOT(slotSetFastSelectorLine(int))); - connect(m_pDiffTextWindow2, TQT_SIGNAL(setFastSelectorLine(int)), p, TQT_SLOT(slotSetFastSelectorLine(int))); - connect(m_pDiffTextWindow3, TQT_SIGNAL(setFastSelectorLine(int)), p, TQT_SLOT(slotSetFastSelectorLine(int))); - connect(m_pDiffTextWindow1, TQT_SIGNAL(gotFocus()), p, TQT_SLOT(updateSourceMask())); - connect(m_pDiffTextWindow2, TQT_SIGNAL(gotFocus()), p, TQT_SLOT(updateSourceMask())); - connect(m_pDiffTextWindow3, TQT_SIGNAL(gotFocus()), p, TQT_SLOT(updateSourceMask())); - connect(m_pDirectoryMergeInfo, TQT_SIGNAL(gotFocus()), p, TQT_SLOT(updateSourceMask())); + connect( p, TQ_SIGNAL(setFastSelectorRange(int,int)), m_pDiffTextWindow1, TQ_SLOT(setFastSelectorRange(int,int))); + connect( p, TQ_SIGNAL(setFastSelectorRange(int,int)), m_pDiffTextWindow2, TQ_SLOT(setFastSelectorRange(int,int))); + connect( p, TQ_SIGNAL(setFastSelectorRange(int,int)), m_pDiffTextWindow3, TQ_SLOT(setFastSelectorRange(int,int))); + connect(m_pDiffTextWindow1, TQ_SIGNAL(setFastSelectorLine(int)), p, TQ_SLOT(slotSetFastSelectorLine(int))); + connect(m_pDiffTextWindow2, TQ_SIGNAL(setFastSelectorLine(int)), p, TQ_SLOT(slotSetFastSelectorLine(int))); + connect(m_pDiffTextWindow3, TQ_SIGNAL(setFastSelectorLine(int)), p, TQ_SLOT(slotSetFastSelectorLine(int))); + connect(m_pDiffTextWindow1, TQ_SIGNAL(gotFocus()), p, TQ_SLOT(updateSourceMask())); + connect(m_pDiffTextWindow2, TQ_SIGNAL(gotFocus()), p, TQ_SLOT(updateSourceMask())); + connect(m_pDiffTextWindow3, TQ_SIGNAL(gotFocus()), p, TQ_SLOT(updateSourceMask())); + connect(m_pDirectoryMergeInfo, TQ_SIGNAL(gotFocus()), p, TQ_SLOT(updateSourceMask())); - connect( m_pDiffTextWindow1, TQT_SIGNAL( resizeSignal(int,int) ),this, TQT_SLOT(resizeDiffTextWindow(int,int))); + connect( m_pDiffTextWindow1, TQ_SIGNAL( resizeSignal(int,int) ),this, TQ_SLOT(resizeDiffTextWindow(int,int))); // The following two connects cause the wordwrap to be recalced thrice, just to make sure. Better than forgetting one. - connect( m_pDiffTextWindow2, TQT_SIGNAL( resizeSignal(int,int) ),this, TQT_SLOT(slotRecalcWordWrap())); - connect( m_pDiffTextWindow3, TQT_SIGNAL( resizeSignal(int,int) ),this, TQT_SLOT(slotRecalcWordWrap())); + connect( m_pDiffTextWindow2, TQ_SIGNAL( resizeSignal(int,int) ),this, TQ_SLOT(slotRecalcWordWrap())); + connect( m_pDiffTextWindow3, TQ_SIGNAL( resizeSignal(int,int) ),this, TQ_SLOT(slotRecalcWordWrap())); m_pDiffTextWindow1->setFocus(); m_pMainWidget->setMinimumSize(50,50); @@ -995,7 +995,7 @@ void KDiff3App::slotFileOpen() TQDir::convertSeparators( m_bDirCompare ? m_pDirectoryMergeWindow->getDirNameC() : m_sd3.isFromBuffer() ? TQString("") : m_sd3.getAliasName() ), m_bDirCompare ? ! m_pDirectoryMergeWindow->getDirNameDest().isEmpty() : !m_outputFilename.isEmpty(), TQDir::convertSeparators( m_bDirCompare ? m_pDirectoryMergeWindow->getDirNameDest() : m_bDefaultFilename ? TQString("") : m_outputFilename ), - TQT_SLOT(slotConfigure()), m_pOptionDialog ); + TQ_SLOT(slotConfigure()), m_pOptionDialog ); /*OpenDialog d(this, m_sd1.isFromBuffer() ? TQString("") : m_sd1.getAliasName(), @@ -1003,7 +1003,7 @@ void KDiff3App::slotFileOpen() m_sd3.isFromBuffer() ? TQString("") : m_sd3.getAliasName(), !m_outputFilename.isEmpty(), m_bDefaultFilename ? TQString("") : m_outputFilename, - TQT_SLOT(slotConfigure()), m_pOptionDialog );*/ + TQ_SLOT(slotConfigure()), m_pOptionDialog );*/ int status = d.exec(); if ( status == TQDialog::Accepted ) { @@ -1296,7 +1296,7 @@ void KDiff3App::choose( int choice ) if ( autoAdvance->isChecked() ) { m_bTimerBlock = true; - TQTimer::singleShot( m_pOptionDialog->m_autoAdvanceDelay, this, TQT_SLOT( slotGoNextUnsolvedConflict() ) ); + TQTimer::singleShot( m_pOptionDialog->m_autoAdvanceDelay, this, TQ_SLOT( slotGoNextUnsolvedConflict() ) ); } } } |