summaryrefslogtreecommitdiffstats
path: root/src/kdiff3.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
commit721c5c4ee3dcee163a2b0f7fd94cb3689154c1bd (patch)
treed775ffe309859e438c3fcac0825c8f7c9d384c81 /src/kdiff3.cpp
parent5173e6fcb16310e130fba4143e334563b4f8460e (diff)
downloadkdiff3-721c5c4ee3dcee163a2b0f7fd94cb3689154c1bd.tar.gz
kdiff3-721c5c4ee3dcee163a2b0f7fd94cb3689154c1bd.zip
rename the following methods:
tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdiff3@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/kdiff3.cpp')
-rw-r--r--src/kdiff3.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/kdiff3.cpp b/src/kdiff3.cpp
index d17a031..c3541ec 100644
--- a/src/kdiff3.cpp
+++ b/src/kdiff3.cpp
@@ -132,7 +132,7 @@ KDiff3App::KDiff3App(TQWidget* pParent, const char* name, KDiff3Part* pKDiff3Par
m_pOptionDialog->readOptions( isPart() ? m_pKDiff3Part->instance()->config() : kapp->config() );
- // Option handling: Only when pParent==0 (no tqparent)
+ // Option handling: Only when pParent==0 (no parent)
KCmdLineArgs *args = isPart() ? 0 : KCmdLineArgs::parsedArgs();
if (args)