From 721c5c4ee3dcee163a2b0f7fd94cb3689154c1bd Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Wed, 10 Aug 2011 22:19:39 +0000
Subject: 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
---
 src/optiondialog.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/optiondialog.cpp')

diff --git a/src/optiondialog.cpp b/src/optiondialog.cpp
index ac6b03e..9b46a6d 100644
--- a/src/optiondialog.cpp
+++ b/src/optiondialog.cpp
@@ -451,9 +451,9 @@ public:
 };
 
 
-OptionDialog::OptionDialog( bool bShowDirMergeSettings, TQWidget *tqparent, char *name )
+OptionDialog::OptionDialog( bool bShowDirMergeSettings, TQWidget *parent, char *name )
   :KDialogBase( IconList, i18n("Configure"), Help|Default|Apply|Ok|Cancel,
-                Ok, tqparent, name, true /*modal*/, true )
+                Ok, parent, name, true /*modal*/, true )
 {
    setHelp( "kdiff3/index.html", TQString() );
 
-- 
cgit v1.2.1