1 files changed, 21 insertions, 30 deletions
diff --git a/src/libs/3rdparty/syntax-highlighting/src/lib/contextswitch_p.h b/src/libs/3rdparty/syntax-highlighting/src/lib/contextswitch_p.h
index 669855af7a..29b0e685e2 100644
--- a/src/libs/3rdparty/syntax-highlighting/src/lib/contextswitch_p.h
+++ b/src/libs/3rdparty/syntax-highlighting/src/lib/contextswitch_p.h
@@ -1,24 +1,7 @@
 /*
-    Copyright (C) 2016 Volker Krause <vkrause@kde.org>
-
-    Permission is hereby granted, free of charge, to any person obtaining
-    a copy of this software and associated documentation files (the
-    "Software"), to deal in the Software without restriction, including
-    without limitation the rights to use, copy, modify, merge, publish,
-    distribute, sublicense, and/or sell copies of the Software, and to
-    permit persons to whom the Software is furnished to do so, subject to
-    the following conditions:
-
-    The above copyright notice and this permission notice shall be included
-    in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-    IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-    CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-    TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-    SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+    SPDX-FileCopyrightText: 2016 Volker Krause <vkrause@kde.org>
+
+    SPDX-License-Identifier: MIT
 */
 
 #ifndef KSYNTAXHIGHLIGHTING_CONTEXTSWITCH_P_H
@@ -26,10 +9,10 @@
 
 #include <QString>
 
-namespace KSyntaxHighlighting {
-
+namespace KSyntaxHighlighting
+{
 class Context;
-class Definition;
+class DefinitionData;
 
 class ContextSwitch
 {
@@ -37,19 +20,27 @@ public:
     ContextSwitch() = default;
     ~ContextSwitch() = default;
 
-    bool isStay() const;
+    bool isStay() const
+    {
+        return m_isStay;
+    }
+
+    int popCount() const
+    {
+        return m_popCount;
+    }
 
-    int popCount() const;
-    Context* context() const;
+    Context *context() const
+    {
+        return m_context;
+    }
 
-    void parse(const QStringRef &contextInstr);
-    void resolve(const Definition &def);
+    void resolve(DefinitionData &def, QStringView contextInstr);
 
 private:
-    QString m_defName;
-    QString m_contextName;
     Context *m_context = nullptr;
     int m_popCount = 0;
+    bool m_isStay = true;
 };
 }