diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-01-25 12:03:58 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-02 08:02:54 +0000 |
commit | 4978328534c0f759eea7d0c196046f1d53b06925 (patch) | |
tree | cf9dcd62c4f09dcd08115bbda2a8950678a38562 /idl | |
parent | 1461ebbbb5d47d90e31f0945a4878a68fbee5213 (diff) |
convert method names in tools::SvRef to be more like our other..
reference classes, uno::Reference and rtl::Reference.
Specifically rename Is()->is() and Clear()->clear().
Change-Id: Icb7e05e2d09cb9977121508b837ba0961dabb4ae
Reviewed-on: https://gerrit.libreoffice.org/33576
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'idl')
-rw-r--r-- | idl/inc/basobj.hxx | 2 | ||||
-rw-r--r-- | idl/source/objects/object.cxx | 6 | ||||
-rw-r--r-- | idl/source/objects/slot.cxx | 12 | ||||
-rw-r--r-- | idl/source/objects/types.cxx | 2 | ||||
-rw-r--r-- | idl/source/prj/parser.cxx | 8 |
5 files changed, 15 insertions, 15 deletions
diff --git a/idl/inc/basobj.hxx b/idl/inc/basobj.hxx index 44de0278c36b..cf205644ca17 100644 --- a/idl/inc/basobj.hxx +++ b/idl/inc/basobj.hxx @@ -115,7 +115,7 @@ public: const OString & GetName() const override { - return ( !aRef.Is() + return ( !aRef.is() || !SvMetaObject::GetName().isEmpty() ) ? SvMetaObject::GetName() : aRef->GetName(); diff --git a/idl/source/objects/object.cxx b/idl/source/objects/object.cxx index 7b0e648e7a41..8e5e177fbd2e 100644 --- a/idl/source/objects/object.cxx +++ b/idl/source/objects/object.cxx @@ -201,7 +201,7 @@ void SvMetaClass::InsertSlots( SvSlotElementList& rList, std::vector<sal_uLong>& // written any more. // It is prohibited that Shell and SuperShell directly import the same //class. - if( GetMetaTypeType() == MetaTypeType::Shell && aSuperClass.Is() ) + if( GetMetaTypeType() == MetaTypeType::Shell && aSuperClass.is() ) aSuperClass->FillClasses( rClassList ); // Write all attributes of the imported classes, as long as they have @@ -221,7 +221,7 @@ void SvMetaClass::InsertSlots( SvSlotElementList& rList, std::vector<sal_uLong>& } // only write superclass if no shell and not in the list - if( GetMetaTypeType() != MetaTypeType::Shell && aSuperClass.Is() ) + if( GetMetaTypeType() != MetaTypeType::Shell && aSuperClass.is() ) { aSuperClass->InsertSlots( rList, rSuperList, rClassList, rPrefix, rBase ); } @@ -245,7 +245,7 @@ void SvMetaClass::FillClasses( SvMetaClassList & rList ) } // my superclass - if( aSuperClass.Is() ) + if( aSuperClass.is() ) aSuperClass->FillClasses( rList ); } diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx index 9ae31d437cc9..f5ac534ac30d 100644 --- a/idl/source/objects/slot.cxx +++ b/idl/source/objects/slot.cxx @@ -105,12 +105,12 @@ OString SvMetaSlot::GetMangleName() const /** reference disbandment **/ SvMetaType * SvMetaSlot::GetSlotType() const { - if( aSlotType.Is() || !GetRef() ) return aSlotType.get(); + if( aSlotType.is() || !GetRef() ) return aSlotType.get(); return static_cast<SvMetaSlot *>(GetRef())->GetSlotType(); } SvMetaAttribute * SvMetaSlot::GetMethod() const { - if( aMethod.Is() || !GetRef() ) return aMethod.get(); + if( aMethod.is() || !GetRef() ) return aMethod.get(); return static_cast<SvMetaSlot *>(GetRef())->GetMethod(); } const OString& SvMetaSlot::GetGroupId() const @@ -272,7 +272,7 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase, if( !bOk ) { - if( !aSlotType.Is() ) + if( !aSlotType.is() ) { sal_uInt32 nTokPos = rInStm.Tell(); SvToken& rTok = rInStm.GetToken_Next(); @@ -281,7 +281,7 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase, if( rInStm.ReadIf( '=' ) ) { aSlotType = rBase.ReadKnownType( rInStm ); - if( !aSlotType.Is() ) + if( !aSlotType.is() ) throw SvParseException( rInStm, "SlotType with unknown item type" ); if( !aSlotType->IsItem() ) throw SvParseException( rInStm, "the SlotType is not a item" ); @@ -291,7 +291,7 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase, rInStm.Seek( nTokPos ); } - if( !aMethod.Is() ) + if( !aMethod.is() ) { SvToken& rTok = rInStm.GetToken(); if( rTok.IsIdentifier() ) @@ -308,7 +308,7 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase, } rInStm.Seek( nTokPos ); } - aMethod.Clear(); + aMethod.clear(); } } } diff --git a/idl/source/objects/types.cxx b/idl/source/objects/types.cxx index a7b913d49d4f..6f3042b70d33 100644 --- a/idl/source/objects/types.cxx +++ b/idl/source/objects/types.cxx @@ -39,7 +39,7 @@ SvMetaAttribute::SvMetaAttribute( SvMetaType * pType ) SvMetaType * SvMetaAttribute::GetType() const { - if( aType.Is() || !GetRef() ) return aType.get(); + if( aType.is() || !GetRef() ) return aType.get(); return static_cast<SvMetaAttribute *>(GetRef())->GetType(); } diff --git a/idl/source/prj/parser.cxx b/idl/source/prj/parser.cxx index d21e334a3c51..2172fb87b029 100644 --- a/idl/source/prj/parser.cxx +++ b/idl/source/prj/parser.cxx @@ -428,7 +428,7 @@ void SvIdlParser::ReadSlotAttribute( SvMetaSlot& rSlot ) if( bOk ) return; - if( !rSlot.aSlotType.Is() ) + if( !rSlot.aSlotType.is() ) { sal_uInt32 nTokPos = rInStm.Tell(); SvToken& rTok = rInStm.GetToken_Next(); @@ -437,7 +437,7 @@ void SvIdlParser::ReadSlotAttribute( SvMetaSlot& rSlot ) if( rInStm.ReadIf( '=' ) ) { rSlot.aSlotType = rBase.ReadKnownType( rInStm ); - if( !rSlot.aSlotType.Is() ) + if( !rSlot.aSlotType.is() ) throw SvParseException( rInStm, "SlotType with unknown item type" ); if( !rSlot.aSlotType->IsItem() ) throw SvParseException( rInStm, "the SlotType is not a item" ); @@ -447,7 +447,7 @@ void SvIdlParser::ReadSlotAttribute( SvMetaSlot& rSlot ) rInStm.Seek( nTokPos ); } - if( !rSlot.aMethod.Is() ) + if( !rSlot.aMethod.is() ) { SvToken& rTok = rInStm.GetToken(); if( rTok.IsIdentifier() ) @@ -464,7 +464,7 @@ void SvIdlParser::ReadSlotAttribute( SvMetaSlot& rSlot ) } rInStm.Seek( nTokPos ); } - rSlot.aMethod.Clear(); + rSlot.aMethod.clear(); } } } |