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

23 files changed, 31 insertions, 31 deletions

diff --git a/kcoloredit/colorselector.cpp b/kcoloredit/colorselector.cpp
index af209147..acf1fd06 100644
--- a/kcoloredit/colorselector.cpp
+++ b/kcoloredit/colorselector.cpp
@@ -30,7 +30,7 @@
 #include "texteditselection.h"
 #include "colorselector.h"
 
-ColorSelector::ColorSelector(TQWidget *tqparent, const char *name ) : TQWidget(tqparent, name) {
+ColorSelector::ColorSelector(TQWidget *parent, const char *name ) : TQWidget(parent, name) {
 	fComponentsMode = false;
 	TQVBoxLayout* topLayout = new TQVBoxLayout(this, 4);
 	/*
diff --git a/kcoloredit/colorselector.h b/kcoloredit/colorselector.h
index 5c3d9b62..4a02c1e0 100644
--- a/kcoloredit/colorselector.h
+++ b/kcoloredit/colorselector.h
@@ -35,7 +35,7 @@ class ColorSelector : public TQWidget  {
 
 public:
 	/** constructs a color selector widget */
-	ColorSelector(TQWidget *tqparent=0, const char *name=0);
+	ColorSelector(TQWidget *parent=0, const char *name=0);
 	~ColorSelector();
 	/** @return the selected color */
 	const Color& color();
diff --git a/kcoloredit/gradientselection.cpp b/kcoloredit/gradientselection.cpp
index 1399a952..fd1b7a87 100644
--- a/kcoloredit/gradientselection.cpp
+++ b/kcoloredit/gradientselection.cpp
@@ -24,7 +24,7 @@
 #include "main.h"
 #include "gradientselection.h"
 
-GradientSelection::GradientSelection(TQWidget *tqparent, const char *name ) : TQWidget(tqparent,name) {
+GradientSelection::GradientSelection(TQWidget *parent, const char *name ) : TQWidget(parent,name) {
 	TQGridLayout* topLayout = new TQGridLayout(this, 2, 2, 0);
 	TQHBoxLayout* tqlayout = new TQHBoxLayout(0);
 	tqlayout->setMargin(3);
diff --git a/kcoloredit/gradientselection.h b/kcoloredit/gradientselection.h
index e3e58d1c..526e5696 100644
--- a/kcoloredit/gradientselection.h
+++ b/kcoloredit/gradientselection.h
@@ -36,7 +36,7 @@ class GradientSelection : public TQWidget  {
 
 public:
 	/** Constructs the widget */
-	GradientSelection(TQWidget *tqparent=0, const char *name=0);
+	GradientSelection(TQWidget *parent=0, const char *name=0);
 	~GradientSelection();
 	/** Enables or disables the color synchronize button */
 	void enableSynchronizeColorButton(bool enable);
diff --git a/kcoloredit/imageselection.cpp b/kcoloredit/imageselection.cpp
index a82bdfdb..b6d47c47 100644
--- a/kcoloredit/imageselection.cpp
+++ b/kcoloredit/imageselection.cpp
@@ -17,7 +17,7 @@
 
 #include "imageselection.h"
 
-ImageSelection::ImageSelection(TQWidget *tqparent, const char *name ) : TQWidget(tqparent,name) {
+ImageSelection::ImageSelection(TQWidget *parent, const char *name ) : TQWidget(parent,name) {
 }
 ImageSelection::~ImageSelection(){
 }
diff --git a/kcoloredit/imageselection.h b/kcoloredit/imageselection.h
index a773cdcc..769382d2 100644
--- a/kcoloredit/imageselection.h
+++ b/kcoloredit/imageselection.h
@@ -31,7 +31,7 @@ class ImageSelection : public TQWidget  {
 
 public:
 	/** constructs the widget */
-	ImageSelection(TQWidget *tqparent=0, const char *name=0);
+	ImageSelection(TQWidget *parent=0, const char *name=0);
 	~ImageSelection();
 	
 signals:
diff --git a/kcoloredit/kcoloreditdoc.cpp b/kcoloredit/kcoloreditdoc.cpp
index 449c78f3..0669380b 100644
--- a/kcoloredit/kcoloreditdoc.cpp
+++ b/kcoloredit/kcoloreditdoc.cpp
@@ -31,7 +31,7 @@
 #include "kcoloreditview.h"
 #include "resource.h"
 
-KColorEditDoc::KColorEditDoc(TQWidget *tqparent, const char *name) : TQObject(tqparent, name),
+KColorEditDoc::KColorEditDoc(TQWidget *parent, const char *name) : TQObject(parent, name),
 	m_palette(), m_paletteHistory(&m_palette, 0) {
 	m_pViewList = new TQPtrList<KColorEditView>();
 	m_pViewList->setAutoDelete(true);
@@ -106,7 +106,7 @@ bool KColorEditDoc::saveModified()
 
   if(m_modified)
   {
-    KColorEditApp *window=(KColorEditApp *) tqparent();
+    KColorEditApp *window=(KColorEditApp *) parent();
     int want_save = KMessageBox::warningYesNoCancel(window,
                                          i18n("The current file has been modified.\n"
                                               "Do you want to save it?"), TQString(), KStdGuiItem::save(), i18n("Do Not Save"));
@@ -175,7 +175,7 @@ bool KColorEditDoc::openDocument(const TQString& filename) {
 		setPaletteCursorPos(m_palette.length());
 		setPaletteSelection(0, 0);
 		slotRedrawAllViews(0, true);
-        KColorEditApp *window=(KColorEditApp*)tqparent();
+        KColorEditApp *window=(KColorEditApp*)parent();
         window->setCaption(m_title);
 	}
 	return true;
diff --git a/kcoloredit/kcoloreditdoc.h b/kcoloredit/kcoloreditdoc.h
index 9f65c25e..afbb65c0 100644
--- a/kcoloredit/kcoloreditdoc.h
+++ b/kcoloredit/kcoloreditdoc.h
@@ -51,7 +51,7 @@ class KColorEditDoc : public TQObject
 
   public:
     /** Constructor for the fileclass of the application */
-    KColorEditDoc(TQWidget *tqparent, const char *name=0);
+    KColorEditDoc(TQWidget *parent, const char *name=0);
     /** Destructor for the fileclass of the application */
     ~KColorEditDoc();
 
diff --git a/kcoloredit/kcoloreditview.cpp b/kcoloredit/kcoloreditview.cpp
index e7251ec7..32e61a06 100644
--- a/kcoloredit/kcoloreditview.cpp
+++ b/kcoloredit/kcoloreditview.cpp
@@ -35,7 +35,7 @@
 #include "kcoloredit.h"
 #include "palette.h"
 
-KColorEditView::KColorEditView(TQWidget *tqparent, const char *name) : TQSplitter(tqparent, name) {
+KColorEditView::KColorEditView(TQWidget *parent, const char *name) : TQSplitter(parent, name) {
 	colorSelector = new ColorSelector(this);
 	colorSelector->slotSetColor(
 		Color( RGB_MAX_COMPONENT_VALUE, RGB_MAX_COMPONENT_VALUE, RGB_MAX_COMPONENT_VALUE, "" ));
diff --git a/kcoloredit/kcoloreditview.h b/kcoloredit/kcoloreditview.h
index 1ede4427..74b16d43 100644
--- a/kcoloredit/kcoloreditview.h
+++ b/kcoloredit/kcoloreditview.h
@@ -47,11 +47,11 @@ class KColorEditView : public TQSplitter {
 
   public:
     /** Constructor for the main view */
-    KColorEditView(TQWidget *tqparent = 0, const char *name = 0);
+    KColorEditView(TQWidget *parent = 0, const char *name = 0);
     /** Destructor for the main view */
     ~KColorEditView();
 
-    /** returns a pointer to the document connected to the view instance. Mind that this method requires a KColorEditApp instance as a tqparent
+    /** returns a pointer to the document connected to the view instance. Mind that this method requires a KColorEditApp instance as a parent
      * widget to get to the window document pointer by calling the KColorEditApp::getDocument() method.
      *
      * @see KColorEditApp#getDocument
diff --git a/kcoloredit/kxycolorselector.cpp b/kcoloredit/kxycolorselector.cpp
index bcd58f00..68df676d 100644
--- a/kcoloredit/kxycolorselector.cpp
+++ b/kcoloredit/kxycolorselector.cpp
@@ -23,7 +23,7 @@
 
 #include "kxycolorselector.h"
 
-KXYColorSelector::KXYColorSelector(TQWidget *tqparent, const char *name) : KXYSelector(tqparent,name) {
+KXYColorSelector::KXYColorSelector(TQWidget *parent, const char *name) : KXYSelector(parent,name) {
 	setBackgroundMode(NoBackground);
 	setRange(0, 0, COMPONENT_SELECTION_RESOLUTION - 1, COMPONENT_SELECTION_RESOLUTION - 1);
 	setType(TYPE_NONE);
diff --git a/kcoloredit/kxycolorselector.h b/kcoloredit/kxycolorselector.h
index 263a39f3..ab6cf926 100644
--- a/kcoloredit/kxycolorselector.h
+++ b/kcoloredit/kxycolorselector.h
@@ -47,7 +47,7 @@ public:
 	/** Constructs a two-dimensional color component selector widget,
 	 *  with a type TYPE_NONE and ranges 0 .. MAX_COLOR_COMPONENT_VALUE
 	 */
-	KXYColorSelector(TQWidget *tqparent=0, const char *name=0);
+	KXYColorSelector(TQWidget *parent=0, const char *name=0);
 	~KXYColorSelector();
 	/** Set the type of the selector */
 	void setType(const int type);
diff --git a/kcoloredit/kzcolorselector.cpp b/kcoloredit/kzcolorselector.cpp
index b0f7914a..c705cad0 100644
--- a/kcoloredit/kzcolorselector.cpp
+++ b/kcoloredit/kzcolorselector.cpp
@@ -23,8 +23,8 @@
 #include "main.h"
 #include "kzcolorselector.h"
 
-KZColorSelector::KZColorSelector(Qt::Orientation o, TQWidget *tqparent, const char *name) :
-	KSelector(o, tqparent, name) {
+KZColorSelector::KZColorSelector(Qt::Orientation o, TQWidget *parent, const char *name) :
+	KSelector(o, parent, name) {
 	baseColorH = -1;
 	baseColorS = 0;
 	baseColorV = 0;
diff --git a/kcoloredit/kzcolorselector.h b/kcoloredit/kzcolorselector.h
index f226d744..6996817d 100644
--- a/kcoloredit/kzcolorselector.h
+++ b/kcoloredit/kzcolorselector.h
@@ -38,7 +38,7 @@ public:
 	       TYPE_V = 2 };
 
 	/** Constructs the widget */
-	KZColorSelector(Qt::Orientation o, TQWidget *tqparent=0, const char *name=0);
+	KZColorSelector(Qt::Orientation o, TQWidget *parent=0, const char *name=0);
 	~KZColorSelector();
 	/** Sets the selector type */
 	void setType(const int type);
diff --git a/kcoloredit/loadpalettedlg.cpp b/kcoloredit/loadpalettedlg.cpp
index 35fceb26..23def4d5 100644
--- a/kcoloredit/loadpalettedlg.cpp
+++ b/kcoloredit/loadpalettedlg.cpp
@@ -31,8 +31,8 @@
 #include "palette.h"
 #include "loadpalettedlg.h"
 
-LoadPaletteDlg::LoadPaletteDlg(TQWidget *tqparent, const char *name) 
-        : KDialogBase(tqparent, name, true, i18n( "Load Palette" ), 
+LoadPaletteDlg::LoadPaletteDlg(TQWidget *parent, const char *name) 
+        : KDialogBase(parent, name, true, i18n( "Load Palette" ), 
           Ok|Cancel, Ok, true) {
 	fileName = "";
     TQWidget *mainWidget = new TQWidget( this );
diff --git a/kcoloredit/loadpalettedlg.h b/kcoloredit/loadpalettedlg.h
index 7e71e2f5..3a2383e7 100644
--- a/kcoloredit/loadpalettedlg.h
+++ b/kcoloredit/loadpalettedlg.h
@@ -32,7 +32,7 @@ class LoadPaletteDlg : public KDialogBase  {
 public:
 	/** constructs the dialog
 	 */
-	LoadPaletteDlg(TQWidget *tqparent = 0, const char *name = 0);
+	LoadPaletteDlg(TQWidget *parent = 0, const char *name = 0);
 	~LoadPaletteDlg();
 	/** @return the fetched file name
 	 */
diff --git a/kcoloredit/paletteview.cpp b/kcoloredit/paletteview.cpp
index d62ec43f..52e8b4be 100644
--- a/kcoloredit/paletteview.cpp
+++ b/kcoloredit/paletteview.cpp
@@ -21,8 +21,8 @@
 #include "paletteview.h"
 
 PaletteView::PaletteView(const int defaultCellWidth, const int defaultCellHeight, const int cellSpacing,
-	KColorEditView* view, TQWidget *tqparent, const char *name) :
-	TQFrame(tqparent, name, TQWidget::WResizeNoErase*0) {
+	KColorEditView* view, TQWidget *parent, const char *name) :
+	TQFrame(parent, name, TQWidget::WResizeNoErase*0) {
 	setFrameStyle(StyledPanel|Sunken);
 	setLineWidth(2);
 	TQGridLayout* topLayout = new TQGridLayout(this, 2, 2);
diff --git a/kcoloredit/paletteview.h b/kcoloredit/paletteview.h
index cc1e56b8..d5ddcb0d 100644
--- a/kcoloredit/paletteview.h
+++ b/kcoloredit/paletteview.h
@@ -26,7 +26,7 @@
 class KColorEditView;
 
 /** This is a Palette class view widget.
-  * Its tqparent is KColorEditView
+  * Its parent is KColorEditView
   * @author Artur Rataj
   */
 class PaletteView : public TQFrame {
@@ -38,7 +38,7 @@ public:
 	 *  The effective cell sizes may be adjusted to fit the widget sizes.
 	 */
 	PaletteView(const int defaultCellWidth, const int defaultCellHeight, const int cellSpacing,
-			KColorEditView* view, TQWidget *tqparent = 0, const char *name=0);
+			KColorEditView* view, TQWidget *parent = 0, const char *name=0);
 	~PaletteView();
 	/** Calls redraw() in scrolledArea */
 	void redraw();
diff --git a/kcoloredit/paletteviewscrolledarea.cpp b/kcoloredit/paletteviewscrolledarea.cpp
index f6aa47cb..63cb3f9b 100644
--- a/kcoloredit/paletteviewscrolledarea.cpp
+++ b/kcoloredit/paletteviewscrolledarea.cpp
@@ -38,8 +38,8 @@
 
 PaletteViewScrolledArea::PaletteViewScrolledArea(const int defaultCellWidth,
 	const int defaultCellHeight, const int cellSpacing, TQScrollBar* scrollBar,
-	TQScrollBar* hScrollBar, KColorEditView* view, TQWidget* tqparent, const char* name)
-	: TQFrame(tqparent, name) {
+	TQScrollBar* hScrollBar, KColorEditView* view, TQWidget* parent, const char* name)
+	: TQFrame(parent, name) {
 	this->defaultCellWidth = defaultCellWidth;
 	this->defaultCellHeight = defaultCellHeight;
 	this->cellSpacing = cellSpacing;
diff --git a/kcoloredit/paletteviewscrolledarea.h b/kcoloredit/paletteviewscrolledarea.h
index 9f708b85..3202c317 100644
--- a/kcoloredit/paletteviewscrolledarea.h
+++ b/kcoloredit/paletteviewscrolledarea.h
@@ -40,7 +40,7 @@ public:
 	PaletteViewScrolledArea(const int defaultCellWidth, const int defaultCellHeight,
 		const int cellSpacing, TQScrollBar* scrollBar,
 		TQScrollBar* hScrollBar, KColorEditView* view,
-		TQWidget* tqparent = 0, const char* name = 0);
+		TQWidget* parent = 0, const char* name = 0);
 	~PaletteViewScrolledArea();
 	/** Sets cells sizes and then calls repaintPalette() */
 	void redraw();
diff --git a/kcoloredit/texteditselection.cpp b/kcoloredit/texteditselection.cpp
index bf00ab3d..1b49ec6a 100644
--- a/kcoloredit/texteditselection.cpp
+++ b/kcoloredit/texteditselection.cpp
@@ -24,7 +24,7 @@
 #include "main.h"
 #include "texteditselection.h"
 
-TextEditSelection::TextEditSelection(TQWidget *tqparent, const char *name ) : TQWidget(tqparent,name) {
+TextEditSelection::TextEditSelection(TQWidget *parent, const char *name ) : TQWidget(parent,name) {
 	inChangingComponents = false;
 	TQVBoxLayout* topLayout = new TQVBoxLayout(this, 4);
 	TQGridLayout* componentsLayout = new TQGridLayout(3, 5, 2);
diff --git a/kcoloredit/texteditselection.h b/kcoloredit/texteditselection.h
index 67a299a1..e0ef91f5 100644
--- a/kcoloredit/texteditselection.h
+++ b/kcoloredit/texteditselection.h
@@ -34,7 +34,7 @@ class TextEditSelection : public TQWidget  {
 
 public:
 	/** Constructs the widget */
-	TextEditSelection(TQWidget *tqparent=0, const char *name=0);
+	TextEditSelection(TQWidget *parent=0, const char *name=0);
 	~TextEditSelection();
 	
 signals:
diff --git a/kcoloredit/textselection.cpp b/kcoloredit/textselection.cpp
index ae15650d..f916d48f 100644
--- a/kcoloredit/textselection.cpp
+++ b/kcoloredit/textselection.cpp
@@ -17,7 +17,7 @@
 
 #include "textselection.h"
 
-TextSelection::TextSelection(TQWidget *tqparent, const char *name ) : TQWidget(tqparent,name) {
+TextSelection::TextSelection(TQWidget *parent, const char *name ) : TQWidget(parent,name) {
 	
 }
 TextSelection::~TextSelection(){