TDE
/
kdiff3
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kdiff3
0
0
Fork 0
Code Issues Releases Wiki Activity

Replace Qt with TQt

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/11/head
Michele Calgaro 1 year ago
parent 02927b1c01
commit 77c18c3fab
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
7 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File

4
src/difftextwindow.cpp
Unescape View File

@ -398,7 +398,7 @@ void DiffTextWindow::focusInEvent(TQFocusEvent* e)
void DiffTextWindow::mousePressEvent ( TQMouseEvent* e ) void DiffTextWindow::mousePressEvent ( TQMouseEvent* e )
{ {
if ( e->button() == Qt::LeftButton ) if ( e->button() == TQt::LeftButton )
{ {
int line; int line;
int pos; int pos;
@ -458,7 +458,7 @@ void DiffTextWindow::mouseDoubleClickEvent( TQMouseEvent* e )
{ {
d->m_bSelectionInProgress = false; d->m_bSelectionInProgress = false;
d->m_lastKnownMousePos = e->pos(); d->m_lastKnownMousePos = e->pos();
if ( e->button() == Qt::LeftButton ) if ( e->button() == TQt::LeftButton )
{ {
int line; int line;
int pos; int pos;

2
src/directorymergewindow.cpp
Unescape View File

@ -1580,7 +1580,7 @@ void DirectoryMergeWindow::onClick( int button, TQListViewItem* lvi, const TQPoi
if (!itemPath.isEmpty()) if (!itemPath.isEmpty())
{ {
selectItemAndColumn( pDMI, c, button==Qt::RightButton ); selectItemAndColumn( pDMI, c, button==TQt::RightButton );
} }
} }
} }

4
src/kdiff3.cpp
Unescape View File

@ -272,10 +272,10 @@ KDiff3App::KDiff3App(TQWidget* pParent, const char* name, KDiff3Part* pKDiff3Par
slotRefresh(); slotRefresh();
m_pMainSplitter = this; //new TQSplitter(this); m_pMainSplitter = this; //new TQSplitter(this);
m_pMainSplitter->setOrientation(Qt::Vertical ); m_pMainSplitter->setOrientation(TQt::Vertical );
// setCentralWidget( m_pMainSplitter ); // setCentralWidget( m_pMainSplitter );
m_pDirectoryMergeSplitter = new TQSplitter( 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, m_pDirectoryMergeWindow = new DirectoryMergeWindow( m_pDirectoryMergeSplitter, m_pOptionDialog,
TDEApplication::kApplication()->iconLoader() ); TDEApplication::kApplication()->iconLoader() );
m_pDirectoryMergeInfo = new DirectoryMergeInfo( m_pDirectoryMergeSplitter ); m_pDirectoryMergeInfo = new DirectoryMergeInfo( m_pDirectoryMergeSplitter );

2
src/kdiff3.h
Unescape View File

@ -67,7 +67,7 @@ class ReversibleScrollBar : public TQScrollBar
bool* m_pbRightToLeftLanguage; bool* m_pbRightToLeftLanguage;
int m_realVal; int m_realVal;
public: public:
ReversibleScrollBar( Qt::Orientation o, TQWidget* pParent, bool* pbRightToLeftLanguage ) ReversibleScrollBar( TQt::Orientation o, TQWidget* pParent, bool* pbRightToLeftLanguage )
: TQScrollBar( o, pParent ) : TQScrollBar( o, pParent )
{ {
m_pbRightToLeftLanguage=pbRightToLeftLanguage; m_pbRightToLeftLanguage=pbRightToLeftLanguage;

10
src/mergeresultwindow.cpp
Unescape View File

@ -1929,9 +1929,9 @@ void MergeResultWindow::mousePressEvent ( TQMouseEvent* e )
int pos; int pos;
convertToLinePos( e->x(), e->y(), line, pos ); convertToLinePos( e->x(), e->y(), line, pos );
bool bLMB = e->button() == Qt::LeftButton; bool bLMB = e->button() == TQt::LeftButton;
bool bMMB = e->button() == Qt::MidButton; bool bMMB = e->button() == TQt::MidButton;
bool bRMB = e->button() == Qt::RightButton; bool bRMB = e->button() == TQt::RightButton;
if ( bLMB && pos < m_firstColumn || bRMB ) // Fast range selection if ( bLMB && pos < m_firstColumn || bRMB ) // Fast range selection
{ {
@ -1999,7 +1999,7 @@ void MergeResultWindow::mousePressEvent ( TQMouseEvent* e )
void MergeResultWindow::mouseDoubleClickEvent( TQMouseEvent* e ) void MergeResultWindow::mouseDoubleClickEvent( TQMouseEvent* e )
{ {
if ( e->button() == Qt::LeftButton ) if ( e->button() == TQt::LeftButton )
{ {
int line; int line;
int pos; int pos;
@ -2033,7 +2033,7 @@ void MergeResultWindow::mouseDoubleClickEvent( TQMouseEvent* e )
void MergeResultWindow::mouseReleaseEvent ( TQMouseEvent * e ) void MergeResultWindow::mouseReleaseEvent ( TQMouseEvent * e )
{ {
if ( e->button() == Qt::LeftButton ) if ( e->button() == TQt::LeftButton )
{ {
killTimer(m_delayedDrawTimer); killTimer(m_delayedDrawTimer);
m_delayedDrawTimer = 0; m_delayedDrawTimer = 0;

6
src/optiondialog.cpp
Unescape View File

@ -847,7 +847,7 @@ void OptionDialog::setupMergePage( void )
); );
++line; ++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); gbox->addMultiCellWidget( pGroupBox, line,line,0,1);
++line; ++line;
{ {
@ -873,7 +873,7 @@ void OptionDialog::setupMergePage( void )
++line; ++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); gbox->addMultiCellWidget( pGroupBox, line,line,0,1);
++line; ++line;
{ {
@ -922,7 +922,7 @@ void OptionDialog::setupMergePage( void )
//int year = newHistoryEntry.cap(4).toInt(); //int year = newHistoryEntry.cap(4).toInt();
//TQString time = newHistoryEntry.cap(5); //TQString time = newHistoryEntry.cap(5);
//TQString name = newHistoryEntry.cap(6); //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 ); label = new TQLabel( i18n("History entry start sort key order:"), page );
gbox->addWidget( label, line, 0 ); gbox->addWidget( label, line, 0 );

16
src/pdiff.cpp
Unescape View File

@ -638,14 +638,14 @@ void KDiff3App::initView()
TQVBoxLayout* pVLayout = new TQVBoxLayout(m_pMainWidget,0,0); TQVBoxLayout* pVLayout = new TQVBoxLayout(m_pMainWidget,0,0);
TQSplitter* pVSplitter = new TQSplitter( m_pMainWidget ); TQSplitter* pVSplitter = new TQSplitter( m_pMainWidget );
pVSplitter->setOrientation( Qt::Vertical ); pVSplitter->setOrientation( TQt::Vertical );
pVLayout->addWidget( pVSplitter ); pVLayout->addWidget( pVSplitter );
TQWidget* pDiffWindowFrame = new TQWidget( pVSplitter ); TQWidget* pDiffWindowFrame = new TQWidget( pVSplitter );
TQHBoxLayout* pDiffHLayout = new TQHBoxLayout( pDiffWindowFrame,0,0 ); TQHBoxLayout* pDiffHLayout = new TQHBoxLayout( pDiffWindowFrame,0,0 );
m_pDiffWindowSplitter = new TQSplitter( pDiffWindowFrame ); 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 ); pDiffHLayout->addWidget( m_pDiffWindowSplitter );
m_pOverview = new Overview( pDiffWindowFrame, m_pOptionDialog ); 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(setLine(int)), this, TQT_SLOT(setDiff3Line(int)) );
//connect( m_pOverview, TQT_SIGNAL(afterFirstPaint()), this, TQT_SLOT(slotAfterFirstPaint())); //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 ); pDiffHLayout->addWidget( m_pDiffVScrollBar );
m_pDiffTextWindowFrame1 = new DiffTextWindowFrame( m_pDiffWindowSplitter, statusBar(), m_pOptionDialog, 1 ); 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() ); m_pMergeResultWindow = new MergeResultWindow( m_pMergeWindowFrame, m_pOptionDialog, statusBar() );
pMergeVLayout->addWidget( m_pMergeResultWindow, 1 ); 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 ); pMergeHLayout->addWidget( m_pMergeVScrollBar );
autoAdvance->setEnabled(true); autoAdvance->setEnabled(true);
@ -693,7 +693,7 @@ void KDiff3App::initView()
m_pMergeResultWindow->installEventFilter( m_pMergeResultWindowTitle ); // for focus tracking m_pMergeResultWindow->installEventFilter( m_pMergeResultWindowTitle ); // for focus tracking
TQHBoxLayout* pHScrollBarLayout = new TQHBoxLayout( pVLayout ); 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 ); pHScrollBarLayout->addWidget( m_pHScrollBar );
m_pCornerWidget = new TQWidget( m_pMainWidget ); m_pCornerWidget = new TQWidget( m_pMainWidget );
pHScrollBarLayout->addWidget( m_pCornerWidget ); pHScrollBarLayout->addWidget( m_pCornerWidget );
@ -1434,7 +1434,7 @@ void KDiff3App::slotRefresh()
} }
if ( m_pDiffWindowSplitter!=0 ) 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 ) if ( m_pDirectoryMergeWindow )
{ {
@ -2032,10 +2032,10 @@ void KDiff3App::slotWinToggleSplitterOrientation()
if ( m_pDiffWindowSplitter!=0 ) if ( m_pDiffWindowSplitter!=0 )
{ {
m_pDiffWindowSplitter->setOrientation( 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;
} }
} }

Write Preview
Loading…
Cancel
Save