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/applications/koffice@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

7 files changed, 26 insertions, 26 deletions

diff --git a/kexi/plugins/forms/widgets/kexidbautofield.cpp b/kexi/plugins/forms/widgets/kexidbautofield.cpp
index 4926a334..521dce2a 100644
--- a/kexi/plugins/forms/widgets/kexidbautofield.cpp
+++ b/kexi/plugins/forms/widgets/kexidbautofield.cpp
@@ -193,7 +193,7 @@ KexiDBAutoField::createEditor()
 			TQWidget::setFocusPolicy(newSubwidget->focusPolicy());
 		}
 		setFocusProxy(newSubwidget); //ok?
-		if (tqparentWidget())
+		if (parentWidget())
 			newSubwidget->setPalette( tqApp->palette() );
 		copyPropertiesToEditor();
 //		KFormDesigner::installRecursiveEventFilter(newSubwidget, this);
diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.cpp b/kexi/plugins/forms/widgets/kexidbcombobox.cpp
index a908c2fd..f977a962 100644
--- a/kexi/plugins/forms/widgets/kexidbcombobox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbcombobox.cpp
@@ -477,9 +477,9 @@ TQVariant KexiDBComboBox::valueFromInternalEditor()
 TQPoint KexiDBComboBox::mapFromParentToGlobal(const TQPoint& pos) const
 {
 //	const KexiFormScrollView* view = KexiUtils::findParentConst<const KexiFormScrollView>(this, "KexiFormScrollView"); 
-	if (!tqparentWidget())
+	if (!parentWidget())
 		return TQPoint(-1,-1);
-	return tqparentWidget()->mapToGlobal(pos);
+	return parentWidget()->mapToGlobal(pos);
 //	return view->viewport()->mapToGlobal(pos);
 }
 
diff --git a/kexi/plugins/forms/widgets/kexidbform.cpp b/kexi/plugins/forms/widgets/kexidbform.cpp
index 8c9534d2..cca955e5 100644
--- a/kexi/plugins/forms/widgets/kexidbform.cpp
+++ b/kexi/plugins/forms/widgets/kexidbform.cpp
@@ -210,10 +210,10 @@ void
 KexiDBForm::highlightWidgets(TQWidget *from, TQWidget *to)//, const TQPoint &point)
 {
 	TQPoint fromPoint, toPoint;
-	if(from && from->tqparentWidget() && (from != this))
-		fromPoint = from->tqparentWidget()->mapTo(this, from->pos());
-	if(to && to->tqparentWidget() && (to != this))
-		toPoint = to->tqparentWidget()->mapTo(this, to->pos());
+	if(from && from->parentWidget() && (from != this))
+		fromPoint = from->parentWidget()->mapTo(this, from->pos());
+	if(to && to->parentWidget() && (to != this))
+		toPoint = to->parentWidget()->mapTo(this, to->pos());
 
 	TQPainter p;
 	p.tqbegin(TQT_TQPAINTDEVICE(this), true);
@@ -234,7 +234,7 @@ KexiDBForm::highlightWidgets(TQWidget *from, TQWidget *to)//, const TQPoint &poi
 		TQPixmap pix2 = TQPixmap::grabWidget(to);
 
 		if((from != this) && (to != this))
-			p.drawLine( from->tqparentWidget()->mapTo(this, from->tqgeometry().center()), to->tqparentWidget()->mapTo(this, to->tqgeometry().center()) );
+			p.drawLine( from->parentWidget()->mapTo(this, from->tqgeometry().center()), to->parentWidget()->mapTo(this, to->tqgeometry().center()) );
 
 		p.drawPixmap(fromPoint.x(), fromPoint.y(), pix1);
 		p.drawPixmap(toPoint.x(), toPoint.y(), pix2);
@@ -425,7 +425,7 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e )
 						while (dataItemIface) {
 							if (dataItemIface->keyPressed(ke))
 								return false;
-							dataItemIface = dynamic_cast<KexiFormDataItemInterface*>(dataItemIface->tqparentInterface()); //try in tqparent, e.g. in combobox
+							dataItemIface = dynamic_cast<KexiFormDataItemInterface*>(dataItemIface->parentInterface()); //try in tqparent, e.g. in combobox
 						}
 						break;
 					}
@@ -491,13 +491,13 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e )
 			if (tab || backtab) {
 				//the watched widget can be a subwidget of a real widget, e.g. a drop down button of image box: find it
 				while (!KexiFormPart::library()->widgetInfoForClassName(realWidget->className()))
-					realWidget = realWidget->tqparentWidget();
+					realWidget = realWidget->parentWidget();
 				if (!realWidget)
 					return true; //ignore
 				//the watched widget can be a subwidget of a real widget, e.g. autofield: find it
 				//TQWidget* realWidget = TQT_TQWIDGET(watched);
-				while (dynamic_cast<KexiDataItemInterface*>(realWidget) && dynamic_cast<KexiDataItemInterface*>(realWidget)->tqparentInterface())
-					realWidget = dynamic_cast<TQWidget*>( dynamic_cast<KexiDataItemInterface*>(realWidget)->tqparentInterface() );
+				while (dynamic_cast<KexiDataItemInterface*>(realWidget) && dynamic_cast<KexiDataItemInterface*>(realWidget)->parentInterface())
+					realWidget = dynamic_cast<TQWidget*>( dynamic_cast<KexiDataItemInterface*>(realWidget)->parentInterface() );
 
 				d->setOrderedFocusWidgetsIteratorTo( realWidget );
 				kexipluginsdbg << realWidget->name() << endl;
@@ -585,7 +585,7 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e )
 				TQWidget *dataItem = dynamic_cast<TQWidget*>(watched);
 				while (dataItem) {
 					while (dataItem && !dynamic_cast<KexiDataItemInterface*>(dataItem))
-						dataItem = dataItem->tqparentWidget();
+						dataItem = dataItem->parentWidget();
 					if (!dataItem)
 						break;
 					kexipluginsdbg << "KexiDBForm: FocusIn: FOUND " << dataItem->className() << " " << dataItem->name() << endl;
@@ -600,7 +600,7 @@ bool KexiDBForm::eventFilter( TQObject * watched, TQEvent * e )
 						break;
 					}
 					else
-						dataItem = dataItem->tqparentWidget();
+						dataItem = dataItem->parentWidget();
 
 					dataItem->update();
 				}
diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.cpp b/kexi/plugins/forms/widgets/kexidbimagebox.cpp
index 5f2f20e3..0e79fada 100644
--- a/kexi/plugins/forms/widgets/kexidbimagebox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbimagebox.cpp
@@ -608,9 +608,9 @@ void KexiDBImageBox::setDataSource( const TQString &ds )
 	if (!m_lineWidthChanged) {
 		KexiFrame::setLineWidth( ds.isEmpty() ? 0 : 1 );
 	}
-	if (!m_paletteBackgroundColorChanged && tqparentWidget()) {
+	if (!m_paletteBackgroundColorChanged && parentWidget()) {
 		KexiFrame::setPaletteBackgroundColor( 
-			dataSource().isEmpty() ? tqparentWidget()->paletteBackgroundColor() : tqpalette().active().base() );
+			dataSource().isEmpty() ? parentWidget()->paletteBackgroundColor() : tqpalette().active().base() );
 	}
 }
 
diff --git a/kexi/plugins/forms/widgets/kexidblineedit.h b/kexi/plugins/forms/widgets/kexidblineedit.h
index 4457a8d0..92a87280 100644
--- a/kexi/plugins/forms/widgets/kexidblineedit.h
+++ b/kexi/plugins/forms/widgets/kexidblineedit.h
@@ -38,7 +38,7 @@ void setLighterGrayBackgroundColor(TQWidget* widget);
 
 //! @short Line edit widget for Kexi forms
 /*! Handles many data types. User input is validated by using validators 
- and/or input tqmasks.
+ and/or input masks.
 */
 class KEXIFORMUTILS_EXPORT KexiDBLineEdit :
 	public KLineEdit,
diff --git a/kexi/plugins/forms/widgets/kexidbsubform.cpp b/kexi/plugins/forms/widgets/kexidbsubform.cpp
index 8cb4f795..6fcd851a 100644
--- a/kexi/plugins/forms/widgets/kexidbsubform.cpp
+++ b/kexi/plugins/forms/widgets/kexidbsubform.cpp
@@ -29,8 +29,8 @@
 #include <formeditor/container.h>
 #include <formeditor/formmanager.h>
 
-KexiDBSubForm::KexiDBSubForm(KFormDesigner::Form *tqparentForm, TQWidget *tqparent, const char *name)
-: TQScrollView(tqparent, name), m_parentForm(tqparentForm), m_form(0), m_widget(0)
+KexiDBSubForm::KexiDBSubForm(KFormDesigner::Form *parentForm, TQWidget *tqparent, const char *name)
+: TQScrollView(tqparent, name), m_parentForm(parentForm), m_form(0), m_widget(0)
 {
 	setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken);
 	viewport()->setPaletteBackgroundColor(tqcolorGroup().mid());
@@ -74,7 +74,7 @@ KexiDBSubForm::setFormName(const TQString &name)
 		return;
 	}
 
-	TQWidget *pw = tqparentWidget();
+	TQWidget *pw = parentWidget();
 	KexiFormView *view = 0;
 	TQStringList list;
 	while(pw) {
@@ -87,18 +87,18 @@ KexiDBSubForm::setFormName(const TQString &name)
 		}
 		else if(! view && pw->isA("KexiFormView"))
 			view = static_cast<KexiFormView*>(pw); // we need a KexiFormView*
-		pw = pw->tqparentWidget();
+		pw = pw->parentWidget();
 	}
 
-	if (!view || !view->tqparentDialog() || !view->tqparentDialog()->mainWin()
-		|| !view->tqparentDialog()->mainWin()->project()->dbConnection())
+	if (!view || !view->parentDialog() || !view->parentDialog()->mainWin()
+		|| !view->parentDialog()->mainWin()->project()->dbConnection())
 		return;
 
-	KexiDB::Connection *conn = view->tqparentDialog()->mainWin()->project()->dbConnection();
+	KexiDB::Connection *conn = view->parentDialog()->mainWin()->project()->dbConnection();
 
 	// we check if there is a form with this name
 	int id = KexiDB::idForObjectName(*conn, name, KexiPart::FormObjectType);
-	if((id == 0) || (id == view->tqparentDialog()->id())) // == our form
+	if((id == 0) || (id == view->parentDialog()->id())) // == our form
 		return; // because of recursion when loading
 
 	// we create the container widget
diff --git a/kexi/plugins/forms/widgets/kexidbsubform.h b/kexi/plugins/forms/widgets/kexidbsubform.h
index ea2bdbd3..cbbc6250 100644
--- a/kexi/plugins/forms/widgets/kexidbsubform.h
+++ b/kexi/plugins/forms/widgets/kexidbsubform.h
@@ -32,7 +32,7 @@ class KEXIFORMUTILS_EXPORT KexiDBSubForm : public TQScrollView
 	TQ_PROPERTY(TQString formName READ formName WRITE setFormName DESIGNABLE true)
 
 	public:
-		KexiDBSubForm(KFormDesigner::Form *tqparentForm, TQWidget *tqparent, const char *name);
+		KexiDBSubForm(KFormDesigner::Form *parentForm, TQWidget *tqparent, const char *name);
 		~KexiDBSubForm() {}
 
 		//! \return the name of the subform to display inside this widget