From c4f056c01b674046c8d1852ae5e5ce0d48b0714f Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Mon, 8 Feb 2016 13:48:55 +0200
Subject: disambiguate the two GetType methods

Change-Id: I922af3a2ebe8cdaa6465542a5d6de365e1bc6dff
---
 idl/inc/types.hxx             |  2 +-
 idl/source/objects/object.cxx |  2 +-
 idl/source/objects/slot.cxx   |  6 +++---
 idl/source/objects/types.cxx  | 12 ++++++------
 4 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'idl')

diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index 09c8a7cd4135..48d3331360d2 100644
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -80,7 +80,7 @@ public:
     sal_uLong           GetAttrCount() const { return aAttrList.size(); }
 
     void                SetType( MetaTypeType nT );
-    MetaTypeType        GetType() const { return nType; }
+    MetaTypeType        GetMetaTypeType() const { return nType; }
     SvMetaType *        GetBaseType() const;
     SvMetaType *        GetReturnType() const;
     bool                IsItem() const { return bIsItem; }
diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx
index ecc2691bcaa9..f95ea36f2a58 100644
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -109,7 +109,7 @@ void SvMetaClass::ReadContextSvIdl( SvIdlDataBase & rBase,
 bool SvMetaClass::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
 {
     sal_uLong nTokPos = rInStm.Tell();
-    if( SvMetaType::ReadHeaderSvIdl( rBase, rInStm ) && GetType() == MetaTypeType::Class )
+    if( SvMetaType::ReadHeaderSvIdl( rBase, rInStm ) && GetMetaTypeType() == MetaTypeType::Class )
     {
         bool bOk = true;
         if( rInStm.Read( ':' ) )
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index cb8ce8229fc7..d2cddd7e736d 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -84,12 +84,12 @@ bool SvMetaSlot::GetHidden() const
 bool SvMetaSlot::IsVariable() const
 {
     SvMetaType * pType = GetType();
-    return pType->GetType() != MetaTypeType::Method;
+    return pType->GetMetaTypeType() != MetaTypeType::Method;
 }
 
 bool SvMetaSlot::IsMethod() const
 {
-    bool b = GetType()->GetType() == MetaTypeType::Method;
+    bool b = GetType()->GetMetaTypeType() == MetaTypeType::Method;
     b |= nullptr != GetMethod();
     return b;
 }
@@ -338,7 +338,7 @@ bool SvMetaSlot::Test( SvIdlDataBase & rBase, SvTokenStream & rInStm )
     if( bOk )
     {
         SvMetaType * pType = GetType();
-        if( pType->GetType() == MetaTypeType::Method )
+        if( pType->GetMetaTypeType() == MetaTypeType::Method )
             pType = pType->GetReturnType();
         if( !pType->IsItem() )
         {
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index d4eaf659f234..392b0b0325f9 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -114,7 +114,7 @@ sal_uLong SvMetaAttribute::MakeSfx( OStringBuffer& rAttrArray )
     DBG_ASSERT( pType, "no type for attribute" );
     SvMetaType * pBaseType = pType->GetBaseType();
     DBG_ASSERT( pBaseType, "no base type for attribute" );
-    if( pBaseType->GetType() == MetaTypeType::Struct )
+    if( pBaseType->GetMetaTypeType() == MetaTypeType::Struct )
         return pBaseType->MakeSfx( rAttrArray );
     else
     {
@@ -162,14 +162,14 @@ void SvMetaType::SetType( MetaTypeType nT )
 
 SvMetaType * SvMetaType::GetBaseType() const
 {
-    if( GetRef() && GetType() == MetaTypeType::Base )
+    if( GetRef() && GetMetaTypeType() == MetaTypeType::Base )
         return static_cast<SvMetaType *>(GetRef())->GetBaseType();
     return const_cast<SvMetaType *>(this);
 }
 
 SvMetaType * SvMetaType::GetReturnType() const
 {
-    DBG_ASSERT( GetType() == MetaTypeType::Method, "no method" );
+    DBG_ASSERT( GetMetaTypeType() == MetaTypeType::Method, "no method" );
     DBG_ASSERT( GetRef(), "no return type" );
     return static_cast<SvMetaType *>(GetRef());
 }
@@ -254,7 +254,7 @@ sal_uLong SvMetaType::MakeSfx( OStringBuffer& rAttrArray )
 {
     sal_uLong nC = 0;
 
-    if( GetBaseType()->GetType() == MetaTypeType::Struct )
+    if( GetBaseType()->GetMetaTypeType() == MetaTypeType::Struct )
     {
         sal_uLong nAttrCount = GetAttrCount();
         // write the single attributes
@@ -331,7 +331,7 @@ void SvMetaType::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
 {
     if( IsItem() )
     {
-        if( GetBaseType()->GetType() == MetaTypeType::Struct )
+        if( GetBaseType()->GetMetaTypeType() == MetaTypeType::Struct )
             GetBaseType()->WriteSfxItem( GetName(), rBase, rOutStm );
         else
             WriteSfxItem( GetName(), rBase, rOutStm );
@@ -419,7 +419,7 @@ bool SvMetaTypeEnum::ReadSvIdl( SvIdlDataBase & rBase,
 {
     sal_uInt32  nTokPos = rInStm.Tell();
     if( SvMetaType::ReadHeaderSvIdl( rBase, rInStm )
-      && GetType() == MetaTypeType::Enum )
+      && GetMetaTypeType() == MetaTypeType::Enum )
     {
         if( SvMetaObject::ReadSvIdl( rBase, rInStm ) )
              return true;
-- 
cgit