rename the following methods:

tqparent parent
tqmask mask


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

4 files changed, 68 insertions, 68 deletions

diff --git a/kexi/formeditor/factories/containerfactory.cpp b/kexi/formeditor/factories/containerfactory.cpp
index ff7a2562..2a38803a 100644
--- a/kexi/formeditor/factories/containerfactory.cpp
+++ b/kexi/formeditor/factories/containerfactory.cpp
@@ -64,8 +64,8 @@
 # include <kinputdialog.h>
 #endif
 
-ContainerWidget::ContainerWidget(TQWidget *tqparent, const char *name)
- : TQWidget(tqparent, name)
+ContainerWidget::ContainerWidget(TQWidget *parent, const char *name)
+ : TQWidget(parent, name)
 {
 }
 
@@ -92,8 +92,8 @@ void ContainerWidget::dropEvent( TQDropEvent *e )
 
 ////////////////////////
 
-GroupBox::GroupBox(const TQString & title, TQWidget *tqparent, const char *name)
- : TQGroupBox(title, tqparent, name)
+GroupBox::GroupBox(const TQString & title, TQWidget *parent, const char *name)
+ : TQGroupBox(title, parent, name)
 {
 }
 
@@ -115,8 +115,8 @@ void GroupBox::dropEvent( TQDropEvent *e )
 
 ////////////////////////
 
-KFDTabWidget::KFDTabWidget(TQWidget *tqparent, const char *name)
- : KFormDesigner::TabWidget(tqparent, name)
+KFDTabWidget::KFDTabWidget(TQWidget *parent, const char *name)
+ : KFormDesigner::TabWidget(parent, name)
 {
 }
 
@@ -152,8 +152,8 @@ void KFDTabWidget::dropEvent( TQDropEvent *e )
 
 /// Various tqlayout widgets /////////////////:
 
-HBox::HBox(TQWidget *tqparent, const char *name)
- : TQFrame(tqparent, name), m_preview(false)
+HBox::HBox(TQWidget *parent, const char *name)
+ : TQFrame(parent, name), m_preview(false)
 {}
 
 void
@@ -165,8 +165,8 @@ HBox::paintEvent(TQPaintEvent *)
 	p.drawRect(1, 1, width()-1, height() - 1);
 }
 
-VBox::VBox(TQWidget *tqparent, const char *name)
- : TQFrame(tqparent, name), m_preview(false)
+VBox::VBox(TQWidget *parent, const char *name)
+ : TQFrame(parent, name), m_preview(false)
 {}
 
 void
@@ -178,8 +178,8 @@ VBox::paintEvent(TQPaintEvent *)
 	p.drawRect(1, 1, width()-1, height() - 1);
 }
 
-Grid::Grid(TQWidget *tqparent, const char *name)
- : TQFrame(tqparent, name), m_preview(false)
+Grid::Grid(TQWidget *parent, const char *name)
+ : TQFrame(parent, name), m_preview(false)
 {}
 
 void
@@ -191,8 +191,8 @@ Grid::paintEvent(TQPaintEvent *)
 	p.drawRect(1, 1, width()-1, height() - 1);
 }
 
-HFlow::HFlow(TQWidget *tqparent, const char *name)
- : TQFrame(tqparent, name), m_preview(false)
+HFlow::HFlow(TQWidget *parent, const char *name)
+ : TQFrame(parent, name), m_preview(false)
 {}
 
 void
@@ -204,8 +204,8 @@ HFlow::paintEvent(TQPaintEvent *)
 	p.drawRect(1, 1, width()-1, height() - 1);
 }
 
-VFlow::VFlow(TQWidget *tqparent, const char *name)
- : TQFrame(tqparent, name), m_preview(false)
+VFlow::VFlow(TQWidget *parent, const char *name)
+ : TQFrame(parent, name), m_preview(false)
 {}
 
 void
@@ -228,12 +228,12 @@ VFlow::tqsizeHint() const
 
 ///////  Tab related KCommand (to allow tab creation/deletion undoing)
 
-InsertPageCommand::InsertPageCommand(KFormDesigner::Container *container, TQWidget *tqparent)
+InsertPageCommand::InsertPageCommand(KFormDesigner::Container *container, TQWidget *parent)
   : KCommand()
 {
 	m_containername = container->widget()->name();
 	m_form = container->form();
-	m_parentname = tqparent->name();
+	m_parentname = parent->name();
 	m_pageid = -1;
 }
 
@@ -241,21 +241,21 @@ void
 InsertPageCommand::execute()
 {
 	KFormDesigner::Container *container = m_form->objectTree()->lookup(m_containername)->container();
-	TQWidget *tqparent = m_form->objectTree()->lookup(m_parentname)->widget();
+	TQWidget *parent = m_form->objectTree()->lookup(m_parentname)->widget();
 	if(m_name.isEmpty()) {
 		m_name = container->form()->objectTree()->generateUniqueName(
 			container->form()->library()->displayName(TQWIDGET_OBJECT_NAME_STRING).latin1(),
 			/*!numberSuffixRequired*/false);
 	}
 
-	TQWidget *page = container->form()->library()->createWidget(TQWIDGET_OBJECT_NAME_STRING, tqparent, m_name.latin1(), container);
-//	TQWidget *page = new ContainerWidget(tqparent, m_name.latin1());
-//	new KFormDesigner::Container(container, page, tqparent);
+	TQWidget *page = container->form()->library()->createWidget(TQWIDGET_OBJECT_NAME_STRING, parent, m_name.latin1(), container);
+//	TQWidget *page = new ContainerWidget(parent, m_name.latin1());
+//	new KFormDesigner::Container(container, page, parent);
 
-	TQCString classname = tqparent->className();
+	TQCString classname = parent->className();
 	if(classname == "KFDTabWidget")
 	{
-		TabWidgetBase *tab = dynamic_cast<TabWidgetBase*>(tqparent);
+		TabWidgetBase *tab = dynamic_cast<TabWidgetBase*>(parent);
 		TQString n = i18n("Page %1").tqarg(tab->count() + 1);
 		tab->addTab(page, n);
 		tab->showPage(page);
@@ -265,7 +265,7 @@ InsertPageCommand::execute()
 	}
 	else if(classname == TQWIDGETSTACK_OBJECT_NAME_STRING)
 	{
-		TQWidgetStack *stack = (TQWidgetStack*)tqparent;
+		TQWidgetStack *stack = (TQWidgetStack*)parent;
 		stack->addWidget(page, m_pageid);
 		stack->raiseWidget(page);
 		m_pageid = stack->id(page);
@@ -279,21 +279,21 @@ void
 InsertPageCommand::unexecute()
 {
 	TQWidget *page = m_form->objectTree()->lookup(m_name)->widget();
-	TQWidget *tqparent = m_form->objectTree()->lookup(m_parentname)->widget();
+	TQWidget *parent = m_form->objectTree()->lookup(m_parentname)->widget();
 
 	KFormDesigner::WidgetList list;
 	list.append(page);
 	KCommand *com = new KFormDesigner::DeleteWidgetCommand(list, m_form);
 
-	TQCString classname = tqparent->className();
+	TQCString classname = parent->className();
 	if(classname == "KFDTabWidget")
 	{
-		TabWidgetBase *tab = dynamic_cast<TabWidgetBase*>(tqparent);
+		TabWidgetBase *tab = dynamic_cast<TabWidgetBase*>(parent);
 		tab->removePage(page);
 	}
 	else if(classname == TQWIDGETSTACK_OBJECT_NAME_STRING)
 	{
-		TQWidgetStack *stack = (TQWidgetStack*)tqparent;
+		TQWidgetStack *stack = (TQWidgetStack*)parent;
 		int id = stack->id(page) - 1;
 		while(!stack->widget(id))
 			id--;
@@ -314,8 +314,8 @@ InsertPageCommand::name() const
 
 /////// Sub forms ////////////////////////:
 
-SubForm::SubForm(TQWidget *tqparent, const char *name)
-: TQScrollView(tqparent, name), m_form(0), m_widget(0)
+SubForm::SubForm(TQWidget *parent, const char *name)
+: TQScrollView(parent, name), m_form(0), m_widget(0)
 {
 	setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken);
 	viewport()->setPaletteBackgroundColor(tqcolorGroup().mid());
@@ -352,8 +352,8 @@ SubForm::setFormName(const TQString &name)
 
 /////   The factory /////////////////////////
 
-ContainerFactory::ContainerFactory(TQObject *tqparent, const char *, const TQStringList &)
- : KFormDesigner::WidgetFactory(tqparent, "containers")
+ContainerFactory::ContainerFactory(TQObject *parent, const char *, const TQStringList &)
+ : KFormDesigner::WidgetFactory(parent, "containers")
 {
 	KFormDesigner::WidgetInfo *wBtnGroup = new KFormDesigner::WidgetInfo(this);
 	wBtnGroup->setPixmap("frame");
@@ -674,10 +674,10 @@ ContainerFactory::createMenuActions(const TQCString &classname, TQWidget *w, TQP
 		TQWidgetStack *stack = (TQWidgetStack*)w->parentWidget(); //m_widget;
 		setWidget(
 			w->parentWidget(),
-			container->form()->objectTree()->lookup(stack->name())->tqparent()->container()
+			container->form()->objectTree()->lookup(stack->name())->parent()->container()
 		);
-//		m_container = container->form()->objectTree()->lookup(m_widget->name())->tqparent()->container();
-//		m_container = container->form()->objectTree()->lookup(stack->name())->tqparent()->container();
+//		m_container = container->form()->objectTree()->lookup(m_widget->name())->parent()->container();
+//		m_container = container->form()->objectTree()->lookup(stack->name())->parent()->container();
 
 		int id = menu->insertItem(SmallIconSet("tab_new"), i18n("Add Page"), this, TQT_SLOT(addStackPage()) );
 
@@ -720,17 +720,17 @@ ContainerFactory::startEditing(const TQCString &classname, TQWidget *w, KFormDes
 }
 
 bool
-ContainerFactory::saveSpecialProperty(const TQCString &, const TQString &name, const TQVariant &, TQWidget *w, TQDomElement &parentNode, TQDomDocument &tqparent)
+ContainerFactory::saveSpecialProperty(const TQCString &, const TQString &name, const TQVariant &, TQWidget *w, TQDomElement &parentNode, TQDomDocument &parent)
 {
 	if((name == "title") && (w->parentWidget()->parentWidget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)))
 	{
 		TabWidgetBase *tab = dynamic_cast<TabWidgetBase*>(w->parentWidget()->parentWidget());
-		KFormDesigner::FormIO::savePropertyElement(parentNode, tqparent, "attribute", "title", tab->tabLabel(w));
+		KFormDesigner::FormIO::savePropertyElement(parentNode, parent, "attribute", "title", tab->tabLabel(w));
 	}
 	else if((name == "id") && (w->parentWidget()->isA(TQWIDGETSTACK_OBJECT_NAME_STRING)))
 	{
 		TQWidgetStack *stack = (TQWidgetStack*)w->parentWidget();
-		KFormDesigner::FormIO::savePropertyElement(parentNode, tqparent, "attribute", "id", stack->id(w));
+		KFormDesigner::FormIO::savePropertyElement(parentNode, parent, "attribute", "id", stack->id(w));
 	}
 	else
 		return false;
@@ -741,7 +741,7 @@ bool
 ContainerFactory::readSpecialProperty(const TQCString &, TQDomElement &node, TQWidget *w, KFormDesigner::ObjectTreeItem *item)
 {
 	TQString name = node.attribute("name");
-	if((name == "title") && (item->tqparent()->widget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)))
+	if((name == "title") && (item->parent()->widget()->inherits(TQTABWIDGET_OBJECT_NAME_STRING)))
 	{
 		TabWidgetBase *tab = dynamic_cast<TabWidgetBase*>(w->parentWidget());
 		tab->addTab(w, node.firstChild().toElement().text());
diff --git a/kexi/formeditor/factories/containerfactory.h b/kexi/formeditor/factories/containerfactory.h
index c8bdc1a6..b88b437f 100644
--- a/kexi/formeditor/factories/containerfactory.h
+++ b/kexi/formeditor/factories/containerfactory.h
@@ -58,7 +58,7 @@ class KFORMEDITOR_EXPORT HBox : public TQFrame
   TQ_OBJECT
 
 	public:
-		HBox(TQWidget *tqparent, const char *name);
+		HBox(TQWidget *parent, const char *name);
 		virtual ~HBox(){;}
 		void setPreviewMode() {m_preview = true;}
 		virtual void paintEvent(TQPaintEvent *ev);
@@ -74,7 +74,7 @@ class KFORMEDITOR_EXPORT VBox : public TQFrame
   TQ_OBJECT
 
 	public:
-		VBox(TQWidget *tqparent, const char *name);
+		VBox(TQWidget *parent, const char *name);
 		virtual ~VBox(){;}
 		void setPreviewMode() {m_preview = true;}
 		virtual void paintEvent(TQPaintEvent *ev);
@@ -90,7 +90,7 @@ class KFORMEDITOR_EXPORT Grid : public TQFrame
   TQ_OBJECT
 
 	public:
-		Grid(TQWidget *tqparent, const char *name);
+		Grid(TQWidget *parent, const char *name);
 		virtual ~Grid(){;}
 		void setPreviewMode() {m_preview = true;}
 		virtual void paintEvent(TQPaintEvent *ev);
@@ -106,7 +106,7 @@ class KFORMEDITOR_EXPORT HFlow : public TQFrame
   TQ_OBJECT
 
 	public:
-		HFlow(TQWidget *tqparent, const char *name);
+		HFlow(TQWidget *parent, const char *name);
 		virtual ~HFlow(){;}
 		void setPreviewMode() {m_preview = true;}
 		virtual void paintEvent(TQPaintEvent *ev);
@@ -122,7 +122,7 @@ class KFORMEDITOR_EXPORT VFlow : public TQFrame
   TQ_OBJECT
 
 	public:
-		VFlow(TQWidget *tqparent, const char *name);
+		VFlow(TQWidget *parent, const char *name);
 		virtual ~VFlow(){;}
 		void setPreviewMode() {m_preview = true;}
 		virtual void paintEvent(TQPaintEvent *ev);
@@ -141,7 +141,7 @@ class KFORMEDITOR_EXPORT ContainerWidget : public TQWidget
 	friend class KFDTabWidget;
 
 	public:
-		ContainerWidget(TQWidget *tqparent, const char *name);
+		ContainerWidget(TQWidget *parent, const char *name);
 		virtual ~ContainerWidget();
 
 		virtual TQSize tqsizeHint() const;
@@ -167,7 +167,7 @@ class KFORMEDITOR_EXPORT KFDTabWidget : public KFormDesigner::TabWidget
   TQ_OBJECT
 
 	public:
-		KFDTabWidget(TQWidget *tqparent, const char *name);
+		KFDTabWidget(TQWidget *parent, const char *name);
 		virtual ~KFDTabWidget();
 
 		virtual TQSize tqsizeHint() const;
@@ -193,7 +193,7 @@ class KFORMEDITOR_EXPORT GroupBox : public TQGroupBox
   TQ_OBJECT
 
 	public:
-		GroupBox(const TQString & title, TQWidget *tqparent, const char *name);
+		GroupBox(const TQString & title, TQWidget *parent, const char *name);
 		virtual ~GroupBox();
 
 		//! Used to emit handleDragMoveEvent() signal needed to control dragging over the container's surface
@@ -218,7 +218,7 @@ class KFORMEDITOR_EXPORT SubForm : public TQScrollView
 	TQ_PROPERTY(TQString formName READ formName WRITE setFormName DESIGNABLE true)
 
 	public:
-		SubForm(TQWidget *tqparent, const char *name);
+		SubForm(TQWidget *parent, const char *name);
 		~SubForm() {}
 
 		//! \return the name of the subform inside the db
@@ -239,10 +239,10 @@ class ContainerFactory : public KFormDesigner::WidgetFactory
   TQ_OBJECT
 
 	public:
-		ContainerFactory(TQObject *tqparent, const char *name, const TQStringList &args);
+		ContainerFactory(TQObject *parent, const char *name, const TQStringList &args);
 		virtual ~ContainerFactory();
 
-		virtual TQWidget *createWidget(const TQCString & classname, TQWidget *tqparent, const char *name, KFormDesigner::Container *container,
+		virtual TQWidget *createWidget(const TQCString & classname, TQWidget *parent, const char *name, KFormDesigner::Container *container,
 			int options = DefaultOptions);
 		virtual bool createMenuActions(const TQCString& classname, TQWidget *w, TQPopupMenu *menu,
 			KFormDesigner::Container *container);
@@ -251,7 +251,7 @@ class ContainerFactory : public KFormDesigner::WidgetFactory
 		virtual bool previewWidget(const TQCString &classname, TQWidget *widget,
 			KFormDesigner::Container *container);
 		virtual bool saveSpecialProperty(const TQCString &classname, const TQString &name,
-			const TQVariant &value, TQWidget *w, TQDomElement &parentNode, TQDomDocument &tqparent);
+			const TQVariant &value, TQWidget *w, TQDomElement &parentNode, TQDomDocument &parent);
 		virtual bool readSpecialProperty(const TQCString &classname, TQDomElement &node, TQWidget *w,
 			KFormDesigner::ObjectTreeItem *item);
 		virtual TQValueList<TQCString> autoSaveProperties(const TQCString &classname);
diff --git a/kexi/formeditor/factories/stdwidgetfactory.cpp b/kexi/formeditor/factories/stdwidgetfactory.cpp
index 32c557b3..bfc9db63 100644
--- a/kexi/formeditor/factories/stdwidgetfactory.cpp
+++ b/kexi/formeditor/factories/stdwidgetfactory.cpp
@@ -57,8 +57,8 @@
 #include "stdwidgetfactory.h"
 
 // Some widgets subclass to allow event filtering and some other things
-KexiPictureLabel::KexiPictureLabel(const TQPixmap &pix, TQWidget *tqparent, const char *name)
- : TQLabel(tqparent, name)
+KexiPictureLabel::KexiPictureLabel(const TQPixmap &pix, TQWidget *parent, const char *name)
+ : TQLabel(parent, name)
 {
 	setPixmap(pix);
 	setScaledContents(false);
@@ -72,8 +72,8 @@ KexiPictureLabel::setProperty(const char *name, const TQVariant &value)
 	return TQLabel::setProperty(name, value);
 }
 
-Line::Line(Qt::Orientation orient, TQWidget *tqparent, const char *name)
- : TQFrame(tqparent, name)
+Line::Line(Qt::Orientation orient, TQWidget *parent, const char *name)
+ : TQFrame(parent, name)
 {
 	setFrameShadow(Sunken);
 	if(orient ==Qt::Horizontal)
@@ -102,8 +102,8 @@ Line::orientation() const
 
 // The factory itself
 
-StdWidgetFactory::StdWidgetFactory(TQObject *tqparent, const char *, const TQStringList &)
- : KFormDesigner::WidgetFactory(tqparent, "stdwidgets")
+StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStringList &)
+ : KFormDesigner::WidgetFactory(parent, "stdwidgets")
 {
 	KFormDesigner::WidgetInfo *wFormWidget = new KFormDesigner::WidgetInfo(this);
 	wFormWidget->setPixmap("form");
@@ -798,18 +798,18 @@ StdWidgetFactory::readSpecialProperty(const TQCString &classname, TQDomElement &
 }
 
 void
-StdWidgetFactory::readListItem(TQDomElement &node, TQListViewItem *tqparent, KListView *listview)
+StdWidgetFactory::readListItem(TQDomElement &node, TQListViewItem *parent, KListView *listview)
 {
 	TQListViewItem *item;
-	if(tqparent)
-		item = new KListViewItem(tqparent);
+	if(parent)
+		item = new KListViewItem(parent);
 	else
 		item = new KListViewItem(listview);
 
 	// We need to move the item at the end of the list
 	TQListViewItem *last;
-	if(tqparent)
-		last = tqparent->firstChild();
+	if(parent)
+		last = parent->firstChild();
 	else
 		last = listview->firstChild();
 
diff --git a/kexi/formeditor/factories/stdwidgetfactory.h b/kexi/formeditor/factories/stdwidgetfactory.h
index 5d9032f0..e91f08b9 100644
--- a/kexi/formeditor/factories/stdwidgetfactory.h
+++ b/kexi/formeditor/factories/stdwidgetfactory.h
@@ -31,7 +31,7 @@ class KFORMEDITOR_EXPORT KexiPictureLabel : public TQLabel
   TQ_OBJECT
 
 	public:
-		KexiPictureLabel(const TQPixmap &pix, TQWidget *tqparent, const char *name);
+		KexiPictureLabel(const TQPixmap &pix, TQWidget *parent, const char *name);
 		~KexiPictureLabel(){;}
 
 		virtual bool setProperty(const char *name, const TQVariant &value);
@@ -44,7 +44,7 @@ class KFORMEDITOR_EXPORT Line : public TQFrame
 	TQ_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation)
 
 	public:
-		Line(Qt::Orientation orient, TQWidget *tqparent, const char *name);
+		Line(Qt::Orientation orient, TQWidget *parent, const char *name);
 		~Line(){;}
 
 		void setOrientation(Qt::Orientation orient);
@@ -58,7 +58,7 @@ class StdWidgetFactory : public KFormDesigner::WidgetFactory
   TQ_OBJECT
 
 	public:
-		StdWidgetFactory(TQObject *tqparent, const char *name, const TQStringList &args);
+		StdWidgetFactory(TQObject *parent, const char *name, const TQStringList &args);
 		~StdWidgetFactory();
 
 		virtual TQWidget *createWidget(const TQCString &c, TQWidget *p, const char *n, 
@@ -74,7 +74,7 @@ class StdWidgetFactory : public KFormDesigner::WidgetFactory
 
 		virtual bool saveSpecialProperty(const TQCString &classname,
 			const TQString &name, const TQVariant &value, TQWidget *w,
-			TQDomElement &parentNode, TQDomDocument &tqparent);
+			TQDomElement &parentNode, TQDomDocument &parent);
 		virtual bool readSpecialProperty(const TQCString &classname, TQDomElement &node,
 			TQWidget *w, KFormDesigner::ObjectTreeItem *item);
 		virtual TQValueList<TQCString> autoSaveProperties(const TQCString &classname);
@@ -92,7 +92,7 @@ class StdWidgetFactory : public KFormDesigner::WidgetFactory
 		virtual bool changeText(const TQString &newText);
 		virtual void resizeEditor(TQWidget *editor, TQWidget *widget, const TQCString &classname);
 		void saveListItem(TQListViewItem *item, TQDomNode &parentNode, TQDomDocument &domDoc);
-		void readListItem(TQDomElement &node, TQListViewItem *tqparent, KListView *listview);
+		void readListItem(TQDomElement &node, TQListViewItem *parent, KListView *listview);
 
 	private:
 //		KFormDesigner::Container *m_container;