summaryrefslogtreecommitdiffstats
path: root/lib/koproperty
diff options
context:
space:
mode:
Diffstat (limited to 'lib/koproperty')
-rw-r--r--lib/koproperty/editor.cpp34
-rw-r--r--lib/koproperty/editoritem.cpp2
-rw-r--r--lib/koproperty/editoritem.h2
-rw-r--r--lib/koproperty/editors/cursoredit.cpp4
-rw-r--r--lib/koproperty/editors/pixmapedit.cpp2
-rw-r--r--lib/koproperty/editors/pointedit.cpp8
-rw-r--r--lib/koproperty/editors/rectedit.cpp16
-rw-r--r--lib/koproperty/editors/sizeedit.cpp8
-rw-r--r--lib/koproperty/editors/sizepolicyedit.cpp12
-rw-r--r--lib/koproperty/editors/stringlistedit.cpp2
-rw-r--r--lib/koproperty/editors/symbolcombo.cpp2
-rw-r--r--lib/koproperty/factory.h6
-rw-r--r--lib/koproperty/property.cpp44
-rw-r--r--lib/koproperty/property.h8
-rw-r--r--lib/koproperty/test/test.cpp2
15 files changed, 76 insertions, 76 deletions
diff --git a/lib/koproperty/editor.cpp b/lib/koproperty/editor.cpp
index 7f8bb11a3..7040e8857 100644
--- a/lib/koproperty/editor.cpp
+++ b/lib/koproperty/editor.cpp
@@ -233,7 +233,7 @@ Editor::fill()
}
}
-// tqrepaint();
+// repaint();
if (firstChild())
{
@@ -271,12 +271,12 @@ Editor::addItem(const TQCString &name, EditorItem *parent)
// Create child items
item->setOpen(true);
- if(!property->tqchildren())
+ if(!property->children())
return;
last = 0;
- TQValueList<Property*>::ConstIterator endIt = property->tqchildren()->constEnd();
- for(TQValueList<Property*>::ConstIterator it = property->tqchildren()->constBegin(); it != endIt; ++it) {
+ TQValueList<Property*>::ConstIterator endIt = property->children()->constEnd();
+ for(TQValueList<Property*>::ConstIterator it = property->children()->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);
@@ -652,7 +652,7 @@ Editor::createWidgetForProperty(Property *property, bool changeWidgetProperty)
this, TQT_SLOT(slotWidgetRejectInput(Widget*)) );
}
- //update tqgeometry earlier, because Widget::setValue() can depend on widget's tqgeometry
+ //update geometry earlier, because Widget::setValue() can depend on widget's geometry
updateEditorGeometry(d->currentItem, widget);
if(widget && (!widget->property() || changeWidgetProperty))
@@ -723,7 +723,7 @@ Editor::updateGroupLabelsPosition()
TQRect r = itemRect((TQListViewItem*) group);
if(group->label()) {
group->label()->setGeometry(r);
- group->label()->tqrepaint();
+ group->label()->repaint();
}
group = dynamic_cast<EditorGroupItem*>(group->nextSibling());
}
@@ -748,7 +748,7 @@ Editor::showUndoButton( bool show )
return;
int y = viewportToContents(TQPoint(0, itemRect(d->currentItem).y())).y();
- TQRect tqgeometry(columnWidth(0), y, columnWidth(1) + 1, d->currentItem->height());
+ TQRect geometry(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()) {
- tqgeometry.setWidth(tqgeometry.width()-d->undoButton->width());
+ geometry.setWidth(geometry.width()-d->undoButton->width());
}
- d->currentWidget->resize(tqgeometry.width(), tqgeometry.height());
+ d->currentWidget->resize(geometry.width(), geometry.height());
}*/
d->undoButton->hide();
return;
}
- TQPoint p = contentsToViewport(TQPoint(0, tqgeometry.y()));
- d->undoButton->move(tqgeometry.x() + tqgeometry.width()
+ TQPoint p = contentsToViewport(TQPoint(0, geometry.y()));
+ d->undoButton->move(geometry.x() + geometry.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(tqgeometry.width()-d->undoButton->width(), tqgeometry.height());
+// d->currentWidget->resize(geometry.width()-d->undoButton->width(), geometry.height());
// }
d->undoButton->show();
}
@@ -791,7 +791,7 @@ Editor::slotExpanded(TQListViewItem *item)
updateEditorGeometry();
updateGroupLabelsPosition();
repaintContents();
- tqrepaint();
+ repaint();
}
void
@@ -815,7 +815,7 @@ Editor::slotCollapsed(TQListViewItem *item)
updateEditorGeometry();
updateGroupLabelsPosition();
repaintContents();
- tqrepaint();
+ repaint();
}
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()->tqrepaint();
+ it.current()->repaint();
}
}*/
/*
@@ -843,7 +843,7 @@ Editor::slotColumnSizeChanged(int section, int oldSize, int newSize)
}
}*/
// repaintContents();
-// tqrepaint();
+// repaint();
updateEditorGeometry();
update();
}
@@ -1021,7 +1021,7 @@ Editor::setSorting( int column, bool ascending )
updateEditorGeometry();
updateGroupLabelsPosition();
repaintContents();
- tqrepaint();
+ repaint();
}
#include "editor.moc"
diff --git a/lib/koproperty/editoritem.cpp b/lib/koproperty/editoritem.cpp
index 8c34a5e35..0a4313292 100644
--- a/lib/koproperty/editoritem.cpp
+++ b/lib/koproperty/editoritem.cpp
@@ -245,7 +245,7 @@ bool GroupContainer::event( TQEvent * e ) {
d->contents->show();
else
d->contents->hide();
- d->lyr->tqinvalidate();
+ d->lyr->invalidate();
update();
}
}
diff --git a/lib/koproperty/editoritem.h b/lib/koproperty/editoritem.h
index 9f2c75c29..fc7032398 100644
--- a/lib/koproperty/editoritem.h
+++ b/lib/koproperty/editoritem.h
@@ -72,7 +72,7 @@ class EditorItem : public KListViewItem
virtual void paintCell(TQPainter *p, const TQColorGroup & cg, int column, int width, int align);
/*! Reimplemented from KListViewItem to draw custom contents. It takes care of drawing the [+] and [-]
- signs only if the item has tqchildren.
+ signs only if the item has children.
*/
virtual void paintBranches(TQPainter *p, const TQColorGroup &cg, int w, int y, int h);
diff --git a/lib/koproperty/editors/cursoredit.cpp b/lib/koproperty/editors/cursoredit.cpp
index 61d444996..5ff0bb34f 100644
--- a/lib/koproperty/editors/cursoredit.cpp
+++ b/lib/koproperty/editors/cursoredit.cpp
@@ -118,13 +118,13 @@ CursorEdit::value() const
void
CursorEdit::setValue(const TQVariant &value, bool emitChange)
{
- ComboBox::setValue(value.toCursor().tqshape(), emitChange);
+ ComboBox::setValue(value.toCursor().shape(), emitChange);
}
void
CursorEdit::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &value)
{
- ComboBox::drawViewer(p, cg, r, value.toCursor().tqshape());
+ ComboBox::drawViewer(p, cg, r, value.toCursor().shape());
}
void
diff --git a/lib/koproperty/editors/pixmapedit.cpp b/lib/koproperty/editors/pixmapedit.cpp
index 17f6d508c..d887a8cde 100644
--- a/lib/koproperty/editors/pixmapedit.cpp
+++ b/lib/koproperty/editors/pixmapedit.cpp
@@ -153,7 +153,7 @@ PixmapEdit::selectPixmapFileName()
emit valueChanged(this);
}
#endif*/
- TQString caption( i18n("Insert Image From File (for \"%1\" property)").tqarg(property()->caption()) );
+ TQString caption( i18n("Insert Image From File (for \"%1\" property)").arg(property()->caption()) );
#ifdef TQ_WS_WIN
TQString recentDir;
TQString fileName = TQFileDialog::getOpenFileName(
diff --git a/lib/koproperty/editors/pointedit.cpp b/lib/koproperty/editors/pointedit.cpp
index fee526627..c47c854fe 100644
--- a/lib/koproperty/editors/pointedit.cpp
+++ b/lib/koproperty/editors/pointedit.cpp
@@ -64,8 +64,8 @@ PointEdit::setValue(const TQVariant &value, bool emitChange)
{
m_value = value;
m_edit->selectAll(false);
- m_edit->setText(TQString(POINTEDIT_MASK).tqarg(value.toPoint().x()).tqarg(value.toPoint().y()));
- TQToolTip::add(this, TQString("%1, %2").tqarg(value.toPoint().x()).tqarg(value.toPoint().y()));
+ m_edit->setText(TQString(POINTEDIT_MASK).arg(value.toPoint().x()).arg(value.toPoint().y()));
+ TQToolTip::add(this, TQString("%1, %2").arg(value.toPoint().x()).arg(value.toPoint().y()));
if (emitChange)
emit valueChanged(this);
@@ -76,10 +76,10 @@ PointEdit::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, con
{
TQRect rect(r);
rect.setBottom(r.bottom()+1);
- Widget::drawViewer(p, cg, rect, TQString(POINTEDIT_MASK).tqarg(value.toPoint().x()).tqarg(value.toPoint().y()));
+ Widget::drawViewer(p, cg, rect, TQString(POINTEDIT_MASK).arg(value.toPoint().x()).arg(value.toPoint().y()));
// p->eraseRect(r);
// p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine,
-// TQString("[ %1, %2 ]").tqarg(value.toPoint().x()).tqarg(value.toPoint().y()));
+// TQString("[ %1, %2 ]").arg(value.toPoint().x()).arg(value.toPoint().y()));
}
void
diff --git a/lib/koproperty/editors/rectedit.cpp b/lib/koproperty/editors/rectedit.cpp
index ba6fec49b..3cebfea8d 100644
--- a/lib/koproperty/editors/rectedit.cpp
+++ b/lib/koproperty/editors/rectedit.cpp
@@ -60,10 +60,10 @@ RectEdit::setValue(const TQVariant &value, bool emitChange)
{
m_value = value;
m_edit->selectAll(false);
- m_edit->setText(TQString(RECTEDIT_MASK).tqarg(value.toRect().x()).
- tqarg(value.toRect().y()).tqarg(value.toRect().width()).tqarg(value.toRect().height()));
- TQToolTip::add(this, i18n("Position: %1, %2\nSize: %3 x %4").tqarg(value.toRect().x()).
- tqarg(value.toRect().y()).tqarg(value.toRect().width()).tqarg(value.toRect().height()));
+ m_edit->setText(TQString(RECTEDIT_MASK).arg(value.toRect().x()).
+ arg(value.toRect().y()).arg(value.toRect().width()).arg(value.toRect().height()));
+ TQToolTip::add(this, i18n("Position: %1, %2\nSize: %3 x %4").arg(value.toRect().x()).
+ arg(value.toRect().y()).arg(value.toRect().width()).arg(value.toRect().height()));
if (emitChange)
emit valueChanged(this);
@@ -75,12 +75,12 @@ RectEdit::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, cons
TQRect rect(r);
rect.setBottom(r.bottom()+1);
Widget::drawViewer(p, cg, rect,
- TQString(RECTEDIT_MASK).tqarg(value.toRect().x()).tqarg(value.toRect().y())
- .tqarg(value.toRect().width()).tqarg(value.toRect().height()));
+ TQString(RECTEDIT_MASK).arg(value.toRect().x()).arg(value.toRect().y())
+ .arg(value.toRect().width()).arg(value.toRect().height()));
// p->eraseRect(r);
// p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine,
-// TQString("[ %1, %2, %3, %4 ]").tqarg(value.toRect().x()).tqarg(value.toRect().y())
-// .tqarg(value.toRect().width()).tqarg(value.toRect().height()));
+// TQString("[ %1, %2, %3, %4 ]").arg(value.toRect().x()).arg(value.toRect().y())
+// .arg(value.toRect().width()).arg(value.toRect().height()));
}
void
diff --git a/lib/koproperty/editors/sizeedit.cpp b/lib/koproperty/editors/sizeedit.cpp
index 2fa29bc47..98075515e 100644
--- a/lib/koproperty/editors/sizeedit.cpp
+++ b/lib/koproperty/editors/sizeedit.cpp
@@ -63,8 +63,8 @@ SizeEdit::setValue(const TQVariant &value, bool emitChange)
{
m_value = value;
m_edit->selectAll(false);
- m_edit->setText(TQString(SIZEEDIT_MASK).tqarg(value.toSize().width()).tqarg(value.toSize().height()));
- TQToolTip::add(this, TQString("%1 x %2").tqarg(value.toSize().width()).tqarg(value.toSize().height()));
+ m_edit->setText(TQString(SIZEEDIT_MASK).arg(value.toSize().width()).arg(value.toSize().height()));
+ TQToolTip::add(this, TQString("%1 x %2").arg(value.toSize().width()).arg(value.toSize().height()));
if (emitChange)
emit valueChanged(this);
@@ -76,10 +76,10 @@ SizeEdit::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, cons
TQRect rect(r);
rect.setBottom(r.bottom()+1);
Widget::drawViewer(p, cg, rect,
- TQString(SIZEEDIT_MASK).tqarg(value.toSize().width()).tqarg(value.toSize().height()));
+ TQString(SIZEEDIT_MASK).arg(value.toSize().width()).arg(value.toSize().height()));
// p->eraseRect(r);
// p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine,
-// TQString("[ %1, %2 ]").tqarg(value.toSize().width()).tqarg(value.toSize().height()));
+// TQString("[ %1, %2 ]").arg(value.toSize().width()).arg(value.toSize().height()));
}
void
diff --git a/lib/koproperty/editors/sizepolicyedit.cpp b/lib/koproperty/editors/sizepolicyedit.cpp
index 7722d4a26..ba65a92ff 100644
--- a/lib/koproperty/editors/sizepolicyedit.cpp
+++ b/lib/koproperty/editors/sizepolicyedit.cpp
@@ -77,9 +77,9 @@ void
SizePolicyEdit::setValue(const TQVariant &value, bool emitChange)
{
m_value = value;
- m_edit->setText(TQString("%1/%2/%3/%4").tqarg(findDescription(value.toSizePolicy().horData())).
- tqarg(findDescription(value.toSizePolicy().verData())).
- tqarg(value.toSizePolicy().horStretch()).tqarg(value.toSizePolicy().verStretch()));
+ m_edit->setText(TQString("%1/%2/%3/%4").arg(findDescription(value.toSizePolicy().horData())).
+ arg(findDescription(value.toSizePolicy().verData())).
+ arg(value.toSizePolicy().horStretch()).arg(value.toSizePolicy().verStretch()));
TQToolTip::add(this, m_edit->text());
if (emitChange)
@@ -94,9 +94,9 @@ SizePolicyEdit::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r
TQRect rect(r);
rect.setBottom(r.bottom()+1);
Widget::drawViewer(p, cg, rect,
- TQString("%1/%2/%3/%4").tqarg(findDescription(value.toSizePolicy().horData())).
- tqarg(findDescription(value.toSizePolicy().verData())).
- tqarg(value.toSizePolicy().horStretch()).tqarg(value.toSizePolicy().verStretch()));
+ TQString("%1/%2/%3/%4").arg(findDescription(value.toSizePolicy().horData())).
+ arg(findDescription(value.toSizePolicy().verData())).
+ arg(value.toSizePolicy().horStretch()).arg(value.toSizePolicy().verStretch()));
}
TQString
diff --git a/lib/koproperty/editors/stringlistedit.cpp b/lib/koproperty/editors/stringlistedit.cpp
index fe599e582..54f986c55 100644
--- a/lib/koproperty/editors/stringlistedit.cpp
+++ b/lib/koproperty/editors/stringlistedit.cpp
@@ -90,7 +90,7 @@ StringListEdit::showEditor()
KDialogBase dialog(this->topLevelWidget(), "stringlist_dialog", true, i18n("Edit List of Items"),
KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, false);
- KEditListBox *edit = new KEditListBox(i18n("Contents of %1").tqarg(property()->caption()), &dialog, "editlist");
+ KEditListBox *edit = new KEditListBox(i18n("Contents of %1").arg(property()->caption()), &dialog, "editlist");
dialog.setMainWidget(edit);
edit->insertStringList(m_list);
diff --git a/lib/koproperty/editors/symbolcombo.cpp b/lib/koproperty/editors/symbolcombo.cpp
index 1af1fcd18..65a7d9511 100644
--- a/lib/koproperty/editors/symbolcombo.cpp
+++ b/lib/koproperty/editors/symbolcombo.cpp
@@ -61,7 +61,7 @@ TQVariant
SymbolCombo::value() const
{
if (!(m_edit->text().isNull()))
- return m_edit->text().tqat(0).tqunicode();
+ return m_edit->text().at(0).tqunicode();
else
return 0;
}
diff --git a/lib/koproperty/factory.h b/lib/koproperty/factory.h
index 8aca55387..f4b0cf36e 100644
--- a/lib/koproperty/factory.h
+++ b/lib/koproperty/factory.h
@@ -81,7 +81,7 @@ class KOPROPERTY_EXPORT CustomPropertyFactory : public TQObject
\section custom_prop_composed Using Custom Properties to create composed properties
Use a composed property when you need more than one editor for a property. Examples
are rect, size or point properties.
- If you create a composed property, both parent and tqchildren properties must have custom
+ If you create a composed property, both parent and children properties must have custom
(different) types.
Child properties are created in CustomProperty constructor of the <b>parent</b> type,
by adding CustomProperty::property() as parent in Property constructor.\n
@@ -89,7 +89,7 @@ class KOPROPERTY_EXPORT CustomPropertyFactory : public TQObject
parent's Property::setValue() should be called, making sure that useCustomProperty argument is set
to false.\n
Parent's handleValue() should be set to false, unless you cannot store the property in a TQVariant.
- You just need to update tqchildren's value, making sure that useCustomProperty argument is set
+ You just need to update children's value, making sure that useCustomProperty argument is set
to false.
\section custom_editor Using Custom Editors
@@ -105,7 +105,7 @@ class KOPROPERTY_EXPORT CustomPropertyFactory : public TQObject
\section custom_prop_composed Using Custom Properties with value that cannot be stored in a TQVariant
You then need to set handleValue() to true. The Widget you create also have
to call directly CustomProperty member to store the value. just make sure you call emitPropertyChanged()
- when the proerty value changes. Also make sure to avoid infinite recursion if you use tqchildren properties.
+ when the proerty value changes. Also make sure to avoid infinite recursion if you use children properties.
\author Cedric Pasteur <cedric.pasteur@free.fr>
\author Alexander Dymo <cloudtemple@mskat.net>
diff --git a/lib/koproperty/property.cpp b/lib/koproperty/property.cpp
index 49ca2b6cc..6c4fa246a 100644
--- a/lib/koproperty/property.cpp
+++ b/lib/koproperty/property.cpp
@@ -43,7 +43,7 @@ class PropertyPrivate
: caption(0), listData(0), changed(false), storable(true),
readOnly(false), visible(true),
autosync(-1), custom(0), useCustomProperty(true),
- sets(0), parent(0), tqchildren(0), relatedProperties(0),
+ sets(0), parent(0), children(0), relatedProperties(0),
sortingKey(0)
{
}
@@ -63,7 +63,7 @@ class PropertyPrivate
delete caption;
caption = 0;
delete listData;
- delete tqchildren;
+ delete children;
delete relatedProperties;
delete custom;
delete sets;
@@ -99,7 +99,7 @@ class PropertyPrivate
// TQValueList<Set*> sets;
Property *parent;
- TQValueList<Property*> *tqchildren;
+ TQValueList<Property*> *children;
//! list of properties with the same name (when intersecting buffers)
TQValueList<Property*> *relatedProperties;
@@ -564,9 +564,9 @@ Property::operator= (const Property &property)
delete d->listData;
d->listData = 0;
}
- if(d->tqchildren) {
- delete d->tqchildren;
- d->tqchildren = 0;
+ if(d->children) {
+ delete d->children;
+ d->children = 0;
}
if(d->relatedProperties) {
delete d->relatedProperties;
@@ -594,16 +594,16 @@ Property::operator= (const Property &property)
}
if(property.d->custom) {
d->custom = FactoryManager::self()->createCustomProperty(this);
- // updates all tqchildren value, using CustomProperty
+ // updates all children value, using CustomProperty
setValue(property.value());
}
else {
d->value = property.d->value;
- if(property.d->tqchildren) {
- // no CustomProperty (should never happen), simply copy all tqchildren
- d->tqchildren = new TQValueList<Property*>();
- TQValueList<Property*>::ConstIterator endIt = property.d->tqchildren->constEnd();
- for(TQValueList<Property*>::ConstIterator it = property.d->tqchildren->constBegin(); it != endIt; ++it) {
+ if(property.d->children) {
+ // no CustomProperty (should never happen), simply copy all children
+ d->children = new TQValueList<Property*>();
+ TQValueList<Property*>::ConstIterator endIt = property.d->children->constEnd();
+ for(TQValueList<Property*>::ConstIterator it = property.d->children->constBegin(); it != endIt; ++it) {
Property *child = new Property( *(*it) );
addChild(child);
}
@@ -614,7 +614,7 @@ Property::operator= (const Property &property)
d->relatedProperties = new TQValueList<Property*>( *(property.d->relatedProperties));
}
- // update these later because they may have been changed when creating tqchildren
+ // update these later because they may have been changed when creating children
d->oldValue = property.d->oldValue;
d->changed = property.d->changed;
d->sortingKey = property.d->sortingKey;
@@ -631,16 +631,16 @@ Property::operator ==(const Property &prop) const
/////////////////////////////////////////////////////////////////
const TQValueList<Property*>*
-Property::tqchildren() const
+Property::children() const
{
- return d->tqchildren;
+ return d->children;
}
Property*
Property::child(const TQCString &name)
{
- TQValueList<Property*>::ConstIterator endIt = d->tqchildren->constEnd();
- for(TQValueList<Property*>::ConstIterator it = d->tqchildren->constBegin(); it != endIt; ++it) {
+ TQValueList<Property*>::ConstIterator endIt = d->children->constEnd();
+ for(TQValueList<Property*>::ConstIterator it = d->children->constBegin(); it != endIt; ++it) {
if((*it)->name() == name)
return *it;
}
@@ -659,11 +659,11 @@ Property::addChild(Property *prop)
if (!prop)
return;
- if(!d->tqchildren || tqFind( d->tqchildren->begin(), d->tqchildren->end(), prop) == d->tqchildren->end()) { // not in our list
- if(!d->tqchildren)
- d->tqchildren = new TQValueList<Property*>();
- d->tqchildren->append(prop);
- prop->setSortingKey(d->tqchildren->count());
+ if(!d->children || tqFind( d->children->begin(), d->children->end(), prop) == d->children->end()) { // not in our list
+ if(!d->children)
+ d->children = new TQValueList<Property*>();
+ d->children->append(prop);
+ prop->setSortingKey(d->children->count());
prop->d->parent = this;
}
else {
diff --git a/lib/koproperty/property.h b/lib/koproperty/property.h
index bc8a503ea..5f61ff6bf 100644
--- a/lib/koproperty/property.h
+++ b/lib/koproperty/property.h
@@ -306,9 +306,9 @@ class KOPROPERTY_EXPORT Property
/*! \return property icon's string. Can be empty. */
TQString icon() const;
- /*! \return a list of all tqchildren for this property, or NULL of there
- is no tqchildren for this property */
- const TQValueList<Property*>* tqchildren() const;
+ /*! \return a list of all children for this property, or NULL of there
+ is no children for this property */
+ const TQValueList<Property*>* children() const;
/*! \return a child property for \a name, or NULL if there is no property with that name. */
Property* child(const TQCString &name);
@@ -407,7 +407,7 @@ class KOPROPERTY_EXPORT Property
protected:
/*! Adds \a prop as a child of this property.
- The tqchildren will be owned by this property. */
+ The children will be owned by this property. */
void addChild(Property *prop);
/*! Adds \a set to this property. */
diff --git a/lib/koproperty/test/test.cpp b/lib/koproperty/test/test.cpp
index c026aad04..1c4678c97 100644
--- a/lib/koproperty/test/test.cpp
+++ b/lib/koproperty/test/test.cpp
@@ -89,7 +89,7 @@ Test::Test()
group = "ComplexGroup";
m_set->setGroupDescription(group, "Complex Group");
}
- m_set->addProperty(new Property("Rect", this->tqgeometry(),"Rect"), group);
+ m_set->addProperty(new Property("Rect", this->geometry(),"Rect"), group);
m_set->addProperty(new Property("Point", TQPoint(3,4), "Point"), group);
m_set->addProperty(new Property("Size", TQPoint(3,4), "Size"), group);