1 files changed, 10 insertions, 10 deletions

diff --git a/kexi/formeditor/formmanager.cpp b/kexi/formeditor/formmanager.cpp
index a2ed0dac..5fb76ca8 100644
--- a/kexi/formeditor/formmanager.cpp
+++ b/kexi/formeditor/formmanager.cpp
@@ -227,7 +227,7 @@ FormManager::createActions(WidgetLibrary *lib, KActionCollection* collection, KX
 	m_style->setEditable(false);
 
 	KGlobal::config()->setGroup("General");
-	TQString currentStyle = TQString::tqfromLatin1(kapp->tqstyle().name()).lower();
+	TQString currentStyle = TQString::fromLatin1(kapp->tqstyle().name()).lower();
 	const TQStringList styles = TQStyleFactory::keys();
 	m_style->setItems(styles);
 	m_style->setCurrentItem(0);
@@ -790,7 +790,7 @@ FormManager::createSignalMenu(TQWidget *w)
 	m_sigSlotMenu = new KPopupMenu();
 	m_sigSlotMenu->insertTitle(SmallIcon("connection"), i18n("Signals"));
 
-	TQStrList list = w->tqmetaObject()->signalNames(true);
+	TQStrList list = w->metaObject()->signalNames(true);
 	TQStrListIterator it(list);
 	for(; it.current() != 0; ++it)
 		m_sigSlotMenu->insertItem(*it);
@@ -813,14 +813,14 @@ FormManager::createSlotMenu(TQWidget *w)
 
 	TQString signalArg( m_connection->signal().remove( TQRegExp(".*[(]|[)]") ) );
 
-	TQStrList list = w->tqmetaObject()->slotNames(true);
+	TQStrList list = w->metaObject()->slotNames(true);
 	TQStrListIterator it(list);
 	for(; it.current() != 0; ++it)
 	{
 		// we add the slot only if it is compatible with the signal
 		TQString slotArg(*it);
 		slotArg = slotArg.remove( TQRegExp(".*[(]|[)]") );
-		if(!signalArg.tqstartsWith(slotArg, true)) // args not compatible
+		if(!signalArg.startsWith(slotArg, true)) // args not compatible
 			continue;
 
 		m_sigSlotMenu->insertItem(*it);
@@ -937,7 +937,7 @@ FormManager::createContextMenu(TQWidget *w, Container *container, bool popupAtCu
 
 		// We create the signals menu
 		KPopupMenu *sigMenu = new KPopupMenu();
-		TQStrList list = w->tqmetaObject()->signalNames(true);
+		TQStrList list = w->metaObject()->signalNames(true);
 		TQStrListIterator it(list);
 		for(; it.current() != 0; ++it)
 			sigMenu->insertItem(*it);
@@ -1115,7 +1115,7 @@ FormManager::createLayout(int layoutType)
 		kdDebug() << "comparing widget " << w->name() << " whose parent is " << w->parentWidget()->name() << " insteaed of " << parent->name() << endl;
 		if(w->parentWidget() != parent)
 		{
-			KMessageBox::sorry(m_active->widget()->tqtopLevelWidget(), i18n("<b>Cannot create the tqlayout.</b>\n"
+			KMessageBox::sorry(m_active->widget()->topLevelWidget(), i18n("<b>Cannot create the tqlayout.</b>\n"
 		   "All selected widgets must have the same parent."));
 			kdDebug() << "FormManager::createLayout() widgets don't have the same parent widget" << endl;
 			return;
@@ -1188,7 +1188,7 @@ FormManager::editTabOrder()
 {
 	if(!activeForm() || !activeForm()->objectTree())
 		return;
-	TQWidget *topLevel = m_active->widget()->tqtopLevelWidget();
+	TQWidget *topLevel = m_active->widget()->topLevelWidget();
 	TabStopDialog dlg(topLevel);
 	//const bool oldAutoTabStops = m_active->autoTabStops();
 	if (dlg.exec(m_active) == TQDialog::Accepted) {
@@ -1222,7 +1222,7 @@ FormManager::editFormPixmapCollection()
 	if(!activeForm() || !activeForm()->objectTree())
 		return;
 
-	PixmapCollectionEditor dialog(activeForm()->pixmapCollection(), activeForm()->widget()->tqtopLevelWidget());
+	PixmapCollectionEditor dialog(activeForm()->pixmapCollection(), activeForm()->widget()->topLevelWidget());
 	dialog.exec();
 }
 
@@ -1234,7 +1234,7 @@ FormManager::editConnections()
 	if(!activeForm() || !activeForm()->objectTree())
 		return;
 
-	ConnectionDialog dialog(activeForm()->widget()->tqtopLevelWidget());
+	ConnectionDialog dialog(activeForm()->widget()->topLevelWidget());
 	dialog.exec(activeForm());
 }
 
@@ -1493,7 +1493,7 @@ FormManager::emitWidgetSelected( KFormDesigner::Form* form, bool multiple )
 	WidgetList *wlist = form->selectedWidgets();
 	bool fontEnabled = false;
 	for (WidgetListIterator it(*wlist); it.current(); ++it) {
-		if (-1 != it.current()->tqmetaObject()->findProperty("font", true)) {
+		if (-1 != it.current()->metaObject()->findProperty("font", true)) {
 			fontEnabled = true;
 			break;
 		}