rename the following methods:

tqparent parent
tqmask mask


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

6 files changed, 11 insertions, 11 deletions

diff --git a/kview/kviewcanvas/config/confmodules.cpp b/kview/kviewcanvas/config/confmodules.cpp
index a90c1024..f9cf90cc 100644
--- a/kview/kviewcanvas/config/confmodules.cpp
+++ b/kview/kviewcanvas/config/confmodules.cpp
@@ -34,8 +34,8 @@
 typedef KGenericFactory<KViewCanvasConfig, TQWidget> KViewCanvasConfigFactory;
 K_EXPORT_COMPONENT_FACTORY( kcm_kviewcanvasconfig, KViewCanvasConfigFactory( "kcm_kviewcanvasconfig" ) )
 
-KViewCanvasConfig::KViewCanvasConfig( TQWidget * tqparent, const char *, const TQStringList & args )
-	: KCModule( KViewCanvasConfigFactory::instance(), tqparent, args )
+KViewCanvasConfig::KViewCanvasConfig( TQWidget * parent, const char *, const TQStringList & args )
+	: KCModule( KViewCanvasConfigFactory::instance(), parent, args )
 	, m_config( new KConfig( "kviewcanvasrc" ) )
 {
 	TQBoxLayout * tqlayout = new TQVBoxLayout( this );
diff --git a/kview/kviewcanvas/config/confmodules.h b/kview/kviewcanvas/config/confmodules.h
index 95fa00c6..d8760ff4 100644
--- a/kview/kviewcanvas/config/confmodules.h
+++ b/kview/kviewcanvas/config/confmodules.h
@@ -31,7 +31,7 @@ class KViewCanvasConfig : public KCModule
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		KViewCanvasConfig( TQWidget * tqparent, const char * name = 0, const TQStringList & args = TQStringList() );
+		KViewCanvasConfig( TQWidget * parent, const char * name = 0, const TQStringList & args = TQStringList() );
 		~KViewCanvasConfig();
 
 		void load();
diff --git a/kview/kviewcanvas/kimagecanvas.cpp b/kview/kviewcanvas/kimagecanvas.cpp
index d3a8608b..a2e6c5b7 100644
--- a/kview/kviewcanvas/kimagecanvas.cpp
+++ b/kview/kviewcanvas/kimagecanvas.cpp
@@ -43,8 +43,8 @@ typedef KGenericFactory<KImageCanvas> KImageCanvasFactory;
 K_EXPORT_COMPONENT_FACTORY( libkviewcanvas,
 		KImageCanvasFactory( "kviewcanvas" ) )
 
-KImageCanvas::KImageCanvas( TQWidget * tqparent, const char * name, const TQStringList & )
-	: TQScrollView( tqparent, name, WResizeNoErase | WStaticContents )
+KImageCanvas::KImageCanvas( TQWidget * parent, const char * name, const TQStringList & )
+	: TQScrollView( parent, name, WResizeNoErase | WStaticContents )
 	, m_client( 0 )
 	, m_oldClient( 0 )
 	, m_image( 0 )
diff --git a/kview/kviewcanvas/kimagecanvas.h b/kview/kviewcanvas/kimagecanvas.h
index c7af475e..52b49aca 100644
--- a/kview/kviewcanvas/kimagecanvas.h
+++ b/kview/kviewcanvas/kimagecanvas.h
@@ -47,7 +47,7 @@ class KDE_EXPORT KImageCanvas : public TQScrollView, public KImageViewer::Canvas
 		/**
 		 * KImageCanvas Constructor
 		 */
-		KImageCanvas( TQWidget * tqparent, const char * name, const TQStringList & args );
+		KImageCanvas( TQWidget * parent, const char * name, const TQStringList & args );
 
 		/**
 		 * KImageCanvas Destructor
diff --git a/kview/kviewcanvas/kimageholder.cpp b/kview/kviewcanvas/kimageholder.cpp
index 1bf3df98..f2e54462 100644
--- a/kview/kviewcanvas/kimageholder.cpp
+++ b/kview/kviewcanvas/kimageholder.cpp
@@ -33,8 +33,8 @@
 
 #include "kimageholder.h"
 
-KImageHolder::KImageHolder( TQWidget * tqparent, const char * name )
-	: TQWidget( tqparent, name, TQt::WResizeNoErase | TQt::WRepaintNoErase )
+KImageHolder::KImageHolder( TQWidget * parent, const char * name )
+	: TQWidget( parent, name, TQt::WResizeNoErase | TQt::WRepaintNoErase )
 	, m_selected( false )
 	, m_bSelecting( false )
 	, m_scrollTimerId( 0 )
@@ -96,7 +96,7 @@ void KImageHolder::mouseMoveEvent( TQMouseEvent *ev )
 		}
 		else // create a selection
 		{
-			TQWidget * parentwidget = ( TQWidget* )tqparent();
+			TQWidget * parentwidget = ( TQWidget* )parent();
 			if( ! m_bSelecting )
 			{
 				m_bSelecting = true;
@@ -282,7 +282,7 @@ void KImageHolder::paintEvent( TQPaintEvent *ev )
 	painter.setClipRegion( ev->region().intersect( m_drawRect ) );
 	if( m_pPixmap )
 	{
-		if( m_pPixmap->tqmask() )
+		if( m_pPixmap->mask() )
 		{
 			if( ! m_pDoubleBuffer )
 			{
diff --git a/kview/kviewcanvas/kimageholder.h b/kview/kviewcanvas/kimageholder.h
index d8d220c0..165ec0bc 100644
--- a/kview/kviewcanvas/kimageholder.h
+++ b/kview/kviewcanvas/kimageholder.h
@@ -37,7 +37,7 @@ class KImageHolder : public TQWidget
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		KImageHolder( TQWidget *tqparent = 0, const char * name = 0 );
+		KImageHolder( TQWidget *parent = 0, const char * name = 0 );
 
 		virtual ~KImageHolder();