diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-08 15:58:41 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-11 12:13:46 +0100 |
commit | 3af500580b1c82eabd60335c9ebc458a3f68850c (patch) | |
tree | e0ad105be694cfb46221d16e9ce987879794fa04 /idlc | |
parent | 0f9a596aa853b4f2beeff25c131246a7b31492a4 (diff) |
loplugin:salcall fix functions
since cdecl is the default calling convention on Windows for
such functions, the annotation is redundant.
Change-Id: I1a85fa27e5ac65ce0e04a19bde74c90800ffaa2d
Reviewed-on: https://gerrit.libreoffice.org/46164
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'idlc')
-rw-r--r-- | idlc/inc/astexpression.hxx | 2 | ||||
-rw-r--r-- | idlc/inc/idlc.hxx | 4 | ||||
-rw-r--r-- | idlc/inc/idlctypes.hxx | 4 | ||||
-rw-r--r-- | idlc/source/astexpression.cxx | 2 | ||||
-rw-r--r-- | idlc/source/idlc.cxx | 12 |
5 files changed, 12 insertions, 12 deletions
diff --git a/idlc/inc/astexpression.hxx b/idlc/inc/astexpression.hxx index 53c9ff934556..9dac7e79cc10 100644 --- a/idlc/inc/astexpression.hxx +++ b/idlc/inc/astexpression.hxx @@ -84,7 +84,7 @@ struct AstExprValue ExprType et; }; -const sal_Char* SAL_CALL exprTypeToString(ExprType t); +const sal_Char* exprTypeToString(ExprType t); class AstExpression final { diff --git a/idlc/inc/idlc.hxx b/idlc/inc/idlc.hxx index 99efb291b1f0..881078303e4a 100644 --- a/idlc/inc/idlc.hxx +++ b/idlc/inc/idlc.hxx @@ -150,8 +150,8 @@ bool isFileUrl(const OString& fileName); OString convertToAbsoluteSystemPath(const OString& fileName); OString convertToFileUrl(const OString& fileName); -Idlc* SAL_CALL idlc(); -Idlc* SAL_CALL setIdlc(Options* pOptions); +Idlc* idlc(); +Idlc* setIdlc(Options* pOptions); AstDeclaration const * resolveTypedefs(AstDeclaration const * type); diff --git a/idlc/inc/idlctypes.hxx b/idlc/inc/idlctypes.hxx index 8f6f799f11ff..6d013f834e75 100644 --- a/idlc/inc/idlctypes.hxx +++ b/idlc/inc/idlctypes.hxx @@ -36,8 +36,8 @@ class AstDeclaration; typedef std::list< AstDeclaration* > DeclList; class AstScope; -AstDeclaration* SAL_CALL scopeAsDecl(AstScope* pScope); -AstScope* SAL_CALL declAsScope(AstDeclaration* pDecl); +AstDeclaration* scopeAsDecl(AstScope* pScope); +AstScope* declAsScope(AstDeclaration* pDecl); #ifdef _MSC_VER #pragma warning( disable : 4541 ) diff --git a/idlc/source/astexpression.cxx b/idlc/source/astexpression.cxx index 5da3616e1c00..f63663badbaa 100644 --- a/idlc/source/astexpression.cxx +++ b/idlc/source/astexpression.cxx @@ -1045,7 +1045,7 @@ OString AstExpression::toString() } // Convert the type of an AST_Expression to a char * -const sal_Char* SAL_CALL exprTypeToString(ExprType t) +const sal_Char* exprTypeToString(ExprType t) { switch (t) { diff --git a/idlc/source/idlc.cxx b/idlc/source/idlc.cxx index c7042d7a87ba..008e1aaa3e91 100644 --- a/idlc/source/idlc.cxx +++ b/idlc/source/idlc.cxx @@ -40,7 +40,7 @@ #include <algorithm> -AstDeclaration* SAL_CALL scopeAsDecl(AstScope* pScope) +AstDeclaration* scopeAsDecl(AstScope* pScope) { if (pScope == nullptr) return nullptr; @@ -69,7 +69,7 @@ AstDeclaration* SAL_CALL scopeAsDecl(AstScope* pScope) } } -AstScope* SAL_CALL declAsScope(AstDeclaration* pDecl) +AstScope* declAsScope(AstDeclaration* pDecl) { if (pDecl == nullptr) return nullptr; @@ -98,7 +98,7 @@ AstScope* SAL_CALL declAsScope(AstDeclaration* pDecl) } } -static void SAL_CALL predefineXInterface(AstModule* pRoot) +static void predefineXInterface(AstModule* pRoot) { // define the modules com::sun::star::uno AstModule* pParentScope = pRoot; @@ -146,7 +146,7 @@ static void SAL_CALL predefineXInterface(AstModule* pRoot) pInterface->addMember(pOp); } -static void SAL_CALL initializePredefinedTypes(AstModule* pRoot) +static void initializePredefinedTypes(AstModule* pRoot) { if ( pRoot ) { @@ -348,12 +348,12 @@ Idlc::dumpDeps(OString const& rDepFile, OString const& rTarget) static Idlc* pStaticIdlc = nullptr; -Idlc* SAL_CALL idlc() +Idlc* idlc() { return pStaticIdlc; } -Idlc* SAL_CALL setIdlc(Options* pOptions) +Idlc* setIdlc(Options* pOptions) { delete pStaticIdlc; pStaticIdlc = new Idlc(pOptions); |