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

1 files changed, 40 insertions, 40 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());