convert RT_ACCESS fields to scoped enum

Change-Id: Ifef0aaae6208f18c1352fef7c471deb60a97820d

4 files changed, 20 insertions, 20 deletions

diff --git a/idlc/source/astconstant.cxx b/idlc/source/astconstant.cxx
index b37ff90e6b73..ce38dcbfa461 100644
--- a/idlc/source/astconstant.cxx
+++ b/idlc/source/astconstant.cxx
@@ -114,7 +114,7 @@ bool AstConstant::dumpBlob(
 
     rBlob.setFieldData(
         index, getDocumentation(), OUString(),
-        RT_ACCESS_CONST | (published ? RT_ACCESS_PUBLISHED : 0),
+        RTFieldAccess::CONST | (published ? RTFieldAccess::PUBLISHED : RTFieldAccess::NONE),
         OStringToOUString(name, RTL_TEXTENCODING_UTF8), type, aConst);
 
     return true;
diff --git a/idlc/source/astdump.cxx b/idlc/source/astdump.cxx
index d7adc08c90c1..c8691972b486 100644
--- a/idlc/source/astdump.cxx
+++ b/idlc/source/astdump.cxx
@@ -258,7 +258,7 @@ bool AstService::dump(RegistryKey& rKey)
             AstInterfaceMember * decl = static_cast<AstInterfaceMember *>(*i);
             writer.setReferenceData(
                 referenceIndex++, decl->getDocumentation(), RT_REF_SUPPORTS,
-                (decl->isOptional() ? RT_ACCESS_OPTIONAL : RT_ACCESS_INVALID),
+                (decl->isOptional() ? RTFieldAccess::OPTIONAL : RTFieldAccess::INVALID),
                 OStringToOUString( decl->getRealInterface()->getRelativName(),
                                         RTL_TEXTENCODING_UTF8));
             break;
@@ -269,7 +269,7 @@ bool AstService::dump(RegistryKey& rKey)
             {
                 AstServiceMember * decl = static_cast<AstServiceMember *>(*i);
                 writer.setReferenceData(referenceIndex++, decl->getDocumentation(), RT_REF_EXPORTS,
-                    (decl->isOptional() ? RT_ACCESS_OPTIONAL : RT_ACCESS_INVALID),
+                    (decl->isOptional() ? RTFieldAccess::OPTIONAL : RTFieldAccess::INVALID),
                     OStringToOUString(decl->getRealService()->getRelativName(),
                                            RTL_TEXTENCODING_UTF8));
             }
@@ -279,7 +279,7 @@ bool AstService::dump(RegistryKey& rKey)
             {
                 AstObserves * decl = static_cast<AstObserves *>(*i);
                 writer.setReferenceData(referenceIndex++, decl->getDocumentation(), RT_REF_OBSERVES,
-                    RT_ACCESS_INVALID,
+                    RTFieldAccess::INVALID,
                     OStringToOUString( decl->getRealInterface()->getRelativName(),
                                             RTL_TEXTENCODING_UTF8));
                 break;
@@ -289,7 +289,7 @@ bool AstService::dump(RegistryKey& rKey)
             {
                 AstNeeds * decl = static_cast<AstNeeds *>(*i);
                 writer.setReferenceData( referenceIndex++, decl->getDocumentation(), RT_REF_NEEDS,
-                    RT_ACCESS_INVALID,
+                    RTFieldAccess::INVALID,
                     OStringToOUString( decl->getRealService()->getRelativName(),
                                             RTL_TEXTENCODING_UTF8));
                 break;
@@ -326,46 +326,46 @@ bool AstService::dump(RegistryKey& rKey)
 bool AstAttribute::dumpBlob(
     typereg::Writer & rBlob, sal_uInt16 index, sal_uInt16 * methodIndex)
 {
-    RTFieldAccess accessMode = RT_ACCESS_INVALID;
+    RTFieldAccess accessMode = RTFieldAccess::INVALID;
 
     if (isReadonly())
     {
-        accessMode |= RT_ACCESS_READONLY;
+        accessMode |= RTFieldAccess::READONLY;
     } else
     {
-        accessMode |= RT_ACCESS_READWRITE;
+        accessMode |= RTFieldAccess::READWRITE;
     }
     if (isOptional())
     {
-        accessMode |= RT_ACCESS_OPTIONAL;
+        accessMode |= RTFieldAccess::OPTIONAL;
     }
     if (isBound())
     {
-        accessMode |= RT_ACCESS_BOUND;
+        accessMode |= RTFieldAccess::BOUND;
     }
     if (isMayBeVoid())
     {
-        accessMode |= RT_ACCESS_MAYBEVOID;
+        accessMode |= RTFieldAccess::MAYBEVOID;
     }
     if (isConstrained())
     {
-        accessMode |= RT_ACCESS_CONSTRAINED;
+        accessMode |= RTFieldAccess::CONSTRAINED;
     }
     if (isTransient())
     {
-        accessMode |= RT_ACCESS_TRANSIENT;
+        accessMode |= RTFieldAccess::TRANSIENT;
     }
     if (isMayBeAmbiguous())
     {
-        accessMode |= RT_ACCESS_MAYBEAMBIGUOUS;
+        accessMode |= RTFieldAccess::MAYBEAMBIGUOUS;
     }
     if (isMayBeDefault())
     {
-        accessMode |= RT_ACCESS_MAYBEDEFAULT;
+        accessMode |= RTFieldAccess::MAYBEDEFAULT;
     }
     if (isRemoveable())
     {
-        accessMode |= RT_ACCESS_REMOVABLE;
+        accessMode |= RTFieldAccess::REMOVABLE;
     }
 
     OUString name(OStringToOUString(getLocalName(), RTL_TEXTENCODING_UTF8));
diff --git a/idlc/source/astinterface.cxx b/idlc/source/astinterface.cxx
index 579ca0ac3a28..5941fa3e64d9 100644
--- a/idlc/source/astinterface.cxx
+++ b/idlc/source/astinterface.cxx
@@ -207,7 +207,7 @@ bool AstInterface::dump(RegistryKey& rKey)
         if (i->isOptional()) {
             aBlob.setReferenceData(
                 referenceIndex++, i->getDocumentation(), RT_REF_SUPPORTS,
-                RT_ACCESS_OPTIONAL,
+                RTFieldAccess::OPTIONAL,
                 OStringToOUString(
                     i->getInterface()->getRelativName(),
                     RTL_TEXTENCODING_UTF8));
diff --git a/idlc/source/aststruct.cxx b/idlc/source/aststruct.cxx
index 2b150e1e6aa3..49831731e97d 100644
--- a/idlc/source/aststruct.cxx
+++ b/idlc/source/aststruct.cxx
@@ -129,10 +129,10 @@ bool AstStruct::dump(RegistryKey& rKey)
             if ( pDecl->getNodeType() == NT_member )
             {
                 pMember = static_cast<AstMember*>(pDecl);
-                RTFieldAccess flags = RT_ACCESS_READWRITE;
+                RTFieldAccess flags = RTFieldAccess::READWRITE;
                 OString typeName;
                 if (pMember->getType()->getNodeType() == NT_type_parameter) {
-                    flags |= RT_ACCESS_PARAMETERIZED_TYPE;
+                    flags |= RTFieldAccess::PARAMETERIZED_TYPE;
                     typeName = pMember->getType()->getLocalName();
                 } else {
                     typeName = pMember->getType()->getRelativName();
@@ -153,7 +153,7 @@ bool AstStruct::dump(RegistryKey& rKey)
          i != m_typeParameters.end(); ++i)
     {
         aBlob.setReferenceData(
-            index++, emptyStr, RT_REF_TYPE_PARAMETER, RT_ACCESS_INVALID,
+            index++, emptyStr, RT_REF_TYPE_PARAMETER, RTFieldAccess::INVALID,
             OStringToOUString(
                 (*i)->getLocalName(), RTL_TEXTENCODING_UTF8));
     }