From 6f2d11a57fe28eceec745d025602e7470853a229 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Tue, 23 Feb 2016 10:23:04 +0200
Subject: convert codemaker::cpp::IdentifierTranslationMode to scoped enum

Change-Id: I17f7a2f8f89166c5a51be4ee15986d21f1cb24b3
---
 codemaker/source/commoncpp/commoncpp.cxx |  4 ++--
 codemaker/source/cppumaker/cpputype.cxx  | 16 ++++++++--------
 include/codemaker/commoncpp.hxx          | 10 +++++-----
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/codemaker/source/commoncpp/commoncpp.cxx b/codemaker/source/commoncpp/commoncpp.cxx
index 46a779089e06..e50e982cca60 100644
--- a/codemaker/source/commoncpp/commoncpp.cxx
+++ b/codemaker/source/commoncpp/commoncpp.cxx
@@ -169,7 +169,7 @@ OString translateUnoToCppIdentifier(
         || unoIdentifier == "xor"
         /* unoIdentifier == "xor_eq" */
         // Standard macros:
-        || (transmode != ITM_KEYWORDSONLY
+        || (transmode != IdentifierTranslationMode::KeywordsOnly
             && (unoIdentifier == "BUFSIZ"
                 || unoIdentifier == "CLOCKS_PER_SEC"
                 || unoIdentifier == "EDOM"
@@ -265,7 +265,7 @@ OString translateUnoToCppIdentifier(
                 || unoIdentifier == "UINT_MAX"
                 || unoIdentifier == "ULONG_MAX"
                 || unoIdentifier == "USHRT_MAX"))
-            || (transmode == ITM_GLOBAL
+            || (transmode == IdentifierTranslationMode::Global
                 && (// Standard types:
                     /* unoIdentifier == "clock_t" */
                     /* unoIdentifier == "div_t" */
diff --git a/codemaker/source/cppumaker/cpputype.cxx b/codemaker/source/cppumaker/cpputype.cxx
index 1f98590e2a0f..06f6561ebb69 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -618,7 +618,7 @@ void CppuType::dumpLightGetCppuType(FileStream & out) {
 
 codemaker::cpp::IdentifierTranslationMode CppuType::isGlobal() const {
     return name_.indexOf('.') == -1
-        ? codemaker::cpp::ITM_GLOBAL : codemaker::cpp::ITM_NONGLOBAL;
+        ? codemaker::cpp::IdentifierTranslationMode::Global : codemaker::cpp::IdentifierTranslationMode::NonGlobal;
 }
 
 sal_uInt32 CppuType::getInheritedMemberCount()
@@ -3518,7 +3518,7 @@ void ServiceType::dumpHppFile(
                 o << indent() << "static ::css::uno::Reference< "
                   << scopedBaseName << " > "
                   << codemaker::cpp::translateUnoToCppIdentifier(
-                      "create", "method", codemaker::cpp::ITM_NONGLOBAL,
+                      "create", "method", codemaker::cpp::IdentifierTranslationMode::NonGlobal,
                       &cppName)
                   << ("(::css::uno::Reference< ::css::uno::XComponentContext > const &"
                       " the_context) {\n");
@@ -3576,7 +3576,7 @@ void ServiceType::dumpHppFile(
                 o << indent() << "static ::css::uno::Reference< "
                   << scopedBaseName << " > "
                   << codemaker::cpp::translateUnoToCppIdentifier(
-                      u2b(cons.name), "method", codemaker::cpp::ITM_NONGLOBAL,
+                      u2b(cons.name), "method", codemaker::cpp::IdentifierTranslationMode::NonGlobal,
                       &cppName)
                   << ("(::css::uno::Reference< ::css::uno::XComponentContext > const &"
                       " the_context");
@@ -3595,7 +3595,7 @@ void ServiceType::dumpHppFile(
                     dumpType(o, type, byRef, byRef);
                     o << " "
                       << codemaker::cpp::translateUnoToCppIdentifier(
-                          u2b(param.name), "param", codemaker::cpp::ITM_NONGLOBAL);
+                          u2b(param.name), "param", codemaker::cpp::IdentifierTranslationMode::NonGlobal);
                 }
                 o << ") {\n";
                 inc();
@@ -3614,7 +3614,7 @@ void ServiceType::dumpHppFile(
                         OString param(
                             codemaker::cpp::translateUnoToCppIdentifier(
                                 u2b(j.name), "param",
-                                codemaker::cpp::ITM_NONGLOBAL));
+                                codemaker::cpp::IdentifierTranslationMode::NonGlobal));
                         sal_Int32 rank;
                         if (m_typeMgr->getSort(
                                 b2u(codemaker::UnoType::decompose(
@@ -3664,7 +3664,7 @@ void ServiceType::dumpHppFile(
                 if (rest) {
                     o << codemaker::cpp::translateUnoToCppIdentifier(
                         u2b(cons.parameters.back().name), "param",
-                        codemaker::cpp::ITM_NONGLOBAL);
+                        codemaker::cpp::IdentifierTranslationMode::NonGlobal);
                 } else if (cons.parameters.empty()) {
                     o << "::css::uno::Sequence< ::css::uno::Any >()";
                 } else {
@@ -3691,7 +3691,7 @@ void ServiceType::dumpHppFile(
                 if (rest) {
                     o << codemaker::cpp::translateUnoToCppIdentifier(
                         u2b(cons.parameters.back().name), "param",
-                        codemaker::cpp::ITM_NONGLOBAL);
+                        codemaker::cpp::IdentifierTranslationMode::NonGlobal);
                 } else if (cons.parameters.empty()) {
                     o << ("::css::uno::Sequence< ::css::uno::Any >()");
                 } else {
@@ -3815,7 +3815,7 @@ void SingletonType::dumpHppFile(
     o << indent() << "static ::css::uno::Reference< "
       << scopedBaseName << " > "
       << codemaker::cpp::translateUnoToCppIdentifier(
-          "get", "method", codemaker::cpp::ITM_NONGLOBAL, &cppName)
+          "get", "method", codemaker::cpp::IdentifierTranslationMode::NonGlobal, &cppName)
       << ("(::css::uno::Reference<"
           " ::css::uno::XComponentContext > const & the_context)"
           " {\n");
diff --git a/include/codemaker/commoncpp.hxx b/include/codemaker/commoncpp.hxx
index e09b387cd92e..a1a8e9180e59 100644
--- a/include/codemaker/commoncpp.hxx
+++ b/include/codemaker/commoncpp.hxx
@@ -45,15 +45,15 @@ rtl::OString scopedCppName(rtl::OString const & type, bool ns_alias=true);
 rtl::OString translateUnoToCppType(
     codemaker::UnoType::Sort sort, rtl::OUString const & nucleus);
 
-enum IdentifierTranslationMode {
-    ITM_GLOBAL,
-    ITM_NONGLOBAL,
-    ITM_KEYWORDSONLY
+enum class IdentifierTranslationMode {
+    Global,
+    NonGlobal,
+    KeywordsOnly
 };
 
 rtl::OString translateUnoToCppIdentifier(
     rtl::OString const & identifier, rtl::OString const & prefix,
-    IdentifierTranslationMode transmode = ITM_GLOBAL,
+    IdentifierTranslationMode transmode = IdentifierTranslationMode::Global,
     rtl::OString const * forbidden = nullptr);
 
 } }
-- 
cgit