summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <[email protected]>2023-11-24 10:47:52 +0900
committerMichele Calgaro <[email protected]>2023-11-24 22:32:44 +0900
commit211ad8746b45efc702311df0c0ffef5efd312340 (patch)
tree144424b5cd6db26ebfbc0f2bdf5c48747668a785
parent5dcd02bb657c1028bd5d0626cedafc6049d16c77 (diff)
downloadtellico-211ad8746b45efc702311df0c0ffef5efd312340.tar.gz
tellico-211ad8746b45efc702311df0c0ffef5efd312340.zip
Replaced various '#define' with actual strings - part 3
Signed-off-by: Michele Calgaro <[email protected]> (cherry picked from commit 4bbccf7d67bbc86e87ff1444dc3b1c18efa097a2)
-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_,