1 files changed, 24 insertions, 24 deletions

diff --git a/lib/koproperty/editor.cpp b/lib/koproperty/editor.cpp
index 59983222..6ffdcf5c 100644
--- a/lib/koproperty/editor.cpp
+++ b/lib/koproperty/editor.cpp
@@ -27,7 +27,7 @@
 #include "widget.h"
 
 #include <tqpushbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqmap.h>
 #include <tqguardedptr.h>
 #include <tqheader.h>
@@ -233,7 +233,7 @@ Editor::fill()
 		}
 	}
 
-//	repaint();
+//	tqrepaint();
 
 	if (firstChild())
 	{
@@ -271,12 +271,12 @@ Editor::addItem(const TQCString &name, EditorItem *parent)
 
 	// Create child items
 	item->setOpen(true);
-	if(!property->children())
+	if(!property->tqchildren())
 		return;
 
 	last = 0;
-	TQValueList<Property*>::ConstIterator endIt = property->children()->constEnd();
-	for(TQValueList<Property*>::ConstIterator it = property->children()->constBegin(); it != endIt; ++it) {
+	TQValueList<Property*>::ConstIterator endIt = property->tqchildren()->constEnd();
+	for(TQValueList<Property*>::ConstIterator it = property->tqchildren()->constBegin(); it != endIt; ++it) {
 		//! \todo allow to have child prop with child items too
 		if( *it && (*it)->isVisible() )
 			last = new EditorItem(this, item, *it, last);
@@ -366,7 +366,7 @@ Editor::changeSetInternal(Set *set, bool preservePrevSelection, const TQCString&
 		if (item) {
 			d->itemToSelectLater = item;
 			TQTimer::singleShot(10, this, TQT_SLOT(selectItemLater()));
-			//d->doNotSetFocusOnSelection = !hasParent(this, focusWidget());
+			//d->doNotSetFocusOnSelection = !hasParent(this, tqfocusWidget());
 			//setSelected(item, true);
 			//d->doNotSetFocusOnSelection = false;
 //			ensureItemVisible(item);
@@ -590,7 +590,7 @@ Editor::slotClicked(TQListViewItem *it)
 	if (d->currentWidget) {
 		if (d->currentWidget->visibleFlag()) {
 			d->currentWidget->show();
-			if (hasParent( TQT_TQOBJECT(this), TQT_TQOBJECT(kapp->focusWidget()) ))
+			if (hasParent( TQT_TQOBJECT(this), TQT_TQOBJECT(kapp->tqfocusWidget()) ))
 				d->currentWidget->setFocus();
 		}
 	}
@@ -652,7 +652,7 @@ Editor::createWidgetForProperty(Property *property, bool changeWidgetProperty)
 			this, TQT_SLOT(slotWidgetRejectInput(Widget*)) );
 	}
 
-	//update geometry earlier, because Widget::setValue() can depend on widget's geometry
+	//update tqgeometry earlier, because Widget::setValue() can depend on widget's tqgeometry
 	updateEditorGeometry(d->currentItem, widget);
 
 	if(widget && (!widget->property() || changeWidgetProperty))
@@ -720,10 +720,10 @@ Editor::updateGroupLabelsPosition()
 
 	EditorGroupItem *group = dynamic_cast<EditorGroupItem*>(d->topItem->firstChild());
 	while(group) {
-		TQRect r = itemRect((TQListViewItem*) group);
+		TQRect r = tqitemRect((TQListViewItem*) group);
 		if(group->label()) {
 			group->label()->setGeometry(r);
-			group->label()->repaint();
+			group->label()->tqrepaint();
 		}
 		group = dynamic_cast<EditorGroupItem*>(group->nextSibling());
 	}
@@ -747,8 +747,8 @@ Editor::showUndoButton( bool show )
 	if (!d->currentItem || !d->currentWidget || (d->currentWidget && d->currentWidget->isReadOnly()))
 		return;
 
-	int y = viewportToContents(TQPoint(0, itemRect(d->currentItem).y())).y();
-	TQRect geometry(columnWidth(0), y, columnWidth(1) + 1, d->currentItem->height());
+	int y = viewportToContents(TQPoint(0, tqitemRect(d->currentItem).y())).y();
+	TQRect tqgeometry(columnWidth(0), y, columnWidth(1) + 1, d->currentItem->height());
 	d->undoButton->resize(d->baseRowHeight, d->currentItem->height());
 
 	updateEditorGeometry(true, show);
@@ -756,21 +756,21 @@ Editor::showUndoButton( bool show )
 	if (!show) {
 /*	  if (d->currentWidget) {
 			if (d->currentWidget->leavesTheSpaceForRevertButton()) {
-				geometry.setWidth(geometry.width()-d->undoButton->width());
+				tqgeometry.setWidth(tqgeometry.width()-d->undoButton->width());
 			}
-			d->currentWidget->resize(geometry.width(), geometry.height());
+			d->currentWidget->resize(tqgeometry.width(), tqgeometry.height());
 		}*/
 		d->undoButton->hide();
 		return;
 	}
 
-	TQPoint p = contentsToViewport(TQPoint(0, geometry.y()));
-	d->undoButton->move(geometry.x() + geometry.width()
+	TQPoint p = contentsToViewport(TQPoint(0, tqgeometry.y()));
+	d->undoButton->move(tqgeometry.x() + tqgeometry.width()
 		-((d->currentWidget && d->currentWidget->hasBorders())?1:0)/*editor is moved by 1 to left*/
 		- d->undoButton->width(), p.y());
 //  if (d->currentWidget) {
 //	  d->currentWidget->move(d->currentWidget->x(), p.y());
-//	  d->currentWidget->resize(geometry.width()-d->undoButton->width(), geometry.height());
+//	  d->currentWidget->resize(tqgeometry.width()-d->undoButton->width(), tqgeometry.height());
 //  }
 	d->undoButton->show();
 }
@@ -791,7 +791,7 @@ Editor::slotExpanded(TQListViewItem *item)
 	updateEditorGeometry();
 	updateGroupLabelsPosition();
 	repaintContents();
-	repaint();
+	tqrepaint();
 }
 
 void
@@ -815,7 +815,7 @@ Editor::slotCollapsed(TQListViewItem *item)
 	updateEditorGeometry();
 	updateGroupLabelsPosition();
 	repaintContents();
-	repaint();
+	tqrepaint();
 }
 
 void
@@ -826,7 +826,7 @@ Editor::slotColumnSizeChanged(int section, int oldSize, int newSize)
 	Q_UNUSED(newSize);
 	/*for (TQListViewItemIterator it(this); it.current(); ++it) {
 		if (section == 0 && dynamic_cast<EditorGroupItem*>(it.current())) {
-			it.current()->repaint();
+			it.current()->tqrepaint();
 	}
 	}*/
 /*
@@ -843,7 +843,7 @@ Editor::slotColumnSizeChanged(int section, int oldSize, int newSize)
 		}
 	}*/
 //	repaintContents();
-//	repaint();
+//	tqrepaint();
 	updateEditorGeometry();
 	update();
 }
@@ -869,10 +869,10 @@ Editor::slotColumnSizeChanged(int section)
 }
 
 TQSize
-Editor::sizeHint() const
+Editor::tqsizeHint() const
 {
 	return TQSize( TQFontMetrics(font()).width(columnText(0)+columnText(1)+"   "),
-		KListView::sizeHint().height());
+		KListView::tqsizeHint().height());
 }
 
 void
@@ -1021,7 +1021,7 @@ Editor::setSorting( int column, bool ascending )
 	updateEditorGeometry();
 	updateGroupLabelsPosition();
 	repaintContents();
-	repaint();
+	tqrepaint();
 }
 
 #include "editor.moc"