Mercurial > hg > forks > UniversalIndentGUI

changeset 611:729d1ad18e9b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Made UiGUI be compilable using QScintilla version < 2.3. git-svn-id: svn://svn.code.sf.net/p/universalindent/code/trunk@870 59b1889a-e5ac-428c-b0c7-476e01d41282
author thomas_-_s <thomas_-_s@59b1889a-e5ac-428c-b0c7-476e01d41282>
date Mon, 27 Oct 2008 15:48:36 +0000
parents 193ccb04013e
children e877a8d5c6b3
files src/UiguiHighlighter.cpp
diffstat 1 files changed, 26 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/UiguiHighlighter.cpp	Fri Oct 24 14:04:53 2008 +0000
+++ b/src/UiguiHighlighter.cpp	Mon Oct 27 15:48:36 2008 +0000
@@ -52,28 +52,38 @@
     mapHighlighternameToExtension["CSS"] = QStringList() << "css";
     mapHighlighternameToExtension["D"] = QStringList() << "d";
     mapHighlighternameToExtension["Diff"] = QStringList() << "diff";
+#if ( QSCINTILLA_VERSION >= 0x020300 )
     mapHighlighternameToExtension["Fortran"] = QStringList() << "f" << "for";
     mapHighlighternameToExtension["Fortran77"] = QStringList() << "f77";
-    mapHighlighternameToExtension["HTML"] = QStringList() << "html";
+#endif
+    mapHighlighternameToExtension["HTML"] = QStringList() << "html" << "htm";
     mapHighlighternameToExtension["IDL"] = QStringList() << "idl";
     mapHighlighternameToExtension["Java"] = QStringList() << "java";
     mapHighlighternameToExtension["JavaScript"] = QStringList() << "js";
     mapHighlighternameToExtension["LUA"] = QStringList() << "lua";
     mapHighlighternameToExtension["Makefile"] = QStringList() << "makefile";
+#if ( QSCINTILLA_VERSION >= 0x020300 )
     mapHighlighternameToExtension["Pascal"] = QStringList() << "pas";
+#endif
     mapHighlighternameToExtension["Perl"] = QStringList() << "perl" << "pl" << "pm";
     mapHighlighternameToExtension["PHP"] = QStringList() << "php";
+#if ( QSCINTILLA_VERSION >= 0x020300 )
     mapHighlighternameToExtension["PostScript"] = QStringList() << "ps" << "eps" << "pdf" << "ai" << "fh";
+#endif
     mapHighlighternameToExtension["POV"] = QStringList() << "pov";
     mapHighlighternameToExtension["Ini"] = QStringList() << "ini";
     mapHighlighternameToExtension["Python"] = QStringList() << "py";
     mapHighlighternameToExtension["Ruby"] = QStringList() << "rub" << "rb";
     mapHighlighternameToExtension["SQL"] = QStringList() << "sql";
+#if ( QSCINTILLA_VERSION >= 0x020300 )
     mapHighlighternameToExtension["TCL"] = QStringList() << "tcl";
+#endif
     mapHighlighternameToExtension["TeX"] = QStringList() << "tex";
     mapHighlighternameToExtension["VHDL"] = QStringList() << "vhdl";
     mapHighlighternameToExtension["XML"] = QStringList() << "xml";
+#if ( QSCINTILLA_VERSION >= 0x020300 )
     mapHighlighternameToExtension["YAML"] = QStringList() << "yaml";
+#endif
 
     lexer = 0;
 
@@ -341,13 +351,15 @@
 	else if ( extension == "diff" ) {
 		lexer = new QsciLexerDiff();
 	}
+#if ( QSCINTILLA_VERSION >= 0x020300 )
     else if ( extension == "f" || extension == "for" ) {
         lexer = new QsciLexerFortran();
     }
     else if ( extension == "f77" ) {
         lexer = new QsciLexerFortran77();
     }
-	else if ( extension == "html" ) {
+#endif
+	else if ( extension == "html" || extension == "htm" ) {
 		lexer = new QsciLexerHTML();
 	}
 	else if ( extension == "idl" ) {
@@ -365,18 +377,22 @@
     else if ( extension == "makefile" ) {
 		lexer = new QsciLexerMakefile();
 	}
+#if ( QSCINTILLA_VERSION >= 0x020300 )
     else if ( extension == "pas" ) {
         lexer = new QsciLexerPascal();
     }
+#endif
 	else if ( extension == "perl" || extension == "pl" || extension == "pm" ) {
 		lexer = new QsciLexerPerl();
 	}
     else if ( extension == "php" ) {
 		lexer = new QsciLexerHTML();
 	}
+#if ( QSCINTILLA_VERSION >= 0x020300 )
     else if ( extension == "ps" || extension == "eps" || extension == "pdf" || extension == "ai" || extension == "fh") {
         lexer = new QsciLexerPostScript();
     }
+#endif
 	else if ( extension == "pov" ) {
 		lexer = new QsciLexerPOV();
 	}
@@ -392,9 +408,11 @@
 	else if ( extension == "sql" ) {
 		lexer = new QsciLexerSQL();
 	}
+#if ( QSCINTILLA_VERSION >= 0x020300 )
     else if ( extension == "tcl" ) {
         lexer = new QsciLexerTCL();
     }
+#endif
 	else if ( extension == "tex" ) {
 		lexer = new QsciLexerTeX();
 	}
@@ -402,11 +420,17 @@
         lexer = new QsciLexerVHDL();
     }
     else if ( extension == "xml" ) {
+#if ( QSCINTILLA_VERSION >= 0x020300 )
 		lexer = new QsciLexerXML();
+#else
+        lexer = new QsciLexerHTML();
+#endif
 	}
+#if ( QSCINTILLA_VERSION >= 0x020300 )
     else if ( extension == "yaml" ) {
         lexer = new QsciLexerYAML();
     }
+#endif
 	else {
 		lexer = new QsciLexerCPP();
         extension = "cpp";