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

2 files changed, 22 insertions, 22 deletions

diff --git a/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.cpp b/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.cpp
index a79374cd..8ab3ae0d 100644
--- a/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.cpp
+++ b/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.cpp
@@ -69,11 +69,11 @@ KFDFactory::~KFDFactory()
 }
 
 KParts::Part*
-KFDFactory::createPartObject( TQWidget *tqparentWidget, const char *, TQObject *, const char *name,
+KFDFactory::createPartObject( TQWidget *parentWidget, const char *, TQObject *, const char *name,
   const char *classname, const TQStringList &args)
 {
 	bool readOnly = (classname == "KParts::ReadOnlyPart");
-	KFormDesignerKDevPart *part = new KFormDesignerKDevPart(tqparentWidget, name, readOnly, args);
+	KFormDesignerKDevPart *part = new KFormDesignerKDevPart(parentWidget, name, readOnly, args);
 	return part;
 }
 
@@ -215,9 +215,9 @@ KFormDesignerKDevPart::setupActions()
 	new KAction(i18n("Edit Pixmap Collection"), "icons", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editFormPixmapCollection()), actionCollection(), "pixmap_collection");
 	new KAction(i18n("Edit Form Connections"), "connections", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(editConnections()), actionCollection(), "form_connections");
 
-	new KAction(i18n("Lay Out Widgets &Horizontally"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutHBox()), actionCollection(), "tqlayout_hbox");
-	new KAction(i18n("Lay Out Widgets &Vertically"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutVBox()), actionCollection(), "tqlayout_vbox");
-	new KAction(i18n("Lay Out Widgets in &Grid"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(tqlayoutGrid()), actionCollection(), "tqlayout_grid");
+	new KAction(i18n("Lay Out Widgets &Horizontally"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutHBox()), actionCollection(), "layout_hbox");
+	new KAction(i18n("Lay Out Widgets &Vertically"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutVBox()), actionCollection(), "layout_vbox");
+	new KAction(i18n("Lay Out Widgets in &Grid"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(layoutGrid()), actionCollection(), "layout_grid");
 	new KAction(i18n("&Break Layout"), TQString(), KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(breakLayout()), actionCollection(), "break_layout");
 
 	new KAction(i18n("Bring Widget to Front"), "raise", KShortcut(0), KFormDesigner::FormManager::self(), TQT_SLOT(bringWidgetToFront()), actionCollection(), "format_raise");
@@ -405,12 +405,12 @@ KFormDesignerKDevPart::slotWidgetSelected(Form *form, bool multiple)
 			multiple = true;
 	}
 	// Layout actions
-	ENABLE_ACTION("tqlayout_hbox", multiple);
-	ENABLE_ACTION("tqlayout_vbox", multiple);
-	ENABLE_ACTION("tqlayout_grid", multiple);
+	ENABLE_ACTION("layout_hbox", multiple);
+	ENABLE_ACTION("layout_vbox", multiple);
+	ENABLE_ACTION("layout_grid", multiple);
 
 	KFormDesigner::Container *container = KFormDesigner::FormManager::self()->activeForm()->activeContainer();
-	ENABLE_ACTION("break_layout", (container->tqlayoutType() != KFormDesigner::Container::NoLayout));
+	ENABLE_ACTION("break_layout", (container->layoutType() != KFormDesigner::Container::NoLayout));
 }
 
 void
@@ -420,10 +420,10 @@ KFormDesignerKDevPart::slotFormWidgetSelected(Form *form)
 	enableFormActions();
 
 	// Layout actions
-	ENABLE_ACTION("tqlayout_hbox", true);
-	ENABLE_ACTION("tqlayout_vbox", true);
-	ENABLE_ACTION("tqlayout_grid", true);
-	ENABLE_ACTION("break_layout", (form->toplevelContainer()->tqlayoutType() != KFormDesigner::Container::NoLayout));
+	ENABLE_ACTION("layout_hbox", true);
+	ENABLE_ACTION("layout_vbox", true);
+	ENABLE_ACTION("layout_grid", true);
+	ENABLE_ACTION("break_layout", (form->toplevelContainer()->layoutType() != KFormDesigner::Container::NoLayout));
 }
 
 void
@@ -486,9 +486,9 @@ KFormDesignerKDevPart::disableWidgetActions()
 	ENABLE_ACTION("format_raise", false);
 	ENABLE_ACTION("format_lower", false);
 
-	ENABLE_ACTION("tqlayout_hbox", false);
-	ENABLE_ACTION("tqlayout_vbox", false);
-	ENABLE_ACTION("tqlayout_grid", false);
+	ENABLE_ACTION("layout_hbox", false);
+	ENABLE_ACTION("layout_vbox", false);
+	ENABLE_ACTION("layout_grid", false);
 	ENABLE_ACTION("break_layout", false);
 }
 
@@ -616,10 +616,10 @@ void
 FormWidgetBase::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.begin(this, true);
@@ -639,7 +639,7 @@ FormWidgetBase::highlightWidgets(TQWidget *from, TQWidget *to)//, const TQPoint
 		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);
diff --git a/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.h b/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.h
index 548b4a35..72f2ef82 100644
--- a/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.h
+++ b/kexi/formeditor/kdevelop_plugin/kfd_kdev_part.h
@@ -45,7 +45,7 @@ class KFORMEDITOR_EXPORT KFDFactory : public KParts::Factory
 		KFDFactory();
 		virtual ~KFDFactory();
 
-		virtual KParts::Part* createPartObject(TQWidget *tqparentWidget=0, const char *widgetName=0, TQObject *tqparent=0, const char *name=0,
+		virtual KParts::Part* createPartObject(TQWidget *parentWidget=0, const char *widgetName=0, TQObject *tqparent=0, const char *name=0,
 		  const char *classname="KParts::Part", const TQStringList &args=TQStringList());
 
 		static KInstance *instance();