summaryrefslogtreecommitdiffstats
path: root/src/entrymerger.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/entrymerger.cpp')
-rw-r--r--src/entrymerger.cpp4
1 files changed, 2 insertions, 2 deletions
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"));