convert HighlighterLanguage to scoped enum

Change-Id: Ibf0871601e52ea4fa49e9622176431943c55abdd

basctl/source/basicide/baside2b.cxx

@@ -221,7 +221,7 @@ EditorWindow::EditorWindow (vcl::Window* pParent, ModulWindow* pModulWindow) :
     Window(pParent, WB_BORDER),
     rModulWindow(*pModulWindow),
     nCurTextWidth(0),
-    aHighlighter(HIGHLIGHT_BASIC),
+    aHighlighter(HighlighterLanguage::Basic),
     bHighlightning(false),
     bDoSyntaxHighlight(true),
     bDelayHighlight(true),

comphelper/qa/unit/syntaxhighlighttest.cxx

@@ -45,7 +45,7 @@ std::ostream& operator<<(std::ostream& rStrm, const TokenType& tt)
 void SyntaxHighlightTest::testBasicString() {
     OUString s("\"foo\"");
     std::vector<HighlightPortion> ps;
-    SyntaxHighlighter(HIGHLIGHT_BASIC).getHighlightPortions(s, ps);
+    SyntaxHighlighter(HighlighterLanguage::Basic).getHighlightPortions(s, ps);
     CPPUNIT_ASSERT_EQUAL(
         static_cast<std::vector<HighlightPortion>::size_type>(1), ps.size());
     CPPUNIT_ASSERT_EQUAL(sal_Int32(0), ps[0].nBegin);
@@ -56,7 +56,7 @@ void SyntaxHighlightTest::testBasicString() {
 void SyntaxHighlightTest::testBasicComment() {
     OUString s("' foo");
     std::vector<HighlightPortion> ps;
-    SyntaxHighlighter(HIGHLIGHT_BASIC).getHighlightPortions(s, ps);
+    SyntaxHighlighter(HighlighterLanguage::Basic).getHighlightPortions(s, ps);
     CPPUNIT_ASSERT_EQUAL(
         static_cast<std::vector<HighlightPortion>::size_type>(1), ps.size());
     CPPUNIT_ASSERT_EQUAL(sal_Int32(0), ps[0].nBegin);
@@ -67,7 +67,7 @@ void SyntaxHighlightTest::testBasicComment() {
 void SyntaxHighlightTest::testBasicCommentNewline() {
     OUString s("' foo\n");
     std::vector<HighlightPortion> ps;
-    SyntaxHighlighter(HIGHLIGHT_BASIC).getHighlightPortions(s, ps);
+    SyntaxHighlighter(HighlighterLanguage::Basic).getHighlightPortions(s, ps);
     CPPUNIT_ASSERT_EQUAL(
         static_cast<std::vector<HighlightPortion>::size_type>(2), ps.size());
     CPPUNIT_ASSERT_EQUAL(sal_Int32(0), ps[0].nBegin);
@@ -81,7 +81,7 @@ void SyntaxHighlightTest::testBasicCommentNewline() {
 void SyntaxHighlightTest::testBasicEmptyComment() {
     OUString s("'");
     std::vector<HighlightPortion> ps;
-    SyntaxHighlighter(HIGHLIGHT_BASIC).getHighlightPortions(s, ps);
+    SyntaxHighlighter(HighlighterLanguage::Basic).getHighlightPortions(s, ps);
     CPPUNIT_ASSERT_EQUAL(
         static_cast<std::vector<HighlightPortion>::size_type>(1), ps.size());
     CPPUNIT_ASSERT_EQUAL(sal_Int32(0), ps[0].nBegin);
@@ -92,7 +92,7 @@ void SyntaxHighlightTest::testBasicEmptyComment() {
 void SyntaxHighlightTest::testBasicEmptyCommentNewline() {
     OUString s("'\n");
     std::vector<HighlightPortion> ps;
-    SyntaxHighlighter(HIGHLIGHT_BASIC).getHighlightPortions(s, ps);
+    SyntaxHighlighter(HighlighterLanguage::Basic).getHighlightPortions(s, ps);
     CPPUNIT_ASSERT_EQUAL(
         static_cast<std::vector<HighlightPortion>::size_type>(2), ps.size());
     CPPUNIT_ASSERT_EQUAL(sal_Int32(0), ps[0].nBegin);
@@ -108,7 +108,7 @@ void SyntaxHighlightTest::testBasic()
     OUString aBasicString("        if Mid(sText,iRun,1 )<> \" \" then Mid( sText ,iRun, 1, Chr( 1 + Asc( Mid(sText,iRun,1 )) ) '");
 
     std::vector<HighlightPortion> aPortions;
-    SyntaxHighlighter(HIGHLIGHT_BASIC).getHighlightPortions(
+    SyntaxHighlighter(HighlighterLanguage::Basic).getHighlightPortions(
         aBasicString, aPortions );
 
     sal_Int32 prevEnd = 0;

comphelper/source/misc/syntaxhighlight.cxx

@@ -387,7 +387,7 @@ bool SyntaxHighlighter::Tokenizer::getNextToken(const sal_Unicode*& pos, /*out*/
 
     // Operator?
     // only for BASIC '\'' should be a comment, otherwise it is a normal string and handled there
-    else if ( testCharFlags( c, CHAR_OPERATOR ) || ( (c == '\'') && (aLanguage==HIGHLIGHT_BASIC)) )
+    else if ( testCharFlags( c, CHAR_OPERATOR ) || ( (c == '\'') && (aLanguage==HighlighterLanguage::Basic)) )
     {
         // parameters for SQL view
         if ( (c==':') || (c=='?'))
@@ -691,11 +691,11 @@ SyntaxHighlighter::SyntaxHighlighter(HighlighterLanguage language):
 {
     switch (eLanguage)
     {
-        case HIGHLIGHT_BASIC:
+        case HighlighterLanguage::Basic:
             m_tokenizer->setKeyWords( strListBasicKeyWords,
                                             sizeof( strListBasicKeyWords ) / sizeof( char* ));
             break;
-        case HIGHLIGHT_SQL:
+        case HighlighterLanguage::SQL:
             m_tokenizer->setKeyWords( strListSqlKeyWords,
                                             sizeof( strListSqlKeyWords ) / sizeof( char* ));
             break;

helpcompiler/source/BasCodeTagger.cxx

@@ -50,7 +50,7 @@ bool LibXmlTreeWalker::end()
 
 
 BasicCodeTagger::BasicCodeTagger( xmlDocPtr rootDoc ):
-    m_Highlighter(HIGHLIGHT_BASIC)
+    m_Highlighter(HighlighterLanguage::Basic)
 {
       if ( rootDoc == nullptr )
           throw NULL_DOCUMENT;

include/comphelper/syntaxhighlight.hxx

@@ -59,10 +59,10 @@ struct HighlightPortion {
 
 // Language mode of the Highlighter (possibly to be refined later with keyword
 // lists, C comment flags)
-enum HighlighterLanguage
+enum class HighlighterLanguage
 {
-    HIGHLIGHT_BASIC,
-    HIGHLIGHT_SQL
+    Basic,
+    SQL
 };
 
 class COMPHELPER_DLLPUBLIC SyntaxHighlighter

include/svtools/editsyntaxhighlighter.hxx

@@ -39,7 +39,7 @@ class SVT_DLLPUBLIC MultiLineEditSyntaxHighlight : public MultiLineEdit
         virtual bool PreNotify( NotifyEvent& rNEvt ) override;
 
     public:
-        MultiLineEditSyntaxHighlight( vcl::Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER , HighlighterLanguage aLanguage = HIGHLIGHT_SQL);
+        MultiLineEditSyntaxHighlight( vcl::Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER , HighlighterLanguage aLanguage = HighlighterLanguage::SQL);
 
         virtual void UpdateData() override;
         virtual void SetText(const OUString& rNewText) override;

svtools/source/edit/editsyntaxhighlighter.cxx

@@ -120,7 +120,7 @@ Color MultiLineEditSyntaxHighlight::GetColorValue(TokenType aToken)
     Color aColor;
     switch (aHighlighter.GetLanguage())
     {
-        case HIGHLIGHT_SQL:
+        case HighlighterLanguage::SQL:
         {
             switch (aToken)
             {
@@ -135,7 +135,7 @@ Color MultiLineEditSyntaxHighlight::GetColorValue(TokenType aToken)
             }
             break;
         }
-        case HIGHLIGHT_BASIC:
+        case HighlighterLanguage::Basic:
         {
             switch (aToken)
             {