Rename obsolete tq methods to standard names

1 files changed, 12 insertions, 12 deletions

diff --git a/kexi/formeditor/container.cpp b/kexi/formeditor/container.cpp
index 706ef69b..246940c7 100644
--- a/kexi/formeditor/container.cpp
+++ b/kexi/formeditor/container.cpp
@@ -333,7 +333,7 @@ Container::eventFilter(TQObject *s, TQEvent *e)
 			return false;
 		}
 
-		case TQEvent::Resize: // we are resizing a widget, so we set m_move to true -> the tqlayout will be reloaded when releasing mouse
+		case TQEvent::Resize: // we are resizing a widget, so we set m_move to true -> the layout will be reloaded when releasing mouse
 		{
 			if(m_form->interactiveMode())
 				m_state = MovingWidget;
@@ -525,7 +525,7 @@ Container::handleMouseReleaseEvent(TQObject *s, TQMouseEvent *mev)
 
 		//m_initialPos = TQPoint();
 	}
-	else if(m_state == MovingWidget) // one widget has been moved, so we need to update the tqlayout
+	else if(m_state == MovingWidget) // one widget has been moved, so we need to update the layout
 		reloadLayout();
 
 	// cancel copying as user released Ctrl before releasing mouse button
@@ -639,7 +639,7 @@ Container::setLayout(LayoutType type)
 			return;
 		}
 	}
-	m_container->setGeometry(m_container->geometry()); // just update tqlayout
+	m_container->setGeometry(m_container->geometry()); // just update layout
 	m_layout->activate();
 }
 
@@ -654,14 +654,14 @@ Container::reloadLayout()
 void
 Container::createBoxLayout(WidgetList *list)
 {
-	TQBoxLayout *tqlayout = static_cast<TQBoxLayout*>(m_layout);
+	TQBoxLayout *layout = static_cast<TQBoxLayout*>(m_layout);
 
 	for(ObjectTreeItem *tree = m_tree->children()->first(); tree; tree = m_tree->children()->next())
 		list->append( tree->widget());
 	list->sort();
 
 	for(TQWidget *obj = list->first(); obj; obj = list->next())
-		tqlayout->addWidget(obj);
+		layout->addWidget(obj);
 	delete list;
 }
 
@@ -776,7 +776,7 @@ Container::createGridLayout(bool testOnly)
 		}
 	}
 
-	// Then we count the number of rows in the tqlayout, and set their beginnings
+	// Then we count the number of rows in the layout, and set their beginnings
 	for(WidgetListIterator it(*vlist); it.current() != 0; ++it)
 	{
 		TQWidget *w = it.current();
@@ -830,11 +830,11 @@ Container::createGridLayout(bool testOnly)
 	}
 	kdDebug() << "the new grid will have n columns: n == " << cols.size() << endl;
 
-	// We create the tqlayout ..
-	TQGridLayout *tqlayout=0;
+	// We create the layout ..
+	TQGridLayout *layout=0;
 	if(!testOnly) {
-		tqlayout = new TQGridLayout(m_container, rows.size(), cols.size(), m_margin, m_spacing, "grid");
-		m_layout = (TQLayout*)tqlayout;
+		layout = new TQGridLayout(m_container, rows.size(), cols.size(), m_margin, m_spacing, "grid");
+		m_layout = (TQLayout*)layout;
 	}
 
 	// .. and we fill it with widgets
@@ -901,14 +901,14 @@ Container::createGridLayout(bool testOnly)
 		ObjectTreeItem *item = m_form->objectTree()->lookup(w->name());
 		if(!endrow && !endcol) {
 			if(!testOnly)
-				tqlayout->addWidget(w, wrow, wcol);
+				layout->addWidget(w, wrow, wcol);
 			item->setGridPos(wrow, wcol, 0, 0);
 		}
 		else {
 			if(!endcol)  endcol = wcol;
 			if(!endrow)  endrow = wrow;
 			if(!testOnly)
-				tqlayout->addMultiCellWidget(w, wrow, endrow, wcol, endcol);
+				layout->addMultiCellWidget(w, wrow, endrow, wcol, endcol);
 			item->setGridPos(wrow, wcol, endrow-wrow+1, endcol-wcol+1);
 		}
 	}