Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

18 files changed, 30 insertions, 30 deletions

diff --git a/klinkstatus/src/engine/linkstatus.cpp b/klinkstatus/src/engine/linkstatus.cpp
index cec4cd52..d95c7860 100644
--- a/klinkstatus/src/engine/linkstatus.cpp
+++ b/klinkstatus/src/engine/linkstatus.cpp
@@ -90,7 +90,7 @@ void LinktqStatus::reset()
             redirection_ = 0;
         }
     }
-    Q_ASSERT(!tqparent_);
+    Q_ASSERT(!parent_);
     base_URI_ = "";
 }
 
@@ -100,7 +100,7 @@ TQString const LinktqStatus::toString() const
 
     if(!is_root_)
     {
-        Q_ASSERT(tqparent_);
+        Q_ASSERT(parent_);
         aux += i18n( "Parent: %1" ).tqarg( tqparent()->absoluteUrl().prettyURL() ) + "\n";
     }
     Q_ASSERT(!original_url_.isNull());
diff --git a/klinkstatus/src/engine/linkstatus.h b/klinkstatus/src/engine/linkstatus.h
index 7ec26ca9..a74282f8 100644
--- a/klinkstatus/src/engine/linkstatus.h
+++ b/klinkstatus/src/engine/linkstatus.h
@@ -163,7 +163,7 @@ private:
     bool error_occurred_;
     bool is_redirection_;
     vector<Node*> tqchildren_nodes_;
-    LinktqStatus* tqparent_;
+    LinktqStatus* parent_;
     LinktqStatus* redirection_;
     bool checked_;
     bool only_check_header_;
diff --git a/klinkstatus/src/engine/linkstatus_impl.h b/klinkstatus/src/engine/linkstatus_impl.h
index 4d3faf36..a29bcdcc 100644
--- a/klinkstatus/src/engine/linkstatus_impl.h
+++ b/klinkstatus/src/engine/linkstatus_impl.h
@@ -20,7 +20,7 @@
 
 inline LinktqStatus::LinktqStatus()
         : status_(LinktqStatus::UNDETERMINED), depth_(-1), external_domain_depth_(-1), is_root_(false),
-        error_occurred_(false), is_redirection_(false), tqparent_(0), redirection_(0), checked_(false),
+        error_occurred_(false), is_redirection_(false), parent_(0), redirection_(0), checked_(false),
         only_check_header_(true), malformed_(false),
         node_(0), has_base_URI_(false), has_html_doc_title_(false), ignored_(false),
         mimetype_(""), is_error_page_(false), tree_view_item_(0)
@@ -28,7 +28,7 @@ inline LinktqStatus::LinktqStatus()
 
 inline LinktqStatus::LinktqStatus(KURL const& absolute_url)
         : status_(LinktqStatus::UNDETERMINED), depth_(-1), external_domain_depth_(-1), is_root_(false),
-        error_occurred_(false), is_redirection_(false), tqparent_(0), redirection_(0), checked_(false),
+        error_occurred_(false), is_redirection_(false), parent_(0), redirection_(0), checked_(false),
         only_check_header_(true), malformed_(false),
         node_(0), has_base_URI_(false), has_html_doc_title_(false), ignored_(false),
         mimetype_(""), is_error_page_(false), tree_view_item_(0)
@@ -38,7 +38,7 @@ inline LinktqStatus::LinktqStatus(KURL const& absolute_url)
 
 inline LinktqStatus::LinktqStatus(Node* node, LinktqStatus* tqparent)
         : status_(LinktqStatus::UNDETERMINED), depth_(-1), external_domain_depth_(-1), is_root_(false),
-        error_occurred_(false), is_redirection_(false), tqparent_(0), redirection_(0), checked_(false),
+        error_occurred_(false), is_redirection_(false), parent_(0), redirection_(0), checked_(false),
         only_check_header_(true), malformed_(false),
         node_(node), has_base_URI_(false), has_html_doc_title_(false), ignored_(false),
         mimetype_(""), is_error_page_(false), tree_view_item_(0)
@@ -69,7 +69,7 @@ inline void LinktqStatus::setParent(LinktqStatus* tqparent)
 {
     Q_ASSERT(tqparent);
 
-    tqparent_ = tqparent;
+    parent_ = tqparent;
     addReferrer(tqparent->absoluteUrl());
 }
 
@@ -263,7 +263,7 @@ inline bool LinktqStatus::isLocalRestrict() const
 
 inline LinktqStatus const* LinktqStatus::tqparent() const
 {
-    return tqparent_;
+    return parent_;
 }
 
 inline TQString const& LinktqStatus::originalUrl() const
diff --git a/klinkstatus/src/engine/searchmanager.cpp b/klinkstatus/src/engine/searchmanager.cpp
index 3a34d04c..02d85853 100644
--- a/klinkstatus/src/engine/searchmanager.cpp
+++ b/klinkstatus/src/engine/searchmanager.cpp
@@ -618,7 +618,7 @@ bool SearchManager::checkable(KURL const& url, LinktqStatus const& link_parent)
 
     if(!check_parent_dirs_)
     {
-        if(Url::tqparentDir(root_.absoluteUrl(), url))
+        if(Url::parentDir(root_.absoluteUrl(), url))
             return false;
     }
     if(!check_external_links_)
diff --git a/klinkstatus/src/klinkstatus_part.cpp b/klinkstatus/src/klinkstatus_part.cpp
index e6ce9776..54b08f0b 100644
--- a/klinkstatus/src/klinkstatus_part.cpp
+++ b/klinkstatus/src/klinkstatus_part.cpp
@@ -55,7 +55,7 @@ const char KLinkStatusPart::version_[] = "0.3.2";
 typedef KParts::GenericFactory<KLinkStatusPart> KLinkStatusFactory;
 K_EXPORT_COMPONENT_FACTORY( libklinkstatuspart, KLinkStatusFactory )
 
-KLinkStatusPart::KLinkStatusPart(TQWidget *tqparentWidget, const char *widgetName,
+KLinkStatusPart::KLinkStatusPart(TQWidget *parentWidget, const char *widgetName,
                                  TQObject *tqparent, const char *name,
                                  const TQStringList & /*string_list*/)
     : KParts::ReadOnlyPart(tqparent, name), m_dlgAbout(0)
@@ -66,7 +66,7 @@ KLinkStatusPart::KLinkStatusPart(TQWidget *tqparentWidget, const char *widgetNam
     ActionManager::setInstance(action_manager_);
     initGUI();
 
-    tabwidget_ = new TabWidgetSession(tqparentWidget, widgetName);
+    tabwidget_ = new TabWidgetSession(parentWidget, widgetName);
     setWidget(tabwidget_);
     action_manager_->initTabWidget(tabwidget_);
 
diff --git a/klinkstatus/src/klinkstatus_part.h b/klinkstatus/src/klinkstatus_part.h
index 1e7f1009..8d9eaf2e 100644
--- a/klinkstatus/src/klinkstatus_part.h
+++ b/klinkstatus/src/klinkstatus_part.h
@@ -39,7 +39,7 @@ class KLinkStatusPart: public KParts::ReadOnlyPart
     Q_OBJECT
   TQ_OBJECT
 public:
-    KLinkStatusPart(TQWidget *tqparentWidget, const char *widgetName,
+    KLinkStatusPart(TQWidget *parentWidget, const char *widgetName,
                     TQObject *tqparent, const char *name,
                     const TQStringList& args);
     virtual ~KLinkStatusPart();
diff --git a/klinkstatus/src/parser/url.cpp b/klinkstatus/src/parser/url.cpp
index 164b54a6..173c734b 100644
--- a/klinkstatus/src/parser/url.cpp
+++ b/klinkstatus/src/parser/url.cpp
@@ -296,7 +296,7 @@ bool Url::localDomain(KURL const& url1, KURL const& url2, bool restrict)
 /**
 	Returns true if url2 is a tqparent of url1.
 */
-bool Url::tqparentDir(KURL const& url1, KURL const& url2)
+bool Url::parentDir(KURL const& url1, KURL const& url2)
 {
     if(url1.protocol() != url2.protocol())
         return false;
diff --git a/klinkstatus/src/parser/url.h b/klinkstatus/src/parser/url.h
index 0f704783..fbfeb952 100644
--- a/klinkstatus/src/parser/url.h
+++ b/klinkstatus/src/parser/url.h
@@ -45,7 +45,7 @@ bool equalHost(TQString const& host1, TQString const& host2, bool restrict = fal
 bool hasProtocol(TQString const& url);
 TQString convertToLocal(LinktqStatus const* ls);
 bool localDomain(KURL const& url1, KURL const& url2, bool restrict = true);
-bool tqparentDir(KURL const& url1, KURL const& url2);
+bool parentDir(KURL const& url1, KURL const& url2);
 bool externalLink(KURL const& url1, KURL const& url2, bool restrict = true);
 }
 
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();