[Libreoffice-commits] core.git: idl/inc idl/source
Noel Grandin
noel at peralex.com
Sun Feb 7 06:54:04 UTC 2016
idl/inc/types.hxx | 10 +++++-----
idl/source/objects/object.cxx | 2 +-
idl/source/objects/slot.cxx | 2 +-
idl/source/objects/types.cxx | 41 +++++++++++++++++++----------------------
4 files changed, 26 insertions(+), 29 deletions(-)
New commits:
commit e90f4e18fd53bd85cc953eb2e796d593ae3f79df
Author: Noel Grandin <noel at peralex.com>
Date: Fri Feb 5 11:36:48 2016 +0200
convert TYPE_ enum to scoped
Change-Id: I514cf8591d8e7b3ff26bafba8fdbac2ad26249b8
Reviewed-on: https://gerrit.libreoffice.org/22150
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/idl/inc/types.hxx b/idl/inc/types.hxx
index 1589fe7..54100bc 100644
--- a/idl/inc/types.hxx
+++ b/idl/inc/types.hxx
@@ -68,15 +68,15 @@ public:
SvIdlDataBase& );
};
-enum { TYPE_METHOD, TYPE_STRUCT, TYPE_BASE, TYPE_ENUM,
- TYPE_CLASS };
+enum MetaTypeType { Method, Struct, Base, Enum, Class };
+
class SvMetaType : public SvMetaExtern
{
SvIdentifier aCName;
SvIdentifier aBasicPostfix;
SvIdentifier aBasicName;
SvRefMemberList<SvMetaAttribute *>* pAttrList;
- int nType;
+ MetaTypeType nType;
bool bIsItem;
bool bIsShell;
char cParserChar;
@@ -106,8 +106,8 @@ public:
return pAttrList ? pAttrList->size() : 0L;
}
- void SetType( int nT );
- int GetType() const { return nType; }
+ void SetType( MetaTypeType nT );
+ MetaTypeType GetType() 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 d4d8002..d27b5ac 100644
--- a/idl/source/objects/object.cxx
+++ b/idl/source/objects/object.cxx
@@ -115,7 +115,7 @@ void SvMetaClass::ReadContextSvIdl( SvIdlDataBase & rBase,
bool SvMetaClass::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm )
{
sal_uLong nTokPos = rInStm.Tell();
- if( SvMetaType::ReadHeaderSvIdl( rBase, rInStm ) && GetType() == TYPE_CLASS )
+ if( SvMetaType::ReadHeaderSvIdl( rBase, rInStm ) && GetType() == MetaTypeType::Class )
{
bool bOk = true;
if( rInStm.Read( ':' ) )
diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index ad11111..16a1d79 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -316,7 +316,7 @@ bool SvMetaSlot::Test( SvIdlDataBase & rBase, SvTokenStream & rInStm )
if( bOk )
{
SvMetaType * pType = GetType();
- if( pType->GetType() == TYPE_METHOD )
+ if( pType->GetType() == MetaTypeType::Method )
pType = pType->GetReturnType();
if( !pType->IsItem() )
{
diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx
index 51be69d..fd8d1d7 100644
--- a/idl/source/objects/types.cxx
+++ b/idl/source/objects/types.cxx
@@ -83,13 +83,13 @@ bool SvMetaAttribute::IsMethod() const
{
SvMetaType * pType = GetType();
DBG_ASSERT( pType, "no type for attribute" );
- return pType->GetType() == TYPE_METHOD;
+ return pType->GetType() == MetaTypeType::Method;
}
bool SvMetaAttribute::IsVariable() const
{
SvMetaType * pType = GetType();
- return pType->GetType() != TYPE_METHOD;
+ return pType->GetType() != MetaTypeType::Method;
}
OString SvMetaAttribute::GetMangleName( bool ) const
@@ -163,7 +163,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() == TYPE_STRUCT )
+ if( pBaseType->GetType() == MetaTypeType::Struct )
return pBaseType->MakeSfx( rAttrArray );
else
{
@@ -181,8 +181,8 @@ void SvMetaAttribute::Insert (SvSlotElementList&, const OString&, SvIdlDataBase&
}
#define CTOR \
- : pAttrList( nullptr ) \
- , nType( TYPE_BASE ) \
+ : pAttrList( nullptr ) \
+ , nType( MetaTypeType::Base ) \
, bIsItem( false ) \
, bIsShell( false ) \
, cParserChar( 'h' )
@@ -226,13 +226,10 @@ SvRefMemberList<SvMetaAttribute *>& SvMetaType::GetAttrList() const
return *pAttrList;
}
-void SvMetaType::SetType( int nT )
+void SvMetaType::SetType( MetaTypeType nT )
{
nType = nT;
- if( nType == TYPE_ENUM )
- {
- }
- else if( nType == TYPE_CLASS )
+ if( nType == MetaTypeType::Class )
{
OStringBuffer aTmp(C_PREF);
aTmp.append("Object *");
@@ -242,14 +239,14 @@ void SvMetaType::SetType( int nT )
SvMetaType * SvMetaType::GetBaseType() const
{
- if( GetRef() && GetType() == TYPE_BASE )
+ if( GetRef() && GetType() == MetaTypeType::Base )
return static_cast<SvMetaType *>(GetRef())->GetBaseType();
return const_cast<SvMetaType *>(this);
}
SvMetaType * SvMetaType::GetReturnType() const
{
- DBG_ASSERT( GetType() == TYPE_METHOD, "no method" );
+ DBG_ASSERT( GetType() == MetaTypeType::Method, "no method" );
DBG_ASSERT( GetRef(), "no return type" );
return static_cast<SvMetaType *>(GetRef());
}
@@ -288,18 +285,18 @@ bool SvMetaType::ReadHeaderSvIdl( SvIdlDataBase & rBase,
{
if( pTok->Is( SvHash_shell() ) )
bIsShell = true;
- SetType( TYPE_CLASS );
+ SetType( MetaTypeType::Class );
bOk = ReadNamesSvIdl( rBase, rInStm );
}
else if( pTok->Is( SvHash_struct() ) )
{
- SetType( TYPE_STRUCT );
+ SetType( MetaTypeType::Struct );
bOk = ReadNamesSvIdl( rBase, rInStm );
}
else if( pTok->Is( SvHash_enum() ) )
{
- SetType( TYPE_ENUM );
+ SetType( MetaTypeType::Enum );
bOk = ReadNameSvIdl( rBase, rInStm );
}
else if( pTok->Is( SvHash_item() ) )
@@ -318,7 +315,7 @@ bool SvMetaType::ReadHeaderSvIdl( SvIdlDataBase & rBase,
DoReadContextSvIdl( rBase, rInStm );
if( rInStm.Read( ')' ) )
{
- SetType( TYPE_METHOD );
+ SetType( MetaTypeType::Method );
bOk = true;
}
}
@@ -376,7 +373,7 @@ sal_uLong SvMetaType::MakeSfx( OStringBuffer& rAttrArray )
{
sal_uLong nC = 0;
- if( GetBaseType()->GetType() == TYPE_STRUCT )
+ if( GetBaseType()->GetType() == MetaTypeType::Struct )
{
sal_uLong nAttrCount = GetAttrCount();
// write the single attributes
@@ -455,7 +452,7 @@ void SvMetaType::WriteSfx( SvIdlDataBase & rBase, SvStream & rOutStm )
{
if( IsItem() )
{
- if( GetBaseType()->GetType() == TYPE_STRUCT )
+ if( GetBaseType()->GetType() == MetaTypeType::Struct )
GetBaseType()->WriteSfxItem( GetName().getString(), rBase, rOutStm );
else
WriteSfxItem( GetName().getString(), rBase, rOutStm );
@@ -471,7 +468,7 @@ bool SvMetaType::ReadMethodArgs( SvIdlDataBase & rBase,
DoReadContextSvIdl( rBase, rInStm );
if( rInStm.Read( ')' ) )
{
- SetType( TYPE_METHOD );
+ SetType( MetaTypeType::Method );
return true;
}
}
@@ -485,10 +482,10 @@ OString SvMetaType::GetParserString() const
if( pBT != this )
return pBT->GetParserString();
- int type = GetType();
+ MetaTypeType type = GetType();
OString aPStr;
- if( TYPE_METHOD == type || TYPE_STRUCT == type )
+ if( MetaTypeType::Method == type || MetaTypeType::Struct == type )
{
sal_uLong nAttrCount = GetAttrCount();
// write the single attributes
@@ -570,7 +567,7 @@ bool SvMetaTypeEnum::ReadSvIdl( SvIdlDataBase & rBase,
{
sal_uInt32 nTokPos = rInStm.Tell();
if( SvMetaType::ReadHeaderSvIdl( rBase, rInStm )
- && GetType() == TYPE_ENUM )
+ && GetType() == MetaTypeType::Enum )
{
if( SvMetaObject::ReadSvIdl( rBase, rInStm ) )
return true;
More information about the Libreoffice-commits
mailing list