summaryrefslogtreecommitdiffstats
path: root/kompare
diff options
context:
space:
mode:
Diffstat (limited to 'kompare')
-rw-r--r--kompare/kompare_shell.cpp4
-rw-r--r--kompare/komparepart/kompareconnectwidget.cpp22
-rw-r--r--kompare/komparepart/kompareconnectwidget.h2
-rw-r--r--kompare/komparepart/komparelistview.cpp8
-rw-r--r--kompare/komparepart/komparelistview.h2
-rw-r--r--kompare/komparepart/komparesplitter.cpp10
-rw-r--r--kompare/libdialogpages/pagebase.cpp4
-rw-r--r--kompare/libdialogpages/viewpage.cpp24
-rw-r--r--kompare/libdiff2/diffhunk.cpp4
-rw-r--r--kompare/libdiff2/diffmodel.cpp8
-rw-r--r--kompare/libdiff2/perforceparser.cpp18
11 files changed, 53 insertions, 53 deletions
diff --git a/kompare/kompare_shell.cpp b/kompare/kompare_shell.cpp
index 3af1af3b..62b6b7e3 100644
--- a/kompare/kompare_shell.cpp
+++ b/kompare/kompare_shell.cpp
@@ -258,7 +258,7 @@ void KompareShell::setupStatusBar()
m_generalLabel = new KSqueezedTextLabel( "", 0, "general_statusbar_label" );
statusBar()->addWidget( m_generalLabel, 1, false );
- m_generalLabel->tqsetAlignment( TQt::AlignLeft );
+ m_generalLabel->setAlignment( TQt::AlignLeft );
}
void KompareShell::slotUpdateStatusBar( int modelIndex, int differenceIndex, int modelCount, int differenceCount, int appliedCount )
@@ -438,7 +438,7 @@ void KompareShell::slotShowTextView()
// FIXME: proper error checking
m_textViewWidget = createDockWidget( i18n("Text View"), SmallIcon( "text") );
m_textViewPart = KParts::ComponentFactory::createPartInstanceFromQuery<KTextEditor::Document>(
- TQString::tqfromLatin1("KTextEditor/Document"),
+ TQString::fromLatin1("KTextEditor/Document"),
TQString(), TQT_TQWIDGET(this), 0, TQT_TQOBJECT(this), 0, TQStringList(), &errCode );
if ( m_textViewPart )
{
diff --git a/kompare/komparepart/kompareconnectwidget.cpp b/kompare/komparepart/kompareconnectwidget.cpp
index 4d7bd603..aa35fc7f 100644
--- a/kompare/komparepart/kompareconnectwidget.cpp
+++ b/kompare/komparepart/kompareconnectwidget.cpp
@@ -46,14 +46,14 @@ KompareConnectWidgetFrame::KompareConnectWidgetFrame( KompareListView* left,
m_label ( "", this ),
m_layout ( this )
{
- tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Ignored) );
- m_wid.tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored) );
- m_label.tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) );
+ setSizePolicy ( TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Ignored) );
+ m_wid.setSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored) );
+ m_label.setSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) );
m_label.setMargin(3);
TQFrame* bottomLine = new TQFrame(this);
bottomLine->setFrameShape(TQFrame::HLine);
bottomLine->setFrameShadow ( TQFrame::Plain );
- bottomLine->tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) );
+ bottomLine->setSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) );
bottomLine->setFixedHeight(1);
m_layout.setSpacing(0);
m_layout.setMargin(0);
@@ -66,9 +66,9 @@ KompareConnectWidgetFrame::~KompareConnectWidgetFrame()
{
}
-TQSize KompareConnectWidgetFrame::tqsizeHint() const
+TQSize KompareConnectWidgetFrame::sizeHint() const
{
- return TQSize(50, tqstyle().tqpixelMetric( TQStyle::PM_ScrollBarExtent ) );
+ return TQSize(50, tqstyle().pixelMetric( TQStyle::PM_ScrollBarExtent ) );
}
static int kMouseOffset;
@@ -111,7 +111,7 @@ KompareConnectWidget::KompareConnectWidget( KompareListView* left, KompareListVi
{
// connect( m_settings, TQT_SIGNAL( settingsChanged() ), this, TQT_SLOT( slotDelayedRepaint() ) );
setBackgroundMode( NoBackground );
- tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) );
+ setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) );
setFocusProxy( parent->parentWidget() );
}
@@ -190,13 +190,13 @@ void KompareConnectWidget::paintEvent( TQPaintEvent* /* e */ )
if ( TQApplication::reverseLayout() )
{
- leftRect = m_rightView->tqitemRect( i );
- rightRect = m_leftView->tqitemRect( i );
+ leftRect = m_rightView->itemRect( i );
+ rightRect = m_leftView->itemRect( i );
}
else
{
- leftRect = m_leftView->tqitemRect( i );
- rightRect = m_rightView->tqitemRect( i );
+ leftRect = m_leftView->itemRect( i );
+ rightRect = m_rightView->itemRect( i );
}
int tl = leftRect.top();
diff --git a/kompare/komparepart/kompareconnectwidget.h b/kompare/komparepart/kompareconnectwidget.h
index cc22ed86..ec48ff61 100644
--- a/kompare/komparepart/kompareconnectwidget.h
+++ b/kompare/komparepart/kompareconnectwidget.h
@@ -76,7 +76,7 @@ public:
ViewSettings* settings, KompareSplitter* parent, const char* name = 0 );
~KompareConnectWidgetFrame();
- TQSize tqsizeHint() const;
+ TQSize sizeHint() const;
KompareConnectWidget* wid() { return &m_wid; }
diff --git a/kompare/komparepart/komparelistview.cpp b/kompare/komparepart/komparelistview.cpp
index f8779fa9..cc114859 100644
--- a/kompare/komparepart/komparelistview.cpp
+++ b/kompare/komparepart/komparelistview.cpp
@@ -54,12 +54,12 @@ KompareListViewFrame::KompareListViewFrame( bool isSource,
m_label ( isSource?"Source":"Dest", this ),
m_layout ( this )
{
- tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored) );
- m_label.tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) );
+ setSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored) );
+ m_label.setSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) );
TQFrame *bottomLine = new TQFrame(this);
bottomLine->setFrameShape(TQFrame::HLine);
bottomLine->setFrameShadow ( TQFrame::Plain );
- bottomLine->tqsetSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) );
+ bottomLine->setSizePolicy ( TQSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed) );
bottomLine->setFixedHeight(1);
m_label.setMargin(3);
m_layout.setSpacing(0);
@@ -182,7 +182,7 @@ int KompareListView::lastVisibleDifference()
return -1;
}
-TQRect KompareListView::tqitemRect( int i )
+TQRect KompareListView::itemRect( int i )
{
TQListViewItem* item = itemAtIndex( i );
int x = 0;
diff --git a/kompare/komparepart/komparelistview.h b/kompare/komparepart/komparelistview.h
index b5de7661..0cd41cbf 100644
--- a/kompare/komparepart/komparelistview.h
+++ b/kompare/komparepart/komparelistview.h
@@ -55,7 +55,7 @@ public:
KompareListViewItem* itemAtIndex( int i );
int firstVisibleDifference();
int lastVisibleDifference();
- TQRect tqitemRect( int i );
+ TQRect itemRect( int i );
int minScrollId();
int maxScrollId();
int contentsWidth();
diff --git a/kompare/komparepart/komparesplitter.cpp b/kompare/komparepart/komparesplitter.cpp
index 5e30652c..009156cd 100644
--- a/kompare/komparepart/komparesplitter.cpp
+++ b/kompare/komparepart/komparesplitter.cpp
@@ -44,7 +44,7 @@ KompareSplitter::KompareSplitter( ViewSettings *settings, TQWidget * parent,
// Set up the scrollFrame
scrollFrame->setFrameStyle( TQFrame::NoFrame | TQFrame::Plain );
- scrollFrame->setLineWidth(scrollFrame->tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth));
+ scrollFrame->setLineWidth(scrollFrame->tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth));
TQGridLayout *pairtqlayout = new TQGridLayout(scrollFrame, 2, 2, 0);
m_vScroll = new TQScrollBar( Qt::Vertical, scrollFrame );
pairtqlayout->addWidget( m_vScroll, 0, 1 );
@@ -57,12 +57,12 @@ KompareSplitter::KompareSplitter( ViewSettings *settings, TQWidget * parent,
// set up our looks
setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken );
- setLineWidth( tqstyle().tqpixelMetric( TQStyle::PM_DefaultFrameWidth ) );
+ setLineWidth( tqstyle().pixelMetric( TQStyle::PM_DefaultFrameWidth ) );
setHandleWidth(50);
setChildrenCollapsible( false );
setFrameStyle( TQFrame::NoFrame );
- tqsetSizePolicy( TQSizePolicy (TQSizePolicy::Ignored, TQSizePolicy::Ignored ));
+ setSizePolicy( TQSizePolicy (TQSizePolicy::Ignored, TQSizePolicy::Ignored ));
setOpaqueResize( true );
setFocusPolicy( TQ_WheelFocus );
@@ -121,7 +121,7 @@ TQSplitterLayoutStruct *KompareSplitter::addWidget( KompareListViewFrame *w, boo
s->wid = newHandle;
newHandle->setId( d->list.count() );
s->isHandle = TRUE;
- s->sizer = pick( newHandle->tqsizeHint() );
+ s->sizer = pick( newHandle->sizeHint() );
if ( prepend )
d->list.prepend( s );
else
@@ -279,7 +279,7 @@ void KompareSplitter::doMove( bool backwards, int pos, int id, int delta,
: pick( bottomRight(w) ) - pos + 1;
if ( dd > 0 || (!isCollapsed(w) && !mayCollapse) ) {
dd = TQMAX( pick(qSmartMinSize(w)),
- TQMIN(dd, pick(w->tqmaximumSize())) );
+ TQMIN(dd, pick(w->maximumSize())) );
} else {
dd = 0;
}
diff --git a/kompare/libdialogpages/pagebase.cpp b/kompare/libdialogpages/pagebase.cpp
index 33c45dba..a2061a2b 100644
--- a/kompare/libdialogpages/pagebase.cpp
+++ b/kompare/libdialogpages/pagebase.cpp
@@ -36,7 +36,7 @@ PageBase::~PageBase()
TQSize PageBase::sizeHintForWidget( TQWidget* widget )
{
//
- // The size is computed by adding the tqsizeHint().height() of all
+ // The size is computed by adding the sizeHint().height() of all
// widget tqchildren and taking the width of the widest child and adding
// tqlayout()->margin() and tqlayout()->spacing()
//
@@ -57,7 +57,7 @@ TQSize PageBase::sizeHintForWidget( TQWidget* widget )
numChild += 1;
TQWidget *w=((TQWidget*)o);
- TQSize s = w->tqsizeHint();
+ TQSize s = w->sizeHint();
if( s.isEmpty() == true )
{
s = TQSize( 50, 100 ); // Default size
diff --git a/kompare/libdialogpages/viewpage.cpp b/kompare/libdialogpages/viewpage.cpp
index 827e8a4d..8a9f286e 100644
--- a/kompare/libdialogpages/viewpage.cpp
+++ b/kompare/libdialogpages/viewpage.cpp
@@ -37,7 +37,7 @@ ViewPage::ViewPage( TQWidget* parent ) : PageBase( parent )
{
TQWidget* page;
TQVBoxLayout* tqlayout;
- TQGroupBox* tqcolorGroupBox;
+ TQGroupBox* colorGroupBox;
TQHGroupBox* snolGroupBox;
TQHGroupBox* tabGroupBox;
TQLabel* label;
@@ -48,28 +48,28 @@ ViewPage::ViewPage( TQWidget* parent ) : PageBase( parent )
tqlayout->setMargin( KDialog::marginHint() );
// add a groupbox
- tqcolorGroupBox = new TQGroupBox( 2, Qt::Horizontal, i18n( "Colors" ), page );
- tqlayout->addWidget( tqcolorGroupBox );
- tqcolorGroupBox->setMargin( KDialog::marginHint() );
+ colorGroupBox = new TQGroupBox( 2, Qt::Horizontal, i18n( "Colors" ), page );
+ tqlayout->addWidget( colorGroupBox );
+ colorGroupBox->setMargin( KDialog::marginHint() );
// add the removeColor
- label = new TQLabel( i18n( "Removed color:" ), tqcolorGroupBox );
- m_removedColorButton = new KColorButton( tqcolorGroupBox );
+ label = new TQLabel( i18n( "Removed color:" ), colorGroupBox );
+ m_removedColorButton = new KColorButton( colorGroupBox );
label->setBuddy( m_removedColorButton );
// add the changeColor
- label = new TQLabel( i18n( "Changed color:" ), tqcolorGroupBox );
- m_changedColorButton = new KColorButton( tqcolorGroupBox );
+ label = new TQLabel( i18n( "Changed color:" ), colorGroupBox );
+ m_changedColorButton = new KColorButton( colorGroupBox );
label->setBuddy( m_changedColorButton );
// add the addColor
- label = new TQLabel( i18n( "Added color:" ), tqcolorGroupBox );
- m_addedColorButton = new KColorButton( tqcolorGroupBox );
+ label = new TQLabel( i18n( "Added color:" ), colorGroupBox );
+ m_addedColorButton = new KColorButton( colorGroupBox );
label->setBuddy( m_addedColorButton );
// add the appliedColor
- label = new TQLabel( i18n( "Applied color:" ), tqcolorGroupBox );
- m_appliedColorButton = new KColorButton( tqcolorGroupBox );
+ label = new TQLabel( i18n( "Applied color:" ), colorGroupBox );
+ m_appliedColorButton = new KColorButton( colorGroupBox );
label->setBuddy( m_appliedColorButton );
// scroll number of lines (snol)
diff --git a/kompare/libdiff2/diffhunk.cpp b/kompare/libdiff2/diffhunk.cpp
index efa7e12d..3fbd082e 100644
--- a/kompare/libdiff2/diffhunk.cpp
+++ b/kompare/libdiff2/diffhunk.cpp
@@ -97,7 +97,7 @@ TQString DiffHunk::recreateHunk() const
}
// recreate header
- hunk += TQString::tqfromLatin1( "@@ -%1,%3 +%2,%4 @@" )
+ hunk += TQString::fromLatin1( "@@ -%1,%3 +%2,%4 @@" )
.tqarg( m_sourceLine )
.tqarg( m_destinationLine )
.tqarg( slc )
@@ -106,7 +106,7 @@ TQString DiffHunk::recreateHunk() const
if ( !m_function.isEmpty() )
hunk += " " + m_function;
- hunk += TQString::tqfromLatin1( "\n" );
+ hunk += TQString::fromLatin1( "\n" );
hunk += differences;
diff --git a/kompare/libdiff2/diffmodel.cpp b/kompare/libdiff2/diffmodel.cpp
index cd348dfc..c300755b 100644
--- a/kompare/libdiff2/diffmodel.cpp
+++ b/kompare/libdiff2/diffmodel.cpp
@@ -152,13 +152,13 @@ TQString DiffModel::recreateDiff() const
TQString diff;
// recreate header
- TQString tab = TQString::tqfromLatin1( "\t" );
- TQString nl = TQString::tqfromLatin1( "\n" );
- diff += TQString::tqfromLatin1( "--- %1\t%2" ).tqarg( m_source ).tqarg( m_sourceTimestamp );
+ TQString tab = TQString::fromLatin1( "\t" );
+ TQString nl = TQString::fromLatin1( "\n" );
+ diff += TQString::fromLatin1( "--- %1\t%2" ).tqarg( m_source ).tqarg( m_sourceTimestamp );
if ( !m_sourceRevision.isEmpty() )
diff += tab + m_sourceRevision;
diff += nl;
- diff += TQString::tqfromLatin1( "+++ %1\t%2" ).tqarg( m_destination ).tqarg( m_destinationTimestamp );
+ diff += TQString::fromLatin1( "+++ %1\t%2" ).tqarg( m_destination ).tqarg( m_destinationTimestamp );
if ( !m_destinationRevision.isEmpty() )
diff += tab + m_destinationRevision;
diff += nl;
diff --git a/kompare/libdiff2/perforceparser.cpp b/kompare/libdiff2/perforceparser.cpp
index b0d54157..0e0a2aef 100644
--- a/kompare/libdiff2/perforceparser.cpp
+++ b/kompare/libdiff2/perforceparser.cpp
@@ -103,8 +103,8 @@ bool PerforceParser::parseContextDiffHeader()
destinationFileRE.exactMatch( m_contextDiffHeader1.cap( 2 ) );
kdDebug(8101) << "Matched length = " << sourceFileRE.matchedLength() << endl;
kdDebug(8101) << "Matched length = " << destinationFileRE.matchedLength() << endl;
- kdDebug(8101) << "Captured texts = " << sourceFileRE.tqcapturedTexts() << endl;
- kdDebug(8101) << "Captured texts = " << destinationFileRE.tqcapturedTexts() << endl;
+ kdDebug(8101) << "Captured texts = " << sourceFileRE.capturedTexts() << endl;
+ kdDebug(8101) << "Captured texts = " << destinationFileRE.capturedTexts() << endl;
kdDebug(8101) << "Source File : " << sourceFileRE.cap( 1 ) << endl;
kdDebug(8101) << "Destination File : " << destinationFileRE.cap( 1 ) << endl;
m_currentModel->setSourceFile ( sourceFileRE.cap( 1 ) );
@@ -117,7 +117,7 @@ bool PerforceParser::parseContextDiffHeader()
else
{
kdDebug(8101) << "Matched length = " << m_contextDiffHeader1.matchedLength() << endl;
- kdDebug(8101) << "Captured texts = " << m_contextDiffHeader1.tqcapturedTexts() << endl;
+ kdDebug(8101) << "Captured texts = " << m_contextDiffHeader1.capturedTexts() << endl;
}
}
@@ -149,8 +149,8 @@ bool PerforceParser::parseNormalDiffHeader()
destinationFileRE.exactMatch( m_normalDiffHeader.cap( 2 ) );
kdDebug(8101) << "Matched length = " << sourceFileRE.matchedLength() << endl;
kdDebug(8101) << "Matched length = " << destinationFileRE.matchedLength() << endl;
- kdDebug(8101) << "Captured texts = " << sourceFileRE.tqcapturedTexts() << endl;
- kdDebug(8101) << "Captured texts = " << destinationFileRE.tqcapturedTexts() << endl;
+ kdDebug(8101) << "Captured texts = " << sourceFileRE.capturedTexts() << endl;
+ kdDebug(8101) << "Captured texts = " << destinationFileRE.capturedTexts() << endl;
kdDebug(8101) << "Source File : " << sourceFileRE.cap( 1 ) << endl;
kdDebug(8101) << "Destination File : " << destinationFileRE.cap( 1 ) << endl;
m_currentModel->setSourceFile ( sourceFileRE.cap( 1 ) );
@@ -163,7 +163,7 @@ bool PerforceParser::parseNormalDiffHeader()
else
{
kdDebug(8101) << "Matched length = " << m_normalDiffHeader.matchedLength() << endl;
- kdDebug(8101) << "Captured texts = " << m_normalDiffHeader.tqcapturedTexts() << endl;
+ kdDebug(8101) << "Captured texts = " << m_normalDiffHeader.capturedTexts() << endl;
}
}
@@ -200,8 +200,8 @@ bool PerforceParser::parseUnifiedDiffHeader()
destinationFileRE.exactMatch( m_unifiedDiffHeader1.cap( 2 ) );
// kdDebug(8101) << "Matched length = " << sourceFileRE.matchedLength() << endl;
// kdDebug(8101) << "Matched length = " << destinationFileRE.matchedLength() << endl;
-// kdDebug(8101) << "Captured texts = " << sourceFileRE.tqcapturedTexts() << endl;
-// kdDebug(8101) << "Captured texts = " << destinationFileRE.tqcapturedTexts() << endl;
+// kdDebug(8101) << "Captured texts = " << sourceFileRE.capturedTexts() << endl;
+// kdDebug(8101) << "Captured texts = " << destinationFileRE.capturedTexts() << endl;
// kdDebug(8101) << "Source File : " << sourceFileRE.cap( 1 ) << endl;
// kdDebug(8101) << "Destination File : " << destinationFileRE.cap( 1 ) << endl;
m_currentModel->setSourceFile ( sourceFileRE.cap( 1 ) );
@@ -214,7 +214,7 @@ bool PerforceParser::parseUnifiedDiffHeader()
else
{
// kdDebug(8101) << "Matched length = " << m_unifiedDiffHeader1.matchedLength() << endl;
-// kdDebug(8101) << "Captured texts = " << m_unifiedDiffHeader1.tqcapturedTexts() << endl;
+// kdDebug(8101) << "Captured texts = " << m_unifiedDiffHeader1.capturedTexts() << endl;
}
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-16 01:32:48 +0000