From 7c71ab86d1f7e387fc3df63b48df07231f111862 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sat, 9 Jul 2011 02:23:29 +0000
Subject: 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/applications/koffice@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kword/mailmerge/kabc/KWMailMergeKABC.cpp | 4 ++--
 kword/mailmerge/kabc/addresspicker.ui    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'kword/mailmerge/kabc')

diff --git a/kword/mailmerge/kabc/KWMailMergeKABC.cpp b/kword/mailmerge/kabc/KWMailMergeKABC.cpp
index aeadae4c..855611f5 100644
--- a/kword/mailmerge/kabc/KWMailMergeKABC.cpp
+++ b/kword/mailmerge/kabc/KWMailMergeKABC.cpp
@@ -396,10 +396,10 @@ TQStringList KWMailMergeKABC::lists() const
 }
 
 
-void KWMailMergeKABC::load( TQDomElement& tqparentElem )
+void KWMailMergeKABC::load( TQDomElement& parentElem )
 {
     clear();
-    TQDomNode contentNode=tqparentElem.namedItem("CONTENT");
+    TQDomNode contentNode=parentElem.namedItem("CONTENT");
     if( contentNode.isNull() )
         return;
     for( TQDomNode rec=contentNode.firstChild(); !rec.isNull(); rec=rec.nextSibling() )
diff --git a/kword/mailmerge/kabc/addresspicker.ui b/kword/mailmerge/kabc/addresspicker.ui
index 40521704..c7276c9b 100644
--- a/kword/mailmerge/kabc/addresspicker.ui
+++ b/kword/mailmerge/kabc/addresspicker.ui
@@ -287,7 +287,7 @@
         </widget>
     </grid>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
-- 
cgit v1.2.1