Kate syntax highlighting files update - Mar 2014

1 files changed, 21 insertions, 17 deletions

diff --git a/kate/data/qt4.xml b/kate/data/qt4.xml
index 2c1d1e099..ba9481154 100644
--- a/kate/data/qt4.xml
+++ b/kate/data/qt4.xml
@@ -11,32 +11,26 @@
 <language
     name="C++/Qt4"
     section="Sources"
-    version="1.2"
+    version="1.5-1"
     kateversion="2.4"
     indenter="cstyle"
-    extensions="*.moc"
     mimetype="text/x-c++src;text/x-c++hdr;text/x-chdr"
+    extensions="*.c++;*.cxx;*.cpp;*.cc;*.C;*.h;*.hh;*.H;*.h++;*.hxx;*.hpp;*.hcc;*.moc"
     author="Alex Turbov (i.zaufi@gmail.com)"
     license="LGPL"
-    priority="6"
+    priority="9"
   >
 <!--
   The main purpose of this file is to hold Qt extensions syntax in a single place,
   so later it can be included (using IncludeRules) to other (C++ based) syntaxes.
 
-  NOTE Default colors are set to 'Normal Text', so if u don't want to highlight Qt stuff,
-  just leave colors as is...
-
   Based on Qt 4.8 documentation (http://qt-project.org/doc/qt-4.8/)
 -->
 <highlighting>
-  <list name="Qt4Extensions">
+  <list name="Qt4Macros">
     <item> emit </item>
     <item> signals </item>
     <item> slots </item>
-  </list>
-
-  <list name="Qt4Macros">
     <item> foreach </item>
     <item> forever </item>
     <item> SIGNAL </item>
@@ -404,6 +398,11 @@
     <item> QT_WA </item>
     <item> QT_WA_INLINE </item>
     <item> QT_WIN_CALLBACK </item>
+    <item> QT_USE_NAMESPACE </item>
+    <item> QT_BEGIN_NAMESPACE </item>
+    <item> QT_END_NAMESPACE </item>
+    <item> QT_BEGIN_HEADER </item>
+    <item> QT_END_HEADER </item>
     <item> Q_ALIGNOF </item>
     <item> Q_ASSERT </item>
     <item> Q_ASSERT_X </item>
@@ -576,6 +575,12 @@
     <item> Q_WS_WINCE </item>
     <item> Q_WS_WINCE_WM </item>
     <item> Q_WS_X11 </item>
+    <!-- arguments for Q_DECLARE_TYPEINFO, not really macros but good if highlighted like that -->
+    <item> Q_COMPLEX_TYPE </item>
+    <item> Q_PRIMITIVE_TYPE </item>
+    <item> Q_STATIC_TYPE </item>
+    <item> Q_MOVABLE_TYPE </item>
+    <item> Q_DUMMY_TYPE </item>
   </list>
 
   <list name="Qt4Classes">
@@ -647,6 +652,7 @@
     <item> QBitArray </item>
     <item> QBitmap </item>
     <item> QBoxLayout </item>
+    <item> QBool </item>
     <item> QBrush </item>
     <item> QBuffer </item>
     <item> QButtonGroup </item>
@@ -1554,14 +1560,13 @@
     <!-- Base context for C++ and Qt highlighting to be used as standalone syntax -->
     <context attribute="Normal Text" lineEndContext="#stay" name="Normal">
       <IncludeRules context="DetectQt4Extensions" />
-      <IncludeRules context="##C++" />
+      <IncludeRules context="##ISO C++" />
     </context>
 
     <!-- This context can be used from other (alternative) C++ syntax files
          To use it just <IncludeRules context="DetectQt4Extensions##Qt4/C++" />
       -->
     <context attribute="Normal Text" lineEndContext="#stay" name="DetectQt4Extensions">
-      <keyword attribute="Qt4 Extensions" context="#stay" String="Qt4Extensions" />
       <keyword attribute="Qt4 Types" context="#stay" String="Qt4Types" />
       <keyword attribute="Qt4 Classes" context="QtClassMember" String="Qt4Classes" />
       <keyword attribute="Qt4 Functions" context="#stay" String="Qt4Func" />
@@ -1582,11 +1587,10 @@
 
   <itemDatas>
     <itemData name="Normal Text"    defStyleNum="dsNormal" spellChecking="false" />
-    <itemData name="Qt4 Extensions" defStyleNum="dsOthers" spellChecking="false" />
-    <itemData name="Qt4 Types"      defStyleNum="dsOthers" spellChecking="false" />
-    <itemData name="Qt4 Classes"    defStyleNum="dsOthers" spellChecking="false" />
-    <itemData name="Qt4 Functions"  defStyleNum="dsOthers" spellChecking="false" />
-    <itemData name="Qt4 Macros"     defStyleNum="dsOthers" spellChecking="false" />
+    <itemData name="Qt4 Macros" defStyleNum="dsKeyword" color="#0095ff" selColor="#ffffff" bold="1" italic="0" spellChecking="false" />
+    <itemData name="Qt4 Types" defStyleNum="dsDataType" spellChecking="false" />
+    <itemData name="Qt4 Classes" defStyleNum="dsOthers" spellChecking="false" />
+    <itemData name="Qt4 Functions" defStyleNum="dsFunction" spellChecking="false" />
   </itemDatas>
 </highlighting>