10 files changed, 16 insertions, 16 deletions
diff --git a/klinkstatus/src/ui/resultview.h b/klinkstatus/src/ui/resultview.h
index d63fb8c0..5c614fbf 100644
--- a/klinkstatus/src/ui/resultview.h
+++ b/klinkstatus/src/ui/resultview.h
@@ -127,7 +127,7 @@ protected:
 
     LinktqStatus* ls_;
     int column_index_;
-    int tqalignment_;
+    int alignment_;
 };
 
 
diff --git a/klinkstatus/src/ui/sessionwidget.cpp b/klinkstatus/src/ui/sessionwidget.cpp
index 0678822a..26123b6b 100644
--- a/klinkstatus/src/ui/sessionwidget.cpp
+++ b/klinkstatus/src/ui/sessionwidget.cpp
@@ -392,15 +392,15 @@ void SessionWidget::slotLinkChecked(LinktqStatus const* linkstatus, LinkChecker
     if(linkstatus->checked())
     {
         TreeViewItem* tree_view_item = 0;
-        TreeViewItem* tqparent_item = linkstatus->tqparent()->treeViewItem();
+        TreeViewItem* parent_item = linkstatus->tqparent()->treeViewItem();
         bool match = resultsSearchBar->currentLinkMatcher().matches(*linkstatus);
 
         if(tree_display_)
         {
             //kdDebug(23100) << "TREE!!!!!" << endl;
-            tree_view_item = new TreeViewItem(tree_view, tqparent_item, tqparent_item->lastChild(), linkstatus);
+            tree_view_item = new TreeViewItem(tree_view, parent_item, parent_item->lastChild(), linkstatus);
 
-            tqparent_item->setLastChild(tree_view_item);
+            parent_item->setLastChild(tree_view_item);
             if(follow_last_link_checked_)
                 tree_view->ensureRowVisible(tree_view_item, tree_display_);
             
diff --git a/klinkstatus/src/ui/sessionwidgetbase.ui b/klinkstatus/src/ui/sessionwidgetbase.ui
index 64870e29..7cf9819a 100644
--- a/klinkstatus/src/ui/sessionwidgetbase.ui
+++ b/klinkstatus/src/ui/sessionwidgetbase.ui
@@ -590,7 +590,7 @@
     <slot specifier="pure virtual">slotCancel()</slot>
     <slot specifier="pure virtual">slotClearComboUrl()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klshistorycombo.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/klinkstatus/src/ui/settings/configidentificationdialogui.ui b/klinkstatus/src/ui/settings/configidentificationdialogui.ui
index 7f70dbb1..8fa3e5d7 100644
--- a/klinkstatus/src/ui/settings/configidentificationdialogui.ui
+++ b/klinkstatus/src/ui/settings/configidentificationdialogui.ui
@@ -126,7 +126,7 @@
     <tabstop>kcfg_UserAgent</tabstop>
     <tabstop>buttonDefault</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/klinkstatus/src/ui/settings/configresultsdialog.ui b/klinkstatus/src/ui/settings/configresultsdialog.ui
index 86f579c3..4d1fc6ac 100644
--- a/klinkstatus/src/ui/settings/configresultsdialog.ui
+++ b/klinkstatus/src/ui/settings/configresultsdialog.ui
@@ -68,5 +68,5 @@
         </widget>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/klinkstatus/src/ui/settings/configsearchdialog.ui b/klinkstatus/src/ui/settings/configsearchdialog.ui
index df982adb..4c63274b 100644
--- a/klinkstatus/src/ui/settings/configsearchdialog.ui
+++ b/klinkstatus/src/ui/settings/configsearchdialog.ui
@@ -343,7 +343,7 @@
     <tabstop>kcfg_CheckExternalLinks</tabstop>
     <tabstop>kcfg_RememberCheckSettings</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
diff --git a/klinkstatus/src/ui/tablelinkstatus.cpp b/klinkstatus/src/ui/tablelinkstatus.cpp
index d640f7bd..d7bca792 100644
--- a/klinkstatus/src/ui/tablelinkstatus.cpp
+++ b/klinkstatus/src/ui/tablelinkstatus.cpp
@@ -387,7 +387,7 @@ void TableLinkstatus::slotEditReferrerWithQuanta(KURL const& url)
         if(!success)
         {
             TQString message = i18n("<qt>File <b>%1</b> cannot be opened. Might be a DCOP problem.</qt>").tqarg(filePath);
-            KMessageBox::error(tqparentWidget(), message);
+            KMessageBox::error(parentWidget(), message);
         }
     }
     else
@@ -443,7 +443,7 @@ TableItem::TableItem(TQTable* table, EditType et,
                      int column_index, int tqalignment)
         : TQTableItem(table, et, ""), ResultViewItem(linkstatus, column_index),
         /*ls_((LinktqStatus*)linkstatus),
-        column_index_(column_index),*/ tqalignment_(tqalignment)
+        column_index_(column_index),*/ alignment_(tqalignment)
 {
     //Q_ASSERT(ls_);
     //Q_ASSERT(column_index_ > 0);
@@ -469,12 +469,12 @@ int TableItem::columnIndex() const
 
 void TableItem::tqsetAlignment(int aFlags)
 {
-    tqalignment_ = aFlags;
+    alignment_ = aFlags;
 }
 
 int TableItem::tqalignment() const
 {
-    return tqalignment_;
+    return alignment_;
 }
 /*
 LinktqStatus const* const TableItem::linktqStatus() const
diff --git a/klinkstatus/src/ui/tablelinkstatus.h b/klinkstatus/src/ui/tablelinkstatus.h
index 2d320619..70f6fd41 100644
--- a/klinkstatus/src/ui/tablelinkstatus.h
+++ b/klinkstatus/src/ui/tablelinkstatus.h
@@ -135,7 +135,7 @@ private:
 
     //LinktqStatus* ls_;
     //int column_index_;
-    int tqalignment_;
+    int alignment_;
 };
 
 
diff --git a/klinkstatus/src/ui/treeview.cpp b/klinkstatus/src/ui/treeview.cpp
index 3adec065..b5d42143 100644
--- a/klinkstatus/src/ui/treeview.cpp
+++ b/klinkstatus/src/ui/treeview.cpp
@@ -293,7 +293,7 @@ void TreeView::slotEditReferrerWithQuanta(KURL const& url)
         if(!success)
         {
             TQString message = i18n("<qt>File <b>%1</b> cannot be opened. Might be a DCOP problem.</qt>").tqarg(filePath);
-            KMessageBox::error(tqparentWidget(), message);
+            KMessageBox::error(parentWidget(), message);
         }
     }
     else
diff --git a/klinkstatus/src/ui/treeview.h b/klinkstatus/src/ui/treeview.h
index ccb84bb1..dc3e62e8 100644
--- a/klinkstatus/src/ui/treeview.h
+++ b/klinkstatus/src/ui/treeview.h
@@ -75,7 +75,7 @@ private:
     double columnsWidth() const;
 
 private:
-    int current_column_; // aptqparently it's impossible to know what is the current column
+    int current_column_; // apparently it's impossible to know what is the current column
     bool tree_display_;
 };
 
@@ -93,7 +93,7 @@ public:
 
     TreeViewItem(TreeView* tqparent, TQListViewItem* after,
                  LinktqStatus const* linkstatus);
-    TreeViewItem(TreeView* root, TQListViewItem* tqparent_item, TQListViewItem* after,
+    TreeViewItem(TreeView* root, TQListViewItem* parent_item, TQListViewItem* after,
                  LinktqStatus const* linkstatus);
     virtual ~TreeViewItem();