Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 files changed, 12 insertions, 12 deletions

diff --git a/kompare/komparenavtreepart/komparenavtreepart.cpp b/kompare/komparenavtreepart/komparenavtreepart.cpp
index 1fe65b4f..a8c5e8f2 100644
--- a/kompare/komparenavtreepart/komparenavtreepart.cpp
+++ b/kompare/komparenavtreepart/komparenavtreepart.cpp
@@ -675,12 +675,12 @@ KompareNavTreePartFactory::~KompareNavTreePartFactory()
 	s_instance = 0L;
 }
 
-KParts::Part* KompareNavTreePartFactory::createPartObject( TQWidget* tqparentWidget, const char* widgetName,
+KParts::Part* KompareNavTreePartFactory::createPartObject( TQWidget* parentWidget, const char* widgetName,
                                                   TQObject* /*tqparent*/, const char* /*name*/,
                                                   const char* /*classname*/, const TQStringList & /*args*/ )
 {
 	// Create an instance of our Part
-	KompareNavTreePart* obj = new KompareNavTreePart( tqparentWidget, widgetName );
+	KompareNavTreePart* obj = new KompareNavTreePart( parentWidget, widgetName );
 
 	KGlobal::locale()->insertCatalogue("kompare");
 
diff --git a/kompare/komparenavtreepart/komparenavtreepart.h b/kompare/komparenavtreepart/komparenavtreepart.h
index 6fa0667b..45a16001 100644
--- a/kompare/komparenavtreepart/komparenavtreepart.h
+++ b/kompare/komparenavtreepart/komparenavtreepart.h
@@ -180,7 +180,7 @@ class KompareNavTreePartFactory : public KParts::Factory
 public:
 	KompareNavTreePartFactory();
 	virtual ~KompareNavTreePartFactory();
-	virtual KParts::Part* createPartObject( TQWidget *tqparentWidget, const char *widgetName,
+	virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName,
 	                                        TQObject *tqparent, 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 24c23ffe..1ea3217e 100644
--- a/kompare/komparepart/kompare_part.cpp
+++ b/kompare/komparepart/kompare_part.cpp
@@ -56,7 +56,7 @@ K_EXPORT_COMPONENT_FACTORY( libkomparepart, KomparePartFactory )
 ViewSettings* KomparePart::m_viewSettings = 0L;
 DiffSettings* KomparePart::m_diffSettings = 0L;
 
-KomparePart::KomparePart( TQWidget *tqparentWidget, const char *widgetName,
+KomparePart::KomparePart( TQWidget *parentWidget, const char *widgetName,
                           TQObject *tqparent, const char *name, const TQStringList & /*args*/ ) :
 	KParts::ReadWritePart(tqparent, name),
 	m_tempDiff( 0 ),
@@ -116,7 +116,7 @@ KomparePart::KomparePart( TQWidget *tqparentWidget, const char *widgetName,
 	         this, TQT_SIGNAL(applyDifference(const Diff2::Difference*, bool)) );
 
 	// This creates the splitterwidget and connects the signals and slots
-	m_splitter = new KompareSplitter ( m_viewSettings, tqparentWidget, widgetName );
+	m_splitter = new KompareSplitter ( m_viewSettings, parentWidget, widgetName );
 
 	connect( m_modelList, TQT_SIGNAL(setSelection(const Diff2::DiffModel*, const Diff2::Difference*)),
 	         m_splitter,  TQT_SLOT(slotSetSelection(const Diff2::DiffModel*, const Diff2::Difference*)) );
@@ -136,7 +136,7 @@ KomparePart::KomparePart( TQWidget *tqparentWidget, const char *widgetName,
 	connect( this, TQT_SIGNAL(configChanged()), m_splitter, TQT_SIGNAL(configChanged()) );
 
 	// notify the part that this is our internal widget
-	setWidget( m_splitter->tqparentWidget() );
+	setWidget( m_splitter->parentWidget() );
 
 	setupActions();
 
diff --git a/kompare/komparepart/kompare_part.h b/kompare/komparepart/kompare_part.h
index 33c19a64..985fe6fc 100644
--- a/kompare/komparepart/kompare_part.h
+++ b/kompare/komparepart/kompare_part.h
@@ -65,7 +65,7 @@ public:
 	/**
 	* Default constructor
 	*/
-	KomparePart( TQWidget *tqparentWidget, const char *widgetName,
+	KomparePart( TQWidget *parentWidget, const char *widgetName,
 	             TQObject *tqparent, const char *name, const TQStringList & /*args*/);
 
 	/**
diff --git a/kompare/komparepart/kompareconnectwidget.cpp b/kompare/komparepart/kompareconnectwidget.cpp
index 6b70ff4e..50c8f221 100644
--- a/kompare/komparepart/kompareconnectwidget.cpp
+++ b/kompare/komparepart/kompareconnectwidget.cpp
@@ -78,7 +78,7 @@ void KompareConnectWidgetFrame::mouseMoveEvent( TQMouseEvent *e )
 	if ( !(e->state()&Qt::LeftButton) )
 		return;
 
-	TQCOORD pos = s->pick( tqparentWidget()->mapFromGlobal(e->globalPos()) )
+	TQCOORD pos = s->pick( parentWidget()->mapFromGlobal(e->globalPos()) )
 		- kMouseOffset;
 
 	((KompareSplitter*)s)->moveSplitter( pos, id() );
@@ -94,7 +94,7 @@ void KompareConnectWidgetFrame::mousePressEvent( TQMouseEvent *e )
 void KompareConnectWidgetFrame::mouseReleaseEvent( TQMouseEvent *e )
 {
 	if ( !opaque() && e->button() == Qt::LeftButton ) {
-		TQCOORD pos = s->pick( tqparentWidget()->mapFromGlobal(e->globalPos()) )
+		TQCOORD pos = s->pick( parentWidget()->mapFromGlobal(e->globalPos()) )
 			- kMouseOffset;
 		((KompareSplitter*)s)->moveSplitter( pos, id() );
     }
@@ -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->tqparentWidget() );
+	setFocusProxy( tqparent->parentWidget() );
 }
 
 KompareConnectWidget::~KompareConnectWidget()
diff --git a/kompare/komparepart/komparelistview.cpp b/kompare/komparepart/komparelistview.cpp
index 7dd21845..5bf8e910 100644
--- a/kompare/komparepart/komparelistview.cpp
+++ b/kompare/komparepart/komparelistview.cpp
@@ -125,7 +125,7 @@ KompareListView::KompareListView( bool isSource,
 	setFocusPolicy( TQ_NoFocus );
 	setFont( m_settings->m_font );
 	setSpaces( m_settings->m_tabToNumberOfSpaces );
-	setFocusProxy( tqparent->tqparentWidget() );
+	setFocusProxy( tqparent->parentWidget() );
 }
 
 KompareListView::~KompareListView()
diff --git a/kompare/komparepart/komparesaveoptionsbase.ui b/kompare/komparepart/komparesaveoptionsbase.ui
index 29ac061b..7636a27f 100644
--- a/kompare/komparepart/komparesaveoptionsbase.ui
+++ b/kompare/komparepart/komparesaveoptionsbase.ui
@@ -332,5 +332,5 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>