summaryrefslogtreecommitdiffstats
path: root/kompare
diff options
context:
space:
mode:
Diffstat (limited to 'kompare')
-rw-r--r--kompare/komparenavtreepart/komparenavtreepart.cpp16
-rw-r--r--kompare/komparenavtreepart/komparenavtreepart.h14
-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
-rw-r--r--kompare/kompareurldialog.cpp4
-rw-r--r--kompare/kompareurldialog.h2
-rw-r--r--kompare/libdialogpages/diffpage.cpp2
-rw-r--r--kompare/libdialogpages/diffsettings.cpp4
-rw-r--r--kompare/libdialogpages/diffsettings.h2
-rw-r--r--kompare/libdialogpages/filespage.cpp2
-rw-r--r--kompare/libdialogpages/filespage.h2
-rw-r--r--kompare/libdialogpages/filessettings.cpp4
-rw-r--r--kompare/libdialogpages/filessettings.h2
-rw-r--r--kompare/libdialogpages/pagebase.cpp2
-rw-r--r--kompare/libdialogpages/settingsbase.cpp2
-rw-r--r--kompare/libdialogpages/settingsbase.h2
-rw-r--r--kompare/libdialogpages/viewpage.cpp2
-rw-r--r--kompare/libdialogpages/viewsettings.cpp4
-rw-r--r--kompare/libdialogpages/viewsettings.h2
-rw-r--r--kompare/libdiff2/komparemodellist.cpp34
-rw-r--r--kompare/libdiff2/komparemodellist.h2
29 files changed, 118 insertions, 118 deletions
diff --git a/kompare/komparenavtreepart/komparenavtreepart.cpp b/kompare/komparenavtreepart/komparenavtreepart.cpp
index 87e8ce2b..1a402260 100644
--- a/kompare/komparenavtreepart/komparenavtreepart.cpp
+++ b/kompare/komparenavtreepart/komparenavtreepart.cpp
@@ -37,8 +37,8 @@
using namespace Diff2;
-KompareNavTreePart::KompareNavTreePart( TQWidget* tqparent, const char* name )
- : KParts::ReadOnlyPart( TQT_TQOBJECT(tqparent), name ),
+KompareNavTreePart::KompareNavTreePart( TQWidget* parent, const char* name )
+ : KParts::ReadOnlyPart( TQT_TQOBJECT(parent), name ),
m_splitter( 0 ),
m_modelList( 0 ),
m_srcDirTree( 0 ),
@@ -453,7 +453,7 @@ void KChangeLVI::setDifferenceText()
setText( 2, text );
}
-KChangeLVI::KChangeLVI( KListView* tqparent, Difference* diff ) : KListViewItem( tqparent )
+KChangeLVI::KChangeLVI( KListView* parent, Difference* diff ) : KListViewItem( parent )
{
m_difference = diff;
@@ -487,7 +487,7 @@ KChangeLVI::~KChangeLVI()
{
}
-KFileLVI::KFileLVI( KListView* tqparent, DiffModel* model ) : KListViewItem( tqparent )
+KFileLVI::KFileLVI( KListView* parent, DiffModel* model ) : KListViewItem( parent )
{
m_model = model;
@@ -519,7 +519,7 @@ KFileLVI::~KFileLVI()
{
}
-KDirLVI::KDirLVI( KListView* tqparent, TQString& dir ) : KListViewItem( tqparent )
+KDirLVI::KDirLVI( KListView* parent, TQString& dir ) : KListViewItem( parent )
{
// kdDebug(8105) << "KDirLVI (KListView) constructor called with dir = " << dir << endl;
m_rootItem = true;
@@ -533,7 +533,7 @@ KDirLVI::KDirLVI( KListView* tqparent, TQString& dir ) : KListViewItem( tqparent
setText( 0, m_dirName );
}
-KDirLVI::KDirLVI( KDirLVI* tqparent, TQString& dir ) : KListViewItem( tqparent )
+KDirLVI::KDirLVI( KDirLVI* parent, TQString& dir ) : KListViewItem( parent )
{
// kdDebug(8105) << "KDirLVI (KDirLVI) constructor called with dir = " << dir << endl;
m_rootItem = false;
@@ -619,7 +619,7 @@ TQString KDirLVI::fullPath( TQString& path )
path = path.prepend( m_dirName );
- KDirLVI* lviParent = dynamic_cast<KDirLVI*>( tqparent() );
+ KDirLVI* lviParent = dynamic_cast<KDirLVI*>( parent() );
if ( lviParent )
{
path = lviParent->fullPath( path );
@@ -676,7 +676,7 @@ KompareNavTreePartFactory::~KompareNavTreePartFactory()
}
KParts::Part* KompareNavTreePartFactory::createPartObject( TQWidget* parentWidget, const char* widgetName,
- TQObject* /*tqparent*/, const char* /*name*/,
+ TQObject* /*parent*/, const char* /*name*/,
const char* /*classname*/, const TQStringList & /*args*/ )
{
// Create an instance of our Part
diff --git a/kompare/komparenavtreepart/komparenavtreepart.h b/kompare/komparenavtreepart/komparenavtreepart.h
index 45a16001..b0177a8c 100644
--- a/kompare/komparenavtreepart/komparenavtreepart.h
+++ b/kompare/komparenavtreepart/komparenavtreepart.h
@@ -50,7 +50,7 @@ class KompareNavTreePart : public KParts::ReadOnlyPart
TQ_OBJECT
public:
- KompareNavTreePart( TQWidget* tqparent = 0L, const char* name = 0L );
+ KompareNavTreePart( TQWidget* parent = 0L, const char* name = 0L );
virtual ~KompareNavTreePart();
public:
@@ -88,7 +88,7 @@ private:
TQString compareFromEndAndReturnSame( const TQString& string1, const TQString& string2 );
void addDirToTreeView( enum Kompare::Target, const TQString& filename );
- KListViewItem* findDirInDirTree( const KListViewItem* tqparent, const TQString& dir );
+ KListViewItem* findDirInDirTree( const KListViewItem* parent, const TQString& dir );
// KListViewItem* firstItem();
// KListViewItem* lastItem();
@@ -125,7 +125,7 @@ private:
class KChangeLVI : public KListViewItem
{
public:
- KChangeLVI( KListView* tqparent, Diff2::Difference* diff );
+ KChangeLVI( KListView* parent, Diff2::Difference* diff );
~KChangeLVI();
public:
Diff2::Difference* difference() { return m_difference; };
@@ -139,7 +139,7 @@ private:
class KFileLVI : public KListViewItem
{
public:
- KFileLVI( KListView* tqparent, Diff2::DiffModel* model );
+ KFileLVI( KListView* parent, Diff2::DiffModel* model );
~KFileLVI();
public:
Diff2::DiffModel* model() { return m_model; };
@@ -151,8 +151,8 @@ private:
class KDirLVI : public KListViewItem
{
public:
- KDirLVI( KDirLVI* tqparent, TQString& dir );
- KDirLVI( KListView* tqparent, TQString& dir );
+ KDirLVI( KDirLVI* parent, TQString& dir );
+ KDirLVI( KListView* parent, TQString& dir );
~KDirLVI();
public:
void addModel( TQString& dir, Diff2::DiffModel* model, TQPtrDict<KDirLVI>* modelToDirItemDict );
@@ -181,7 +181,7 @@ public:
KompareNavTreePartFactory();
virtual ~KompareNavTreePartFactory();
virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName,
- TQObject *tqparent, const char *name,
+ TQObject *parent, const char *name,
const char *classname, const TQStringList &args );
static KInstance* instance();
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:
diff --git a/kompare/kompareurldialog.cpp b/kompare/kompareurldialog.cpp
index be28295c..d24abaf9 100644
--- a/kompare/kompareurldialog.cpp
+++ b/kompare/kompareurldialog.cpp
@@ -32,8 +32,8 @@
#include "kompareurldialog.h"
-KompareURLDialog::KompareURLDialog( TQWidget *tqparent, const char *name )
- : KDialogBase( IconList, "", Ok|Cancel, Ok, tqparent, name )
+KompareURLDialog::KompareURLDialog( TQWidget *parent, const char *name )
+ : KDialogBase( IconList, "", Ok|Cancel, Ok, parent, name )
{
setIconListAllVisible(true);
diff --git a/kompare/kompareurldialog.h b/kompare/kompareurldialog.h
index 2bc2a929..14e3ed47 100644
--- a/kompare/kompareurldialog.h
+++ b/kompare/kompareurldialog.h
@@ -44,7 +44,7 @@ class KompareURLDialog : public KDialogBase
TQ_OBJECT
public:
- KompareURLDialog( TQWidget* tqparent = 0, const char* name = 0 );
+ KompareURLDialog( TQWidget* parent = 0, const char* name = 0 );
~KompareURLDialog();
KURL getFirstURL() const;
diff --git a/kompare/libdialogpages/diffpage.cpp b/kompare/libdialogpages/diffpage.cpp
index 70c8af2b..8e6d55e5 100644
--- a/kompare/libdialogpages/diffpage.cpp
+++ b/kompare/libdialogpages/diffpage.cpp
@@ -42,7 +42,7 @@
#include "diffpage.h"
-DiffPage::DiffPage( TQWidget* tqparent ) : PageBase( tqparent ),
+DiffPage::DiffPage( TQWidget* parent ) : PageBase( parent ),
m_ignoreRegExpDialog( 0 )
{
addDiffTab();
diff --git a/kompare/libdialogpages/diffsettings.cpp b/kompare/libdialogpages/diffsettings.cpp
index 3f7cb1be..6c2186f5 100644
--- a/kompare/libdialogpages/diffsettings.cpp
+++ b/kompare/libdialogpages/diffsettings.cpp
@@ -19,8 +19,8 @@
#include "diffsettings.h"
-DiffSettings::DiffSettings( TQWidget* tqparent )
- : SettingsBase( tqparent ),
+DiffSettings::DiffSettings( TQWidget* parent )
+ : SettingsBase( parent ),
m_linesOfContext( 0 ),
m_format( Kompare::Unified ),
m_largeFiles( false ),
diff --git a/kompare/libdialogpages/diffsettings.h b/kompare/libdialogpages/diffsettings.h
index 3d219c96..23bbb6ea 100644
--- a/kompare/libdialogpages/diffsettings.h
+++ b/kompare/libdialogpages/diffsettings.h
@@ -31,7 +31,7 @@ class DiffSettings : public SettingsBase
Q_OBJECT
TQ_OBJECT
public:
- DiffSettings( TQWidget* tqparent );
+ DiffSettings( TQWidget* parent );
virtual ~DiffSettings();
public:
// some virtual functions that will be overloaded from the base class
diff --git a/kompare/libdialogpages/filespage.cpp b/kompare/libdialogpages/filespage.cpp
index fd0f6de6..0bbc87fe 100644
--- a/kompare/libdialogpages/filespage.cpp
+++ b/kompare/libdialogpages/filespage.cpp
@@ -31,7 +31,7 @@
#include "filessettings.h"
#include "filespage.h"
-FilesPage::FilesPage( TQWidget* tqparent ) : PageBase( tqparent ), m_URLChanged( false )
+FilesPage::FilesPage( TQWidget* parent ) : PageBase( parent ), m_URLChanged( false )
{
TQWidget* page = new TQWidget( this );
TQVBoxLayout* tqlayout = new TQVBoxLayout( page );
diff --git a/kompare/libdialogpages/filespage.h b/kompare/libdialogpages/filespage.h
index 24380f7c..ef66771b 100644
--- a/kompare/libdialogpages/filespage.h
+++ b/kompare/libdialogpages/filespage.h
@@ -38,7 +38,7 @@ class FilesPage : PageBase
Q_OBJECT
TQ_OBJECT
public:
- FilesPage( TQWidget* tqparent );
+ FilesPage( TQWidget* parent );
virtual ~FilesPage();
public:
diff --git a/kompare/libdialogpages/filessettings.cpp b/kompare/libdialogpages/filessettings.cpp
index fa982a12..01b70076 100644
--- a/kompare/libdialogpages/filessettings.cpp
+++ b/kompare/libdialogpages/filessettings.cpp
@@ -21,8 +21,8 @@
#include "filessettings.h"
-FilesSettings::FilesSettings( TQWidget* tqparent )
- : SettingsBase( tqparent )
+FilesSettings::FilesSettings( TQWidget* parent )
+ : SettingsBase( parent )
{
}
diff --git a/kompare/libdialogpages/filessettings.h b/kompare/libdialogpages/filessettings.h
index a2e5898b..8b8a8342 100644
--- a/kompare/libdialogpages/filessettings.h
+++ b/kompare/libdialogpages/filessettings.h
@@ -30,7 +30,7 @@ class FilesSettings : public SettingsBase
Q_OBJECT
TQ_OBJECT
public:
- FilesSettings( TQWidget* tqparent );
+ FilesSettings( TQWidget* parent );
virtual ~FilesSettings();
public:
diff --git a/kompare/libdialogpages/pagebase.cpp b/kompare/libdialogpages/pagebase.cpp
index bf13986b..33c45dba 100644
--- a/kompare/libdialogpages/pagebase.cpp
+++ b/kompare/libdialogpages/pagebase.cpp
@@ -22,7 +22,7 @@
#include "pagebase.h"
-PageBase::PageBase( TQWidget* tqparent ) : KTabCtl( tqparent )
+PageBase::PageBase( TQWidget* parent ) : KTabCtl( parent )
{
}
diff --git a/kompare/libdialogpages/settingsbase.cpp b/kompare/libdialogpages/settingsbase.cpp
index 36f70a1b..6e347719 100644
--- a/kompare/libdialogpages/settingsbase.cpp
+++ b/kompare/libdialogpages/settingsbase.cpp
@@ -21,7 +21,7 @@
#include "settingsbase.h"
-SettingsBase::SettingsBase( TQWidget* tqparent ) : TQObject( tqparent )
+SettingsBase::SettingsBase( TQWidget* parent ) : TQObject( parent )
{
}
diff --git a/kompare/libdialogpages/settingsbase.h b/kompare/libdialogpages/settingsbase.h
index 79e556cc..98e85308 100644
--- a/kompare/libdialogpages/settingsbase.h
+++ b/kompare/libdialogpages/settingsbase.h
@@ -32,7 +32,7 @@ class SettingsBase : public TQObject
Q_OBJECT
TQ_OBJECT
public:
- SettingsBase( TQWidget* tqparent );
+ SettingsBase( TQWidget* parent );
~SettingsBase();
public:
diff --git a/kompare/libdialogpages/viewpage.cpp b/kompare/libdialogpages/viewpage.cpp
index f7261011..827e8a4d 100644
--- a/kompare/libdialogpages/viewpage.cpp
+++ b/kompare/libdialogpages/viewpage.cpp
@@ -33,7 +33,7 @@
#include "viewpage.h"
#include "viewsettings.h"
-ViewPage::ViewPage( TQWidget* tqparent ) : PageBase( tqparent )
+ViewPage::ViewPage( TQWidget* parent ) : PageBase( parent )
{
TQWidget* page;
TQVBoxLayout* tqlayout;
diff --git a/kompare/libdialogpages/viewsettings.cpp b/kompare/libdialogpages/viewsettings.cpp
index 8e61117e..403746b1 100644
--- a/kompare/libdialogpages/viewsettings.cpp
+++ b/kompare/libdialogpages/viewsettings.cpp
@@ -31,8 +31,8 @@ const TQColor ViewSettings::default_changeColor (237, 190, 190);
const TQColor ViewSettings::default_addColor (190, 190, 237);
const TQColor ViewSettings::default_appliedColor(237, 237, 190);
-ViewSettings::ViewSettings( TQWidget* tqparent )
- : SettingsBase( tqparent ),
+ViewSettings::ViewSettings( TQWidget* parent )
+ : SettingsBase( parent ),
m_removeColor( 0, 0, 0 ),
m_changeColor( 0, 0, 0),
m_addColor( 0, 0, 0),
diff --git a/kompare/libdialogpages/viewsettings.h b/kompare/libdialogpages/viewsettings.h
index c7a2cfd5..3d314afe 100644
--- a/kompare/libdialogpages/viewsettings.h
+++ b/kompare/libdialogpages/viewsettings.h
@@ -36,7 +36,7 @@ public:
static const TQColor default_addColor;
static const TQColor default_appliedColor;
- ViewSettings( TQWidget* tqparent );
+ ViewSettings( TQWidget* parent );
~ViewSettings();
public:
// some virtual functions that will be overloaded from the base class
diff --git a/kompare/libdiff2/komparemodellist.cpp b/kompare/libdiff2/komparemodellist.cpp
index ada2b949..89912eac 100644
--- a/kompare/libdiff2/komparemodellist.cpp
+++ b/kompare/libdiff2/komparemodellist.cpp
@@ -46,8 +46,8 @@
using namespace Diff2;
-KompareModelList::KompareModelList( DiffSettings* diffSettings, struct Kompare::Info& info, TQObject* tqparent, const char* name )
- : TQObject( tqparent, name ),
+KompareModelList::KompareModelList( DiffSettings* diffSettings, struct Kompare::Info& info, TQObject* parent, const char* name )
+ : TQObject( parent, name ),
m_diffProcess( 0 ),
m_diffSettings( diffSettings ),
m_models( 0 ),
@@ -60,32 +60,32 @@ KompareModelList::KompareModelList( DiffSettings* diffSettings, struct Kompare::
{
m_applyDifference = new KAction( i18n("&Apply Difference"), "1rightarrow", TQt::Key_Space,
this, TQT_SLOT(slotActionApplyDifference()),
- (( KomparePart* )tqparent)->actionCollection(), "difference_apply" );
+ (( KomparePart* )parent)->actionCollection(), "difference_apply" );
m_unApplyDifference = new KAction( i18n("Un&apply Difference"), "1leftarrow", TQt::Key_BackSpace,
this, TQT_SLOT(slotActionUnApplyDifference()),
- (( KomparePart* )tqparent)->actionCollection(), "difference_unapply" );
+ (( KomparePart* )parent)->actionCollection(), "difference_unapply" );
m_applyAll = new KAction( i18n("App&ly All"), "2rightarrow", TQt::CTRL + TQt::Key_A,
this, TQT_SLOT(slotActionApplyAllDifferences()),
- (( KomparePart* )tqparent)->actionCollection(), "difference_applyall" );
+ (( KomparePart* )parent)->actionCollection(), "difference_applyall" );
m_unapplyAll = new KAction( i18n("&Unapply All"), "2leftarrow", TQt::CTRL + TQt::Key_U,
this, TQT_SLOT(slotActionUnapplyAllDifferences()),
- (( KomparePart* )tqparent)->actionCollection(), "difference_unapplyall" );
+ (( KomparePart* )parent)->actionCollection(), "difference_unapplyall" );
m_previousFile = new KAction( i18n("P&revious File"), "2uparrow", TQt::CTRL + TQt::Key_PageUp,
this, TQT_SLOT(slotPreviousModel()),
- (( KomparePart* )tqparent)->actionCollection(), "difference_previousfile" );
+ (( KomparePart* )parent)->actionCollection(), "difference_previousfile" );
m_nextFile = new KAction( i18n("N&ext File"), "2downarrow", TQt::CTRL + TQt::Key_PageDown,
this, TQT_SLOT(slotNextModel()),
- (( KomparePart* )tqparent)->actionCollection(), "difference_nextfile" );
+ (( KomparePart* )parent)->actionCollection(), "difference_nextfile" );
m_previousDifference = new KAction( i18n("&Previous Difference"), "1uparrow", TQt::CTRL + TQt::Key_Up,
this, TQT_SLOT(slotPreviousDifference()),
- (( KomparePart* )tqparent)->actionCollection(), "difference_previous" );
+ (( KomparePart* )parent)->actionCollection(), "difference_previous" );
m_nextDifference = new KAction( i18n("&Next Difference"), "1downarrow", TQt::CTRL + TQt::Key_Down,
this, TQT_SLOT(slotNextDifference()),
- (( KomparePart* )tqparent)->actionCollection(), "difference_next" );
+ (( KomparePart* )parent)->actionCollection(), "difference_next" );
m_previousDifference->setEnabled( false );
m_nextDifference->setEnabled( false );
- m_save = KStdAction::save( this, TQT_SLOT(slotSaveDestination()), ((KomparePart*)tqparent)->actionCollection() );
+ m_save = KStdAction::save( this, TQT_SLOT(slotSaveDestination()), ((KomparePart*)parent)->actionCollection() );
m_save->setEnabled( false );
updateModelListActions();
@@ -361,21 +361,21 @@ bool KompareModelList::saveDestination( DiffModel* model )
kdDebug(8101) << "Tempfilename : " << temp->name() << endl;
kdDebug(8101) << "DestinationURL : " << destination << endl;
KIO::UDSEntry entry;
- if ( !KIO::NetAccess::stat( KURL( destination ).path(), entry, (TQWidget*)tqparent() ) )
+ if ( !KIO::NetAccess::stat( KURL( destination ).path(), entry, (TQWidget*)parent() ) )
{
- if ( !KIO::NetAccess::mkdir( KURL( destination ).path(), (TQWidget*)tqparent() ) )
+ if ( !KIO::NetAccess::mkdir( KURL( destination ).path(), (TQWidget*)parent() ) )
{
emit error( i18n( "<qt>Could not create destination directory <b>%1</b>.\nThe file has not been saved.</qt>" ) );
return false;
}
}
- result = KIO::NetAccess::upload( temp->name(), KURL( destination ), (TQWidget*)tqparent() );
+ result = KIO::NetAccess::upload( temp->name(), KURL( destination ), (TQWidget*)parent() );
}
else
{
kdDebug(8101) << "Tempfilename : " << temp->name() << endl;
kdDebug(8101) << "DestinationURL : " << m_destination << endl;
- result = KIO::NetAccess::upload( temp->name(), KURL( m_destination ), (TQWidget*)tqparent() );
+ result = KIO::NetAccess::upload( temp->name(), KURL( m_destination ), (TQWidget*)parent() );
}
if ( !result )
@@ -613,7 +613,7 @@ void KompareModelList::slotWriteDiffOutput( bool success )
emit error( i18n( "Could not write to the temporary file." ) );
}
- KIO::NetAccess::upload( m_diffTemp->name(), KURL( m_diffURL ), (TQWidget*)tqparent() );
+ KIO::NetAccess::upload( m_diffTemp->name(), KURL( m_diffURL ), (TQWidget*)parent() );
emit status( Kompare::FinishedWritingDiff );
}
@@ -1272,7 +1272,7 @@ void KompareModelList::updateModelListActions()
{
if ( m_models && m_selectedModel && m_selectedDifference )
{
- if ( ( ( KomparePart* )tqparent() )->isReadWrite() )
+ if ( ( ( KomparePart* )parent() )->isReadWrite() )
{
if ( m_selectedModel->appliedCount() != m_selectedModel->differenceCount() )
m_applyAll->setEnabled( true );
diff --git a/kompare/libdiff2/komparemodellist.h b/kompare/libdiff2/komparemodellist.h
index f4fb797e..22230db0 100644
--- a/kompare/libdiff2/komparemodellist.h
+++ b/kompare/libdiff2/komparemodellist.h
@@ -43,7 +43,7 @@ class KompareModelList : public TQObject
Q_OBJECT
TQ_OBJECT
public:
- KompareModelList( DiffSettings* diffSettings, struct Kompare::Info& info, TQObject* tqparent = 0, const char* name = 0 );
+ KompareModelList( DiffSettings* diffSettings, struct Kompare::Info& info, TQObject* parent = 0, const char* name = 0 );
~KompareModelList();
public: