Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 94844816550ad672ccfcdc25659c625546239998.

1 files changed, 23 insertions, 23 deletions

diff --git a/kexi/formeditor/formmanager.cpp b/kexi/formeditor/formmanager.cpp
index 75846dd3..a2ed0dac 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::fromLatin1(kapp->tqstyle().name()).lower();
+	TQString currentStyle = TQString::tqfromLatin1(kapp->tqstyle().name()).lower();
 	const TQStringList styles = TQStyleFactory::keys();
 	m_style->setItems(styles);
 	m_style->setCurrentItem(0);
@@ -413,7 +413,7 @@ FormManager::resetCreatedConnection()
 		m_active->formWidget()->clearForm();
 	}
 	if (m_active && m_active->widget())
-		m_active->widget()->repaint();
+		m_active->widget()->tqrepaint();
 }
 
 void
@@ -790,7 +790,7 @@ FormManager::createSignalMenu(TQWidget *w)
 	m_sigSlotMenu = new KPopupMenu();
 	m_sigSlotMenu->insertTitle(SmallIcon("connection"), i18n("Signals"));
 
-	TQStrList list = w->metaObject()->signalNames(true);
+	TQStrList list = w->tqmetaObject()->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->metaObject()->slotNames(true);
+	TQStrList list = w->tqmetaObject()->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.startsWith(slotArg, true)) // args not compatible
+		if(!signalArg.tqstartsWith(slotArg, true)) // args not compatible
 			continue;
 
 		m_sigSlotMenu->insertItem(*it);
@@ -845,7 +845,7 @@ FormManager::createContextMenu(TQWidget *w, Container *container, bool popupAtCu
 	const uint widgetsCount = container->form()->selectedWidgets()->count();
 	const bool multiple = widgetsCount > 1;
 	//const bool enableRemove = w != m_active->widget();
-	// We only enablelayout creation if more than one widget with the same parent are selected
+	// We only enabletqlayout creation if more than one widget with the same parent are selected
 	const bool enableLayout = multiple || w == container->widget();
 
 	m_menuWidget = w;
@@ -863,14 +863,14 @@ FormManager::createContextMenu(TQWidget *w, Container *container, bool popupAtCu
 	if(!multiple)
 	{
 		if(w == container->form()->widget())
-			m_popup->insertTitle(SmallIcon("form"), i18n("%1 : Form").arg(w->name()) );
+			m_popup->insertTitle(SmallIcon("form"), i18n("%1 : Form").tqarg(w->name()) );
 		else
 			m_popup->insertTitle( SmallIcon(
 				container->form()->library()->iconName(w->className())), TQString(w->name()) + " : " + n );
 	}
 	else
 		m_popup->insertTitle(SmallIcon("multiple_obj"), i18n("Multiple Widgets")
-		+ TQString(" (%1)").arg(widgetsCount));
+		+ TQString(" (%1)").tqarg(widgetsCount));
 
 	KAction *a;
 #define PLUG_ACTION(_name, forceVisible) \
@@ -937,7 +937,7 @@ FormManager::createContextMenu(TQWidget *w, Container *container, bool popupAtCu
 
 		// We create the signals menu
 		KPopupMenu *sigMenu = new KPopupMenu();
-		TQStrList list = w->metaObject()->signalNames(true);
+		TQStrList list = w->tqmetaObject()->signalNames(true);
 		TQStrListIterator it(list);
 		for(; it.current() != 0; ++it)
 			sigMenu->insertItem(*it);
@@ -1095,7 +1095,7 @@ void
 FormManager::createLayout(int layoutType)
 {
 	WidgetList *list = m_active->selectedWidgets();
-	// if only one widget is selected (a container), we modify its layout
+	// if only one widget is selected (a container), we modify its tqlayout
 	if (list->isEmpty()) {//sanity check
 		kdWarning() << "FormManager::createLayout(): list is empty!" << endl;
 		return;
@@ -1103,9 +1103,9 @@ FormManager::createLayout(int layoutType)
 	if(list->count() == 1)
 	{
 		ObjectTreeItem *item = m_active->objectTree()->lookup(list->first()->name());
-		if(!item || !item->container() || !m_propSet->contains("layout"))
+		if(!item || !item->container() || !m_propSet->contains("tqlayout"))
 			return;
-		(*m_propSet)["layout"] = Container::layoutTypeToString(layoutType);
+		(*m_propSet)["tqlayout"] = Container::layoutTypeToString(layoutType);
 		return;
 	}
 
@@ -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()->topLevelWidget(), i18n("<b>Cannot create the layout.</b>\n"
+			KMessageBox::sorry(m_active->widget()->tqtopLevelWidget(), 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;
@@ -1143,7 +1143,7 @@ FormManager::breakLayout()
 	else // normal container
 	{
 		if(activeForm()->selectedWidgets()->count() == 1)
-			(*m_propSet)["layout"] = "NoLayout";
+			(*m_propSet)["tqlayout"] = "NoLayout";
 		else
 			container->setLayout(Container::NoLayout);
 	}
@@ -1188,7 +1188,7 @@ FormManager::editTabOrder()
 {
 	if(!activeForm() || !activeForm()->objectTree())
 		return;
-	TQWidget *topLevel = m_active->widget()->topLevelWidget();
+	TQWidget *topLevel = m_active->widget()->tqtopLevelWidget();
 	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()->topLevelWidget());
+	PixmapCollectionEditor dialog(activeForm()->pixmapCollection(), activeForm()->widget()->tqtopLevelWidget());
 	dialog.exec();
 }
 
@@ -1234,7 +1234,7 @@ FormManager::editConnections()
 	if(!activeForm() || !activeForm()->objectTree())
 		return;
 
-	ConnectionDialog dialog(activeForm()->widget()->topLevelWidget());
+	ConnectionDialog dialog(activeForm()->widget()->tqtopLevelWidget());
 	dialog.exec(activeForm());
 }
 
@@ -1380,9 +1380,9 @@ FormManager::selectAll()
 		return;
 
 	activeForm()->selectFormWidget();
-	uint count = activeForm()->objectTree()->children()->count();
-	for(ObjectTreeItem *it = activeForm()->objectTree()->children()->first(); it; 
-		it = activeForm()->objectTree()->children()->next(), count--)
+	uint count = activeForm()->objectTree()->tqchildren()->count();
+	for(ObjectTreeItem *it = activeForm()->objectTree()->tqchildren()->first(); it; 
+		it = activeForm()->objectTree()->tqchildren()->next(), count--)
 	{
 		activeForm()->setSelectedWidget(it->widget(), /*add*/true, /*raise*/false, /*moreWillBeSelected*/count>1);
 	}
@@ -1493,14 +1493,14 @@ 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()->metaObject()->findProperty("font", true)) {
+		if (-1 != it.current()->tqmetaObject()->findProperty("font", true)) {
 			fontEnabled = true;
 			break;
 		}
 	}
 	enableAction("format_font", fontEnabled);
 
-	// If the widgets selected is a container, we enable layout actions
+	// If the widgets selected is a container, we enable tqlayout actions
 	bool containerSelected = false;
 	if(!multiple)
 	{
@@ -1550,7 +1550,7 @@ FormManager::emitFormWidgetSelected( KFormDesigner::Form* form )
 	enableFormActions();
 
 	const bool twoSelected = form->selectedWidgets()->count()==2;
-	const bool hasChildren = !form->objectTree()->children()->isEmpty();
+	const bool hasChildren = !form->objectTree()->tqchildren()->isEmpty();
 
 	// Layout actions
 	enableAction("layout_menu", hasChildren);