14 files changed, 16 insertions, 16 deletions
diff --git a/apps/ktorrent/addpeerwidgetbase.ui b/apps/ktorrent/addpeerwidgetbase.ui
index aeb5f6e..3ae532a 100644
--- a/apps/ktorrent/addpeerwidgetbase.ui
+++ b/apps/ktorrent/addpeerwidgetbase.ui
@@ -152,7 +152,7 @@
 <Q_SLOTS>
     <slot>btnAdd_clicked()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/apps/ktorrent/advancedpref.ui b/apps/ktorrent/advancedpref.ui
index 527250b..a144aa6 100644
--- a/apps/ktorrent/advancedpref.ui
+++ b/apps/ktorrent/advancedpref.ui
@@ -639,7 +639,7 @@
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>kcombobox.h</includehint>
diff --git a/apps/ktorrent/downloadpref.ui b/apps/ktorrent/downloadpref.ui
index 966fc50..6315cba 100644
--- a/apps/ktorrent/downloadpref.ui
+++ b/apps/ktorrent/downloadpref.ui
@@ -708,7 +708,7 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/apps/ktorrent/fileselectdlgbase.ui b/apps/ktorrent/fileselectdlgbase.ui
index 39cd4b6..152c057 100644
--- a/apps/ktorrent/fileselectdlgbase.ui
+++ b/apps/ktorrent/fileselectdlgbase.ui
@@ -369,7 +369,7 @@
     <tabstop>m_select_none</tabstop>
     <tabstop>m_invert_selection</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/apps/ktorrent/generalpref.ui b/apps/ktorrent/generalpref.ui
index 5a17912..33eb8f3 100644
--- a/apps/ktorrent/generalpref.ui
+++ b/apps/ktorrent/generalpref.ui
@@ -453,7 +453,7 @@
     <tabstop>show_systray_icon</tabstop>
 </tabstops>
 <pixmapinproject/>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/apps/ktorrent/ipfilterwidgetbase.ui b/apps/ktorrent/ipfilterwidgetbase.ui
index a4d56fc..c02218d 100644
--- a/apps/ktorrent/ipfilterwidgetbase.ui
+++ b/apps/ktorrent/ipfilterwidgetbase.ui
@@ -353,7 +353,7 @@
     <slot>btnOk_clicked()</slot>
     <slot>btnApply_clicked()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/apps/ktorrent/newui/dmainwindow.cpp b/apps/ktorrent/newui/dmainwindow.cpp
index b90045c..bf039d6 100644
--- a/apps/ktorrent/newui/dmainwindow.cpp
+++ b/apps/ktorrent/newui/dmainwindow.cpp
@@ -88,7 +88,7 @@ void DMainWindow::createToolWindows()
 
 void DMainWindow::addWidget(TQWidget *widget, const TQString &title)
 {
-//     tqinvalidateActiveTabWidget();
+//     invalidateActiveTabWidget();
     if (m_firstRemoved && m_activeTabWidget == m_tabs.first())
     {
         m_central->addDock(0, 0, m_activeTabWidget);
@@ -180,14 +180,14 @@ DTabWidget *DMainWindow::splitHorizontal()
 
 DTabWidget *DMainWindow::splitVertical()
 {
-//     tqinvalidateActiveTabWidget();
+//     invalidateActiveTabWidget();
     int row = m_central->indexOf(m_activeTabWidget).first;
     m_activeTabWidget = createTab();
     m_central->addDock(row, m_central->numCols(row), m_activeTabWidget);
     return m_activeTabWidget;
 }
 
-void DMainWindow::tqinvalidateActiveTabWidget()
+void DMainWindow::invalidateActiveTabWidget()
 {
 /*    TQWidget *focused = m_central->tqfocusWidget();
     kdDebug(9000) << "tqinvalidate: " << focused << endl;
diff --git a/apps/ktorrent/newui/dmainwindow.h b/apps/ktorrent/newui/dmainwindow.h
index be40b61..edcdb32 100644
--- a/apps/ktorrent/newui/dmainwindow.h
+++ b/apps/ktorrent/newui/dmainwindow.h
@@ -107,7 +107,7 @@ protected:
     TQWidget *m_currentWidget;
 
 private slots:
-    void tqinvalidateActiveTabWidget();
+    void invalidateActiveTabWidget();
 
 };
 
diff --git a/apps/ktorrent/pastedlgbase.ui b/apps/ktorrent/pastedlgbase.ui
index 15d4103..6762dfe 100644
--- a/apps/ktorrent/pastedlgbase.ui
+++ b/apps/ktorrent/pastedlgbase.ui
@@ -135,7 +135,7 @@
 <Q_SLOTS>
     <slot>btnOK_clicked()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
 </includehints>
diff --git a/apps/ktorrent/queuedlg.ui b/apps/ktorrent/queuedlg.ui
index 6c179be..f7c58e6 100644
--- a/apps/ktorrent/queuedlg.ui
+++ b/apps/ktorrent/queuedlg.ui
@@ -715,7 +715,7 @@
     <slot>btnMoveTop_clicked()</slot>
     <slot>btnMoveBottom_clicked()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>ksqueezedtextlabel.h</includehint>
     <includehint>ksqueezedtextlabel.h</includehint>
diff --git a/apps/ktorrent/scandlgbase.ui b/apps/ktorrent/scandlgbase.ui
index 23e4b22..89ffb9f 100644
--- a/apps/ktorrent/scandlgbase.ui
+++ b/apps/ktorrent/scandlgbase.ui
@@ -185,7 +185,7 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kprogress.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/apps/ktorrent/speedlimitsdlgbase.ui b/apps/ktorrent/speedlimitsdlgbase.ui
index 9576f89..f4313e2 100644
--- a/apps/ktorrent/speedlimitsdlgbase.ui
+++ b/apps/ktorrent/speedlimitsdlgbase.ui
@@ -184,7 +184,7 @@
         <slot>accept()</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/apps/ktorrent/torrentcreatordlgbase.ui b/apps/ktorrent/torrentcreatordlgbase.ui
index f11a4d9..78e7494 100644
--- a/apps/ktorrent/torrentcreatordlgbase.ui
+++ b/apps/ktorrent/torrentcreatordlgbase.ui
@@ -514,7 +514,7 @@
     <slot>m_node_textChanged(const QString&amp;)</slot>
     <slot>m_nodeList_selectionChanged(TQListViewItem*)</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/apps/ktupnptest/mainwidget.ui b/apps/ktupnptest/mainwidget.ui
index b3cce96..0aacede 100644
--- a/apps/ktupnptest/mainwidget.ui
+++ b/apps/ktupnptest/mainwidget.ui
@@ -68,7 +68,7 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>