summaryrefslogtreecommitdiffstats
path: root/src/optiondialog.h
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/optiondialog.h
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/optiondialog.h')
-rw-r--r--src/optiondialog.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/optiondialog.h b/src/optiondialog.h
index 0d4c372..697dfe3 100644
--- a/src/optiondialog.h
+++ b/src/optiondialog.h
@@ -53,7 +53,7 @@ class OptionDialog : public KDialogBase
public:
- OptionDialog( bool bShowDirMergeSettings, TQWidget *tqparent = 0, char *name = 0 );
+ OptionDialog( bool bShowDirMergeSettings, TQWidget *parent = 0, char *name = 0 );
~OptionDialog( void );
TQString parseOptions( const QCStringList& optionList );
TQString calcOptionHelp();