diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-29 08:46:47 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-11-29 09:57:15 +0100 |
commit | 933660e591211f06a1be43e83c64ad1e8529bc2f (patch) | |
tree | adc0ede7c30c9ee5af7b75e649c806831f73da41 /idlc | |
parent | b9c9c70157e7bc5b868437ab6bda2b21ba34c627 (diff) |
loplugin:stringconstant look for unnecessary OString constructor use
and tweak the methods in check.hxx to make them more flexible when
called with
dc.Class(xxx ? "foo" : "bar")
Change-Id: I881fe628f22121ced4d8849715d6b1c92b092da1
Reviewed-on: https://gerrit.libreoffice.org/64207
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'idlc')
-rw-r--r-- | idlc/source/idlc.cxx | 48 | ||||
-rw-r--r-- | idlc/source/idlccompile.cxx | 4 | ||||
-rw-r--r-- | idlc/source/parser.y | 2 |
3 files changed, 27 insertions, 27 deletions
diff --git a/idlc/source/idlc.cxx b/idlc/source/idlc.cxx index 5e530968cb9b..cd532f91320f 100644 --- a/idlc/source/idlc.cxx +++ b/idlc/source/idlc.cxx @@ -102,25 +102,25 @@ static void predefineXInterface(AstModule* pRoot) { // define the modules com::sun::star::uno AstModule* pParentScope = pRoot; - AstModule* pModule = new AstModule(OString("com"), pParentScope); + AstModule* pModule = new AstModule("com", pParentScope); pModule->setPredefined(true); pParentScope->addDeclaration(pModule); pParentScope = pModule; - pModule = new AstModule(OString("sun"), pParentScope); + pModule = new AstModule("sun", pParentScope); pModule->setPredefined(true); pParentScope->addDeclaration(pModule); pParentScope = pModule; - pModule = new AstModule(OString("star"), pParentScope); + pModule = new AstModule("star", pParentScope); pModule->setPredefined(true); pParentScope->addDeclaration(pModule); pParentScope = pModule; - pModule = new AstModule(OString("uno"), pParentScope); + pModule = new AstModule("uno", pParentScope); pModule->setPredefined(true); pParentScope->addDeclaration(pModule); pParentScope = pModule; // define XInterface - AstInterface* pInterface = new AstInterface(OString("XInterface"), nullptr, pParentScope); + AstInterface* pInterface = new AstInterface("XInterface", nullptr, pParentScope); pInterface->setDefined(); pInterface->setPredefined(true); pInterface->setPublished(); @@ -128,21 +128,21 @@ static void predefineXInterface(AstModule* pRoot) // define XInterface::queryInterface AstOperation* pOp = new AstOperation(static_cast<AstType*>(pRoot->lookupPrimitiveType(ET_any)), - OString("queryInterface"), pInterface); + "queryInterface", pInterface); AstParameter* pParam = new AstParameter(DIR_IN, false, static_cast<AstType*>(pRoot->lookupPrimitiveType(ET_type)), - OString("aType"), pOp); + "aType", pOp); pOp->addDeclaration(pParam); pInterface->addMember(pOp); // define XInterface::acquire pOp = new AstOperation(static_cast<AstType*>(pRoot->lookupPrimitiveType(ET_void)), - OString("acquire"), pInterface); + "acquire", pInterface); pInterface->addMember(pOp); // define XInterface::release pOp = new AstOperation(static_cast<AstType*>(pRoot->lookupPrimitiveType(ET_void)), - OString("release"), pInterface); + "release", pInterface); pInterface->addMember(pOp); } @@ -150,49 +150,49 @@ static void initializePredefinedTypes(AstModule* pRoot) { if ( pRoot ) { - AstBaseType* pPredefined = new AstBaseType(ET_long, OString("long"), pRoot); + AstBaseType* pPredefined = new AstBaseType(ET_long, "long", pRoot); pRoot->addDeclaration(pPredefined); - pPredefined = new AstBaseType(ET_ulong, OString("unsigned long"), pRoot); + pPredefined = new AstBaseType(ET_ulong, "unsigned long", pRoot); pRoot->addDeclaration(pPredefined); - pPredefined = new AstBaseType(ET_hyper, OString("hyper"), pRoot); + pPredefined = new AstBaseType(ET_hyper, "hyper", pRoot); pRoot->addDeclaration(pPredefined); - pPredefined = new AstBaseType(ET_uhyper, OString("unsigned hyper"), pRoot); + pPredefined = new AstBaseType(ET_uhyper, "unsigned hyper", pRoot); pRoot->addDeclaration(pPredefined); - pPredefined = new AstBaseType(ET_short, OString("short"), pRoot); + pPredefined = new AstBaseType(ET_short, "short", pRoot); pRoot->addDeclaration(pPredefined); - pPredefined = new AstBaseType(ET_ushort, OString("unsigned short"), pRoot); + pPredefined = new AstBaseType(ET_ushort, "unsigned short", pRoot); pRoot->addDeclaration(pPredefined); - pPredefined = new AstBaseType(ET_float, OString("float"), pRoot); + pPredefined = new AstBaseType(ET_float, "float", pRoot); pRoot->addDeclaration(pPredefined); - pPredefined = new AstBaseType(ET_double, OString("double"), pRoot); + pPredefined = new AstBaseType(ET_double, "double", pRoot); pRoot->addDeclaration(pPredefined); - pPredefined = new AstBaseType(ET_char, OString("char"), pRoot); + pPredefined = new AstBaseType(ET_char, "char", pRoot); pRoot->addDeclaration(pPredefined); - pPredefined = new AstBaseType(ET_byte, OString("byte"), pRoot); + pPredefined = new AstBaseType(ET_byte, "byte", pRoot); pRoot->addDeclaration(pPredefined); - pPredefined = new AstBaseType(ET_any, OString("any"), pRoot); + pPredefined = new AstBaseType(ET_any, "any", pRoot); pRoot->addDeclaration(pPredefined); - pPredefined = new AstBaseType(ET_string, OString("string"), pRoot); + pPredefined = new AstBaseType(ET_string, "string", pRoot); pRoot->addDeclaration(pPredefined); - pPredefined = new AstBaseType(ET_type, OString("type"), pRoot); + pPredefined = new AstBaseType(ET_type, "type", pRoot); pRoot->addDeclaration(pPredefined); - pPredefined = new AstBaseType(ET_boolean, OString("boolean"), pRoot); + pPredefined = new AstBaseType(ET_boolean, "boolean", pRoot); pRoot->addDeclaration(pPredefined); - pPredefined = new AstBaseType(ET_void, OString("void"), pRoot); + pPredefined = new AstBaseType(ET_void, "void", pRoot); pRoot->addDeclaration(pPredefined); } } diff --git a/idlc/source/idlccompile.cxx b/idlc/source/idlccompile.cxx index 9f287c836d7f..62fab8e1d692 100644 --- a/idlc/source/idlccompile.cxx +++ b/idlc/source/idlccompile.cxx @@ -210,8 +210,8 @@ bool copyFile(const OString* source, const OString& target) sal_Int32 compileFile(const OString * pathname) { // preprocess input file - OString tmpFile = makeTempName(OString("idli_")); - OString preprocFile = makeTempName(OString("idlf_")); + OString tmpFile = makeTempName("idli_"); + OString preprocFile = makeTempName("idlf_"); OString fileName; if (pathname == nullptr) { diff --git a/idlc/source/parser.y b/idlc/source/parser.y index 74ceb348dc46..054df1e81df7 100644 --- a/idlc/source/parser.y +++ b/idlc/source/parser.y @@ -626,7 +626,7 @@ interface_dcl : && ifc->getScopedName() != "com::sun::star::uno::XInterface") { addInheritedInterface( - ifc, OString("::com::sun::star::uno::XInterface"), false, + ifc, "::com::sun::star::uno::XInterface", false, OUString()); } ifc->setDefined(); |