summaryrefslogtreecommitdiffstats
path: root/kompare/komparepart
diff options
context:
space:
mode:
Diffstat (limited to 'kompare/komparepart')
-rw-r--r--kompare/komparepart/kompare_part.cpp4
-rw-r--r--kompare/komparepart/kompare_part.h2
-rw-r--r--kompare/komparepart/kompareconnectwidget.cpp10
-rw-r--r--kompare/komparepart/kompareconnectwidget.h6
-rw-r--r--kompare/komparepart/komparelistview.cpp70
-rw-r--r--kompare/komparepart/komparelistview.h26
-rw-r--r--kompare/komparepart/komparesaveoptionswidget.cpp4
-rw-r--r--kompare/komparepart/komparesaveoptionswidget.h2
-rw-r--r--kompare/komparepart/komparesplitter.cpp6
-rw-r--r--kompare/komparepart/komparesplitter.h2
10 files changed, 66 insertions, 66 deletions
diff --git a/kompare/komparepart/kompare_part.cpp b/kompare/komparepart/kompare_part.cpp
index 1ea3217e..1339a203 100644
--- a/kompare/komparepart/kompare_part.cpp
+++ b/kompare/komparepart/kompare_part.cpp
@@ -57,8 +57,8 @@ ViewSettings* KomparePart::m_viewSettings = 0L;
DiffSettings* KomparePart::m_diffSettings = 0L;
KomparePart::KomparePart( TQWidget *parentWidget, const char *widgetName,
- TQObject *tqparent, const char *name, const TQStringList & /*args*/ ) :
- KParts::ReadWritePart(tqparent, name),
+ TQObject *parent, const char *name, const TQStringList & /*args*/ ) :
+ KParts::ReadWritePart(parent, name),
m_tempDiff( 0 ),
m_info()
{
diff --git a/kompare/komparepart/kompare_part.h b/kompare/komparepart/kompare_part.h
index 985fe6fc..7afc93fc 100644
--- a/kompare/komparepart/kompare_part.h
+++ b/kompare/komparepart/kompare_part.h
@@ -66,7 +66,7 @@ public:
* Default constructor
*/
KomparePart( TQWidget *parentWidget, const char *widgetName,
- TQObject *tqparent, const char *name, const TQStringList & /*args*/);
+ TQObject *parent, const char *name, const TQStringList & /*args*/);
/**
* Destructor
diff --git a/kompare/komparepart/kompareconnectwidget.cpp b/kompare/komparepart/kompareconnectwidget.cpp
index 07781942..4d7bd603 100644
--- a/kompare/komparepart/kompareconnectwidget.cpp
+++ b/kompare/komparepart/kompareconnectwidget.cpp
@@ -39,9 +39,9 @@ using namespace Diff2;
KompareConnectWidgetFrame::KompareConnectWidgetFrame( KompareListView* left,
KompareListView* right,
ViewSettings* settings,
- KompareSplitter* tqparent,
+ KompareSplitter* parent,
const char* name ) :
- TQSplitterHandle(Qt::Horizontal, (TQSplitter *)tqparent, name),
+ TQSplitterHandle(Qt::Horizontal, (TQSplitter *)parent, name),
m_wid ( left, right, settings, this, name ),
m_label ( "", this ),
m_layout ( this )
@@ -101,8 +101,8 @@ void KompareConnectWidgetFrame::mouseReleaseEvent( TQMouseEvent *e )
}
KompareConnectWidget::KompareConnectWidget( KompareListView* left, KompareListView* right,
- ViewSettings* settings, TQWidget* tqparent, const char* name )
- : TQWidget(tqparent, name),
+ ViewSettings* settings, TQWidget* parent, const char* name )
+ : TQWidget(parent, name),
m_settings( settings ),
m_leftView( left ),
m_rightView( right ),
@@ -112,7 +112,7 @@ KompareConnectWidget::KompareConnectWidget( KompareListView* left, KompareListVi
// connect( m_settings, TQT_SIGNAL( settingsChanged() ), this, TQT_SLOT( slotDelayedRepaint() ) );
setBackgroundMode( NoBackground );
tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) );
- setFocusProxy( tqparent->parentWidget() );
+ setFocusProxy( parent->parentWidget() );
}
KompareConnectWidget::~KompareConnectWidget()
diff --git a/kompare/komparepart/kompareconnectwidget.h b/kompare/komparepart/kompareconnectwidget.h
index a5561a8a..cc22ed86 100644
--- a/kompare/komparepart/kompareconnectwidget.h
+++ b/kompare/komparepart/kompareconnectwidget.h
@@ -39,7 +39,7 @@ class KompareConnectWidget : public TQWidget
public:
KompareConnectWidget( KompareListView* left, KompareListView* right,
- ViewSettings* settings, TQWidget* tqparent, const char* name = 0 );
+ ViewSettings* settings, TQWidget* parent, const char* name = 0 );
~KompareConnectWidget();
public slots:
@@ -73,7 +73,7 @@ class KompareConnectWidgetFrame : public TQSplitterHandle
TQ_OBJECT
public:
KompareConnectWidgetFrame( KompareListView* left, KompareListView* right,
- ViewSettings* settings, KompareSplitter* tqparent, const char* name = 0 );
+ ViewSettings* settings, KompareSplitter* parent, const char* name = 0 );
~KompareConnectWidgetFrame();
TQSize tqsizeHint() const;
@@ -81,7 +81,7 @@ public:
KompareConnectWidget* wid() { return &m_wid; }
protected:
- // stop the tqparent TQSplitterHandle painting
+ // stop the parent TQSplitterHandle painting
void paintEvent( TQPaintEvent* /* e */ ) { }
void mouseMoveEvent( TQMouseEvent * );
diff --git a/kompare/komparepart/komparelistview.cpp b/kompare/komparepart/komparelistview.cpp
index f52191a6..f8779fa9 100644
--- a/kompare/komparepart/komparelistview.cpp
+++ b/kompare/komparepart/komparelistview.cpp
@@ -47,9 +47,9 @@ using namespace Diff2;
KompareListViewFrame::KompareListViewFrame( bool isSource,
ViewSettings* settings,
- KompareSplitter* tqparent,
+ KompareSplitter* parent,
const char* name ):
- TQFrame ( tqparent, name ),
+ TQFrame ( parent, name ),
m_view ( isSource, settings, this, name ),
m_label ( isSource?"Source":"Dest", this ),
m_layout ( this )
@@ -69,11 +69,11 @@ KompareListViewFrame::KompareListViewFrame( bool isSource,
m_layout.addWidget(&m_view);
connect( &m_view, TQT_SIGNAL(differenceClicked(const Diff2::Difference*)),
- tqparent, TQT_SLOT(slotDifferenceClicked(const Diff2::Difference*)) );
+ parent, TQT_SLOT(slotDifferenceClicked(const Diff2::Difference*)) );
- connect( tqparent, TQT_SIGNAL(scrollViewsToId(int)), &m_view, TQT_SLOT(scrollToId(int)) );
- connect( tqparent, TQT_SIGNAL(setXOffset(int)), &m_view, TQT_SLOT(setXOffset(int)) );
- connect( &m_view, TQT_SIGNAL(resized()), tqparent, TQT_SLOT(slotUpdateScrollBars()) );
+ connect( parent, TQT_SIGNAL(scrollViewsToId(int)), &m_view, TQT_SLOT(scrollToId(int)) );
+ connect( parent, TQT_SIGNAL(setXOffset(int)), &m_view, TQT_SLOT(setXOffset(int)) );
+ connect( &m_view, TQT_SIGNAL(resized()), parent, TQT_SLOT(slotUpdateScrollBars()) );
}
void KompareListViewFrame::slotSetModel( const DiffModel* model )
@@ -98,8 +98,8 @@ void KompareListViewFrame::slotSetModel( const DiffModel* model )
KompareListView::KompareListView( bool isSource,
ViewSettings* settings,
- TQWidget* tqparent, const char* name ) :
- KListView( tqparent, name ),
+ TQWidget* parent, const char* name ) :
+ KListView( parent, name ),
m_isSource( isSource ),
m_settings( settings ),
m_scrollId( -1 ),
@@ -125,7 +125,7 @@ KompareListView::KompareListView( bool isSource,
setFocusPolicy( TQ_NoFocus );
setFont( m_settings->m_font );
setSpaces( m_settings->m_tabToNumberOfSpaces );
- setFocusProxy( tqparent->parentWidget() );
+ setFocusProxy( parent->parentWidget() );
}
KompareListView::~KompareListView()
@@ -410,7 +410,7 @@ void KompareListView::setSpaces( int spaces )
void KompareListView::wheelEvent( TQWheelEvent* e )
{
- e->ignore(); // we want the tqparent to catch wheel events
+ e->ignore(); // we want the parent to catch wheel events
}
void KompareListView::resizeEvent( TQResizeEvent* e )
@@ -420,28 +420,28 @@ void KompareListView::resizeEvent( TQResizeEvent* e )
kdDebug() << "resizeEvent " << endl;
}
-KompareListViewItem::KompareListViewItem( KompareListView* tqparent )
- : TQListViewItem( tqparent ),
+KompareListViewItem::KompareListViewItem( KompareListView* parent )
+ : TQListViewItem( parent ),
m_scrollId( 0 )
{
// kdDebug(8104) << "Created KompareListViewItem with scroll id " << m_scrollId << endl;
}
-KompareListViewItem::KompareListViewItem( KompareListView* tqparent, KompareListViewItem* after )
- : TQListViewItem( tqparent, after ),
+KompareListViewItem::KompareListViewItem( KompareListView* parent, KompareListViewItem* after )
+ : TQListViewItem( parent, after ),
m_scrollId( after->scrollId() + after->maxHeight() )
{
// kdDebug(8104) << "Created KompareListViewItem with scroll id " << m_scrollId << endl;
}
-KompareListViewItem::KompareListViewItem( KompareListViewItem* tqparent )
- : TQListViewItem( tqparent ),
+KompareListViewItem::KompareListViewItem( KompareListViewItem* parent )
+ : TQListViewItem( parent ),
m_scrollId( 0 )
{
}
-KompareListViewItem::KompareListViewItem( KompareListViewItem* tqparent, KompareListViewItem* /*after*/ )
- : TQListViewItem( tqparent ),
+KompareListViewItem::KompareListViewItem( KompareListViewItem* parent, KompareListViewItem* /*after*/ )
+ : TQListViewItem( parent ),
m_scrollId( 0 )
{
}
@@ -456,8 +456,8 @@ void KompareListViewItem::paintFocus( TQPainter* /* p */, const TQColorGroup& /*
// Don't paint anything
}
-KompareListViewDiffItem::KompareListViewDiffItem( KompareListView* tqparent, Difference* difference )
- : KompareListViewItem( tqparent ),
+KompareListViewDiffItem::KompareListViewDiffItem( KompareListView* parent, Difference* difference )
+ : KompareListViewItem( parent ),
m_difference( difference ),
m_sourceItem( 0L ),
m_destItem( 0L )
@@ -465,8 +465,8 @@ KompareListViewDiffItem::KompareListViewDiffItem( KompareListView* tqparent, Dif
init();
}
-KompareListViewDiffItem::KompareListViewDiffItem( KompareListView* tqparent, KompareListViewItem* after, Difference* difference )
- : KompareListViewItem( tqparent, after ),
+KompareListViewDiffItem::KompareListViewDiffItem( KompareListView* parent, KompareListViewItem* after, Difference* difference )
+ : KompareListViewItem( parent, after ),
m_difference( difference ),
m_sourceItem( 0L ),
m_destItem( 0L )
@@ -525,8 +525,8 @@ void KompareListViewDiffItem::setSelected( bool b )
}
}
-KompareListViewLineContainerItem::KompareListViewLineContainerItem( KompareListViewDiffItem* tqparent, bool isSource )
- : KompareListViewItem( tqparent ),
+KompareListViewLineContainerItem::KompareListViewLineContainerItem( KompareListViewDiffItem* parent, bool isSource )
+ : KompareListViewItem( parent ),
m_isSource( isSource )
{
// kdDebug(8104) << "isSource ? " << (isSource ? " Yes!" : " No!") << endl;
@@ -554,7 +554,7 @@ void KompareListViewLineContainerItem::setup()
KompareListViewDiffItem* KompareListViewLineContainerItem::diffItemParent() const
{
- return (KompareListViewDiffItem*)tqparent();
+ return (KompareListViewDiffItem*)parent();
}
int KompareListViewLineContainerItem::lineCount() const
@@ -575,8 +575,8 @@ DifferenceString* KompareListViewLineContainerItem::lineAt( int i ) const
diffItemParent()->difference()->destinationLineAt( i );
}
-KompareListViewLineItem::KompareListViewLineItem( KompareListViewLineContainerItem* tqparent, int line, DifferenceString* text )
- : KompareListViewItem( tqparent )
+KompareListViewLineItem::KompareListViewLineItem( KompareListViewLineContainerItem* parent, int line, DifferenceString* text )
+ : KompareListViewItem( parent )
{
setText( COL_LINE_NO, TQString::number( line ) );
setText( COL_MAIN, text->string() );
@@ -618,7 +618,7 @@ void KompareListViewLineItem::paintCell( TQPainter * p, const TQColorGroup & cg,
if ( diffItemParent()->isSelected() )
{
p->setPen( bg.dark(135) );
- if ( this == tqparent()->firstChild() )
+ if ( this == parent()->firstChild() )
p->drawLine( 0, 0, width, 0 );
if ( nextSibling() == 0 )
p->drawLine( 0, height() - 1, width, height() - 1 );
@@ -713,12 +713,12 @@ void KompareListViewLineItem::paintText( TQPainter* p, const TQColor& bg, int co
KompareListViewDiffItem* KompareListViewLineItem::diffItemParent() const
{
- KompareListViewLineContainerItem* p = (KompareListViewLineContainerItem*)tqparent();
+ KompareListViewLineContainerItem* p = (KompareListViewLineContainerItem*)parent();
return p->diffItemParent();
}
-KompareListViewBlankLineItem::KompareListViewBlankLineItem( KompareListViewLineContainerItem* tqparent )
- : KompareListViewLineItem( tqparent, 0, new DifferenceString() )
+KompareListViewBlankLineItem::KompareListViewBlankLineItem( KompareListViewLineContainerItem* parent )
+ : KompareListViewLineItem( parent, 0, new DifferenceString() )
{
}
@@ -737,16 +737,16 @@ void KompareListViewBlankLineItem::paintText( TQPainter* p, const TQColor& bg, i
}
}
-KompareListViewHunkItem::KompareListViewHunkItem( KompareListView* tqparent, DiffHunk* hunk, bool zeroHeight )
- : KompareListViewItem( tqparent ),
+KompareListViewHunkItem::KompareListViewHunkItem( KompareListView* parent, DiffHunk* hunk, bool zeroHeight )
+ : KompareListViewItem( parent ),
m_zeroHeight( zeroHeight ),
m_hunk( hunk )
{
setSelectable( false );
}
-KompareListViewHunkItem::KompareListViewHunkItem( KompareListView* tqparent, KompareListViewItem* after, DiffHunk* hunk, bool zeroHeight )
- : KompareListViewItem( tqparent, after ),
+KompareListViewHunkItem::KompareListViewHunkItem( KompareListView* parent, KompareListViewItem* after, DiffHunk* hunk, bool zeroHeight )
+ : KompareListViewItem( parent, after ),
m_zeroHeight( zeroHeight ),
m_hunk( hunk )
{
diff --git a/kompare/komparepart/komparelistview.h b/kompare/komparepart/komparelistview.h
index 7c10ff6d..b5de7661 100644
--- a/kompare/komparepart/komparelistview.h
+++ b/kompare/komparepart/komparelistview.h
@@ -49,7 +49,7 @@ class KompareListView : public KListView
TQ_OBJECT
public:
- KompareListView( bool isSource, ViewSettings* settings, TQWidget* tqparent, const char* name = 0 );
+ KompareListView( bool isSource, ViewSettings* settings, TQWidget* parent, const char* name = 0 );
virtual ~KompareListView();
KompareListViewItem* itemAtIndex( int i );
@@ -109,7 +109,7 @@ class KompareListViewFrame : public TQFrame
TQ_OBJECT
public:
- KompareListViewFrame( bool isSource, ViewSettings* settings, KompareSplitter* tqparent, const char* name = 0 );
+ KompareListViewFrame( bool isSource, ViewSettings* settings, KompareSplitter* parent, const char* name = 0 );
virtual ~KompareListViewFrame() {};
KompareListView* view() { return &m_view; };
@@ -125,10 +125,10 @@ private:
class KompareListViewItem : public TQListViewItem
{
public:
- KompareListViewItem( KompareListView* tqparent );
- KompareListViewItem( KompareListView* tqparent, KompareListViewItem* after );
- KompareListViewItem( KompareListViewItem* tqparent );
- KompareListViewItem( KompareListViewItem* tqparent, KompareListViewItem* after );
+ KompareListViewItem( KompareListView* parent );
+ KompareListViewItem( KompareListView* parent, KompareListViewItem* after );
+ KompareListViewItem( KompareListViewItem* parent );
+ KompareListViewItem( KompareListViewItem* parent, KompareListViewItem* after );
void paintFocus( TQPainter* p, const TQColorGroup& cg, const TQRect& r );
int scrollId() { return m_scrollId; };
@@ -144,8 +144,8 @@ private:
class KompareListViewDiffItem : public KompareListViewItem
{
public:
- KompareListViewDiffItem( KompareListView* tqparent, Diff2::Difference* difference );
- KompareListViewDiffItem( KompareListView* tqparent, KompareListViewItem* after, Diff2::Difference* difference );
+ KompareListViewDiffItem( KompareListView* parent, Diff2::Difference* difference );
+ KompareListViewDiffItem( KompareListView* parent, KompareListViewItem* after, Diff2::Difference* difference );
void setup();
void setSelected( bool b );
@@ -167,7 +167,7 @@ private:
class KompareListViewLineContainerItem : public KompareListViewItem
{
public:
- KompareListViewLineContainerItem( KompareListViewDiffItem* tqparent, bool isSource );
+ KompareListViewLineContainerItem( KompareListViewDiffItem* parent, bool isSource );
void setup();
int maxHeight() { return 0; }
@@ -184,7 +184,7 @@ private:
class KompareListViewLineItem : public KompareListViewItem
{
public:
- KompareListViewLineItem( KompareListViewLineContainerItem* tqparent, int line, Diff2::DifferenceString* text );
+ KompareListViewLineItem( KompareListViewLineContainerItem* parent, int line, Diff2::DifferenceString* text );
virtual void setup();
int maxHeight() { return 0; }
@@ -201,7 +201,7 @@ private:
class KompareListViewBlankLineItem : public KompareListViewLineItem
{
public:
- KompareListViewBlankLineItem( KompareListViewLineContainerItem* tqparent );
+ KompareListViewBlankLineItem( KompareListViewLineContainerItem* parent );
void setup();
@@ -211,8 +211,8 @@ public:
class KompareListViewHunkItem : public KompareListViewItem
{
public:
- KompareListViewHunkItem( KompareListView* tqparent, Diff2::DiffHunk* hunk, bool zeroHeight = false );
- KompareListViewHunkItem( KompareListView* tqparent, KompareListViewItem* after, Diff2::DiffHunk* hunk, bool zeroHeight= false );
+ KompareListViewHunkItem( KompareListView* parent, Diff2::DiffHunk* hunk, bool zeroHeight = false );
+ KompareListViewHunkItem( KompareListView* parent, KompareListViewItem* after, Diff2::DiffHunk* hunk, bool zeroHeight= false );
void setup();
void paintCell( TQPainter* p, const TQColorGroup& cg, int column, int width, int align );
diff --git a/kompare/komparepart/komparesaveoptionswidget.cpp b/kompare/komparepart/komparesaveoptionswidget.cpp
index cf6e9bf7..723093ac 100644
--- a/kompare/komparepart/komparesaveoptionswidget.cpp
+++ b/kompare/komparepart/komparesaveoptionswidget.cpp
@@ -31,8 +31,8 @@
#include "komparesaveoptionswidget.h"
KompareSaveOptionsWidget::KompareSaveOptionsWidget( TQString source, TQString destination,
- DiffSettings * settings, TQWidget * tqparent )
- : KompareSaveOptionsBase( tqparent, "save options" )
+ DiffSettings * settings, TQWidget * parent )
+ : KompareSaveOptionsBase( parent, "save options" )
, m_source( source )
, m_destination( destination )
{
diff --git a/kompare/komparepart/komparesaveoptionswidget.h b/kompare/komparepart/komparesaveoptionswidget.h
index 3618a2b2..04b3977e 100644
--- a/kompare/komparepart/komparesaveoptionswidget.h
+++ b/kompare/komparepart/komparesaveoptionswidget.h
@@ -32,7 +32,7 @@ class KompareSaveOptionsWidget : public KompareSaveOptionsBase, public KompareFu
Q_OBJECT
TQ_OBJECT
public:
- KompareSaveOptionsWidget( TQString source, TQString destination, DiffSettings* settings, TQWidget* tqparent );
+ KompareSaveOptionsWidget( TQString source, TQString destination, DiffSettings* settings, TQWidget* parent );
~KompareSaveOptionsWidget();
void saveOptions();
diff --git a/kompare/komparepart/komparesplitter.cpp b/kompare/komparepart/komparesplitter.cpp
index 32b7aa29..5e30652c 100644
--- a/kompare/komparepart/komparesplitter.cpp
+++ b/kompare/komparepart/komparesplitter.cpp
@@ -34,12 +34,12 @@
using namespace Diff2;
-KompareSplitter::KompareSplitter( ViewSettings *settings, TQWidget * tqparent,
+KompareSplitter::KompareSplitter( ViewSettings *settings, TQWidget * parent,
const char *name) :
- TQSplitter(Qt::Horizontal, tqparent, name ),
+ TQSplitter(Qt::Horizontal, parent, name ),
m_settings( settings )
{
- TQFrame *scrollFrame = new TQFrame( tqparent, "scrollFrame" );
+ TQFrame *scrollFrame = new TQFrame( parent, "scrollFrame" );
reparent( scrollFrame, *(new TQPoint()), false );
// Set up the scrollFrame
diff --git a/kompare/komparepart/komparesplitter.h b/kompare/komparepart/komparesplitter.h
index 2ce07e29..812906af 100644
--- a/kompare/komparepart/komparesplitter.h
+++ b/kompare/komparepart/komparesplitter.h
@@ -41,7 +41,7 @@ class KompareSplitter : public TQSplitter
TQ_OBJECT
public:
- KompareSplitter(ViewSettings *settings, TQWidget *tqparent=0, const char *name = 0);
+ KompareSplitter(ViewSettings *settings, TQWidget *parent=0, const char *name = 0);
~KompareSplitter();
signals:
generated by cgit v1.2.1 (git 2.18.0) at 2024-07-18 02:30:55 +0000