From 3fcef18c75f7cd751ed706c12977230242fb817d 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/rosegarden@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 src/gui/dialogs/FileMergeDialog.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/gui/dialogs/FileMergeDialog.cpp')

diff --git a/src/gui/dialogs/FileMergeDialog.cpp b/src/gui/dialogs/FileMergeDialog.cpp
index 7d378e6..d7d48cf 100644
--- a/src/gui/dialogs/FileMergeDialog.cpp
+++ b/src/gui/dialogs/FileMergeDialog.cpp
@@ -40,10 +40,10 @@
 namespace Rosegarden
 {
 
-FileMergeDialog::FileMergeDialog(TQWidget *tqparent,
+FileMergeDialog::FileMergeDialog(TQWidget *parent,
                                  TQString /*fileName*/,
                                  bool timingsDiffer) :
-        KDialogBase(tqparent, 0, true, i18n("Merge File"), Ok | Cancel | Help)
+        KDialogBase(parent, 0, true, i18n("Merge File"), Ok | Cancel | Help)
 {
     setHelp("file-merge");
 
-- 
cgit v1.2.3