summaryrefslogtreecommitdiffstats
path: root/src/settings/diffmergesettings_impl.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
commitc6b29717327388357badda064ef1ced71932406e (patch)
tree5d0dadae0d00c60e0773be4e8ee5a60a47615342 /src/settings/diffmergesettings_impl.cpp
parent93f9fda465964160b66d9252d2cf9b4c284eab50 (diff)
downloadtdesvn-c6b29717327388357badda064ef1ced71932406e.tar.gz
tdesvn-c6b29717327388357badda064ef1ced71932406e.zip
rename the following methods:
tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kdesvn@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/settings/diffmergesettings_impl.cpp')
-rw-r--r--src/settings/diffmergesettings_impl.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/settings/diffmergesettings_impl.cpp b/src/settings/diffmergesettings_impl.cpp
index bec03b6..b72c4af 100644
--- a/src/settings/diffmergesettings_impl.cpp
+++ b/src/settings/diffmergesettings_impl.cpp
@@ -26,8 +26,8 @@
#include <klineedit.h>
#include <kdebug.h>
-DiffMergeSettings_impl::DiffMergeSettings_impl(TQWidget *tqparent, const char *name)
- :DiffMergeSettings(tqparent, name)
+DiffMergeSettings_impl::DiffMergeSettings_impl(TQWidget *parent, const char *name)
+ :DiffMergeSettings(parent, name)
{
kcfg_external_diff_display->setEnabled(Kdesvnsettings::use_external_diff());
}