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

This reverts commit 94844816550ad672ccfcdc25659c625546239998.

19 files changed, 80 insertions, 80 deletions

diff --git a/lib/koproperty/editors/booledit.cpp b/lib/koproperty/editors/booledit.cpp
index 09d55e94..886f20d8 100644
--- a/lib/koproperty/editors/booledit.cpp
+++ b/lib/koproperty/editors/booledit.cpp
@@ -30,7 +30,7 @@
 #include <tqtoolbutton.h>
 #include <tqpainter.h>
 #include <tqvariant.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqbitmap.h>
 
 using namespace KoProperty;
@@ -45,8 +45,8 @@ BoolEdit::BoolEdit(Property *property, TQWidget *parent, const char *name)
     m_toggle->setFocusPolicy(TQ_WheelFocus);
     m_toggle->setUsesTextLabel(true);
     m_toggle->setTextPosition(TQToolButton::Right);
-    m_toggle->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
-    //we're not using layout to because of problems with button size
+    m_toggle->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+    //we're not using tqlayout to because of problems with button size
     m_toggle->move(0, 0);
     m_toggle->resize(width(), height());
     setFocusWidget(m_toggle);
diff --git a/lib/koproperty/editors/coloredit.cpp b/lib/koproperty/editors/coloredit.cpp
index f72009e3..a9ab1f1a 100644
--- a/lib/koproperty/editors/coloredit.cpp
+++ b/lib/koproperty/editors/coloredit.cpp
@@ -21,7 +21,7 @@
 #include "coloredit.h"
 
 #include <tqvariant.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcolor.h>
 #include <tqpainter.h>
 
@@ -36,7 +36,7 @@ ColorButton::ColorButton(Property *property, TQWidget *parent, const char *name)
 	m_edit = new KColorCombo(this);
 	m_edit->setFocusPolicy(TQ_NoFocus);
 	connect(m_edit, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotValueChanged(int)));
-	m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+	m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
 	m_edit->setMinimumHeight(5);
 	l->addWidget(m_edit);
 	setFocusWidget(m_edit);
diff --git a/lib/koproperty/editors/combobox.cpp b/lib/koproperty/editors/combobox.cpp
index 1dd35a8d..343a9ed9 100644
--- a/lib/koproperty/editors/combobox.cpp
+++ b/lib/koproperty/editors/combobox.cpp
@@ -19,7 +19,7 @@
 */
 #include "combobox.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqmap.h>
 #include <tqvariant.h>
 #include <tqpainter.h>
@@ -37,7 +37,7 @@ ComboBox::ComboBox(Property *property, TQWidget *parent, const char *name)
 {
 	TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
 	m_edit = new KComboBox(this);
-	m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+	m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
 	m_edit->setMinimumHeight(5);
 	l->addWidget(m_edit);
 
diff --git a/lib/koproperty/editors/cursoredit.cpp b/lib/koproperty/editors/cursoredit.cpp
index 5ff0bb34..61d44499 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().shape(), emitChange);
+	ComboBox::setValue(value.toCursor().tqshape(), emitChange);
 }
 
 void
 CursorEdit::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, const TQVariant &value)
 {
-	ComboBox::drawViewer(p, cg, r, value.toCursor().shape());
+	ComboBox::drawViewer(p, cg, r, value.toCursor().tqshape());
 }
 
 void
diff --git a/lib/koproperty/editors/dateedit.cpp b/lib/koproperty/editors/dateedit.cpp
index d6e5c751..0df8532a 100644
--- a/lib/koproperty/editors/dateedit.cpp
+++ b/lib/koproperty/editors/dateedit.cpp
@@ -23,7 +23,7 @@
 #include <tqdatetimeedit.h>
 #include <tqrangecontrol.h>
 #include <tqobjectlist.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqvariant.h>
 #include <tqpainter.h>
 
@@ -37,7 +37,7 @@ DateEdit::DateEdit(Property *property, TQWidget *parent, const char *name)
 {
 	TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
 	m_edit = new TQDateEdit(this);
-	m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+	m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
 	m_edit->setMinimumHeight(5);
 	l->addWidget(m_edit);
 
diff --git a/lib/koproperty/editors/datetimeedit.cpp b/lib/koproperty/editors/datetimeedit.cpp
index 9355f934..6e12641a 100644
--- a/lib/koproperty/editors/datetimeedit.cpp
+++ b/lib/koproperty/editors/datetimeedit.cpp
@@ -23,7 +23,7 @@
 #include <tqdatetimeedit.h>
 #include <tqrangecontrol.h>
 #include <tqobjectlist.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
 #include <tqvariant.h>
 
@@ -37,7 +37,7 @@ DateTimeEdit::DateTimeEdit(Property *property, TQWidget *parent, const char *nam
 {
 	TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
 	m_edit = new TQDateTimeEdit(this);
-	m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+	m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
 	m_edit->setMinimumHeight(5);
 	l->addWidget(m_edit);
 
diff --git a/lib/koproperty/editors/fontedit.cpp b/lib/koproperty/editors/fontedit.cpp
index 09cd7388..634641b8 100644
--- a/lib/koproperty/editors/fontedit.cpp
+++ b/lib/koproperty/editors/fontedit.cpp
@@ -24,7 +24,7 @@
 
 #include <tqpushbutton.h>
 #include <tqpainter.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqvariant.h>
 #include <tqfont.h>
 #include <tqfontmetrics.h>
@@ -47,7 +47,7 @@ class FontEditRequester : public KFontRequester
 		FontEditRequester(TQWidget* parent)
 			: KFontRequester(parent)
 		{
-			label()->setPaletteBackgroundColor(palette().active().base());
+			label()->setPaletteBackgroundColor(tqpalette().active().base());
 			label()->setMinimumWidth(0);
 			label()->setFrameShape(TQFrame::Box);
 			label()->setIndent(-1);
@@ -55,13 +55,13 @@ class FontEditRequester : public KFontRequester
 			label()->setFocusPolicy(TQ_ClickFocus);
 			KAcceleratorManager::setNoAccel(label());
 #endif
-			layout()->remove(label());
-			layout()->remove(button());//->reparent(this, 0, TQPoint(0,0));
-			delete layout();
+			tqlayout()->remove(label());
+			tqlayout()->remove(button());//->reparent(this, 0, TQPoint(0,0));
+			delete tqlayout();
 			button()->setText(i18n("..."));
 			TQToolTip::add(button(), i18n("Change font"));
 			button()->setFocusPolicy(TQ_NoFocus);
-			button()->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+			button()->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
 			TQFontMetrics fm(button()->font());
 			button()->setFixedWidth(fm.width(button()->text()+' '));
 		}
diff --git a/lib/koproperty/editors/linestyledit.cpp b/lib/koproperty/editors/linestyledit.cpp
index 5c3c5b51..e7f5b2f8 100644
--- a/lib/koproperty/editors/linestyledit.cpp
+++ b/lib/koproperty/editors/linestyledit.cpp
@@ -24,7 +24,7 @@
 #include <tqpainter.h>
 #include <tqpixmap.h>
 #include <tqcombobox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqvariant.h>
 
 using namespace KoProperty;
@@ -140,7 +140,7 @@ LineStyleEdit::LineStyleEdit(Property *property, TQWidget *parent, const char *n
 {
 	TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
 	m_edit = new TQComboBox(this);
-	m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+	m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
 	m_edit->setMinimumHeight(5);
 	l->addWidget(m_edit);
 
diff --git a/lib/koproperty/editors/pixmapedit.cpp b/lib/koproperty/editors/pixmapedit.cpp
index 3742ae03..92ab746d 100644
--- a/lib/koproperty/editors/pixmapedit.cpp
+++ b/lib/koproperty/editors/pixmapedit.cpp
@@ -23,7 +23,7 @@
 #include "editoritem.h"
 #include "property.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
 #include <tqlabel.h>
 #include <tqcursor.h>
@@ -58,22 +58,22 @@ PixmapEdit::PixmapEdit(Property *property, TQWidget *parent, const char *name)
 
 	m_edit = new TQLabel(this, "m_edit");
 	TQToolTip::add(m_edit, i18n("Click to show image preview"));
-	m_edit->setAlignment(TQt::AlignLeft | TQt::AlignVCenter);
+	m_edit->tqsetAlignment(TQt::AlignLeft | TQt::AlignVCenter);
 	m_edit->setMinimumHeight(5);
-	m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed);
+	m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed);
 	m_edit->setBackgroundMode(TQt::PaletteBase);
 	m_edit->setMouseTracking(true);
 	setBackgroundMode(TQt::PaletteBase);
 
 	m_button = new TQPushButton(i18n("..."), this, "m_button");
 	TQToolTip::add(m_button, i18n("Insert image from file"));
-	m_button->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+	m_button->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
 	TQFontMetrics fm(m_button->font());
 	m_button->setFixedWidth(fm.width(m_button->text()+' '));
 	m_button->setFocusPolicy(TQ_NoFocus);
 
 	m_popup = new TQLabel(0, "m_popup", TQt::WStyle_Customize|TQt::WStyle_NoBorder|TQt::WX11BypassWM|WStyle_StaysOnTop);
-	m_popup->setPaletteBackgroundColor(m_popup->palette().active().base());
+	m_popup->setPaletteBackgroundColor(m_popup->tqpalette().active().base());
 	m_popup->setFrameStyle(TQFrame::Plain|TQFrame::Box);
 	m_popup->setMargin(2);
 	m_popup->setLineWidth(1);
@@ -153,7 +153,7 @@ PixmapEdit::selectPixmapFileName()
 		emit valueChanged(this);
 	}
 #endif*/
-	TQString caption( i18n("Insert Image From File (for \"%1\" property)").arg(property()->caption()) );
+	TQString caption( i18n("Insert Image From File (for \"%1\" property)").tqarg(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 30d3c7d6..6983dd68 100644
--- a/lib/koproperty/editors/pointedit.cpp
+++ b/lib/koproperty/editors/pointedit.cpp
@@ -22,7 +22,7 @@
 #include "editoritem.h"
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
 #include <tqtooltip.h>
 
@@ -41,10 +41,10 @@ PointEdit::PointEdit(Property *property, TQWidget *parent, const char *name)
 	m_edit = new KActiveLabel(this);
 	m_edit->setFocusPolicy(TQ_NoFocus);
 //	m_edit->setIndent(KPROPEDITOR_ITEM_MARGIN);
-	m_edit->setPaletteBackgroundColor(palette().active().base());
+	m_edit->setPaletteBackgroundColor(tqpalette().active().base());
 	m_edit->setWordWrap( TQTextEdit::NoWrap );
 //	m_edit->setBackgroundMode(TQt::PaletteBase);
-//	m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+//	m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
 	m_edit->setMinimumHeight(5);
 	setEditor(m_edit);
 //	setFocusWidget(m_edit);
@@ -64,8 +64,8 @@ PointEdit::setValue(const TQVariant &value, bool emitChange)
 {
 	m_value = value;
 	m_edit->selectAll(false);
-	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()));
+	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()));
 
 	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).arg(value.toPoint().x()).arg(value.toPoint().y()));
+	Widget::drawViewer(p, cg, rect, TQString(POINTEDIT_MASK).tqarg(value.toPoint().x()).tqarg(value.toPoint().y()));
 //	p->eraseRect(r);
 //	p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine,
-//		TQString("[ %1, %2 ]").arg(value.toPoint().x()).arg(value.toPoint().y()));
+//		TQString("[ %1, %2 ]").tqarg(value.toPoint().x()).tqarg(value.toPoint().y()));
 }
 
 void
diff --git a/lib/koproperty/editors/rectedit.cpp b/lib/koproperty/editors/rectedit.cpp
index c97451ea..ba6fec49 100644
--- a/lib/koproperty/editors/rectedit.cpp
+++ b/lib/koproperty/editors/rectedit.cpp
@@ -21,7 +21,7 @@
 #include "editoritem.h"
 
 #include <tqvariant.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
 #include <tqtooltip.h>
 
@@ -39,7 +39,7 @@ RectEdit::RectEdit(Property *property, TQWidget *parent, const char *name)
 	setHasBorders(false);
 	m_edit = new KActiveLabel(this);
 	m_edit->setFocusPolicy(TQ_NoFocus);
-	m_edit->setPaletteBackgroundColor(palette().active().base());
+	m_edit->setPaletteBackgroundColor(tqpalette().active().base());
 	m_edit->setWordWrap( TQTextEdit::NoWrap );
 	m_edit->setMinimumHeight(5);
 	setEditor(m_edit);
@@ -60,10 +60,10 @@ RectEdit::setValue(const TQVariant &value, bool emitChange)
 {
 	m_value = value;
 	m_edit->selectAll(false);
-	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()));
+	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()));
 
 	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).arg(value.toRect().x()).arg(value.toRect().y())
-	 	.arg(value.toRect().width()).arg(value.toRect().height()));
+		TQString(RECTEDIT_MASK).tqarg(value.toRect().x()).tqarg(value.toRect().y())
+	 	.tqarg(value.toRect().width()).tqarg(value.toRect().height()));
 //	p->eraseRect(r);
 //	p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine,
-//	 	TQString("[ %1, %2, %3, %4 ]").arg(value.toRect().x()).arg(value.toRect().y())
-//	 	.arg(value.toRect().width()).arg(value.toRect().height()));
+//	 	TQString("[ %1, %2, %3, %4 ]").tqarg(value.toRect().x()).tqarg(value.toRect().y())
+//	 	.tqarg(value.toRect().width()).tqarg(value.toRect().height()));
 }
 
 void
diff --git a/lib/koproperty/editors/sizeedit.cpp b/lib/koproperty/editors/sizeedit.cpp
index b5dd6be5..05422119 100644
--- a/lib/koproperty/editors/sizeedit.cpp
+++ b/lib/koproperty/editors/sizeedit.cpp
@@ -22,7 +22,7 @@
 #include "editoritem.h"
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
 #include <tqtooltip.h>
 
@@ -41,9 +41,9 @@ SizeEdit::SizeEdit(Property *property, TQWidget *parent, const char *name)
 	m_edit = new KActiveLabel(this);
 	m_edit->setFocusPolicy(TQ_NoFocus);
 //	m_edit->setIndent(KPROPEDITOR_ITEM_MARGIN);
-	m_edit->setPaletteBackgroundColor(palette().active().base());
+	m_edit->setPaletteBackgroundColor(tqpalette().active().base());
 //	m_edit->setBackgroundMode(TQt::PaletteBase);
-//	m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+//	m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
 	m_edit->setMinimumHeight(5);
 	setEditor(m_edit);
 //	setFocusWidget(m_edit);
@@ -63,8 +63,8 @@ SizeEdit::setValue(const TQVariant &value, bool emitChange)
 {
 	m_value = value;
 	m_edit->selectAll(false);
-	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()));
+	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()));
 
 	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).arg(value.toSize().width()).arg(value.toSize().height()));
+		TQString(SIZEEDIT_MASK).tqarg(value.toSize().width()).tqarg(value.toSize().height()));
 //	p->eraseRect(r);
 //	p->drawText(r, TQt::AlignLeft | TQt::AlignVCenter | TQt::SingleLine,
-//		TQString("[ %1, %2 ]").arg(value.toSize().width()).arg(value.toSize().height()));
+//		TQString("[ %1, %2 ]").tqarg(value.toSize().width()).tqarg(value.toSize().height()));
 }
 
 void
diff --git a/lib/koproperty/editors/sizepolicyedit.cpp b/lib/koproperty/editors/sizepolicyedit.cpp
index 0b13292b..125e0a26 100644
--- a/lib/koproperty/editors/sizepolicyedit.cpp
+++ b/lib/koproperty/editors/sizepolicyedit.cpp
@@ -22,7 +22,7 @@
 #include "editoritem.h"
 
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
 #include <tqsizepolicy.h>
 #include <tqmap.h>
@@ -42,7 +42,7 @@ SizePolicyEdit::SizePolicyEdit(Property *property, TQWidget *parent, const char
 	m_edit = new TQLabel(this);
 	m_edit->setIndent(KPROPEDITOR_ITEM_MARGIN);
 	m_edit->setBackgroundMode(TQt::PaletteBase);
-//	m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+//	m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
 	m_edit->setMinimumHeight(5);
 	setEditor(m_edit);
 //	l->addWidget(m_edit);
@@ -77,9 +77,9 @@ void
 SizePolicyEdit::setValue(const TQVariant &value, bool emitChange)
 {
 	m_value = value;
-	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()));
+	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()));
 	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").arg(findDescription(value.toSizePolicy().horData())).
-		arg(findDescription(value.toSizePolicy().verData())).
-		arg(value.toSizePolicy().horStretch()).arg(value.toSizePolicy().verStretch()));
+		TQString("%1/%2/%3/%4").tqarg(findDescription(value.toSizePolicy().horData())).
+		tqarg(findDescription(value.toSizePolicy().verData())).
+		tqarg(value.toSizePolicy().horStretch()).tqarg(value.toSizePolicy().verStretch()));
 }
 
 TQString
diff --git a/lib/koproperty/editors/spinbox.cpp b/lib/koproperty/editors/spinbox.cpp
index d2020d2c..8e890419 100644
--- a/lib/koproperty/editors/spinbox.cpp
+++ b/lib/koproperty/editors/spinbox.cpp
@@ -22,7 +22,7 @@
 
 #include "property.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqobjectlist.h>
 #include <tqvariant.h>
 #include <tqpainter.h>
@@ -36,7 +36,7 @@ using namespace KoProperty;
 IntSpinBox::IntSpinBox(int lower, int upper, int step, int value, int base, IntEdit *parent, const char *name)
 : KIntSpinBox(lower, upper, step, value, base, parent, name)
 {
-	editor()->setAlignment(TQt::AlignLeft);
+	editor()->tqsetAlignment(TQt::AlignLeft);
 	installEventFilter(editor());
 	installEventFilter(this);
 	TQObjectList *spinwidgets = queryList( TQSPINWIDGET_OBJECT_NAME_STRING, 0, false, true );
@@ -179,7 +179,7 @@ IntEdit::setReadOnlyInternal(bool readOnly)
 DoubleSpinBox::DoubleSpinBox (double lower, double upper, double step, double value, int precision, DoubleEdit *parent)
 : KDoubleSpinBox(lower, upper, step, value, precision, parent)
 {
-	editor()->setAlignment(TQt::AlignLeft);
+	editor()->tqsetAlignment(TQt::AlignLeft);
 	installEventFilter(editor());
 	installEventFilter(this);
 	TQObjectList *spinwidgets = queryList( TQSPINWIDGET_OBJECT_NAME_STRING, 0, false, true );
@@ -247,7 +247,7 @@ DoubleEdit::DoubleEdit(Property *property, TQWidget *parent, const char *name)
 		 0, precision.toInt(), this);
 	if (!minValueText.isNull())
 		m_edit->setSpecialValueText(minValueText.toString());
-	m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+	m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
 	m_edit->setMinimumHeight(5);
 	setEditor(m_edit);
 
diff --git a/lib/koproperty/editors/stringedit.cpp b/lib/koproperty/editors/stringedit.cpp
index c78b6edb..55d8b3ed 100644
--- a/lib/koproperty/editors/stringedit.cpp
+++ b/lib/koproperty/editors/stringedit.cpp
@@ -20,7 +20,7 @@
 
 #include "stringedit.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqvariant.h>
 
@@ -31,7 +31,7 @@ StringEdit::StringEdit(Property *property, TQWidget *parent, const char *name)
 {
 	TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
 	m_edit = new TQLineEdit(this);
-	m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+	m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
 	m_edit->setMargin(1);
 	m_edit->setMinimumHeight(5);
 	l->addWidget(m_edit);
diff --git a/lib/koproperty/editors/stringlistedit.cpp b/lib/koproperty/editors/stringlistedit.cpp
index f5a1de39..56bf1145 100644
--- a/lib/koproperty/editors/stringlistedit.cpp
+++ b/lib/koproperty/editors/stringlistedit.cpp
@@ -21,7 +21,7 @@
 #include "stringlistedit.h"
 
 #include <tqlineedit.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqdialog.h>
 #include <tqpainter.h>
 #include <tqvariant.h>
@@ -46,12 +46,12 @@ StringListEdit::StringListEdit(Property *property, TQWidget *parent, const char
 	m_edit = new TQLineEdit(this);
 	m_edit->setLineWidth(0);
 	m_edit->setReadOnly(true);
-	m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+	m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
 	m_edit->setMinimumHeight(5);
 	l->addWidget(m_edit);
 
 	m_selectButton = new TQPushButton("...", this);
-	m_selectButton->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding);
+	m_selectButton->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding);
 	l->addWidget(m_selectButton);
 	setFocusWidget(m_selectButton);
 
@@ -87,10 +87,10 @@ StringListEdit::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r
 void
 StringListEdit::showEditor()
 {
-	KDialogBase dialog(this->topLevelWidget(), "stringlist_dialog", true, i18n("Edit List of Items"),
+	KDialogBase dialog(this->tqtopLevelWidget(), "stringlist_dialog", true, i18n("Edit List of Items"),
 	    KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, false);
 
-	KEditListBox *edit = new KEditListBox(i18n("Contents of %1").arg(property()->caption()), &dialog, "editlist");
+	KEditListBox *edit = new KEditListBox(i18n("Contents of %1").tqarg(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 9bb503d9..53394d54 100644
--- a/lib/koproperty/editors/symbolcombo.cpp
+++ b/lib/koproperty/editors/symbolcombo.cpp
@@ -20,7 +20,7 @@
 
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
 #include <tqvariant.h>
 
@@ -41,12 +41,12 @@ SymbolCombo::SymbolCombo(Property *property, TQWidget *parent, const char *name)
 	m_edit = new TQLineEdit(this);
 	m_edit->setLineWidth(0);
 	m_edit->setReadOnly(true);
-	m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+	m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
 	m_edit->setMinimumHeight(5);
 	m_edit->setMaxLength(1);
 	l->addWidget(m_edit);
 	m_select = new TQPushButton("...", this);
-	m_select->setSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding);
+	m_select->tqsetSizePolicy(TQSizePolicy::Maximum, TQSizePolicy::MinimumExpanding);
 	m_select->setMinimumHeight(5);
 	l->addWidget(m_select);
 
@@ -61,7 +61,7 @@ TQVariant
 SymbolCombo::value() const
 {
 	if (!(m_edit->text().isNull()))
-		return m_edit->text().at(0).unicode();
+		return m_edit->text().tqat(0).tqunicode();
 	else
 		return 0;
 }
@@ -90,7 +90,7 @@ SymbolCombo::drawViewer(TQPainter *p, const TQColorGroup &cg, const TQRect &r, c
 void
 SymbolCombo::selectChar()
 {
-	KDialogBase dialog(this->topLevelWidget(), "charselect_dialog", true, i18n("Select Char"),
+	KDialogBase dialog(this->tqtopLevelWidget(), "charselect_dialog", true, i18n("Select Char"),
 	    KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, false);
 
 	KCharSelect *select = new KCharSelect(&dialog, "select_char");
diff --git a/lib/koproperty/editors/timeedit.cpp b/lib/koproperty/editors/timeedit.cpp
index a6ede613..674d2c89 100644
--- a/lib/koproperty/editors/timeedit.cpp
+++ b/lib/koproperty/editors/timeedit.cpp
@@ -24,7 +24,7 @@
 #include <tqrangecontrol.h>
 #include <tqobjectlist.h>
 #include <tqpainter.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqvariant.h>
 #include <tqdatetime.h>
 
@@ -38,7 +38,7 @@ TimeEdit::TimeEdit(Property *property, TQWidget *parent, const char *name)
 {
 	TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
 	m_edit = new TQTimeEdit(this);
-	m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+	m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
 	m_edit->setMinimumHeight(5);
 	l->addWidget(m_edit);
 
diff --git a/lib/koproperty/editors/urledit.cpp b/lib/koproperty/editors/urledit.cpp
index 02734776..8c150de2 100644
--- a/lib/koproperty/editors/urledit.cpp
+++ b/lib/koproperty/editors/urledit.cpp
@@ -20,7 +20,7 @@
 
 #include "urledit.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqvariant.h>
 
 #include <kurlrequester.h>
@@ -36,14 +36,14 @@ URLEdit::URLEdit(Property *property, TQWidget *parent, const char *name)
 {
 	TQHBoxLayout *l = new TQHBoxLayout(this, 0, 0);
 	m_edit = new KURLRequester(this);
-	m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+	m_edit->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
 	m_edit->setMinimumHeight(5);
 	l->addWidget(m_edit);
 
 	setProperty(property);
 
 	connect(m_edit, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotValueChanged(const TQString&)));
-	m_edit->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+	m_edit->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
 }
 
 URLEdit::~URLEdit()