Rename obsolete tq methods to standard names

48 files changed, 224 insertions, 224 deletions

diff --git a/atlantikdesigner/designer/boardinfo.cpp b/atlantikdesigner/designer/boardinfo.cpp
index 77b00a8..56b561a 100644
--- a/atlantikdesigner/designer/boardinfo.cpp
+++ b/atlantikdesigner/designer/boardinfo.cpp
@@ -115,21 +115,21 @@ LotsaEdits::LotsaEdits(bool editable, TQStringList defaults, TQWidget *parent, c
 	list.setAutoDelete(true);
 	this->editable = editable;
 
-	tqlayout = new TQVBoxLayout(this, KDialogBase::spacingHint());
-	TQHBoxLayout *htqlayout = new TQHBoxLayout(tqlayout, KDialogBase::spacingHint());
+	layout = new TQVBoxLayout(this, KDialogBase::spacingHint());
+	TQHBoxLayout *hlayout = new TQHBoxLayout(layout, KDialogBase::spacingHint());
 
 	if (editable)
 	{
 		KPushButton *more = new KPushButton(i18n("&Add Name"), this);
-		htqlayout->addWidget(more);
+		hlayout->addWidget(more);
 		connect(more, TQT_SIGNAL(clicked()), this, TQT_SLOT(more()));
-		htqlayout->addStretch();
+		hlayout->addStretch();
 		KPushButton *less= new KPushButton(i18n("&Delete Name"), this);
-		htqlayout->addWidget(less);
+		hlayout->addWidget(less);
 		connect(less, TQT_SIGNAL(clicked()), this, TQT_SLOT(less()));
 	}
 
-	tqlayout->addStretch();
+	layout->addStretch();
 
 	for (TQStringList::Iterator it = defaults.begin(); it != defaults.end(); ++it)
 	{
@@ -148,7 +148,7 @@ void LotsaEdits::more()
 		edit = new KLineEdit(this);
 	else
 		edit = new TQLabel(this);
-	tqlayout->addWidget(edit);
+	layout->addWidget(edit);
 	list.append(edit);
 	edit->show();
 }
diff --git a/atlantikdesigner/designer/boardinfo.h b/atlantikdesigner/designer/boardinfo.h
index 25d6e71..8ada643 100644
--- a/atlantikdesigner/designer/boardinfo.h
+++ b/atlantikdesigner/designer/boardinfo.h
@@ -45,7 +45,7 @@ class LotsaEdits : public TQWidget
 	private:
 	bool editable;
 	TQPtrList<TQWidget> list;
-	TQVBoxLayout *tqlayout;
+	TQVBoxLayout *layout;
 };
 
 class BoardInfoDlg : public KDialogBase
diff --git a/atlantikdesigner/designer/designer.cpp b/atlantikdesigner/designer/designer.cpp
index 26e618c..f3bfa35 100644
--- a/atlantikdesigner/designer/designer.cpp
+++ b/atlantikdesigner/designer/designer.cpp
@@ -46,7 +46,7 @@ AtlanticDesigner::AtlanticDesigner(TQWidget *parent, const char *name)
 	copiedEstate = 0;
 	editor = 0;
 	board = 0;
-	tqlayout = 0;
+	layout = 0;
 
 	(void) KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), actionCollection());
 	(void) KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(open()), actionCollection());
@@ -130,17 +130,17 @@ void AtlanticDesigner::initBoard()
 
 	delete editor;
 	delete board;
-	delete tqlayout;
+	delete layout;
 
 	board = new AtlantikBoard(0, max, AtlantikBoard::Edit, this, "Board");
 
 	setCentralWidget(board);
-	tqlayout = new TQVBoxLayout(board->centerWidget());
+	layout = new TQVBoxLayout(board->centerWidget());
 	editor = new EstateEdit(&groups, &estates, &cards, board->centerWidget(), "Estate Editor");
 	connect(editor, TQT_SIGNAL(goChecked(int)), TQT_TQOBJECT(this), TQT_SLOT(goChanged(int)));
 	connect(editor, TQT_SIGNAL(updateBackground()), TQT_TQOBJECT(this), TQT_SLOT(updateBackground()));
 	connect(editor, TQT_SIGNAL(resized()), board, TQT_SLOT(slotResizeAftermath()));
-	tqlayout->addWidget(editor);
+	layout->addWidget(editor);
 
 	editor->setReady(false);
 
diff --git a/atlantikdesigner/designer/designer.h b/atlantikdesigner/designer/designer.h
index 553a921..3d807a8 100644
--- a/atlantikdesigner/designer/designer.h
+++ b/atlantikdesigner/designer/designer.h
@@ -75,7 +75,7 @@ class AtlanticDesigner : public KMainWindow
 	ConfigEstate *newEstate(int);
 
 	TQGuardedPtr<EstateEdit> editor;
-	TQGuardedPtr<TQVBoxLayout> tqlayout;
+	TQGuardedPtr<TQVBoxLayout> layout;
 	TQGuardedPtr<AtlantikBoard> board;
 	TQGuardedPtr<GroupEditor> groupEditor;
 	TQGuardedPtr<BoardInfoDlg> boardInfoDlg;
diff --git a/atlantikdesigner/designer/editor.cpp b/atlantikdesigner/designer/editor.cpp
index 81e2135..5687a02 100644
--- a/atlantikdesigner/designer/editor.cpp
+++ b/atlantikdesigner/designer/editor.cpp
@@ -172,19 +172,19 @@ EstateEdit::EstateEdit(ConfigEstateGroupList *newGroups, EstateList *estates, TQ
 
 	connect(this, TQT_SIGNAL(somethingChanged()), this, TQT_SLOT(saveEstate()));
 
-	tqlayout = new TQGridLayout(this, 7, 1, KDialog::marginHint(), KDialog::spacingHint());
+	layout = new TQGridLayout(this, 7, 1, KDialog::marginHint(), KDialog::spacingHint());
 	nameEdit = new TQLineEdit(this, "Name Edit");
-	tqlayout->addWidget(nameEdit, 0, 0);
+	layout->addWidget(nameEdit, 0, 0);
 	connect(nameEdit, TQT_SIGNAL(returnPressed()), this, TQT_SIGNAL(somethingChanged()));
 
 	confDlg = 0;
 
-	tqlayout->setRowStretch(2, 2);
+	layout->setRowStretch(2, 2);
 
-	tqlayout->addWidget(new KSeparator(this), 3, 0);
+	layout->addWidget(new KSeparator(this), 3, 0);
 
 	TQHBoxLayout *typeLayout = new TQHBoxLayout(KDialog::spacingHint());
-	tqlayout->addLayout(typeLayout, 4, 0);
+	layout->addLayout(typeLayout, 4, 0);
 
 	TQLabel *typeLabel = new TQLabel(i18n("Type:"), this);
 	typeLayout->addWidget(typeLabel);
@@ -196,10 +196,10 @@ EstateEdit::EstateEdit(ConfigEstateGroupList *newGroups, EstateList *estates, TQ
 	goCheck = new TQCheckBox(i18n("This estate is 'Go'"), this);
 	connect(goCheck, TQT_SIGNAL(toggled(bool)), this, TQT_SIGNAL(somethingChanged()));
 	connect(goCheck, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(goToggled(bool)));
-	tqlayout->addWidget(goCheck, 5, 0);
+	layout->addWidget(goCheck, 5, 0);
 
 	TQHBoxLayout *passMoneyLayout = new TQHBoxLayout(KDialog::spacingHint());
-	tqlayout->addLayout(passMoneyLayout, 6, 0);
+	layout->addLayout(passMoneyLayout, 6, 0);
 	TQLabel *passMoneyLabel = new TQLabel(i18n("Pass money:"), this);
 	passMoneyLayout->addWidget(passMoneyLabel);
 	passMoney = new TQSpinBox(0, 3000, 10, this);
@@ -327,7 +327,7 @@ void EstateEdit::configure()
 
 	connect(confDlg, TQT_SIGNAL(updateBackground()), this, TQT_SIGNAL(updateBackground()));
 
-	tqlayout->addWidget(confDlg, 1, 0);
+	layout->addWidget(confDlg, 1, 0);
 	confDlg->show();
 
 	oldType = typeCombo->currentItem();
@@ -409,11 +409,11 @@ void TaxDlg::update()
 GenericDlg::GenericDlg(TQWidget *parent, char *name)
 	: EstateDlg(parent, name)
 {
-	TQHBoxLayout *tqlayout = new TQHBoxLayout(this, KDialog::spacingHint());
-	tqlayout->addWidget(new TQLabel(i18n("Background:"), this));
+	TQHBoxLayout *layout = new TQHBoxLayout(this, KDialog::spacingHint());
+	layout->addWidget(new TQLabel(i18n("Background:"), this));
 
 	col = new KColorButton(this);
-	tqlayout->addWidget(col);
+	layout->addWidget(col);
 }
 
 void GenericDlg::save()
@@ -437,26 +437,26 @@ CardsDlg::CardsDlg(EstateList *newEstates, TQValueList<CardStack> *newCards, TQW
 
 	view = 0;
 
-	vtqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+	vlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
 
-	TQHBoxLayout *tqlayout = new TQHBoxLayout(vtqlayout, KDialog::spacingHint());
+	TQHBoxLayout *layout = new TQHBoxLayout(vlayout, KDialog::spacingHint());
 
 	KPushButton *addB = new KPushButton(i18n("&New Stack"), this);
 	connect(addB, TQT_SIGNAL(clicked()), this, TQT_SLOT(addStack()));
-	tqlayout->addWidget(addB);
-	tqlayout->addStretch();
+	layout->addWidget(addB);
+	layout->addStretch();
 
-	tqlayout->addWidget(new TQLabel(i18n("Cards from"), this));
+	layout->addWidget(new TQLabel(i18n("Cards from"), this));
 	TQStringList cardNames;
 	for (TQValueList<CardStack>::Iterator it = stacks->begin(); it != stacks->end(); ++it)
 		cardNames.append((*it).name());
 
 	cards = new TQComboBox(this);
 	cards->insertStringList(cardNames);
-	tqlayout->addWidget(cards);
+	layout->addWidget(cards);
 	connect(cards, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(updateView(const TQString &)));
 
-	vtqlayout->addWidget(new KSeparator(this));
+	vlayout->addWidget(new KSeparator(this));
 }
 
 void CardsDlg::addStack()
@@ -493,7 +493,7 @@ void CardsDlg::updateView(const TQString &curName)
 
 	delete view;
 	view = new CardView(estates, curStack, this);
-	vtqlayout->addWidget(view);
+	vlayout->addWidget(view);
 	view->show();
 }
 
@@ -530,7 +530,7 @@ ChooseWidget::ChooseWidget(EstateList *estates, int id, Card *card, TQWidget *pa
 
 	value = 0;
 
-	htqlayout = new TQHBoxLayout(this, KDialog::spacingHint());
+	hlayout = new TQHBoxLayout(this, KDialog::spacingHint());
 	typeCombo = new KComboBox(this);
 	TQStringList _types(i18n("Pay"));
 	_types.append(i18n("Pay Each Player"));
@@ -546,10 +546,10 @@ ChooseWidget::ChooseWidget(EstateList *estates, int id, Card *card, TQWidget *pa
 	_types.append(i18n("Pay for Each House"));
 	_types.append(i18n("Pay for Each Hotel"));
 	typeCombo->insertStringList(_types);
-	htqlayout->addWidget(typeCombo);
+	hlayout->addWidget(typeCombo);
 	connect(typeCombo, TQT_SIGNAL(activated(int)), this, TQT_SLOT(typeChanged(int)));
 
-	htqlayout->addStretch();
+	hlayout->addStretch();
 }
 
 void ChooseWidget::valueChanged(int i)
@@ -588,7 +588,7 @@ void ChooseWidget::typeChanged(int i)
 
 		value = new TQSpinBox(0, 2000, (key == "advance" || key == "goback")? 1 : 5, this);
 
-		htqlayout->addWidget(value);
+		hlayout->addWidget(value);
 		connect(value, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(valueChanged(int)));
 
 		value->show();
@@ -605,7 +605,7 @@ void ChooseWidget::typeChanged(int i)
 		estate->insertStringList(estateStrings);
 		connect(estate, TQT_SIGNAL(activated(int)), this, TQT_SLOT(estateChanged(int)));
 
-		htqlayout->addWidget(estate);
+		hlayout->addWidget(estate);
 		estate->show();
 	}
 
@@ -649,36 +649,36 @@ CardView::CardView(EstateList *estates, CardStack *stack, TQWidget *parent, char
 
 	choosies.setAutoDelete(true);
 
-	tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-	TQHBoxLayout *htqlayout = new TQHBoxLayout(tqlayout, KDialog::spacingHint());
+	layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+	TQHBoxLayout *hlayout = new TQHBoxLayout(layout, KDialog::spacingHint());
 
 	addButton = new KPushButton(i18n("&Add Card..."), this);
 	connect(addButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(add()));
-	htqlayout->addWidget(addButton);
-	htqlayout->addStretch();
+	hlayout->addWidget(addButton);
+	hlayout->addStretch();
 	renameButton = new KPushButton(i18n("&Rename..."), this);
 	connect(renameButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(rename()));
-	htqlayout->addWidget(renameButton);
-	htqlayout->addStretch();
+	hlayout->addWidget(renameButton);
+	hlayout->addStretch();
 	delButton = new KPushButton(i18n("&Delete"), this);
 	connect(delButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(del()));
-	htqlayout->addWidget(delButton);
+	hlayout->addWidget(delButton);
 
 	List = new KListBox(this);
-	tqlayout->addWidget(List);
+	layout->addWidget(List);
 	connect(List, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(selected(int)));
 
 	// it gets very big (and won't shrink) otherwise
 	List->setMaximumHeight(90);
 
-	htqlayout = new TQHBoxLayout(tqlayout, KDialog::spacingHint());
+	hlayout = new TQHBoxLayout(layout, KDialog::spacingHint());
 	moreButton = new KPushButton(i18n("&More Properties"), this);
 	connect(moreButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(more()));
-	htqlayout->addWidget(moreButton);
-	htqlayout->addStretch();
+	hlayout->addWidget(moreButton);
+	hlayout->addStretch();
 	lessButton = new KPushButton(i18n("&Fewer Properties"), this);
 	connect(lessButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(less()));
-	htqlayout->addWidget(lessButton);
+	hlayout->addWidget(lessButton);
 
 	for (CardStack::Iterator it = stack->begin(); it != stack->end(); ++it)
 		List->insertItem((*it).name);
@@ -698,7 +698,7 @@ void CardView::more()
 	newChooseWidget->valueChanged(0);
 
 	choosies.append(newChooseWidget);
-	tqlayout->addWidget(newChooseWidget);
+	layout->addWidget(newChooseWidget);
 
 	newChooseWidget->show();
 
@@ -780,7 +780,7 @@ void CardView::selected(int i)
 		ChooseWidget *newChooseWidget = new ChooseWidget(estates, choosies.count(), card, this);
 
 		choosies.append(newChooseWidget);
-		tqlayout->addWidget(newChooseWidget);
+		layout->addWidget(newChooseWidget);
 
 		newChooseWidget->show();
 
diff --git a/atlantikdesigner/designer/editor.h b/atlantikdesigner/designer/editor.h
index 051df1f..34c6fa1 100644
--- a/atlantikdesigner/designer/editor.h
+++ b/atlantikdesigner/designer/editor.h
@@ -147,7 +147,7 @@ class EstateEdit : public TQWidget
 	TQCheckBox *goCheck;
 	TQSpinBox *passMoney;
 	TQWidget *centerWidget;
-	TQGridLayout *tqlayout;
+	TQGridLayout *layout;
 
 	EstateList *estates;
 	TQValueList<CardStack> *cards;
@@ -184,7 +184,7 @@ class ChooseWidget : public TQWidget
 	bool number;
 	bool prevNumber;
 	bool init;
-	TQHBoxLayout *htqlayout;
+	TQHBoxLayout *hlayout;
 
 	EstateList *estates;
 
@@ -218,7 +218,7 @@ class CardView : public TQWidget
 
 	EstateList *estates;
 
-	TQVBoxLayout *tqlayout;
+	TQVBoxLayout *layout;
 
 	Card *card;
 
@@ -281,7 +281,7 @@ class CardsDlg : public EstateDlg
 
 	TQComboBox *cards;
 	CardView *view;
-	TQVBoxLayout *vtqlayout;
+	TQVBoxLayout *vlayout;
 };
 
 class StreetDlg : public EstateDlg
diff --git a/atlantikdesigner/designer/group.cpp b/atlantikdesigner/designer/group.cpp
index 679a4ac..79b0205 100644
--- a/atlantikdesigner/designer/group.cpp
+++ b/atlantikdesigner/designer/group.cpp
@@ -26,10 +26,10 @@ GroupEditor::GroupEditor(ConfigEstateGroupList *newList, TQWidget *parent)
 	list = newList;
 
 	TQFrame *page = plainPage();
-	TQHBoxLayout *htqlayout = new TQHBoxLayout(page, marginHint(), spacingHint());
+	TQHBoxLayout *hlayout = new TQHBoxLayout(page, marginHint(), spacingHint());
 
 	groups = new KListBox(page);
-	htqlayout->addWidget(groups);
+	hlayout->addWidget(groups);
 	connect(groups, TQT_SIGNAL(highlighted(TQListBoxItem *)), this, TQT_SLOT(updateSettings(TQListBoxItem *)));
 	TQStringList newgroups;
 	for (ConfigEstateGroupList::Iterator it = list->begin(); it != list->end(); ++it)
@@ -37,9 +37,9 @@ GroupEditor::GroupEditor(ConfigEstateGroupList *newList, TQWidget *parent)
 	groups->insertStringList(newgroups);
 	connect(groups, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(selectionChanged()));
 
-	TQVBoxLayout *vtqlayout = new TQVBoxLayout(htqlayout, spacingHint());
+	TQVBoxLayout *vlayout = new TQVBoxLayout(hlayout, spacingHint());
 	colorGroupBox = new TQVGroupBox(i18n("&Colors"), page);
-	vtqlayout->addWidget(colorGroupBox);
+	vlayout->addWidget(colorGroupBox);
 
 	(void) new TQLabel(i18n("Foreground:"), colorGroupBox);
 	fgButton = new KColorButton(colorGroupBox, "Foreground Button");
@@ -52,7 +52,7 @@ GroupEditor::GroupEditor(ConfigEstateGroupList *newList, TQWidget *parent)
 	connect(bgButton, TQT_SIGNAL(changed(const TQColor &)), this, TQT_SIGNAL(changed()));
 
 	pricesGroupBox = new TQVGroupBox(i18n("&Prices"), page);
-	vtqlayout->addWidget(pricesGroupBox);
+	vlayout->addWidget(pricesGroupBox);
 
 	pricesWidget = new TQWidget(pricesGroupBox);
 	TQGridLayout *pricesLayout = new TQGridLayout(pricesWidget, 2, 2, 0, spacingHint());
@@ -69,7 +69,7 @@ GroupEditor::GroupEditor(ConfigEstateGroupList *newList, TQWidget *parent)
 	connect(globalPrice, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(globalPriceChanged(int)));
 
 	dynamicGroupBox = new TQVGroupBox(i18n("&Dynamic Rent"), page);
-	vtqlayout->addWidget(dynamicGroupBox);
+	vlayout->addWidget(dynamicGroupBox);
 
 	mathWidget = new TQWidget(dynamicGroupBox);
 	TQGridLayout *mathLayout = new TQGridLayout(mathWidget, 2, 2, 0, spacingHint());
@@ -89,13 +89,13 @@ GroupEditor::GroupEditor(ConfigEstateGroupList *newList, TQWidget *parent)
 	connect(rentVarCombo, TQT_SIGNAL(activated(const TQString &)), rentMathEdit, TQT_SLOT(insert(const TQString &)));
 	mathLayout->addWidget(rentMathEdit, 1, 1);
 
-	TQHBoxLayout *buttontqlayout = new TQHBoxLayout(vtqlayout, spacingHint());
+	TQHBoxLayout *buttonlayout = new TQHBoxLayout(vlayout, spacingHint());
 	KPushButton *addB = new KPushButton(i18n("&Add..."), page);
-	buttontqlayout->addWidget(addB);
+	buttonlayout->addWidget(addB);
 	connect(addB, TQT_SIGNAL(clicked()), this, TQT_SLOT(add()));
 
 	removeB = new KPushButton(i18n("&Remove"), page);
-	buttontqlayout->addWidget(removeB);
+	buttonlayout->addWidget(removeB);
 	connect(removeB, TQT_SIGNAL(clicked()), this, TQT_SLOT(remove()));
 
 	selectionChanged();
diff --git a/kate/filetemplates/plugin/filetemplates.cpp b/kate/filetemplates/plugin/filetemplates.cpp
index 56a0dc8..43e4a18 100644
--- a/kate/filetemplates/plugin/filetemplates.cpp
+++ b/kate/filetemplates/plugin/filetemplates.cpp
@@ -687,7 +687,7 @@ KateTemplateWizard::KateTemplateWizard( TQWidget *parent, KateFileTemplates *kft
   rb = new TQRadioButton( i18n("Use an existing file:"), page );
   bgOrigin->insert( rb, 2 );
   glo->addMultiCellWidget( rb, 3, 3, 1, 2 );
-  int marg = rb->tqstyle().subRect( TQStyle::SR_RadioButtonIndicator, rb ).width();
+  int marg = rb->style().subRect( TQStyle::SR_RadioButtonIndicator, rb ).width();
   glo->addItem( new TQSpacerItem( marg, 1, TQSizePolicy::Fixed ), 4, 1 );
   urOrigin = new KURLRequester( page );
   glo->addWidget( urOrigin, 4, 2 );
diff --git a/kate/snippets/CWidgetSnippetsBase.ui b/kate/snippets/CWidgetSnippetsBase.ui
index 19d0170..18a99c5 100644
--- a/kate/snippets/CWidgetSnippetsBase.ui
+++ b/kate/snippets/CWidgetSnippetsBase.ui
@@ -93,7 +93,7 @@
             </widget>
             <widget class="TQLayoutWidget">
                 <property name="name">
-                    <cstring>tqlayout24</cstring>
+                    <cstring>layout24</cstring>
                 </property>
                 <vbox>
                     <property name="name">
@@ -104,7 +104,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>tqlayout11</cstring>
+                            <cstring>layout11</cstring>
                         </property>
                         <hbox>
                             <property name="name">
diff --git a/kate/tabbarextension/plugin_katetabbarextension.h b/kate/tabbarextension/plugin_katetabbarextension.h
index 8fcf398..3c92236 100644
--- a/kate/tabbarextension/plugin_katetabbarextension.h
+++ b/kate/tabbarextension/plugin_katetabbarextension.h
@@ -248,7 +248,7 @@ class KateTabBarExtension : public TQWidget
 
   private:
     KateTabBarButton* pCurrentTab;         ///< pointer to the current tab
-    TQBoxLayout* top;                       ///< tqlayout that contains all tabs
+    TQBoxLayout* top;                       ///< layout that contains all tabs
     Kate::MainWindow* m_win;               ///< pointer to the main window
     Kate::DocumentManager* m_docManager;   ///< pointer to the document manager
 //    TQPtrList <KateTabBarButton> m_tabs;    ///< list containing all tabs
diff --git a/kate/xmltools/kde-docbook.dtd.xml b/kate/xmltools/kde-docbook.dtd.xml
index 4d10a26..11282d5 100644
--- a/kate/xmltools/kde-docbook.dtd.xml
+++ b/kate/xmltools/kde-docbook.dtd.xml
@@ -4451,7 +4451,7 @@
 <element-name name="segmentedlist"/>
 <element-name name="simplelist"/>
 <element-name name="variablelist"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -4881,7 +4881,7 @@
 <attribute name="align" type="#IMPLIED" enumeration="yes" value="left right center" default=""/>
 <attribute name="role" type="#IMPLIED" value="CDATA" default=""/>
 </attlist>
-<element name="literaltqlayout">
+<element name="literallayout">
 <content-model-expanded>
   
 <or-group occurrence="*">
@@ -4989,7 +4989,7 @@
 </or-group>
 </content-model-expanded>
 </element>
-<attlist name="literaltqlayout">
+<attlist name="literallayout">
 <attribute name="lang" type="#IMPLIED" enumeration="yes" value="af az bg bo br bs ca cs cy da de el en en-GB en-US eo es et eu fa fi fo fr ga gl he hi hr hu id is it ja kn ko lt lv mi mk mt nl no nb nn nso oc pl pt pt-BR pt-PT ro ru si sk sl sr st sv ta te tg th tr uk vi x-wa xh zh zh-CN zh-TW zu" default=""/>
 <attribute name="width" type="#IMPLIED" value="CDATA" default=""/>
 <attribute name="format" type="" enumeration="notation" value="linespecific" default="linespecific"/>
@@ -5048,7 +5048,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -5267,7 +5267,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -5488,7 +5488,7 @@
   
 <sequence-group>
 <or-group occurrence="+">
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -5549,7 +5549,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -5668,7 +5668,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -7472,7 +7472,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -7665,7 +7665,7 @@
 <element-name name="segmentedlist"/>
 <element-name name="simplelist"/>
 <element-name name="variablelist"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -7779,7 +7779,7 @@
 <element-name name="segmentedlist"/>
 <element-name name="simplelist"/>
 <element-name name="variablelist"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -8025,7 +8025,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -8228,7 +8228,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -8754,7 +8754,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -8900,7 +8900,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -9601,7 +9601,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -9673,7 +9673,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -9754,7 +9754,7 @@
 <element-name name="titleabbrev" occurrence="?"/>
 </sequence-group>
 <or-group occurrence="+">
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -10513,7 +10513,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -10641,7 +10641,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -10703,7 +10703,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -10768,7 +10768,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -11281,7 +11281,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -11602,7 +11602,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -12033,7 +12033,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -12701,7 +12701,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -12847,7 +12847,7 @@
 <element-name name="segmentedlist"/>
 <element-name name="simplelist"/>
 <element-name name="variablelist"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -13607,7 +13607,7 @@
 <element-name name="segmentedlist"/>
 <element-name name="simplelist"/>
 <element-name name="variablelist"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -13758,7 +13758,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -13863,7 +13863,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -14187,7 +14187,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -14679,7 +14679,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -14795,7 +14795,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -14911,7 +14911,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -15027,7 +15027,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -15143,7 +15143,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -15237,7 +15237,7 @@
 <element-name name="segmentedlist"/>
 <element-name name="simplelist"/>
 <element-name name="variablelist"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -16199,7 +16199,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -16287,7 +16287,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -16372,7 +16372,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -17314,7 +17314,7 @@
 <element-name name="segmentedlist"/>
 <element-name name="simplelist"/>
 <element-name name="variablelist"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -17401,7 +17401,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -17478,7 +17478,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -17764,7 +17764,7 @@
   
 <element-name name="warning"/>
   
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
   
 <element-name name="programlisting"/>
   
@@ -17811,7 +17811,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -18170,7 +18170,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -18403,7 +18403,7 @@
 <element-name name="segmentedlist"/>
 <element-name name="simplelist"/>
 <element-name name="variablelist"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -18671,7 +18671,7 @@
   
 <element-name name="simplelist"/>
   
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
   
 <element-name name="programlisting"/>
   
@@ -18776,7 +18776,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -19127,7 +19127,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -19517,7 +19517,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -19620,7 +19620,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -19897,7 +19897,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -20298,7 +20298,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -20626,7 +20626,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -21006,7 +21006,7 @@
 <element-name name="segmentedlist"/>
 <element-name name="simplelist"/>
 <element-name name="variablelist"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -21077,7 +21077,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literaltqlayout"/>
+<element-name name="literallayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
diff --git a/kate/xmltools/plugin_katexmltools.cpp b/kate/xmltools/plugin_katexmltools.cpp
index f772aeb..e362569 100644
--- a/kate/xmltools/plugin_katexmltools.cpp
+++ b/kate/xmltools/plugin_katexmltools.cpp
@@ -63,7 +63,7 @@ TODO:
  but then at <xsl:template match="/"><html> it will only show you HTML elements!
 =>So better "Assign meta DTD" and "Add meta DTD", the latter will expand the current meta DTD
 -Option to insert empty element in <empty/> form
--Show expanded entities with TQChar::TQChar( int rc ) + tqunicode font
+-Show expanded entities with TQChar::TQChar( int rc ) + unicode font
 -Don't ignore entities defined in the document's prologue
 -Only offer 'valid' elements, i.e. don't take the elements as a set but check
  if the DTD is matched ( order, number of occurences, ... )
@@ -937,7 +937,7 @@ TQString PluginKateXMLTools::getParentElement( Kate::View &kv, bool ignoreSingle
       --col;
     }
 
-    ushort ch = str.at( col).tqunicode();
+    ushort ch = str.at( col).unicode();
 
     switch( parseState )
     {
@@ -981,7 +981,7 @@ TQString PluginKateXMLTools::getParentElement( Kate::View &kv, bool ignoreSingle
 
             TQString tag = str.mid( col + 1 );
             for( uint pos = 0, len = tag.length(); pos < len; ++pos ) {
-              ch = tag.at( pos).tqunicode();
+              ch = tag.at( pos).unicode();
               if( ch == ' ' || ch == '\t' || ch == '>' ) {
                 tag.truncate( pos );
                 break;
diff --git a/kate/xmltools/pseudo_dtd.cpp b/kate/xmltools/pseudo_dtd.cpp
index b13c35f..af66188 100644
--- a/kate/xmltools/pseudo_dtd.cpp
+++ b/kate/xmltools/pseudo_dtd.cpp
@@ -410,7 +410,7 @@ bool PseudoDTD::parseEntities( TQDomDocument *doc, TQProgressDialog *progress )
       {
         TQString exp = expandedElem.text();
         // TODO: support more than one &#...; in the expanded text
-        /* TODO include do this when the tqunicode font problem is solved:
+        /* TODO include do this when the unicode font problem is solved:
         if( exp.contains(TQRegExp("^&#x[a-zA-Z0-9]+;$")) ) {
         // hexadecimal numbers, e.g. "&#x236;"
         uint end = exp.find( ";" );
@@ -445,7 +445,7 @@ TQStringList PseudoDTD::entities( TQString start )
     if( (*it).startsWith(start) )
     {
       TQString str = it.key();
-      /* TODO: show entities as tqunicode character
+      /* TODO: show entities as unicode character
       if( !it.data().isEmpty() ) {
       //str += " -- " + it.data();
       TQRegExp re( "&#(\\d+);" );
diff --git a/kicker-applets/kbinaryclock/kbinaryclock.cpp b/kicker-applets/kbinaryclock/kbinaryclock.cpp
index f46b4a0..9eafcc4 100644
--- a/kicker-applets/kbinaryclock/kbinaryclock.cpp
+++ b/kicker-applets/kbinaryclock/kbinaryclock.cpp
@@ -180,7 +180,7 @@ void KBinaryClock::loadSettings(){
 	int darkFactor = prefs->darkFactor();
 	TQColor backgroundColor = prefs->background();
 	bool modifyBackground = false;
-	if(backgroundColor != KApplication::tqpalette().active().background()){
+	if(backgroundColor != KApplication::palette().active().background()){
 		setPaletteBackgroundColor(backgroundColor);
 		modifyBackground = true;
 	}
@@ -348,7 +348,7 @@ void KBinaryClock::openContextMenu() {
 void KBinaryClock::slotCopyMenuActivated( int id ) {
 	TQPopupMenu *m = (TQPopupMenu *) sender();
 	TQString s = m->text(id);
-	TQApplication::tqclipboard()->setText(s);
+	TQApplication::clipboard()->setText(s);
 }
 
 void KBinaryClock::toggleCalendar()
diff --git a/kicker-applets/kbinaryclock/kbinaryclock.kcfg b/kicker-applets/kbinaryclock/kbinaryclock.kcfg
index 84f35c3..b5a5fb3 100644
--- a/kicker-applets/kbinaryclock/kbinaryclock.kcfg
+++ b/kicker-applets/kbinaryclock/kbinaryclock.kcfg
@@ -35,7 +35,7 @@
     </entry>
     <entry name="Background" type="Color">
       <label>Background color</label>
-      <default code="true">KApplication::tqpalette().active().background()</default>
+      <default code="true">KApplication::palette().active().background()</default>
     </entry>
     <entry name="Show_Seconds" type="Bool">
       <label>Whether to show seconds</label>
diff --git a/kicker-applets/kbinaryclock/settings.ui b/kicker-applets/kbinaryclock/settings.ui
index 7f21dec..59c5f6f 100644
--- a/kicker-applets/kbinaryclock/settings.ui
+++ b/kicker-applets/kbinaryclock/settings.ui
@@ -252,7 +252,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="4" rowspan="3" colspan="1">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <vbox>
                 <property name="name">
diff --git a/kicker-applets/kolourpicker/kolourpicker.cpp b/kicker-applets/kolourpicker/kolourpicker.cpp
index 9acfc26..b727446 100644
--- a/kicker-applets/kolourpicker/kolourpicker.cpp
+++ b/kicker-applets/kolourpicker/kolourpicker.cpp
@@ -208,7 +208,7 @@ void KolourPicker::mouseReleaseEvent(TQMouseEvent *e)
 // set both clipboard and selection
 void KolourPicker::setClipboard(const TQString& text)
 {
-	TQClipboard *clip = TQApplication::tqclipboard();
+	TQClipboard *clip = TQApplication::clipboard();
 	bool oldMode = clip->selectionModeEnabled();
 	clip->setSelectionMode(true);
 	clip->setText(text);
@@ -247,14 +247,14 @@ void KolourPicker::arrangeButtons()
 		h = height();
 		if (h > 40)
 		{
-			// vertical tqlayout
+			// vertical layout
 			p = (h - 40)/3;
 			m_colourButton->setGeometry(2, p, 20, 20);
 			m_historyButton->setGeometry(2, 2*p+20, 20, 20);
 		}
 		else
 		{
-			// horizontal tqlayout
+			// horizontal layout
 			p = (h - 20)/2;
 			m_colourButton->setGeometry(2, p, 20, 20);
 			m_historyButton->setGeometry(24, p, 20, 20);
@@ -265,14 +265,14 @@ void KolourPicker::arrangeButtons()
 		w = width();
 		if (w > 40)
 		{
-			// horizontal tqlayout
+			// horizontal layout
 			p = (w - 40)/3;
 			m_colourButton->setGeometry(p, 2, 20, 20);
 			m_historyButton->setGeometry(2*p+20, 2, 20, 20);
 		}
 		else
 		{
-			// vertical tqlayout
+			// vertical layout
 			p = (w - 20)/2;
 			m_colourButton->setGeometry(p, 2, 20, 20);
 			m_historyButton->setGeometry(p, 24, 20, 20);
diff --git a/kicker-applets/kolourpicker/simplebutton.cpp b/kicker-applets/kolourpicker/simplebutton.cpp
index 4760982..0bc34b5 100644
--- a/kicker-applets/kolourpicker/simplebutton.cpp
+++ b/kicker-applets/kolourpicker/simplebutton.cpp
@@ -234,7 +234,7 @@ void SimpleArrowButton::drawButton( TQPainter *p )
     
     int flags = TQStyle::Style_Default | TQStyle::Style_Enabled;
     if (isDown() || isOn())	flags |= TQStyle::Style_Down;
-    tqstyle().tqdrawPrimitive(pe, p, r, colorGroup(), flags);
+    style().tqdrawPrimitive(pe, p, r, colorGroup(), flags);
 }
 
 void SimpleArrowButton::enterEvent( TQEvent *e )
diff --git a/kicker-applets/ktimemon/confdlg.cc b/kicker-applets/ktimemon/confdlg.cc
index c694f5c..df3fffe 100644
--- a/kicker-applets/ktimemon/confdlg.cc
+++ b/kicker-applets/ktimemon/confdlg.cc
@@ -170,7 +170,7 @@ KConfDialog::KConfDialog(KTimeMon *t)
   bl->addWidget(b);
   bl->addStretch();
 
-  TQVBoxLayout *vbox = new TQVBoxLayout( b->tqlayout() );
+  TQVBoxLayout *vbox = new TQVBoxLayout( b->layout() );
 
   gl = new TQGridLayout(b, MAX_MOUSE_ACTIONS + 1, 3, 0, 6 );
 
diff --git a/kicker-applets/mediacontrol/simplebutton.cpp b/kicker-applets/mediacontrol/simplebutton.cpp
index 4760982..0bc34b5 100644
--- a/kicker-applets/mediacontrol/simplebutton.cpp
+++ b/kicker-applets/mediacontrol/simplebutton.cpp
@@ -234,7 +234,7 @@ void SimpleArrowButton::drawButton( TQPainter *p )
     
     int flags = TQStyle::Style_Default | TQStyle::Style_Enabled;
     if (isDown() || isOn())	flags |= TQStyle::Style_Down;
-    tqstyle().tqdrawPrimitive(pe, p, r, colorGroup(), flags);
+    style().tqdrawPrimitive(pe, p, r, colorGroup(), flags);
 }
 
 void SimpleArrowButton::enterEvent( TQEvent *e )
diff --git a/konq-plugins/domtreeviewer/attributeeditdialog.ui b/konq-plugins/domtreeviewer/attributeeditdialog.ui
index 1a1eafa..9ecf581 100644
--- a/konq-plugins/domtreeviewer/attributeeditdialog.ui
+++ b/konq-plugins/domtreeviewer/attributeeditdialog.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout7</cstring>
+                <cstring>layout7</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -89,7 +89,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout8</cstring>
+                <cstring>layout8</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/konq-plugins/domtreeviewer/domtreecommands.cpp b/konq-plugins/domtreeviewer/domtreecommands.cpp
index 5837239..0bbb918 100644
--- a/konq-plugins/domtreeviewer/domtreecommands.cpp
+++ b/konq-plugins/domtreeviewer/domtreecommands.cpp
@@ -401,8 +401,8 @@ void ChangeCDataCommand::apply()
   if (!shouldReapply()) {
     oldValue = cdata.data();
     has_newlines =
-    	TQConstString(value.tqunicode(), value.length()).string().contains('\n')
-	|| TQConstString(oldValue.tqunicode(), oldValue.length()).string().contains('\n');
+    	TQConstString(value.unicode(), value.length()).string().contains('\n')
+	|| TQConstString(oldValue.unicode(), oldValue.length()).string().contains('\n');
   }
   cdata.setData(value);
   addChangedNode(cdata);
diff --git a/konq-plugins/domtreeviewer/domtreeview.cpp b/konq-plugins/domtreeviewer/domtreeview.cpp
index 4a15a2b..d196f40 100644
--- a/konq-plugins/domtreeviewer/domtreeview.cpp
+++ b/konq-plugins/domtreeviewer/domtreeview.cpp
@@ -343,7 +343,7 @@ void DOMTreeView::highlightHTML(DOMListViewItem *cur_item, const TQString &nodeN
    * think it's worth it.
    */
 
-  TQColor namedColor(tqpalette().active().text());
+  TQColor namedColor(palette().active().text());
   TQString tagName = nodeName.upper();
   if ( tagName == "HTML" ) {
     namedColor = "#0000ff";
diff --git a/konq-plugins/domtreeviewer/domtreeviewbase.ui b/konq-plugins/domtreeviewer/domtreeviewbase.ui
index 9d1c575..4b79c2d 100644
--- a/konq-plugins/domtreeviewer/domtreeviewbase.ui
+++ b/konq-plugins/domtreeviewer/domtreeviewbase.ui
@@ -135,7 +135,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout7</cstring>
+                <cstring>layout7</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -188,7 +188,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout4</cstring>
+                                <cstring>layout4</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -400,7 +400,7 @@
                                     </widget>
                                     <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>tqlayout3</cstring>
+                                            <cstring>layout3</cstring>
                                         </property>
                                         <hbox>
                                             <property name="name">
diff --git a/konq-plugins/domtreeviewer/domtreewindow.cpp b/konq-plugins/domtreeviewer/domtreewindow.cpp
index 5fc3b87..a13e288 100644
--- a/konq-plugins/domtreeviewer/domtreewindow.cpp
+++ b/konq-plugins/domtreeviewer/domtreewindow.cpp
@@ -72,7 +72,7 @@ DOMTreeWindow::DOMTreeWindow(PluginDomtreeviewer *plugin)
 
     // message window dialog
     msgdlg = new MessageDialog(0, "MessageDialog");
-    msgdlg->messagePane->setPaletteBackgroundColor(tqpalette().active().base());
+    msgdlg->messagePane->setPaletteBackgroundColor(palette().active().base());
 // msgdlg->show();
 
     // then, setup our actions
diff --git a/konq-plugins/domtreeviewer/elementeditdialog.ui b/konq-plugins/domtreeviewer/elementeditdialog.ui
index be8eaaf..cd2829b 100644
--- a/konq-plugins/domtreeviewer/elementeditdialog.ui
+++ b/konq-plugins/domtreeviewer/elementeditdialog.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout7</cstring>
+                <cstring>layout7</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -47,7 +47,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -104,7 +104,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout6</cstring>
+                <cstring>layout6</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/konq-plugins/domtreeviewer/messagedialog.ui b/konq-plugins/domtreeviewer/messagedialog.ui
index 35a7b38..830b1cd 100644
--- a/konq-plugins/domtreeviewer/messagedialog.ui
+++ b/konq-plugins/domtreeviewer/messagedialog.ui
@@ -41,7 +41,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/konq-plugins/domtreeviewer/texteditdialog.ui b/konq-plugins/domtreeviewer/texteditdialog.ui
index 250df1b..767f505 100644
--- a/konq-plugins/domtreeviewer/texteditdialog.ui
+++ b/konq-plugins/domtreeviewer/texteditdialog.ui
@@ -60,7 +60,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout6</cstring>
+                <cstring>layout6</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/konq-plugins/fsview/fsview_part.cpp b/konq-plugins/fsview/fsview_part.cpp
index afbf675..3995a47 100644
--- a/konq-plugins/fsview/fsview_part.cpp
+++ b/konq-plugins/fsview/fsview_part.cpp
@@ -344,7 +344,7 @@ void FSViewBrowserExtension::trash()
 void FSViewBrowserExtension::copySelection( bool move )
 {
   KonqDrag *urlData = KonqDrag::newDrag( _view->selectedUrls(), move );
-  TQApplication::tqclipboard()->setData( urlData );
+  TQApplication::clipboard()->setData( urlData );
 }
 
 void FSViewBrowserExtension::editMimeType()
diff --git a/konq-plugins/fsview/treemap.cpp b/konq-plugins/fsview/treemap.cpp
index cab9809..32c52f1 100644
--- a/konq-plugins/fsview/treemap.cpp
+++ b/konq-plugins/fsview/treemap.cpp
@@ -2152,7 +2152,7 @@ void TreeMapWidget::drawTreeMap()
 
   if (hasFocus()) {
     TQPainter p(this);
-    tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p,
+    style().tqdrawPrimitive( TQStyle::PE_FocusRect, &p,
                            TQRect(0, 0, TQWidget::width(), TQWidget::height()),
                            colorGroup() );
   }
diff --git a/konq-plugins/fsview/treemap.h b/konq-plugins/fsview/treemap.h
index 31ac9d3..9bacedc 100644
--- a/konq-plugins/fsview/treemap.h
+++ b/konq-plugins/fsview/treemap.h
@@ -372,7 +372,7 @@ private:
   int _sortTextNo;
   bool _sortAscending;
 
-  // temporary tqlayout
+  // temporary layout
   TQRect _rect;
   TQPtrList<TQRect>* _freeRects;
   int _depth;
diff --git a/konq-plugins/imagerotation/exif.py b/konq-plugins/imagerotation/exif.py
index 1f71387..60fce74 100755
--- a/konq-plugins/imagerotation/exif.py
+++ b/konq-plugins/imagerotation/exif.py
@@ -811,7 +811,7 @@ class EXIF_header:
                                       repr(self.tags[ifd_name+' '+tag_name]))
 
     # extract uncompressed TIFF thumbnail (like pulling teeth)
-    # we take advantage of the pre-existing tqlayout in the thumbnail IFD as
+    # we take advantage of the pre-existing layout in the thumbnail IFD as
     # much as possible
     def extract_TIFF_thumbnail(self, thumb_ifd):
         entries=self.s2n(thumb_ifd, 2)
diff --git a/konq-plugins/searchbar/searchbar.cpp b/konq-plugins/searchbar/searchbar.cpp
index 4da4d30..c31de51 100644
--- a/konq-plugins/searchbar/searchbar.cpp
+++ b/konq-plugins/searchbar/searchbar.cpp
@@ -363,7 +363,7 @@ void SearchBarPlugin::setIcon()
 	TQPainter p( &arrowmap );
 	p.drawPixmap(0, 2, m_searchIcon);
 	TQStyle::SFlags arrowFlags = TQStyle::Style_Default;
-	m_searchCombo->tqstyle().tqdrawPrimitive(TQStyle::PE_ArrowDown, &p, TQRect(arrowmap.width()-6, 
+	m_searchCombo->style().tqdrawPrimitive(TQStyle::PE_ArrowDown, &p, TQRect(arrowmap.width()-6, 
 	    arrowmap.height()-6, 6, 5), m_searchCombo->colorGroup(), arrowFlags, TQStyleOption() );
 	p.end();
 	m_searchIcon = arrowmap;
@@ -590,7 +590,7 @@ int SearchBarCombo::findHistoryItem(const TQString &searchText)
 
 void SearchBarCombo::mousePressEvent(TQMouseEvent *e)
 {
-	int x0 = TQStyle::visualRect( tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ), this ).x();
+	int x0 = TQStyle::visualRect( style().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ), this ).x();
 
 	if(e->x() > x0 + 2 && e->x() < lineEdit()->x())
 	{
diff --git a/konq-plugins/sidebar/metabar/src/configdialog.cpp b/konq-plugins/sidebar/metabar/src/configdialog.cpp
index 63a62a6..d2cd8c0 100644
--- a/konq-plugins/sidebar/metabar/src/configdialog.cpp
+++ b/konq-plugins/sidebar/metabar/src/configdialog.cpp
@@ -161,7 +161,7 @@ ConfigDialog::ConfigDialog(TQWidget *parent, const char *name) : TQDialog(parent
   tab->addTab(actionPage, i18n("Actions"));
   tab->addTab(links, i18n("Links"));
   
-  //tqlayout  
+  //layout  
   TQGridLayout *general_layout = new TQGridLayout(general, 2, 2, 5, 5);
   general_layout->addWidget(entries_group, 0, 0);
   general_layout->addWidget(appearance_group, 0, 1);
@@ -330,15 +330,15 @@ void ConfigDialog::createLink()
   bottom_layout->addWidget(ok);
   bottom_layout->addWidget(cancel);
   
-  TQGridLayout *tqlayout = new TQGridLayout(0, 2, 3, 0, 5);
-  tqlayout->addMultiCellWidget(icon, 0, 1, 0, 0);
-  tqlayout->addWidget(new TQLabel(i18n("Name:"), main), 0, 1);
-  tqlayout->addWidget(name, 0, 2);
-  tqlayout->addWidget(new TQLabel(i18n("URL:"), main), 1, 1);
-  tqlayout->addWidget(url, 1, 2);
+  TQGridLayout *layout = new TQGridLayout(0, 2, 3, 0, 5);
+  layout->addMultiCellWidget(icon, 0, 1, 0, 0);
+  layout->addWidget(new TQLabel(i18n("Name:"), main), 0, 1);
+  layout->addWidget(name, 0, 2);
+  layout->addWidget(new TQLabel(i18n("URL:"), main), 1, 1);
+  layout->addWidget(url, 1, 2);
 
   TQVBoxLayout *main_layout = new TQVBoxLayout(main, 5, 5);
-  main_layout->addLayout(tqlayout);
+  main_layout->addLayout(layout);
   main_layout->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
   main_layout->addLayout(bottom_layout);
   
@@ -413,15 +413,15 @@ void ConfigDialog::editLink(TQListViewItem *item)
     bottom_layout->addWidget(ok);
     bottom_layout->addWidget(cancel);
     
-    TQGridLayout *tqlayout = new TQGridLayout(0, 2, 3, 0, 5);
-    tqlayout->addMultiCellWidget(icon, 0, 1, 0, 0);
-    tqlayout->addWidget(new TQLabel(i18n("Name:"), main), 0, 1);
-    tqlayout->addWidget(name, 0, 2);
-    tqlayout->addWidget(new TQLabel(i18n("URL:"), main), 1, 1);
-    tqlayout->addWidget(url, 1, 2);
+    TQGridLayout *layout = new TQGridLayout(0, 2, 3, 0, 5);
+    layout->addMultiCellWidget(icon, 0, 1, 0, 0);
+    layout->addWidget(new TQLabel(i18n("Name:"), main), 0, 1);
+    layout->addWidget(name, 0, 2);
+    layout->addWidget(new TQLabel(i18n("URL:"), main), 1, 1);
+    layout->addWidget(url, 1, 2);
     
     TQVBoxLayout *main_layout = new TQVBoxLayout(main, 5, 5);
-    main_layout->addLayout(tqlayout);
+    main_layout->addLayout(layout);
     main_layout->addItem(new TQSpacerItem(10, 10, TQSizePolicy::Minimum, TQSizePolicy::Expanding));
     main_layout->addLayout(bottom_layout);
     
diff --git a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
index 05ce39a..eeaf53c 100644
--- a/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
+++ b/konq-plugins/sidebar/metabar/src/metabarwidget.cpp
@@ -114,8 +114,8 @@ MetabarWidget::MetabarWidget(TQWidget *parent, const char *name) : TQWidget(pare
   plugins.insert("http", httpPlugin);
   plugins.insert("https", httpPlugin);
   
-  TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
-  tqlayout->addWidget(html->view());
+  TQVBoxLayout *layout = new TQVBoxLayout(this);
+  layout->addWidget(html->view());
   
   popup = new KPopupMenu(0);
   KAction *configAction = new KAction(i18n("Configure %1...").arg("Metabar"), "configure", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(slotShowConfig()), html->actionCollection(), "configure");
diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
index 59e0e0d..edaa1f4 100644
--- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
+++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.cpp
@@ -53,7 +53,7 @@ namespace KSB_News {
   NSStackTabWidget::NSStackTabWidget(TQWidget *parent, const char *name,
                                      TQPixmap appIcon) : TQWidget(parent, name) {
     currentPage = 0;
-    tqlayout = new TQVBoxLayout(this);
+    layout = new TQVBoxLayout(this);
 
     pagesheader.setAutoDelete(TRUE);
     pages.setAutoDelete(TRUE);
@@ -132,8 +132,8 @@ namespace KSB_News {
     pagesheader.insert(nsp, button);
     pages.insert(nsp, sv);
 
-    tqlayout->addWidget(button);
-    tqlayout->addWidget(sv);
+    layout->addWidget(button);
+    layout->addWidget(sv);
     button->show();
     if (pages.count() == 1) {
       currentPage = sv;
diff --git a/konq-plugins/sidebar/newsticker/nsstacktabwidget.h b/konq-plugins/sidebar/newsticker/nsstacktabwidget.h
index 08f0f22..e6ab6a7 100644
--- a/konq-plugins/sidebar/newsticker/nsstacktabwidget.h
+++ b/konq-plugins/sidebar/newsticker/nsstacktabwidget.h
@@ -74,7 +74,7 @@ namespace KSB_News {
   private:
     TQPtrDict<TQWidget> pages;
     TQPtrDict<TQWidget> pagesheader;
-    TQVBoxLayout *tqlayout;
+    TQVBoxLayout *layout;
     TQWidget *currentPage;
     KPopupMenu *popup, *helpmenu;
     KAboutData *m_aboutdata;
diff --git a/konq-plugins/webarchiver/archiveviewbase.ui b/konq-plugins/webarchiver/archiveviewbase.ui
index 571b39d..743c591 100644
--- a/konq-plugins/webarchiver/archiveviewbase.ui
+++ b/konq-plugins/webarchiver/archiveviewbase.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <grid>
                 <property name="name">
diff --git a/ksig/standardtextbase.ui b/ksig/standardtextbase.ui
index f2e4938..b758544 100644
--- a/ksig/standardtextbase.ui
+++ b/ksig/standardtextbase.ui
@@ -34,7 +34,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout</cstring>
+                <cstring>layout</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/noatun-plugins/alarm/wakeup.cpp b/noatun-plugins/alarm/wakeup.cpp
index 6a9e7a8..28ae6c3 100644
--- a/noatun-plugins/alarm/wakeup.cpp
+++ b/noatun-plugins/alarm/wakeup.cpp
@@ -168,8 +168,8 @@ void Wakeup::slotVolumeChange()
 WakeupPrefs::WakeupPrefs( TQObject *parent ) :
 	CModule( i18n("Wakeup"), i18n("Alarm Configuration"), "date", parent )
 {
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-	TQGridLayout *grid = new TQGridLayout (tqlayout,8,4);
+	TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+	TQGridLayout *grid = new TQGridLayout (layout,8,4);
 	
 	monday=new TQCheckBox(i18n("Monday"),this);
 	tuesday=new TQCheckBox(i18n("Tuesday"),this);
@@ -248,9 +248,9 @@ WakeupPrefs::WakeupPrefs( TQObject *parent ) :
 	TQLabel *volEndLabel = new TQLabel (i18n("Volume increases to:"), volFrame);
 	volEndValue = new KPercentSpinBox (1 ,volFrame,"volendvalue");
 
-	tqlayout->addWidget(modeGroup);
-	tqlayout->addWidget(volFrame);
-	tqlayout->addStretch();
+	layout->addWidget(modeGroup);
+	layout->addWidget(volFrame);
+	layout->addStretch();
 
 	TQHBoxLayout *volLayout = new TQHBoxLayout(volFrame, KDialog::marginHint(), KDialog::spacingHint()); 
 	volLayout->addWidget(volEndLabel);
diff --git a/noatun-plugins/alsaplayer/configmodule.cpp b/noatun-plugins/alsaplayer/configmodule.cpp
index 0c98af7..6fd02f8 100644
--- a/noatun-plugins/alsaplayer/configmodule.cpp
+++ b/noatun-plugins/alsaplayer/configmodule.cpp
@@ -41,11 +41,11 @@ AlsaPlayerConfigModule::AlsaPlayerConfigModule(TQObject * parent)
 {
   scroll_ = new TQCheckBox(i18n("Scroll song title"), this);
 
-  TQVBoxLayout * tqlayout = new TQVBoxLayout(this);
+  TQVBoxLayout * layout = new TQVBoxLayout(this);
 
-  tqlayout->addWidget(scroll_);
+  layout->addWidget(scroll_);
 
-	tqlayout->addStretch(100);
+	layout->addStretch(100);
 
   reopen();
 }
diff --git a/noatun-plugins/charlatan/configmodule.cpp b/noatun-plugins/charlatan/configmodule.cpp
index 0af4ddb..3624e0b 100644
--- a/noatun-plugins/charlatan/configmodule.cpp
+++ b/noatun-plugins/charlatan/configmodule.cpp
@@ -41,11 +41,11 @@ CharlatanConfigModule::CharlatanConfigModule(TQObject * parent)
 {
   scroll_ = new TQCheckBox(i18n("Scroll song title"), this);
 
-  TQVBoxLayout * tqlayout = new TQVBoxLayout(this);
+  TQVBoxLayout * layout = new TQVBoxLayout(this);
 
-  tqlayout->addWidget(scroll_);
+  layout->addWidget(scroll_);
 
-	tqlayout->addStretch(100);
+	layout->addStretch(100);
 
   reopen();
 }
diff --git a/noatun-plugins/dub/dub/dubprefs.ui b/noatun-plugins/dub/dub/dubprefs.ui
index 437dfa9..aa2725d 100644
--- a/noatun-plugins/dub/dub/dubprefs.ui
+++ b/noatun-plugins/dub/dub/dubprefs.ui
@@ -29,7 +29,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/noatun-plugins/dub/dub/fileselectorwidget.cpp b/noatun-plugins/dub/dub/fileselectorwidget.cpp
index ae5c5d3..ac1892e 100644
--- a/noatun-plugins/dub/dub/fileselectorwidget.cpp
+++ b/noatun-plugins/dub/dub/fileselectorwidget.cpp
@@ -40,7 +40,7 @@ FileSelectorWidget::FileSelectorWidget(TQWidget *parent)
     : TQWidget(parent, "file selector widget")
 {
 
-	// widgets and tqlayout
+	// widgets and layout
 
 	TQVBoxLayout* lo = new TQVBoxLayout(this);
 
diff --git a/noatun-plugins/ffrs/ffrs.cpp b/noatun-plugins/ffrs/ffrs.cpp
index 5bdad61..9e73104 100644
--- a/noatun-plugins/ffrs/ffrs.cpp
+++ b/noatun-plugins/ffrs/ffrs.cpp
@@ -187,49 +187,49 @@ void FFRS::changed()
 FFRSPrefs::FFRSPrefs( TQObject *parent )
 	: CModule(i18n("Foreign Region"), i18n("French Foreign Region"),"",parent)
 {
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(this);
+	TQVBoxLayout *layout = new TQVBoxLayout(this);
 
 	TQHBox *box = new TQHBox(this);
-	tqlayout->addWidget(box);
+	layout->addWidget(box);
 	new TQLabel(i18n("Width:"), box);
 	mWidth = new KIntNumInput(width(), box);
 	mWidth->setMinValue(0);
 
 	box = new TQHBox(this);
-	tqlayout->addWidget(box);
+	layout->addWidget(box);
 	new TQLabel(i18n("Height:"), box);
 	mHeight = new KIntNumInput(height(), box);
 	mHeight->setMinValue(0);
 
 	box = new TQHBox(this);
-	tqlayout->addWidget(box);
+	layout->addWidget(box);
 	new TQLabel(i18n("Visible block size:"), box);
 	mFgblock = new KIntNumInput(fgblock(), box);
 	mFgblock->setMinValue(0);
 
 	box = new TQHBox(this);
-	tqlayout->addWidget(box);
+	layout->addWidget(box);
 	new TQLabel(i18n("Transparent block size:"), box);
 	mBgblock = new KIntNumInput(bgblock(), box);
 	mBgblock->setMinValue(0);
 
 	box = new TQHBox(this);
-	tqlayout->addWidget(box);
+	layout->addWidget(box);
 	new TQLabel(i18n("Update interval:"), box);
 	mRate = new KIntNumInput(rate(), box);
 	mRate->setMinValue(0);
 
 	box = new TQHBox(this);
-	tqlayout->addWidget(box);
+	layout->addWidget(box);
 	new TQLabel(i18n("Foreground color:"), box);
 	mFgcolor = new KColorButton(fgcolor(), box);
 
 	box = new TQHBox(this);
-	tqlayout->addWidget(box);
+	layout->addWidget(box);
 	new TQLabel(i18n("Background color:"), box);
 	mBgcolor = new KColorButton(bgcolor(), box);
 
-	tqlayout->addStretch();
+	layout->addStretch();
 }
 
 void FFRSPrefs::save()
diff --git a/noatun-plugins/lyrics/cmodule.cpp b/noatun-plugins/lyrics/cmodule.cpp
index 1d444c4..e83d8fc 100644
--- a/noatun-plugins/lyrics/cmodule.cpp
+++ b/noatun-plugins/lyrics/cmodule.cpp
@@ -47,23 +47,23 @@ const char *const DEFAULT_TQUERY =
 LyricsCModule::LyricsCModule(TQObject *_parent) : CModule(i18n("Lyrics"), i18n("Configure Lyrics Plugin"), "document", _parent) {
   /* Thanks to the kde-usability guys for the help designing this dialog!
    * help to simon edwards of KGuardGod, for a big help designing it */
-  TQVBoxLayout *vtqlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
-  TQHBoxLayout *htqlayout = new TQHBoxLayout(vtqlayout, KDialog::spacingHint());
-  vtqlayout->setStretchFactor( htqlayout, 1 );
+  TQVBoxLayout *vlayout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint());
+  TQHBoxLayout *hlayout = new TQHBoxLayout(vlayout, KDialog::spacingHint());
+  vlayout->setStretchFactor( hlayout, 1 );
 
   // Search box
-  TQVBoxLayout *boxtqlayout = new TQVBoxLayout( htqlayout, KDialog::spacingHint() );
-  boxtqlayout->addWidget( new TQLabel( i18n("Search providers:" ), this ) );
+  TQVBoxLayout *boxlayout = new TQVBoxLayout( hlayout, KDialog::spacingHint() );
+  boxlayout->addWidget( new TQLabel( i18n("Search providers:" ), this ) );
   providersBox = new KListBox( this, "providersBox" );
-  boxtqlayout->addWidget(providersBox);
+  boxlayout->addWidget(providersBox);
 
   boxButtons = new KButtonBox( this,Qt::Vertical );
   boxButtons->addButton( i18n( "New Search Provider" ), TQT_TQOBJECT(this), TQT_SLOT( newSearch() ) );
   boxButtons->addButton( i18n( "Delete Search Provider" ), TQT_TQOBJECT(this), TQT_SLOT( delSearch() ) );
   boxButtons->addButton( i18n( "Move Up" ), TQT_TQOBJECT(this), TQT_SLOT( moveUpSearch() ) );
   boxButtons->addButton( i18n( "Move Down" ), TQT_TQOBJECT(this), TQT_SLOT( moveDownSearch() ) );
-  boxButtons->tqlayout();
-  boxtqlayout->addWidget( boxButtons );
+  boxButtons->layout();
+  boxlayout->addWidget( boxButtons );
 
   // Edit box
   TQGroupBox *propBox = new TQVGroupBox( i18n("Search Provider Properties" ), this );
@@ -77,7 +77,7 @@ LyricsCModule::LyricsCModule(TQObject *_parent) : CModule(i18n("Lyrics"), i18n("
    * The property names can't be translated. This means that $(author) must be kept as $(author), $(title) as $(title), etc, or it won't work.*/
   TQLabel *textLabel = new TQLabel(i18n("For your query, you can use any property of your multimedia item, just enclosing it with a $(property).\n\nSome common properties used are $(title), $(author) and $(album). For example, to search in Google for the author, title and track, just use:\nhttp://www.google.com/search?q=$(author)+$(title)+$(track)"), propBox, "textLabel");
   textLabel->setAlignment(TQt::WordBreak);
-  htqlayout->addWidget( propBox, 1 );
+  hlayout->addWidget( propBox, 1 );
 
   /* Signal/slots */
   nameEdit->setEnabled( false );
@@ -88,7 +88,7 @@ LyricsCModule::LyricsCModule(TQObject *_parent) : CModule(i18n("Lyrics"), i18n("
 
 
 
-  vtqlayout->addStretch();
+  vlayout->addStretch();
   reopen();
   save();
 }
diff --git a/noatun-plugins/oblique/cmodule.cpp b/noatun-plugins/oblique/cmodule.cpp
index 8267865..48dbca2 100644
--- a/noatun-plugins/oblique/cmodule.cpp
+++ b/noatun-plugins/oblique/cmodule.cpp
@@ -36,9 +36,9 @@ SchemaConfig::SchemaConfig(TQWidget *parent, Oblique *oblique)
 	mRegexpEditor=0;
 
 	{
-		TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 11, 7);
-		tqlayout->setAutoAdd(true);
-		tqlayout->setSpacing(7);
+		TQVBoxLayout *layout = new TQVBoxLayout(this, 11, 7);
+		layout->setAutoAdd(true);
+		layout->setSpacing(7);
 	}
 
 
diff --git a/noatun-plugins/synaescope/cmodule.cpp b/noatun-plugins/synaescope/cmodule.cpp
index e6c2930..5b881fd 100644
--- a/noatun-plugins/synaescope/cmodule.cpp
+++ b/noatun-plugins/synaescope/cmodule.cpp
@@ -37,7 +37,7 @@ SynaePrefs::SynaePrefs(TQObject *parent)
 	xRes = new TQSpinBox(320, 1024, 16, this);
 	yRes = new TQSpinBox(240, 768, 12, this);
 
-	TQVBoxLayout *tqlayout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
+	TQVBoxLayout *layout = new TQVBoxLayout(this, 0, KDialog::spacingHint());
 	TQHBoxLayout *xResLayout = new TQHBoxLayout(0, 0, KDialog::spacingHint());
 	TQHBoxLayout *yResLayout = new TQHBoxLayout(0, 0, KDialog::spacingHint());
 
@@ -47,9 +47,9 @@ SynaePrefs::SynaePrefs(TQObject *parent)
 	yResLayout->addWidget(new TQLabel(i18n("Display height:"), this));
 	yResLayout->addWidget(yRes);
 
-	tqlayout->addLayout(xResLayout);
-	tqlayout->addLayout(yResLayout);
-	tqlayout->addStretch();
+	layout->addLayout(xResLayout);
+	layout->addLayout(yResLayout);
+	layout->addStretch();
 
 	changed=false;
 	connect(xRes, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotChanges()));