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/kdepim@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

20 files changed, 58 insertions, 58 deletions

diff --git a/akregator/HACKING b/akregator/HACKING
index 4567e4d49..7ff481182 100644
--- a/akregator/HACKING
+++ b/akregator/HACKING
@@ -66,7 +66,7 @@ Spaces
 ================================================================================
 
 Spaces should be used between the conditional / loop type and the
-conditional statement.  They should not be used after tqparenthesis.  However
+conditional statement.  They should not be used after parenthesis.  However
 the should be to mark of mathematical or comparative operators.
 
 if ( foo == bar )
diff --git a/akregator/src/addfeedwidgetbase.ui b/akregator/src/addfeedwidgetbase.ui
index 9874d08bd..7d9a8a482 100644
--- a/akregator/src/addfeedwidgetbase.ui
+++ b/akregator/src/addfeedwidgetbase.ui
@@ -137,7 +137,7 @@
         </spacer>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>ksqueezedtextlabel.h</includehint>
diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp
index a5189749f..1cfd42b11 100644
--- a/akregator/src/akregator_part.cpp
+++ b/akregator/src/akregator_part.cpp
@@ -116,7 +116,7 @@ class Part::ApplyFiltersInterceptor : public ArticleInterceptor
     }
 };
 
-Part::Part( TQWidget *tqparentWidget, const char * /*widgetName*/,
+Part::Part( TQWidget *parentWidget, const char * /*widgetName*/,
                               TQObject *tqparent, const char *name, const TQStringList& )
     : DCOPObject("AkregatorIface")
        , MyBasePart(tqparent, name)
@@ -168,7 +168,7 @@ Part::Part( TQWidget *tqparentWidget, const char * /*widgetName*/,
     {
         m_storage = Backend::StorageFactoryRegistry::self()->getFactory("dummy")->createStorage(storageParams);
 
-        KMessageBox::error(tqparentWidget, i18n("Unable to load storage backend plugin \"%1\". No feeds are archived.").tqarg(Settings::archiveBackend()), i18n("Plugin error") );
+        KMessageBox::error(parentWidget, i18n("Unable to load storage backend plugin \"%1\". No feeds are archived.").tqarg(Settings::archiveBackend()), i18n("Plugin error") );
     }
 
     Filters::ArticleFilterList list;
@@ -187,7 +187,7 @@ Part::Part( TQWidget *tqparentWidget, const char * /*widgetName*/,
     m_actionManager = new ActionManagerImpl(this);
     ActionManager::setInstance(m_actionManager);
 
-    m_view = new Akregator::View(this, tqparentWidget, m_actionManager, "akregator_view");
+    m_view = new Akregator::View(this, parentWidget, m_actionManager, "akregator_view");
     m_actionManager->initView(m_view);
     m_actionManager->setTagSet(Kernel::self()->tagSet());
 
@@ -823,7 +823,7 @@ KParts::Part* Part::hitTest(TQWidget *widget, const TQPoint &globalPos)
         if (!widget) {
             break;
         }
-        widget = widget->tqparentWidget();
+        widget = widget->parentWidget();
     }
     if (m_view && m_view->currentFrame() && child) {
         return m_view->currentFrame()->part();
diff --git a/akregator/src/akregator_part.h b/akregator/src/akregator_part.h
index 43404a179..c60316cca 100644
--- a/akregator/src/akregator_part.h
+++ b/akregator/src/akregator_part.h
@@ -82,7 +82,7 @@ namespace Akregator
            typedef MyBasePart inherited;
 
             /** Default constructor.*/
-            Part(TQWidget *tqparentWidget, const char *widgetName,
+            Part(TQWidget *parentWidget, const char *widgetName,
                           TQObject *tqparent, const char *name, const TQStringList&);
 
 	        /** Destructor. */
diff --git a/akregator/src/feedlistview.cpp b/akregator/src/feedlistview.cpp
index ac9c82125..a891445fc 100644
--- a/akregator/src/feedlistview.cpp
+++ b/akregator/src/feedlistview.cpp
@@ -212,15 +212,15 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor
             
             TagNodeItem* item = 0;
             TreeNode* prev = node->prevSibling();
-            FolderItem* tqparentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->tqparent()));
-            if (tqparentItem)
+            FolderItem* parentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->tqparent()));
+            if (parentItem)
             {
                 if (prev)
                 {
-                    item = new TagNodeItem( tqparentItem, m_view->findNodeItem(prev), node);
+                    item = new TagNodeItem( parentItem, m_view->findNodeItem(prev), node);
                 }
                 else
-                    item = new TagNodeItem( tqparentItem, node);
+                    item = new TagNodeItem( parentItem, node);
             }
             else
             {
@@ -234,8 +234,8 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor
             item->nodeChanged();     
             m_view->d->itemDict.insert(node, item);
             m_view->connectToNode(node);
-            if (tqparentItem)
-                tqparentItem->sortChildItems(0, true);
+            if (parentItem)
+                parentItem->sortChildItems(0, true);
             return true;
         }
 
@@ -246,15 +246,15 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor
          
             TagFolderItem* item = 0;
             TreeNode* prev = node->prevSibling();
-            FolderItem* tqparentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->tqparent()));
-            if (tqparentItem)
+            FolderItem* parentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->tqparent()));
+            if (parentItem)
             {
                 if (prev)
                 {
-                    item = new TagFolderItem( tqparentItem, m_view->findNodeItem(prev), node);
+                    item = new TagFolderItem( parentItem, m_view->findNodeItem(prev), node);
                 }
                 else
-                    item = new TagFolderItem(tqparentItem, node);
+                    item = new TagFolderItem(parentItem, node);
             }
             else
             {
@@ -284,15 +284,15 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor
                      
             FolderItem* item = 0;
             TreeNode* prev = node->prevSibling();
-            FolderItem* tqparentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->tqparent()));
-            if (tqparentItem)
+            FolderItem* parentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->tqparent()));
+            if (parentItem)
             {
                 if (prev)
                 {
-                    item = new FolderItem( tqparentItem, m_view->findNodeItem(prev), node);
+                    item = new FolderItem( parentItem, m_view->findNodeItem(prev), node);
                 }
                 else
-                    item = new FolderItem(tqparentItem, node);
+                    item = new FolderItem(parentItem, node);
             }
             else
             {
@@ -321,16 +321,16 @@ class NodeListView::CreateItemVisitor : public TreeNodeVisitor
          
             FeedItem* item = 0;
             TreeNode* prev = node->prevSibling();
-            FolderItem* tqparentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->tqparent()));
+            FolderItem* parentItem = static_cast<FolderItem*>(m_view->findNodeItem(node->tqparent()));
             
-            if (tqparentItem)
+            if (parentItem)
             {
                 if (prev)
                 {
-                    item = new FeedItem( tqparentItem, m_view->findNodeItem(prev), node);
+                    item = new FeedItem( parentItem, m_view->findNodeItem(prev), node);
                 }
                 else
-                    item = new FeedItem( tqparentItem, node);
+                    item = new FeedItem( parentItem, node);
             }
             else
             {
@@ -534,7 +534,7 @@ void NodeListView::movableDropEvent(TQListViewItem* /*tqparent*/, TQListViewItem
     {    
         openFolder();
 
-        Folder* tqparentNode = (dynamic_cast<FolderItem*> (d->tqparent))->node();
+        Folder* parentNode = (dynamic_cast<FolderItem*> (d->tqparent))->node();
         TreeNode* afterMeNode = 0; 
         TreeNode* current = selectedNode();
 
@@ -542,7 +542,7 @@ void NodeListView::movableDropEvent(TQListViewItem* /*tqparent*/, TQListViewItem
             afterMeNode = (dynamic_cast<TreeNodeItem*> (d->afterme))->node();
 
         current->tqparent()->removeChild(current);
-        tqparentNode->insertChild(current, afterMeNode);
+        parentNode->insertChild(current, afterMeNode);
         KListView::movableDropEvent(d->tqparent, d->afterme);
     }    
 }
diff --git a/akregator/src/librss/document.cpp b/akregator/src/librss/document.cpp
index 696802ec7..bc10f8a31 100644
--- a/akregator/src/librss/document.cpp
+++ b/akregator/src/librss/document.cpp
@@ -186,24 +186,24 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
     /* This is ugly but necessary since RSS 0.90 and 1.0 have a different tqparent
      * node for <image>, <textinput> and <item> than RSS 0.91-0.94 and RSS 2.0.
      */
-    TQDomNode tqparentNode;
+    TQDomNode parentNode;
     if (d->version == v0_90 || d->version == v1_0 || d->format == AtomFeed)
-        tqparentNode = rootNode;
+        parentNode = rootNode;
     else
     {
 	// following is a HACK for broken 0.91 feeds like xanga.com's
 	if (!rootNode.namedItem(TQString::tqfromLatin1("item")).isNull())
-	    tqparentNode = rootNode;
+	    parentNode = rootNode;
 	else
-            tqparentNode = channelNode;
+            parentNode = channelNode;
     }
     
     // image and textinput aren't supported by Atom.. handle in case feed provides
-    TQDomNode n = tqparentNode.namedItem(TQString::tqfromLatin1("image"));
+    TQDomNode n = parentNode.namedItem(TQString::tqfromLatin1("image"));
     if (!n.isNull())
         d->image = new Image(n);
 
-    n = tqparentNode.namedItem(TQString::tqfromLatin1("textinput"));
+    n = parentNode.namedItem(TQString::tqfromLatin1("textinput"));
     if (!n.isNull())
         d->textInput = new TextInput(n);
 
@@ -214,7 +214,7 @@ Document::Document(const TQDomDocument &doc) : d(new Private)
     else
         tagName=TQString::tqfromLatin1("item");
 
-    for (n = tqparentNode.firstChild(); !n.isNull(); n = n.nextSibling()) {
+    for (n = parentNode.firstChild(); !n.isNull(); n = n.nextSibling()) {
         const TQDomElement e = n.toElement();
         if (e.tagName() == tagName)
             d->articles.append(Article(e, d->format, d->version));
diff --git a/akregator/src/librss/tools_p.cpp b/akregator/src/librss/tools_p.cpp
index 9c18fcaeb..72058fa05 100644
--- a/akregator/src/librss/tools_p.cpp
+++ b/akregator/src/librss/tools_p.cpp
@@ -186,7 +186,7 @@ static void authorFromString(const TQString& strp, TQString& name, TQString& ema
     
     // after removing the email, str might have 
     // the format "(Foo M. Bar)". We cut off 
-    // tqparentheses if there are any. However, if
+    // parentheses if there are any. However, if
     // str is of the format "Foo M. Bar (President)",
     // we should not cut anything.
 
diff --git a/akregator/src/mk4storage/metakit/CHANGES b/akregator/src/mk4storage/metakit/CHANGES
index 1729b493a..e5d4aad17 100644
--- a/akregator/src/mk4storage/metakit/CHANGES
+++ b/akregator/src/mk4storage/metakit/CHANGES
@@ -203,7 +203,7 @@
 
     Modify some recent patches that were Python 2.2 only so they would
     still work with 2.1. Add a view.properties() method (returning a
-    dict of propname -> Property) for cases where a property is tqmasked
+    dict of propname -> Property) for cases where a property is masked
     by a method name.
 
 2003-03-01    Reverted changes in Mk4py/scxx, avoid Mk4tcl warning
diff --git a/akregator/src/mk4storage/metakit/src/column.cpp b/akregator/src/mk4storage/metakit/src/column.cpp
index 0873ac835..dda916abd 100644
--- a/akregator/src/mk4storage/metakit/src/column.cpp
+++ b/akregator/src/mk4storage/metakit/src/column.cpp
@@ -1398,30 +1398,30 @@ void c4_ColOfInts::ResizeData(int index_, int count_, bool clear_)
 
     /*  _currwidth    1:  2:  4:
      *    shiftPos     3   2   1    shift the offset right this much
-     *    tqmaskPos      7   3   1    tqmask the offset with this
+     *    maskPos      7   3   1    tqmask the offset with this
      */
 
   const int shiftPos = _currWidth == 4 ? 1 : 4 - _currWidth;
-  const int tqmaskPos = (1 << shiftPos) - 1;
+  const int maskPos = (1 << shiftPos) - 1;
 
   // the following code is similar to c4_Column::Resize, but at bit level
 
     // turn insertion into deletion by inserting entire bytes
   if (count_ > 0) {
     unsigned off = (unsigned) index_ >> shiftPos;
-    int gapBytes = (count_ + tqmaskPos) >> shiftPos;
+    int gapBytes = (count_ + maskPos) >> shiftPos;
 
     InsertData(off, gapBytes, clear_);
 
       // oops, we might have inserted too low by a few entries
-    const int bits = (index_ & tqmaskPos) * _currWidth;
+    const int bits = (index_ & maskPos) * _currWidth;
     if (bits) {
-      const int tqmaskLow = (1 << bits) - 1;
+      const int maskLow = (1 << bits) - 1;
 
         // move the first few bits to start of inserted range
       t4_byte* p = CopyNow(off + gapBytes);
-      t4_byte one = *p & tqmaskLow;
-      *p &= ~tqmaskLow;
+      t4_byte one = *p & maskLow;
+      *p &= ~maskLow;
 
       * CopyNow(off) = one;
     }
diff --git a/akregator/src/mk4storage/metakit/src/field.cpp b/akregator/src/mk4storage/metakit/src/field.cpp
index ed5a45738..3867d6b5c 100644
--- a/akregator/src/mk4storage/metakit/src/field.cpp
+++ b/akregator/src/mk4storage/metakit/src/field.cpp
@@ -23,7 +23,7 @@
 /////////////////////////////////////////////////////////////////////////////
 // c4_Field
 
-c4_Field::c4_Field (const char*& description_, c4_Field* tqparent_)
+c4_Field::c4_Field (const char*& description_, c4_Field* parent_)
   : _type (0)
 {
   _indirect = this;
@@ -47,7 +47,7 @@ c4_Field::c4_Field (const char*& description_, c4_Field* tqparent_)
 
     if (*description_ == '^') {
       ++description_;
-      _indirect = tqparent_;
+      _indirect = parent_;
       d4_assert(*description_ == ']');
     }
 
diff --git a/akregator/src/mk4storage/metakit/src/handler.cpp b/akregator/src/mk4storage/metakit/src/handler.cpp
index fab473722..9bacfc9f8 100644
--- a/akregator/src/mk4storage/metakit/src/handler.cpp
+++ b/akregator/src/mk4storage/metakit/src/handler.cpp
@@ -397,7 +397,7 @@ void c4_HandlerSeq::ExchangeEntries(int srcPos_, c4_HandlerSeq& dst_, int dstPos
       c4_HandlerSeq& t1 = SubEntry(col, srcPos_);
       c4_HandlerSeq& t2 = dst_.SubEntry(col, dstPos_);
 
-        // adjust the tqparents
+        // adjust the parents
       t1._tqparent = this;
       t2._tqparent = &dst_;
 
@@ -478,14 +478,14 @@ void c4_HandlerSeq::UnmappedAll()
 
   // construct meta view from a pre-parsed field tree structure
   // this will one day be converted to directly parse the description string
-void c4_HandlerSeq::BuildMeta(int tqparent_, int colnum_, c4_View& meta_,
+void c4_HandlerSeq::BuildMeta(int parent_, int colnum_, c4_View& meta_,
     					const c4_Field& field_)
 {
   c4_IntProp pP ("P"), pC ("C");
   c4_ViewProp pF ("F");
   c4_StringProp pN ("N"), pT ("T");
 
-  int n = meta_.Add(pP [tqparent_] + pC [colnum_]);
+  int n = meta_.Add(pP [parent_] + pC [colnum_]);
   c4_View fields = pF (meta_[n]);
 
   for (int i = 0; i < field_.NumSubFields(); ++i) {
diff --git a/akregator/src/mk4storage/metakit/tests/regress.cpp b/akregator/src/mk4storage/metakit/tests/regress.cpp
index 4e210444f..2cd5f0841 100644
--- a/akregator/src/mk4storage/metakit/tests/regress.cpp
+++ b/akregator/src/mk4storage/metakit/tests/regress.cpp
@@ -219,9 +219,9 @@ void FailExpr(const char* expr)
   Fail(buffer);
 }
 
-int StartTest(int tqmask_, const char* name_, const char* desc_)
+int StartTest(int mask_, const char* name_, const char* desc_)
 {
-  if (tqmask_)
+  if (mask_)
   {
     #if q4_MFC && defined(_DEBUG)
       TRACE("%s - %-40s *** DISABLED ***\n", name_, desc_);
diff --git a/akregator/src/mk4storage/mk4confwidgetbase.ui b/akregator/src/mk4storage/mk4confwidgetbase.ui
index bc898e15a..e2b8c63a3 100644
--- a/akregator/src/mk4storage/mk4confwidgetbase.ui
+++ b/akregator/src/mk4storage/mk4confwidgetbase.ui
@@ -169,7 +169,7 @@
         <slot>&lt;No)</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/akregator/src/propertieswidgetbase.ui b/akregator/src/propertieswidgetbase.ui
index de6be8cf5..14adeb001 100644
--- a/akregator/src/propertieswidgetbase.ui
+++ b/akregator/src/propertieswidgetbase.ui
@@ -456,7 +456,7 @@
     <slot access="protected" specifier="pure virtual">slotUpdateComboBoxActivated( int )</slot>
     <slot access="protected" specifier="pure virtual">slotUpdateCheckBoxToggled( bool )</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/akregator/src/settings_advancedbase.ui b/akregator/src/settings_advancedbase.ui
index 9991dbe45..5943f79ad 100644
--- a/akregator/src/settings_advancedbase.ui
+++ b/akregator/src/settings_advancedbase.ui
@@ -150,7 +150,7 @@
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
 </includehints>
diff --git a/akregator/src/settings_appearance.ui b/akregator/src/settings_appearance.ui
index 18c40bc81..fc7f39b0d 100644
--- a/akregator/src/settings_appearance.ui
+++ b/akregator/src/settings_appearance.ui
@@ -234,7 +234,7 @@
         <slot>setValue(int)</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/akregator/src/settings_archive.ui b/akregator/src/settings_archive.ui
index d688ea0cf..26faba49b 100644
--- a/akregator/src/settings_archive.ui
+++ b/akregator/src/settings_archive.ui
@@ -168,7 +168,7 @@
         <slot>setEnabled(bool)</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/akregator/src/settings_browser.ui b/akregator/src/settings_browser.ui
index d7ba2ea79..97dbcca18 100644
--- a/akregator/src/settings_browser.ui
+++ b/akregator/src/settings_browser.ui
@@ -202,5 +202,5 @@
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/akregator/src/settings_general.ui b/akregator/src/settings_general.ui
index 83599b329..4634e5399 100644
--- a/akregator/src/settings_general.ui
+++ b/akregator/src/settings_general.ui
@@ -183,5 +183,5 @@
         <slot>setEnabled(bool)</slot>
     </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/akregator/src/tagpropertieswidgetbase.ui b/akregator/src/tagpropertieswidgetbase.ui
index c28ec33b8..85f3ae941 100644
--- a/akregator/src/tagpropertieswidgetbase.ui
+++ b/akregator/src/tagpropertieswidgetbase.ui
@@ -128,7 +128,7 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kicondialog.h</includehint>
 </includehints>