From 68b35c75588f5702a142c8232d5e805bfe276c72 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Wed, 8 Apr 2015 15:36:06 +0200
Subject: convert RTReferenceType to scoped enum

Change-Id: I8320f6f42d5579fbd09450ddca61c4c066de98e4
---
 registry/source/reflread.cxx  |  4 ++--
 registry/source/reflwrit.cxx  |  2 +-
 registry/source/regimpl.cxx   |  6 +++---
 registry/test/testregcpp.cxx  |  8 ++++----
 registry/tools/regcompare.cxx | 18 +++++++++---------
 5 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'registry')

diff --git a/registry/source/reflread.cxx b/registry/source/reflread.cxx
index cfc218d31e25..49f6e4e2a358 100644
--- a/registry/source/reflread.cxx
+++ b/registry/source/reflread.cxx
@@ -846,7 +846,7 @@ const sal_Char* ReferenceList::getReferenceName(sal_uInt16 index)
 
 RTReferenceType ReferenceList::getReferenceType(sal_uInt16 index)
 {
-    RTReferenceType refType = RT_REF_INVALID;
+    RTReferenceType refType = RTReferenceType::INVALID;
 
     if ((m_numOfEntries > 0) && (index <= m_numOfEntries))
     {
@@ -1788,7 +1788,7 @@ RTReferenceType TYPEREG_CALLTYPE typereg_reader_getReferenceSort(void * hEntry,
 {
     TypeRegistryEntry* pEntry = static_cast<TypeRegistryEntry*>(hEntry);
 
-    if (pEntry == NULL) return RT_REF_INVALID;
+    if (pEntry == NULL) return RTReferenceType::INVALID;
 
     return pEntry->m_pReferences->getReferenceType(index);
 }
diff --git a/registry/source/reflwrit.cxx b/registry/source/reflwrit.cxx
index b97b4f36419d..b98c469fd980 100644
--- a/registry/source/reflwrit.cxx
+++ b/registry/source/reflwrit.cxx
@@ -480,7 +480,7 @@ public:
 };
 
 ReferenceEntry::ReferenceEntry()
-    : m_type(RT_REF_INVALID)
+    : m_type(RTReferenceType::INVALID)
     , m_access(RTFieldAccess::INVALID)
 {
 }
diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx
index 50085b419420..64ad999816bb 100644
--- a/registry/source/regimpl.cxx
+++ b/registry/source/regimpl.cxx
@@ -394,15 +394,15 @@ void dumpType(typereg::Reader const & reader, OString const & indent) {
             printf("\n");
             printf("%s    sort: ", indent.getStr());
             switch (reader.getReferenceSort(i)) {
-            case RT_REF_SUPPORTS:
+            case RTReferenceType::SUPPORTS:
                 printf("supports");
                 break;
 
-            case RT_REF_EXPORTS:
+            case RTReferenceType::EXPORTS:
                 printf("exports");
                 break;
 
-            case RT_REF_TYPE_PARAMETER:
+            case RTReferenceType::TYPE_PARAMETER:
                 printf("type parameter");
                 break;
 
diff --git a/registry/test/testregcpp.cxx b/registry/test/testregcpp.cxx
index 19ef8a7ee157..bc9d447724b2 100644
--- a/registry/test/testregcpp.cxx
+++ b/registry/test/testregcpp.cxx
@@ -299,14 +299,14 @@ void test_coreReflection()
                             OUString("ich bin eine property"),
                             OUString(), RTFieldAccess::READWRITE);
 
-        writer.setReferenceData(0, OUString("ModuleA/XInterfaceA"), RT_REF_SUPPORTS,
+        writer.setReferenceData(0, OUString("ModuleA/XInterfaceA"), RTReferenceType::SUPPORTS,
                                 OUString("Hallo ich eine Reference auf ein supported interface"),
                                 RTFieldAccess::OPTIONAL);
-        writer.setReferenceData(1, OUString("ModuleA/XInterfaceA"), RT_REF_OBSERVES,
+        writer.setReferenceData(1, OUString("ModuleA/XInterfaceA"), RTReferenceType::OBSERVES,
                                 OUString("Hallo ich eine Reference auf ein observed interface"));
-        writer.setReferenceData(2, OUString("ModuleA/ServiceB"), RT_REF_EXPORTS,
+        writer.setReferenceData(2, OUString("ModuleA/ServiceB"), RTReferenceType::EXPORTS,
                                 OUString("Hallo ich eine Reference auf einen exported service"));
-        writer.setReferenceData(3, OUString("ModuleA/ServiceB"), RT_REF_NEEDS,
+        writer.setReferenceData(3, OUString("ModuleA/ServiceB"), RTReferenceType::NEEDS,
                                 OUString("Hallo ich eine Reference auf einen needed service"));
 
         const sal_uInt8* pBlop = writer.getBlop();
diff --git a/registry/tools/regcompare.cxx b/registry/tools/regcompare.cxx
index e85eff8dea7e..8d4d4221bc5d 100644
--- a/registry/tools/regcompare.cxx
+++ b/registry/tools/regcompare.cxx
@@ -886,16 +886,16 @@ static char const * getReferenceType(RTReferenceType refType)
 {
     switch (refType)
     {
-        case RT_REF_SUPPORTS:
-            return "RT_REF_SUPPORTS";
-        case RT_REF_OBSERVES:
-            return "RT_REF_OBSERVES";
-        case RT_REF_EXPORTS:
-            return "RT_REF_EXPORTS";
-        case RT_REF_NEEDS:
-            return "RT_REF_NEEDS";
+        case RTReferenceType::SUPPORTS:
+            return "RTReferenceType::SUPPORTS";
+        case RTReferenceType::OBSERVES:
+            return "RTReferenceType::OBSERVES";
+        case RTReferenceType::EXPORTS:
+            return "RTReferenceType::EXPORTS";
+        case RTReferenceType::NEEDS:
+            return "RTReferenceType::NEEDS";
         default:
-            return "RT_REF_INVALID";
+            return "RTReferenceType::INVALID";
     }
 }
 
-- 
cgit