Lookup optimizations

steveire · Oct 31, 2021 · 735bf06 · 735bf06
1 parent 65cf814
commit 735bf06
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 16 deletions.
diff --git a/templates/lib/cachingloaderdecorator.cpp b/templates/lib/cachingloaderdecorator.cpp
@@ -87,8 +87,10 @@ CachingLoaderDecorator::loadByName(const QString &name,
                                    const Grantlee::Engine *engine) const
 {
   Q_D(const CachingLoaderDecorator);
-  if (d->m_cache.contains(name))
-    return d->m_cache.value(name);
+  const auto it = d->m_cache.constFind(name);
+  if (it != d->m_cache.constEnd()) {
+    return it.value();
+  }
 
   const auto t = d->m_wrappedLoader->loadByName(name, engine);
 

diff --git a/templates/lib/context.cpp b/templates/lib/context.cpp
@@ -101,9 +101,10 @@ QVariant Context::lookup(const QString &str) const
   Q_D(const Context);
 
   // return a variant from the stack.
-  for (auto &h : d->m_variantHashStack) {
-    if (h.contains(str)) {
-      auto var = h.value(str);
+  for (const auto &h : d->m_variantHashStack) {
+    auto it = h.constFind(str);
+    if (it != h.constEnd()) {
+      auto var = it.value();
       // If the user passed a string into the context, turn it into a
       // Grantlee::SafeString.
       if (var.userType() == qMetaTypeId<QString>()) {

diff --git a/templates/lib/customtyperegistry.cpp b/templates/lib/customtyperegistry.cpp
@@ -56,14 +56,15 @@ QVariant CustomTypeRegistry::lookup(const QVariant &object,
   MetaType::LookupFunction lf;
 
   {
-    if (!types.contains(id)) {
+    auto it = types.constFind(id);
+    if (it == types.constEnd()) {
       qCWarning(GRANTLEE_CUSTOMTYPE)
           << "Don't know how to handle metatype" << QMetaType::typeName(id);
       // :TODO: Print out error message
       return QVariant();
     }
 
-    const CustomTypeInfo &info = types[id];
+    const CustomTypeInfo &info = it.value();
     if (!info.lookupFunction) {
       qCWarning(GRANTLEE_CUSTOMTYPE)
           << "No lookup function for metatype" << QMetaType::typeName(id);
@@ -80,5 +81,9 @@ QVariant CustomTypeRegistry::lookup(const QVariant &object,
 
 bool CustomTypeRegistry::lookupAlreadyRegistered(int id) const
 {
-  return types.contains(id) && types.value(id).lookupFunction != nullptr;
+  auto it = types.constFind(id);
+  if (it != types.constEnd()) {
+    return it.value().lookupFunction != nullptr;
+  }
+  return false;
 }
diff --git a/templates/lib/engine.cpp b/templates/lib/engine.cpp
@@ -288,8 +288,9 @@ EnginePrivate::loadScriptableLibrary(const QString &name, uint minorVersion)
   if (libFileName.isEmpty())
     return nullptr;
 
-  if (m_scriptableLibraries.contains(libFileName)) {
-    auto library = m_scriptableLibraries.value(libFileName);
+  const auto it = m_scriptableLibraries.constFind(libFileName);
+  if (it != m_scriptableLibraries.constEnd()) {
+    auto library = it.value();
     library->setNodeFactories(
         m_scriptableTagLibrary->nodeFactories(libFileName));
     library->setFilters(m_scriptableTagLibrary->filters(libFileName));

diff --git a/templates/lib/parser.cpp b/templates/lib/parser.cpp
@@ -156,10 +156,12 @@ void Parser::skipPast(const QString &tag)
 QSharedPointer<Filter> Parser::getFilter(const QString &name) const
 {
   Q_D(const Parser);
-  if (!d->m_filters.contains(name))
-    throw Grantlee::Exception(UnknownFilterError,
-                              QStringLiteral("Unknown filter: %1").arg(name));
-  return d->m_filters.value(name);
+  const auto it = d->m_filters.constFind(name);
+  if (it != d->m_filters.constEnd()) {
+    return it.value();
+  }
+  throw Grantlee::Exception(UnknownFilterError,
+                            QStringLiteral("Unknown filter: %1").arg(name));
 }
 
 NodeList Parser::parse(Node *parent, const QString &stopAt)

diff --git a/templates/lib/templateloader.cpp b/templates/lib/templateloader.cpp
@@ -206,8 +206,9 @@ bool InMemoryTemplateLoader::canLoadTemplate(const QString &name) const
 Template InMemoryTemplateLoader::loadByName(const QString &name,
                                             Engine const *engine) const
 {
-  if (m_namedTemplates.contains(name)) {
-    return engine->newTemplate(m_namedTemplates.value(name), name);
+  const auto it = m_namedTemplates.constFind(name);
+  if (it != m_namedTemplates.constEnd()) {
+    return engine->newTemplate(it.value(), name);
   }
   throw Grantlee::Exception(
       TagSyntaxError,