From feaf6d62da1685a34fbc8c201f31da681f04e2a7 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 9 Jul 2011 02:23:29 +0000 Subject: Remove the tq in front of these incorrectly TQt4-converted methods/data members: tqrepaint[...] tqinvalidate[...] tqparent[...] tqmask[...] tqlayout[...] tqalignment[...] git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/tellico@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/entrymerger.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/entrymerger.cpp') diff --git a/src/entrymerger.cpp b/src/entrymerger.cpp index 61ed0f8..073d32f 100644 --- a/src/entrymerger.cpp +++ b/src/entrymerger.cpp @@ -26,8 +26,8 @@ using Tellico::EntryMerger; -EntryMerger::EntryMerger(Data::EntryVec entries_, TQObject* tqparent_) - : TQObject(tqparent_), m_entriesToCheck(entries_), m_origCount(entries_.count()), m_cancelled(false) { +EntryMerger::EntryMerger(Data::EntryVec entries_, TQObject* parent_) + : TQObject(parent_), m_entriesToCheck(entries_), m_origCount(entries_.count()), m_cancelled(false) { m_entriesLeft = m_entriesToCheck; Kernel::self()->beginCommandGroup(i18n("Merge Entries")); -- cgit v1.2.1