summaryrefslogtreecommitdiffstats
path: root/src/tellico_kernel.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/tellico_kernel.cpp')
-rw-r--r--src/tellico_kernel.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tellico_kernel.cpp b/src/tellico_kernel.cpp
index a4a5c42..867f64f 100644
--- a/src/tellico_kernel.cpp
+++ b/src/tellico_kernel.cpp
@@ -366,7 +366,7 @@ TQPair<Tellico::Data::FieldVec, Tellico::Data::FieldVec> Kernel::mergeFields(Dat
}
}
}
- return tqMakePair(modified, created);
+ return qMakePair(modified, created);
}
int Kernel::askAndMerge(Data::EntryPtr entry1_, Data::EntryPtr entry2_, Data::FieldPtr field_,