From a1876a8509dd048fd97054a71d619baa322226cd Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Thu, 13 Oct 2016 21:23:19 +0300
Subject: [PATCH] QmlDesigner: Use a static const QSet for keyword list

Makes the lookup faster.

Also sort the keywords.

Change-Id: I25ce0f2d1de7be572fecccc09b5ec12d81152e95
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
---
 .../designercore/model/modelnode.cpp          | 64 ++++++++++---------
 1 file changed, 34 insertions(+), 30 deletions(-)

diff --git a/src/plugins/qmldesigner/designercore/model/modelnode.cpp b/src/plugins/qmldesigner/designercore/model/modelnode.cpp
index 3fe7e9ce2e2..eafc521815e 100644
--- a/src/plugins/qmldesigner/designercore/model/modelnode.cpp
+++ b/src/plugins/qmldesigner/designercore/model/modelnode.cpp
@@ -29,8 +29,6 @@
 #include <model.h>
 #include <nodemetainfo.h>
 #include "internalnode_p.h"
-#include <QHash>
-#include <QTextStream>
 #include "invalidargumentexception.h"
 #include "invalididexception.h"
 #include "invalidmodelnodeexception.h"
@@ -44,6 +42,10 @@
 #include "nodeproperty.h"
 #include <rewriterview.h>
 
+#include <QHash>
+#include <QSet>
+#include <QTextStream>
+
 namespace QmlDesigner {
 using namespace QmlDesigner::Internal;
 
@@ -143,34 +145,36 @@ QString ModelNode::validId()
 
 static bool idIsQmlKeyWord(const QString& id)
 {
-    QStringList keywords = { "import",
-                             "as",
-                             "break",
-                             "case",
-                             "catch",
-                             "continue",
-                             "debugger",
-                             "default",
-                             "delete",
-                             "do",
-                             "else",
-                             "finally",
-                             "for",
-                             "function",
-                             "if",
-                             "in",
-                             "instanceof",
-                             "new",
-                             "return",
-                             "switch",
-                             "this",
-                             "throw",
-                             "try",
-                             "typeof",
-                             "var",
-                             "void",
-                             "while",
-                             "with" };
+    static const QSet<QString> keywords = {
+        "as",
+        "break",
+        "case",
+        "catch",
+        "continue",
+        "debugger",
+        "default",
+        "delete",
+        "do",
+        "else",
+        "finally",
+        "for",
+        "function",
+        "if",
+        "import",
+        "in",
+        "instanceof",
+        "new",
+        "return",
+        "switch",
+        "this",
+        "throw",
+        "try",
+        "typeof",
+        "var",
+        "void",
+        "while",
+        "with"
+    };
 
     return keywords.contains(id);
 }