summaryrefslogtreecommitdiffstats
path: root/kompare/komparepart
diff options
context:
space:
mode:
Diffstat (limited to 'kompare/komparepart')
-rw-r--r--kompare/komparepart/kompare_part.cpp32
-rw-r--r--kompare/komparepart/kompareconnectwidget.cpp24
-rw-r--r--kompare/komparepart/kompareconnectwidget.h2
-rw-r--r--kompare/komparepart/komparelistview.cpp14
-rw-r--r--kompare/komparepart/komparelistview.h4
-rw-r--r--kompare/komparepart/komparesaveoptionsbase.ui2
-rw-r--r--kompare/komparepart/komparesplitter.cpp24
7 files changed, 51 insertions, 51 deletions
diff --git a/kompare/komparepart/kompare_part.cpp b/kompare/komparepart/kompare_part.cpp
index 3c110857..c11bbe8e 100644
--- a/kompare/komparepart/kompare_part.cpp
+++ b/kompare/komparepart/kompare_part.cpp
@@ -21,7 +21,7 @@
#include "kompare_qsplitter.h" // make sure we get there first
-#include <tqlayout.h>
+#include <layout.h>
#include <tqwidget.h>
#include <kaction.h>
@@ -266,7 +266,7 @@ const TQString KomparePart::fetchURL( const KURL& url )
{
if ( ! KIO::NetAccess::download( url, tempFileName, widget() ) )
{
- slotShowError( i18n( "<qt>The URL <b>%1</b> cannot be downloaded.</qt>" ).tqarg( url.prettyURL() ) );
+ slotShowError( i18n( "<qt>The URL <b>%1</b> cannot be downloaded.</qt>" ).arg( url.prettyURL() ) );
tempFileName = "";
}
return tempFileName;
@@ -278,7 +278,7 @@ const TQString KomparePart::fetchURL( const KURL& url )
return url.path();
else
{
- slotShowError( i18n( "<qt>The URL <b>%1</b> does not exist on your system.</qt>" ).tqarg( url.prettyURL() ) );
+ slotShowError( i18n( "<qt>The URL <b>%1</b> does not exist on your system.</qt>" ).arg( url.prettyURL() ) );
return tempFileName;
}
}
@@ -543,26 +543,26 @@ void KomparePart::updateStatus()
{
case Kompare::ComparingFiles :
text = i18n( "Comparing file %1 with file %2" )
- .tqarg( source )
- .tqarg( destination );
+ .arg( source )
+ .arg( destination );
break;
case Kompare::ComparingDirs :
text = i18n( "Comparing files in %1 with files in %2" )
- .tqarg( source )
- .tqarg( destination );
+ .arg( source )
+ .arg( destination );
break;
case Kompare::ShowingDiff :
- text = i18n( "Viewing diff output from %1" ).tqarg( source );
+ text = i18n( "Viewing diff output from %1" ).arg( source );
break;
case Kompare::BlendingFile :
text = i18n( "Blending diff output from %1 into file %2" )
- .tqarg( source )
- .tqarg( destination );
+ .arg( source )
+ .arg( destination );
break;
case Kompare::BlendingDir :
text = i18n( "Blending diff output from %1 into folder %2" )
- .tqarg( m_info.source.prettyURL() )
- .tqarg( m_info.destination.prettyURL() );
+ .arg( m_info.source.prettyURL() )
+ .arg( m_info.destination.prettyURL() );
break;
default:
break;
@@ -678,8 +678,8 @@ void KomparePart::slotShowDiffstats( void )
"Format: %3\n"
"Number of hunks: %4\n"
"Number of differences: %5")
- .tqarg(oldFile).tqarg(newFile).tqarg(diffFormat)
- .tqarg(noOfHunks).tqarg(noOfDiffs),
+ .arg(oldFile).arg(newFile).arg(diffFormat)
+ .arg(noOfHunks).arg(noOfDiffs),
i18n("Diff Statistics"), TQString(), false );
} else { // more than 1 file in diff, or 2 directories compared
KMessageBox::information( 0L, i18n(
@@ -693,8 +693,8 @@ void KomparePart::slotShowDiffstats( void )
"\n"
"Number of hunks: %5\n"
"Number of differences: %6")
- .tqarg(filesInDiff).tqarg(diffFormat).tqarg(oldFile)
- .tqarg(newFile).tqarg(noOfHunks).tqarg(noOfDiffs),
+ .arg(filesInDiff).arg(diffFormat).arg(oldFile)
+ .arg(newFile).arg(noOfHunks).arg(noOfDiffs),
i18n("Diff Statistics"), TQString(), false );
}
}
diff --git a/kompare/komparepart/kompareconnectwidget.cpp b/kompare/komparepart/kompareconnectwidget.cpp
index 4d7bd603..2bccc48b 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() );
}
@@ -139,7 +139,7 @@ void KompareConnectWidget::slotSetSelection( const DiffModel* model, const Diffe
void KompareConnectWidget::slotDelayedRepaint()
{
- TQTimer::singleShot( 0, this, TQT_SLOT( tqrepaint() ) );
+ TQTimer::singleShot( 0, this, TQT_SLOT( repaint() ) );
}
void KompareConnectWidget::slotSetSelection( const Difference* diff )
@@ -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..30e65d87 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;
@@ -390,7 +390,7 @@ void KompareListView::slotApplyAllDifferences( bool apply )
TQPtrDictIterator<KompareListViewDiffItem> it ( m_itemDict );
for( ; it.current(); ++it )
it.current()->applyDifference( apply );
- tqrepaint();
+ repaint();
}
void KompareListView::slotApplyDifference( const Difference* diff, bool apply )
@@ -500,7 +500,7 @@ void KompareListViewDiffItem::applyDifference( bool apply )
kdDebug(8104) << "KompareListViewDiffItem::applyDifference( " << apply << " )" << endl;
setVisibility();
setup();
- tqrepaint();
+ repaint();
}
int KompareListViewDiffItem::maxHeight()
@@ -520,7 +520,7 @@ void KompareListViewDiffItem::setSelected( bool b )
m_sourceItem->firstChild() :
m_destItem->firstChild();
while( item && item->isVisible() ) {
- item->tqrepaint();
+ item->repaint();
item = item->nextSibling();
}
}
diff --git a/kompare/komparepart/komparelistview.h b/kompare/komparepart/komparelistview.h
index b5de7661..0cbbefd7 100644
--- a/kompare/komparepart/komparelistview.h
+++ b/kompare/komparepart/komparelistview.h
@@ -25,7 +25,7 @@
#include <tqptrlist.h>
#include <tqptrdict.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <klistview.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/komparesaveoptionsbase.ui b/kompare/komparepart/komparesaveoptionsbase.ui
index 7636a27f..47cfc893 100644
--- a/kompare/komparepart/komparesaveoptionsbase.ui
+++ b/kompare/komparepart/komparesaveoptionsbase.ui
@@ -83,7 +83,7 @@
<property name="title">
<string>Command Line</string>
</property>
- <property name="tqalignment">
+ <property name="alignment">
<set>AlignVCenter|AlignLeft</set>
</property>
<property name="hAlign" stdset="0">
diff --git a/kompare/komparepart/komparesplitter.cpp b/kompare/komparepart/komparesplitter.cpp
index 5e30652c..7087ca4d 100644
--- a/kompare/komparepart/komparesplitter.cpp
+++ b/kompare/komparepart/komparesplitter.cpp
@@ -44,25 +44,25 @@ KompareSplitter::KompareSplitter( ViewSettings *settings, TQWidget * parent,
// Set up the scrollFrame
scrollFrame->setFrameStyle( TQFrame::NoFrame | TQFrame::Plain );
- scrollFrame->setLineWidth(scrollFrame->tqstyle().tqpixelMetric(TQStyle::PM_DefaultFrameWidth));
- TQGridLayout *pairtqlayout = new TQGridLayout(scrollFrame, 2, 2, 0);
+ scrollFrame->setLineWidth(scrollFrame->tqstyle().pixelMetric(TQStyle::PM_DefaultFrameWidth));
+ TQGridLayout *pairlayout = new TQGridLayout(scrollFrame, 2, 2, 0);
m_vScroll = new TQScrollBar( Qt::Vertical, scrollFrame );
- pairtqlayout->addWidget( m_vScroll, 0, 1 );
+ pairlayout->addWidget( m_vScroll, 0, 1 );
m_hScroll = new TQScrollBar( Qt::Horizontal, scrollFrame );
- pairtqlayout->addWidget( m_hScroll, 1, 0 );
+ pairlayout->addWidget( m_hScroll, 1, 0 );
new KompareListViewFrame(true, m_settings, this, "source");
new KompareListViewFrame(false, m_settings, this, "destination");
- pairtqlayout->addWidget( this, 0, 0 );
+ pairlayout->addWidget( this, 0, 0 );
// 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
@@ -184,7 +184,7 @@ void KompareSplitter::childEvent( TQChildEvent *c )
}
}
-// This is from a private qt header (kernel/qtqlayoutengine_p.h). sorry.
+// This is from a private qt header (kernel/qlayoutengine_p.h). sorry.
TQSize qSmartMinSize( TQWidget *w );
static TQPoint toggle( TQWidget *w, TQPoint pos )
@@ -212,7 +212,7 @@ static TQPoint bottomRight( TQWidget *w )
if ( isCollapsed(w) ) {
return toggle( w, w->pos() ) - TQPoint( 1, 1 );
} else {
- return w->tqgeometry().bottomRight();
+ return w->geometry().bottomRight();
}
}
@@ -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;
}
@@ -396,7 +396,7 @@ void KompareSplitter::repaintHandles()
TQSplitterLayoutStruct *curr;
for ( curr = d->list.first(); curr; curr = d->list.next() )
if ( curr->isHandle )
- ((KompareConnectWidgetFrame*)curr->wid)->wid()->tqrepaint();
+ ((KompareConnectWidgetFrame*)curr->wid)->wid()->repaint();
}
// Scrolling stuff
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-20 12:43:34 +0000