summaryrefslogtreecommitdiffstats
path: root/kword/mailmerge/kabc
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-09 02:23:29 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-07-09 02:23:29 +0000
commit7c71ab86d1f7e387fc3df63b48df07231f111862 (patch)
tree30ba2d2f840ff5fd458b6113e9c3f2e8a71d510d /kword/mailmerge/kabc
parentafbfdc507bfaafc8824a9808311d57a9ece87510 (diff)
downloadkoffice-7c71ab86d1f7e387fc3df63b48df07231f111862.tar.gz
koffice-7c71ab86d1f7e387fc3df63b48df07231f111862.zip
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
Diffstat (limited to 'kword/mailmerge/kabc')
-rw-r--r--kword/mailmerge/kabc/KWMailMergeKABC.cpp4
-rw-r--r--kword/mailmerge/kabc/addresspicker.ui2
2 files changed, 3 insertions, 3 deletions
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>