summaryrefslogtreecommitdiff
path: root/registry
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-04-08 14:55:43 +0200
committerNoel Grandin <noel@peralex.com>2015-04-09 08:41:11 +0200
commite2931bce34a274167da52792d07b19743d488aa0 (patch)
tree94935326a3b5753335ff507463393db63a325c6e /registry
parent0833143c271ae444ca83ec16923db9f403f98b86 (diff)
convert RTMethodMode to scoped enum
Change-Id: I81599570698eb92abf14fa6386d8545c2031e863
Diffstat (limited to 'registry')
-rw-r--r--registry/source/reflread.cxx4
-rw-r--r--registry/source/reflwrit.cxx2
-rw-r--r--registry/source/regimpl.cxx8
-rw-r--r--registry/test/testregcpp.cxx2
-rw-r--r--registry/tools/regcompare.cxx8
5 files changed, 12 insertions, 12 deletions
diff --git a/registry/source/reflread.cxx b/registry/source/reflread.cxx
index 5b1c58c8dbef..cfc218d31e25 100644
--- a/registry/source/reflread.cxx
+++ b/registry/source/reflread.cxx
@@ -1132,7 +1132,7 @@ const sal_Char* MethodList::getMethodReturnType(sal_uInt16 index)
RTMethodMode MethodList::getMethodMode(sal_uInt16 index)
{
- RTMethodMode aMode = RT_MODE_INVALID;
+ RTMethodMode aMode = RTMethodMode::INVALID;
if ((m_numOfEntries > 0) && (index <= m_numOfEntries))
{
@@ -1730,7 +1730,7 @@ RTMethodMode TYPEREG_CALLTYPE typereg_reader_getMethodFlags(void * hEntry, sal_u
{
TypeRegistryEntry* pEntry = static_cast<TypeRegistryEntry*>(hEntry);
- if (pEntry == NULL) return RT_MODE_INVALID;
+ if (pEntry == NULL) return RTMethodMode::INVALID;
return pEntry->m_pMethods->getMethodMode(index);
}
diff --git a/registry/source/reflwrit.cxx b/registry/source/reflwrit.cxx
index 426911bce518..b97b4f36419d 100644
--- a/registry/source/reflwrit.cxx
+++ b/registry/source/reflwrit.cxx
@@ -538,7 +538,7 @@ protected:
};
MethodEntry::MethodEntry()
- : m_mode(RT_MODE_INVALID)
+ : m_mode(RTMethodMode::INVALID)
, m_paramCount(0)
, m_params(NULL)
, m_excCount(0)
diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx
index 09afcc0c5cb7..50085b419420 100644
--- a/registry/source/regimpl.cxx
+++ b/registry/source/regimpl.cxx
@@ -294,19 +294,19 @@ void dumpType(typereg::Reader const & reader, OString const & indent) {
printf("\n");
printf("%s flags: ", indent.getStr());
switch (reader.getMethodFlags(i)) {
- case RT_MODE_ONEWAY:
+ case RTMethodMode::ONEWAY:
printf("oneway");
break;
- case RT_MODE_TWOWAY:
+ case RTMethodMode::TWOWAY:
printf("synchronous");
break;
- case RT_MODE_ATTRIBUTE_GET:
+ case RTMethodMode::ATTRIBUTE_GET:
printf("attribute get");
break;
- case RT_MODE_ATTRIBUTE_SET:
+ case RTMethodMode::ATTRIBUTE_SET:
printf("attribute set");
break;
diff --git a/registry/test/testregcpp.cxx b/registry/test/testregcpp.cxx
index e7853c36b81e..19ef8a7ee157 100644
--- a/registry/test/testregcpp.cxx
+++ b/registry/test/testregcpp.cxx
@@ -235,7 +235,7 @@ void test_coreReflection()
OUString("DummyFile"), RTFieldAccess::CONST, aConst);
writer.setMethodData(0, OUString("methodA"),
- OUString("double"), RT_MODE_TWOWAY, 2, 1,
+ OUString("double"), RTMethodMode::TWOWAY, 2, 1,
OUString("Hallo ich bin die methodA"));
writer.setParamData(0, 0, OUString("ModuleA/StructA"),
OUString("aStruct"), RT_PARAM_IN);
diff --git a/registry/tools/regcompare.cxx b/registry/tools/regcompare.cxx
index 2018f57e40e0..e85eff8dea7e 100644
--- a/registry/tools/regcompare.cxx
+++ b/registry/tools/regcompare.cxx
@@ -700,13 +700,13 @@ static char const * getMethodMode(RTMethodMode methodMode)
{
switch ( methodMode )
{
- case RT_MODE_ONEWAY:
+ case RTMethodMode::ONEWAY:
return "ONEWAY";
- case RT_MODE_ONEWAY_CONST:
+ case RTMethodMode::ONEWAY_CONST:
return "ONEWAY,CONST";
- case RT_MODE_TWOWAY:
+ case RTMethodMode::TWOWAY:
return "NONE";
- case RT_MODE_TWOWAY_CONST:
+ case RTMethodMode::TWOWAY_CONST:
return "CONST";
default:
return "INVALID";