Rename obsolete tq methods to standard names

7 files changed, 10 insertions, 10 deletions

diff --git a/lib/koproperty/editors/booledit.cpp b/lib/koproperty/editors/booledit.cpp
index da3fd994..7791730c 100644
--- a/lib/koproperty/editors/booledit.cpp
+++ b/lib/koproperty/editors/booledit.cpp
@@ -46,7 +46,7 @@ BoolEdit::BoolEdit(Property *property, TQWidget *parent, const char *name)
     m_toggle->setUsesTextLabel(true);
     m_toggle->setTextPosition(TQToolButton::Right);
     m_toggle->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
-    //we're not using tqlayout to because of problems with button size
+    //we're not using layout 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/fontedit.cpp b/lib/koproperty/editors/fontedit.cpp
index f85279ce..a4f4b519 100644
--- a/lib/koproperty/editors/fontedit.cpp
+++ b/lib/koproperty/editors/fontedit.cpp
@@ -47,7 +47,7 @@ class FontEditRequester : public KFontRequester
 		FontEditRequester(TQWidget* parent)
 			: KFontRequester(parent)
 		{
-			label()->setPaletteBackgroundColor(tqpalette().active().base());
+			label()->setPaletteBackgroundColor(palette().active().base());
 			label()->setMinimumWidth(0);
 			label()->setFrameShape(TQFrame::Box);
 			label()->setIndent(-1);
@@ -55,9 +55,9 @@ class FontEditRequester : public KFontRequester
 			label()->setFocusPolicy(TQ_ClickFocus);
 			KAcceleratorManager::setNoAccel(label());
 #endif
-			tqlayout()->remove(label());
-			tqlayout()->remove(button());//->reparent(this, 0, TQPoint(0,0));
-			delete tqlayout();
+			layout()->remove(label());
+			layout()->remove(button());//->reparent(this, 0, TQPoint(0,0));
+			delete layout();
 			button()->setText(i18n("..."));
 			TQToolTip::add(button(), i18n("Change font"));
 			button()->setFocusPolicy(TQ_NoFocus);
diff --git a/lib/koproperty/editors/pixmapedit.cpp b/lib/koproperty/editors/pixmapedit.cpp
index d887a8cd..265ee16d 100644
--- a/lib/koproperty/editors/pixmapedit.cpp
+++ b/lib/koproperty/editors/pixmapedit.cpp
@@ -73,7 +73,7 @@ PixmapEdit::PixmapEdit(Property *property, TQWidget *parent, const char *name)
 	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->tqpalette().active().base());
+	m_popup->setPaletteBackgroundColor(m_popup->palette().active().base());
 	m_popup->setFrameStyle(TQFrame::Plain|TQFrame::Box);
 	m_popup->setMargin(2);
 	m_popup->setLineWidth(1);
diff --git a/lib/koproperty/editors/pointedit.cpp b/lib/koproperty/editors/pointedit.cpp
index c47c854f..7badc4de 100644
--- a/lib/koproperty/editors/pointedit.cpp
+++ b/lib/koproperty/editors/pointedit.cpp
@@ -41,7 +41,7 @@ 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(tqpalette().active().base());
+	m_edit->setPaletteBackgroundColor(palette().active().base());
 	m_edit->setWordWrap( TQTextEdit::NoWrap );
 //	m_edit->setBackgroundMode(TQt::PaletteBase);
 //	m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
diff --git a/lib/koproperty/editors/rectedit.cpp b/lib/koproperty/editors/rectedit.cpp
index 3cebfea8..2422eec8 100644
--- a/lib/koproperty/editors/rectedit.cpp
+++ b/lib/koproperty/editors/rectedit.cpp
@@ -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(tqpalette().active().base());
+	m_edit->setPaletteBackgroundColor(palette().active().base());
 	m_edit->setWordWrap( TQTextEdit::NoWrap );
 	m_edit->setMinimumHeight(5);
 	setEditor(m_edit);
diff --git a/lib/koproperty/editors/sizeedit.cpp b/lib/koproperty/editors/sizeedit.cpp
index 98075515..3e0213d9 100644
--- a/lib/koproperty/editors/sizeedit.cpp
+++ b/lib/koproperty/editors/sizeedit.cpp
@@ -41,7 +41,7 @@ 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(tqpalette().active().base());
+	m_edit->setPaletteBackgroundColor(palette().active().base());
 //	m_edit->setBackgroundMode(TQt::PaletteBase);
 //	m_edit->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
 	m_edit->setMinimumHeight(5);
diff --git a/lib/koproperty/editors/symbolcombo.cpp b/lib/koproperty/editors/symbolcombo.cpp
index 65a7d951..faaefdb9 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().at(0).tqunicode();
+		return m_edit->text().at(0).unicode();
 	else
 		return 0;
 }