diff options
86 files changed, 160 insertions, 106 deletions
diff --git a/compilerplugins/clang/automem.cxx b/compilerplugins/clang/automem.cxx index 3aa671fef1b5..52bfdf43d6b3 100644 --- a/compilerplugins/clang/automem.cxx +++ b/compilerplugins/clang/automem.cxx @@ -26,7 +26,7 @@ class AutoMem: public RecursiveASTVisitor<AutoMem>, public loplugin::Plugin { public: - explicit AutoMem(InstantiationData const & data): Plugin(data), mbInsideDestructor(false) {} + explicit AutoMem(loplugin::InstantiationData const & data): Plugin(data), mbInsideDestructor(false) {} virtual void run() override { diff --git a/compilerplugins/clang/badstatics.cxx b/compilerplugins/clang/badstatics.cxx index 9ada7b60459c..3b375311b5bf 100644 --- a/compilerplugins/clang/badstatics.cxx +++ b/compilerplugins/clang/badstatics.cxx @@ -20,7 +20,8 @@ class BadStatics { public: - explicit BadStatics(InstantiationData const& rData) : Plugin(rData) {} + explicit BadStatics(loplugin::InstantiationData const& rData): + Plugin(rData) {} void run() override { if (compiler.getLangOpts().CPlusPlus) { // no non-trivial dtors in C diff --git a/compilerplugins/clang/blockblock.cxx b/compilerplugins/clang/blockblock.cxx index 7d274059fedf..910a3abf3750 100644 --- a/compilerplugins/clang/blockblock.cxx +++ b/compilerplugins/clang/blockblock.cxx @@ -23,7 +23,8 @@ class BlockBlock: public RecursiveASTVisitor<BlockBlock>, public loplugin::RewritePlugin { public: - explicit BlockBlock(InstantiationData const & data): RewritePlugin(data) {} + explicit BlockBlock(loplugin::InstantiationData const & data): + RewritePlugin(data) {} virtual void run() override { diff --git a/compilerplugins/clang/casttovoid.cxx b/compilerplugins/clang/casttovoid.cxx index c6fccf07e7ab..1ed7e4e19c78 100644 --- a/compilerplugins/clang/casttovoid.cxx +++ b/compilerplugins/clang/casttovoid.cxx @@ -47,7 +47,8 @@ class CastToVoid final: public RecursiveASTVisitor<CastToVoid>, public loplugin::Plugin { public: - explicit CastToVoid(InstantiationData const & data): Plugin(data) {} + explicit CastToVoid(loplugin::InstantiationData const & data): + Plugin(data) {} bool TraverseCStyleCastExpr(CStyleCastExpr * expr) { auto const dre = checkCast(expr); diff --git a/compilerplugins/clang/charrightshift.cxx b/compilerplugins/clang/charrightshift.cxx index c1bf9513ba4b..fe21cd8c8468 100644 --- a/compilerplugins/clang/charrightshift.cxx +++ b/compilerplugins/clang/charrightshift.cxx @@ -16,7 +16,8 @@ class CharRightShift: public RecursiveASTVisitor<CharRightShift>, public loplugin::Plugin { public: - explicit CharRightShift(InstantiationData const & data): Plugin(data) {} + explicit CharRightShift(loplugin::InstantiationData const & data): + Plugin(data) {} void run() override { TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); } diff --git a/compilerplugins/clang/checkunusedparams.cxx b/compilerplugins/clang/checkunusedparams.cxx index 1de5e5669738..8dbea6bd72a2 100644 --- a/compilerplugins/clang/checkunusedparams.cxx +++ b/compilerplugins/clang/checkunusedparams.cxx @@ -26,7 +26,8 @@ namespace { class CheckUnusedParams: public RecursiveASTVisitor<CheckUnusedParams>, public loplugin::Plugin { public: - explicit CheckUnusedParams(InstantiationData const & data): Plugin(data) {} + explicit CheckUnusedParams(loplugin::InstantiationData const & data): + Plugin(data) {} void run() override; bool VisitFunctionDecl(FunctionDecl const *); bool VisitUnaryAddrOf(UnaryOperator const *); diff --git a/compilerplugins/clang/commaoperator.cxx b/compilerplugins/clang/commaoperator.cxx index c9efc09092de..4e8ea6153e12 100644 --- a/compilerplugins/clang/commaoperator.cxx +++ b/compilerplugins/clang/commaoperator.cxx @@ -31,7 +31,8 @@ class CommaOperator: public RecursiveASTVisitor<CommaOperator>, public loplugin::Plugin { public: - explicit CommaOperator(InstantiationData const & data): Plugin(data) {} + explicit CommaOperator(loplugin::InstantiationData const & data): + Plugin(data) {} virtual void run() override { diff --git a/compilerplugins/clang/comparisonwithconstant.cxx b/compilerplugins/clang/comparisonwithconstant.cxx index 935174625226..d52e57f71345 100644 --- a/compilerplugins/clang/comparisonwithconstant.cxx +++ b/compilerplugins/clang/comparisonwithconstant.cxx @@ -26,7 +26,7 @@ class ComparisonWithConstant : public RecursiveASTVisitor<ComparisonWithConstant>, public loplugin::RewritePlugin { public: - explicit ComparisonWithConstant(InstantiationData const & data): RewritePlugin(data) {} + explicit ComparisonWithConstant(loplugin::InstantiationData const & data): RewritePlugin(data) {} virtual void run() override { diff --git a/compilerplugins/clang/constantparam.cxx b/compilerplugins/clang/constantparam.cxx index edc99c37699f..e09050a2af12 100644 --- a/compilerplugins/clang/constantparam.cxx +++ b/compilerplugins/clang/constantparam.cxx @@ -57,14 +57,14 @@ class ConstantParam: public loplugin::FunctionAddress<ConstantParam> { public: - explicit ConstantParam(InstantiationData const & data): loplugin::FunctionAddress<ConstantParam>(data) {} + explicit ConstantParam(loplugin::InstantiationData const & data): loplugin::FunctionAddress<ConstantParam>(data) {} virtual void run() override { // ignore some files that make clang crash inside EvaluateAsInt std::string fn( compiler.getSourceManager().getFileEntryForID( compiler.getSourceManager().getMainFileID())->getName() ); - normalizeDotDotInFilePath(fn); + loplugin::normalizeDotDotInFilePath(fn); if (loplugin::isSamePathname(fn, SRCDIR "/basegfx/source/matrix/b2dhommatrix.cxx") || loplugin::isSamePathname(fn, SRCDIR "/basegfx/source/matrix/b3dhommatrix.cxx")) return; @@ -158,7 +158,7 @@ void ConstantParam::addToCallSet(const FunctionDecl* functionDecl, int paramInde aInfo.callValue = callValue; aInfo.sourceLocation = filename.str() + ":" + std::to_string(compiler.getSourceManager().getSpellingLineNumber(expansionLoc)); - normalizeDotDotInFilePath(aInfo.sourceLocation); + loplugin::normalizeDotDotInFilePath(aInfo.sourceLocation); callSet.insert(aInfo); } diff --git a/compilerplugins/clang/constparams.cxx b/compilerplugins/clang/constparams.cxx index 603e9fb4b5f6..ef97d671f801 100644 --- a/compilerplugins/clang/constparams.cxx +++ b/compilerplugins/clang/constparams.cxx @@ -35,12 +35,12 @@ class ConstParams: public loplugin::FunctionAddress<ConstParams> { public: - explicit ConstParams(InstantiationData const & data): loplugin::FunctionAddress<ConstParams>(data) {} + explicit ConstParams(loplugin::InstantiationData const & data): loplugin::FunctionAddress<ConstParams>(data) {} virtual void run() override { std::string fn( compiler.getSourceManager().getFileEntryForID( compiler.getSourceManager().getMainFileID())->getName() ); - normalizeDotDotInFilePath(fn); + loplugin::normalizeDotDotInFilePath(fn); if (startswith(fn, SRCDIR "/sal/") || fn == SRCDIR "/jurt/source/pipe/staticsalhack.cxx" || startswith(fn, SRCDIR "/bridges/") diff --git a/compilerplugins/clang/conststringvar.cxx b/compilerplugins/clang/conststringvar.cxx index f11341676dd6..bc20e182a400 100644 --- a/compilerplugins/clang/conststringvar.cxx +++ b/compilerplugins/clang/conststringvar.cxx @@ -48,7 +48,8 @@ class ConstStringVar: public RecursiveASTVisitor<ConstStringVar>, public loplugin::Plugin { public: - explicit ConstStringVar(InstantiationData const & data): Plugin(data) {} + explicit ConstStringVar(loplugin::InstantiationData const & data): + Plugin(data) {} void run() override { if (compiler.getLangOpts().CPlusPlus) { diff --git a/compilerplugins/clang/convertuintptr.cxx b/compilerplugins/clang/convertuintptr.cxx index 77eb1b4f8616..d2cc93b458f6 100644 --- a/compilerplugins/clang/convertuintptr.cxx +++ b/compilerplugins/clang/convertuintptr.cxx @@ -25,13 +25,14 @@ class ConvertUIntPtr: public RecursiveASTVisitor<ConvertUIntPtr>, public loplugin::Plugin { public: - explicit ConvertUIntPtr(InstantiationData const & data): Plugin(data) {} + explicit ConvertUIntPtr(loplugin::InstantiationData const & data): + Plugin(data) {} virtual void run() override { std::string fn( compiler.getSourceManager().getFileEntryForID( compiler.getSourceManager().getMainFileID())->getName() ); - normalizeDotDotInFilePath(fn); + loplugin::normalizeDotDotInFilePath(fn); // using sal_uIntPtr as in-between type when converting void* to rtl_TextEncoding if (fn == SRCDIR "/sal/osl/unx/thread.cxx") return; diff --git a/compilerplugins/clang/countusersofdefaultparams.cxx b/compilerplugins/clang/countusersofdefaultparams.cxx index 648351a0891f..de0ab7e741cf 100644 --- a/compilerplugins/clang/countusersofdefaultparams.cxx +++ b/compilerplugins/clang/countusersofdefaultparams.cxx @@ -59,7 +59,7 @@ class CountUsersOfDefaultParams: public RecursiveASTVisitor<CountUsersOfDefaultParams>, public loplugin::Plugin { public: - explicit CountUsersOfDefaultParams(InstantiationData const & data): Plugin(data) {} + explicit CountUsersOfDefaultParams(loplugin::InstantiationData const & data): Plugin(data) {} virtual void run() override { @@ -130,7 +130,7 @@ void CountUsersOfDefaultParams::niceName(const FunctionDecl* functionDecl, MyFun } aInfo.sourceLocation = locationToString(functionDecl->getLocation()); - normalizeDotDotInFilePath(aInfo.sourceLocation); + loplugin::normalizeDotDotInFilePath(aInfo.sourceLocation); } bool CountUsersOfDefaultParams::VisitCallExpr(const CallExpr * callExpr) { diff --git a/compilerplugins/clang/cppunitassertequals.cxx b/compilerplugins/clang/cppunitassertequals.cxx index 37dff6acca97..5b0f8f5278c4 100644 --- a/compilerplugins/clang/cppunitassertequals.cxx +++ b/compilerplugins/clang/cppunitassertequals.cxx @@ -20,7 +20,8 @@ class CppunitAssertEquals: public RecursiveASTVisitor<CppunitAssertEquals>, public loplugin::Plugin { public: - explicit CppunitAssertEquals(InstantiationData const & data): Plugin(data) {} + explicit CppunitAssertEquals(loplugin::InstantiationData const & data): + Plugin(data) {} virtual void run() override { diff --git a/compilerplugins/clang/cstylecast.cxx b/compilerplugins/clang/cstylecast.cxx index b428b1d1503f..bf8e2fb00809 100644 --- a/compilerplugins/clang/cstylecast.cxx +++ b/compilerplugins/clang/cstylecast.cxx @@ -86,7 +86,8 @@ class CStyleCast: public RecursiveASTVisitor<CStyleCast>, public loplugin::Plugin { public: - explicit CStyleCast(InstantiationData const & data): Plugin(data) {} + explicit CStyleCast(loplugin::InstantiationData const & data): Plugin(data) + {} virtual void run() override { if (compiler.getLangOpts().CPlusPlus) { diff --git a/compilerplugins/clang/datamembershadow.cxx b/compilerplugins/clang/datamembershadow.cxx index db57163a7137..f1b9b4398473 100644 --- a/compilerplugins/clang/datamembershadow.cxx +++ b/compilerplugins/clang/datamembershadow.cxx @@ -28,7 +28,8 @@ class DataMemberShadow: public RecursiveASTVisitor<DataMemberShadow>, public loplugin::Plugin { public: - explicit DataMemberShadow(InstantiationData const & data): Plugin(data) {} + explicit DataMemberShadow(loplugin::InstantiationData const & data): + Plugin(data) {} virtual void run() override { TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); diff --git a/compilerplugins/clang/derefnullptr.cxx b/compilerplugins/clang/derefnullptr.cxx index 83fa5c4a0b91..350bed2156dc 100644 --- a/compilerplugins/clang/derefnullptr.cxx +++ b/compilerplugins/clang/derefnullptr.cxx @@ -15,7 +15,8 @@ class DerefNullPtr: public RecursiveASTVisitor<DerefNullPtr>, public loplugin::Plugin { public: - explicit DerefNullPtr(InstantiationData const & data): Plugin(data) {} + explicit DerefNullPtr(loplugin::InstantiationData const & data): + Plugin(data) {} void run() override { TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); } diff --git a/compilerplugins/clang/dllprivate.cxx b/compilerplugins/clang/dllprivate.cxx index 3dc54e2fce64..bb4e9c35a26b 100644 --- a/compilerplugins/clang/dllprivate.cxx +++ b/compilerplugins/clang/dllprivate.cxx @@ -15,7 +15,8 @@ class DllPrivate final: public RecursiveASTVisitor<DllPrivate>, public loplugin::Plugin { public: - explicit DllPrivate(InstantiationData const & data): Plugin(data) {} + explicit DllPrivate(loplugin::InstantiationData const & data): Plugin(data) + {} bool VisitNamedDecl(NamedDecl const * decl) { if (!decl->getLocation().isInvalid()&&ignoreLocation(decl)) { diff --git a/compilerplugins/clang/dodgyswitch.cxx b/compilerplugins/clang/dodgyswitch.cxx index 171707c8106a..98ac1c161ef5 100644 --- a/compilerplugins/clang/dodgyswitch.cxx +++ b/compilerplugins/clang/dodgyswitch.cxx @@ -20,7 +20,8 @@ class DodgySwitch: public RecursiveASTVisitor<DodgySwitch>, public loplugin::Plugin { public: - explicit DodgySwitch(InstantiationData const & data): Plugin(data) {} + explicit DodgySwitch(loplugin::InstantiationData const & data): Plugin(data) + {} virtual void run() override { diff --git a/compilerplugins/clang/droplong.cxx b/compilerplugins/clang/droplong.cxx index fe5675b36d2f..1efcf9bf9efb 100644 --- a/compilerplugins/clang/droplong.cxx +++ b/compilerplugins/clang/droplong.cxx @@ -31,13 +31,13 @@ class DropLong: public RecursiveASTVisitor<DropLong>, public loplugin::Plugin { public: - explicit DropLong(InstantiationData const & data): Plugin(data) {} + explicit DropLong(loplugin::InstantiationData const & data): Plugin(data) {} virtual void run() override { std::string fn( compiler.getSourceManager().getFileEntryForID( compiler.getSourceManager().getMainFileID())->getName() ); - normalizeDotDotInFilePath(fn); + loplugin::normalizeDotDotInFilePath(fn); if (startswith(fn, SRCDIR "/sal/")) return; if (startswith(fn, SRCDIR "/desktop/unx/")) diff --git a/compilerplugins/clang/dyncastvisibility.cxx b/compilerplugins/clang/dyncastvisibility.cxx index e6e1f6eb79df..cbfdcf961492 100644 --- a/compilerplugins/clang/dyncastvisibility.cxx +++ b/compilerplugins/clang/dyncastvisibility.cxx @@ -79,7 +79,8 @@ class DynCastVisibility final: public RecursiveASTVisitor<DynCastVisibility>, public loplugin::Plugin { public: - explicit DynCastVisibility(InstantiationData const & data): Plugin(data) {} + explicit DynCastVisibility(loplugin::InstantiationData const & data): + Plugin(data) {} bool shouldVisitTemplateInstantiations() const { return true; } diff --git a/compilerplugins/clang/dynexcspec.cxx b/compilerplugins/clang/dynexcspec.cxx index c3b8e79d0c78..651c997e60cf 100644 --- a/compilerplugins/clang/dynexcspec.cxx +++ b/compilerplugins/clang/dynexcspec.cxx @@ -46,7 +46,8 @@ class DynExcSpec: public RecursiveASTVisitor<DynExcSpec>, public loplugin::RewritePlugin { public: - explicit DynExcSpec(InstantiationData const & data): RewritePlugin(data) {} + explicit DynExcSpec(loplugin::InstantiationData const & data): + RewritePlugin(data) {} void run() override { if (compiler.getLangOpts().CPlusPlus) { diff --git a/compilerplugins/clang/expandablemethods.cxx b/compilerplugins/clang/expandablemethods.cxx index c286711037ed..2f2c3a2d68db 100644 --- a/compilerplugins/clang/expandablemethods.cxx +++ b/compilerplugins/clang/expandablemethods.cxx @@ -59,7 +59,8 @@ class ExpandableMethods: public RecursiveASTVisitor<ExpandableMethods>, public loplugin::Plugin { public: - explicit ExpandableMethods(InstantiationData const & data): Plugin(data) {} + explicit ExpandableMethods(loplugin::InstantiationData const & data): + Plugin(data) {} virtual void run() override { @@ -164,7 +165,7 @@ std::string ExpandableMethods::toString(SourceLocation loc) SourceLocation expansionLoc = compiler.getSourceManager().getExpansionLoc( loc ); StringRef name = compiler.getSourceManager().getFilename(expansionLoc); std::string sourceLocation = std::string(name.substr(strlen(SRCDIR)+1)) + ":" + std::to_string(compiler.getSourceManager().getSpellingLineNumber(expansionLoc)); - normalizeDotDotInFilePath(sourceLocation); + loplugin::normalizeDotDotInFilePath(sourceLocation); return sourceLocation; } diff --git a/compilerplugins/clang/expressionalwayszero.cxx b/compilerplugins/clang/expressionalwayszero.cxx index f10528e8954a..c34b73fec105 100644 --- a/compilerplugins/clang/expressionalwayszero.cxx +++ b/compilerplugins/clang/expressionalwayszero.cxx @@ -31,13 +31,13 @@ class ExpressionAlwaysZero: public RecursiveASTVisitor<ExpressionAlwaysZero>, public loplugin::Plugin { public: - explicit ExpressionAlwaysZero(InstantiationData const & data): Plugin(data) {} + explicit ExpressionAlwaysZero(loplugin::InstantiationData const & data): Plugin(data) {} virtual void run() override { std::string fn( compiler.getSourceManager().getFileEntryForID( compiler.getSourceManager().getMainFileID())->getName() ); - normalizeDotDotInFilePath(fn); + loplugin::normalizeDotDotInFilePath(fn); // encoding of constant value for binary file format if (startswith(fn, SRCDIR "/package/source/zipapi/ZipFile.cxx")) return; diff --git a/compilerplugins/clang/externandnotdefined.cxx b/compilerplugins/clang/externandnotdefined.cxx index b15a1c28a06b..df5455d0dddf 100644 --- a/compilerplugins/clang/externandnotdefined.cxx +++ b/compilerplugins/clang/externandnotdefined.cxx @@ -20,7 +20,7 @@ class ExternAndNotDefined: public RecursiveASTVisitor<ExternAndNotDefined>, public loplugin::Plugin { public: - explicit ExternAndNotDefined(InstantiationData const & data): Plugin(data) {} + explicit ExternAndNotDefined(loplugin::InstantiationData const & data): Plugin(data) {} virtual void run() override { TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); } diff --git a/compilerplugins/clang/externvar.cxx b/compilerplugins/clang/externvar.cxx index fc4bd7af7942..e8c66e556c3a 100644 --- a/compilerplugins/clang/externvar.cxx +++ b/compilerplugins/clang/externvar.cxx @@ -44,7 +44,8 @@ bool hasExternalLinkage(VarDecl const * decl) { class ExternVar: public RecursiveASTVisitor<ExternVar>, public loplugin::Plugin { public: - explicit ExternVar(InstantiationData const & data): Plugin(data) {} + explicit ExternVar(loplugin::InstantiationData const & data): Plugin(data) + {} void run() override { TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); } diff --git a/compilerplugins/clang/faileddyncast.cxx b/compilerplugins/clang/faileddyncast.cxx index 9a257d7d8a23..f99077137f9f 100644 --- a/compilerplugins/clang/faileddyncast.cxx +++ b/compilerplugins/clang/faileddyncast.cxx @@ -93,7 +93,8 @@ class FailedDynCast: public RecursiveASTVisitor<FailedDynCast>, public loplugin::Plugin { public: - explicit FailedDynCast(InstantiationData const & data): Plugin(data) {} + explicit FailedDynCast(loplugin::InstantiationData const & data): + Plugin(data) {} bool shouldVisitTemplateInstantiations() const { return true; } diff --git a/compilerplugins/clang/finalclasses.cxx b/compilerplugins/clang/finalclasses.cxx index 294e52592a51..ff2a29e7e434 100644 --- a/compilerplugins/clang/finalclasses.cxx +++ b/compilerplugins/clang/finalclasses.cxx @@ -36,7 +36,8 @@ class FinalClasses: public RecursiveASTVisitor<FinalClasses>, public loplugin::Plugin { public: - explicit FinalClasses(InstantiationData const & data): Plugin(data) {} + explicit FinalClasses(loplugin::InstantiationData const & data): + Plugin(data) {} virtual void run() override { diff --git a/compilerplugins/clang/finalprotected.cxx b/compilerplugins/clang/finalprotected.cxx index 35e41017a011..71b3cfca03f1 100644 --- a/compilerplugins/clang/finalprotected.cxx +++ b/compilerplugins/clang/finalprotected.cxx @@ -24,7 +24,8 @@ class FinalProtected: public RecursiveASTVisitor<FinalProtected>, public loplugin::Plugin { public: - explicit FinalProtected(InstantiationData const & data): Plugin(data) {} + explicit FinalProtected(loplugin::InstantiationData const & data): + Plugin(data) {} virtual void run() override { TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); diff --git a/compilerplugins/clang/flatten.cxx b/compilerplugins/clang/flatten.cxx index ce16bc2384ee..08abf603568e 100644 --- a/compilerplugins/clang/flatten.cxx +++ b/compilerplugins/clang/flatten.cxx @@ -24,7 +24,8 @@ class Flatten: public RecursiveASTVisitor<Flatten>, public loplugin::RewritePlugin { public: - explicit Flatten(InstantiationData const & data): RewritePlugin(data) {} + explicit Flatten(loplugin::InstantiationData const & data): + RewritePlugin(data) {} virtual void run() override { diff --git a/compilerplugins/clang/fpcomparison.cxx b/compilerplugins/clang/fpcomparison.cxx index 844116a9ccf5..b5026fe21210 100644 --- a/compilerplugins/clang/fpcomparison.cxx +++ b/compilerplugins/clang/fpcomparison.cxx @@ -26,7 +26,8 @@ class FpComparison: public RecursiveASTVisitor<FpComparison>, public loplugin::Plugin { public: - explicit FpComparison(InstantiationData const & data): Plugin(data) {} + explicit FpComparison(loplugin::InstantiationData const & data): + Plugin(data) {} virtual void run() override { diff --git a/compilerplugins/clang/fragiledestructor.cxx b/compilerplugins/clang/fragiledestructor.cxx index b438a81c33e3..5da9f0711b2d 100644 --- a/compilerplugins/clang/fragiledestructor.cxx +++ b/compilerplugins/clang/fragiledestructor.cxx @@ -25,7 +25,8 @@ class FragileDestructor: public RecursiveASTVisitor<FragileDestructor>, public loplugin::Plugin { public: - explicit FragileDestructor(InstantiationData const & data): Plugin(data) {} + explicit FragileDestructor(loplugin::InstantiationData const & data): + Plugin(data) {} virtual void run() override { TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); } diff --git a/compilerplugins/clang/getimplementationname.cxx b/compilerplugins/clang/getimplementationname.cxx index eac0bb5fd3fb..81c3473aa678 100644 --- a/compilerplugins/clang/getimplementationname.cxx +++ b/compilerplugins/clang/getimplementationname.cxx @@ -79,7 +79,7 @@ class GetImplementationName: public loplugin::Plugin { public: - explicit GetImplementationName(InstantiationData const & data) + explicit GetImplementationName(loplugin::InstantiationData const & data) : Plugin(data) , m_Outdir(initOutdir()) , m_OutdirCreated(false) diff --git a/compilerplugins/clang/implicitboolconversion.cxx b/compilerplugins/clang/implicitboolconversion.cxx index 058e042dbcf2..c695148b790e 100644 --- a/compilerplugins/clang/implicitboolconversion.cxx +++ b/compilerplugins/clang/implicitboolconversion.cxx @@ -234,7 +234,7 @@ class ImplicitBoolConversion: public RecursiveASTVisitor<ImplicitBoolConversion>, public loplugin::Plugin { public: - explicit ImplicitBoolConversion(InstantiationData const & data): + explicit ImplicitBoolConversion(loplugin::InstantiationData const & data): Plugin(data) {} virtual void run() override diff --git a/compilerplugins/clang/includeform.cxx b/compilerplugins/clang/includeform.cxx index 11bf2865c58c..bf3d689c603b 100644 --- a/compilerplugins/clang/includeform.cxx +++ b/compilerplugins/clang/includeform.cxx @@ -14,7 +14,8 @@ namespace { class IncludeForm final: public PPCallbacks, public loplugin::RewritePlugin { public: - explicit IncludeForm(InstantiationData const & data): RewritePlugin(data) + explicit IncludeForm(loplugin::InstantiationData const & data): + RewritePlugin(data) { compat::addPPCallbacks(compiler.getPreprocessor(), this); } private: diff --git a/compilerplugins/clang/inlinefields.cxx b/compilerplugins/clang/inlinefields.cxx index 42551dc61660..490d40818683 100644 --- a/compilerplugins/clang/inlinefields.cxx +++ b/compilerplugins/clang/inlinefields.cxx @@ -65,7 +65,8 @@ class InlineFields: public RecursiveASTVisitor<InlineFields>, public loplugin::Plugin { public: - explicit InlineFields(InstantiationData const & data): Plugin(data) {} + explicit InlineFields(loplugin::InstantiationData const & data): + Plugin(data) {} virtual void run() override { @@ -120,7 +121,7 @@ MyFieldInfo InlineFields::niceName(const FieldDecl* fieldDecl) SourceLocation expansionLoc = compiler.getSourceManager().getExpansionLoc( fieldDecl->getLocation() ); StringRef name = compiler.getSourceManager().getFilename(expansionLoc); aInfo.sourceLocation = std::string(name.substr(strlen(SRCDIR)+1)) + ":" + std::to_string(compiler.getSourceManager().getSpellingLineNumber(expansionLoc)); - normalizeDotDotInFilePath(aInfo.sourceLocation); + loplugin::normalizeDotDotInFilePath(aInfo.sourceLocation); return aInfo; } diff --git a/compilerplugins/clang/inlinesimplememberfunctions.cxx b/compilerplugins/clang/inlinesimplememberfunctions.cxx index 9048bb4fe480..de8de482513b 100644 --- a/compilerplugins/clang/inlinesimplememberfunctions.cxx +++ b/compilerplugins/clang/inlinesimplememberfunctions.cxx @@ -21,7 +21,7 @@ class InlineSimpleMemberFunctions: public RecursiveASTVisitor<InlineSimpleMemberFunctions>, public loplugin::RewritePlugin { public: - explicit InlineSimpleMemberFunctions(InstantiationData const & data): RewritePlugin(data) {} + explicit InlineSimpleMemberFunctions(loplugin::InstantiationData const & data): RewritePlugin(data) {} virtual void run() override { TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); } diff --git a/compilerplugins/clang/inlinevisible.cxx b/compilerplugins/clang/inlinevisible.cxx index 280a0750f573..6f0b63856178 100644 --- a/compilerplugins/clang/inlinevisible.cxx +++ b/compilerplugins/clang/inlinevisible.cxx @@ -21,7 +21,8 @@ class InlineVisible: public RecursiveASTVisitor<InlineVisible>, public loplugin::Plugin { public: - explicit InlineVisible(InstantiationData const & data): Plugin(data) {} + explicit InlineVisible(loplugin::InstantiationData const & data): + Plugin(data) {} void run() override { TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); } diff --git a/compilerplugins/clang/literaltoboolconversion.cxx b/compilerplugins/clang/literaltoboolconversion.cxx index 2a1c6f960b24..17fa9da77d73 100644 --- a/compilerplugins/clang/literaltoboolconversion.cxx +++ b/compilerplugins/clang/literaltoboolconversion.cxx @@ -21,7 +21,7 @@ class LiteralToBoolConversion: public loplugin::RewritePlugin { public: - explicit LiteralToBoolConversion(InstantiationData const & data): + explicit LiteralToBoolConversion(loplugin::InstantiationData const & data): RewritePlugin(data) {} virtual void run() override diff --git a/compilerplugins/clang/loopvartoosmall.cxx b/compilerplugins/clang/loopvartoosmall.cxx index 66eda67167e2..b59462171f88 100644 --- a/compilerplugins/clang/loopvartoosmall.cxx +++ b/compilerplugins/clang/loopvartoosmall.cxx @@ -26,7 +26,8 @@ class LoopVarTooSmall: public RecursiveASTVisitor<LoopVarTooSmall>, public loplugin::Plugin { public: - explicit LoopVarTooSmall(InstantiationData const & data): Plugin(data) {} + explicit LoopVarTooSmall(loplugin::InstantiationData const & data): + Plugin(data) {} virtual void run() override { TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); diff --git a/compilerplugins/clang/memoryvar.cxx b/compilerplugins/clang/memoryvar.cxx index 2fecf86eba40..a381563d6509 100644 --- a/compilerplugins/clang/memoryvar.cxx +++ b/compilerplugins/clang/memoryvar.cxx @@ -25,7 +25,7 @@ class MemoryVar: public RecursiveASTVisitor<MemoryVar>, public loplugin::Plugin { public: - explicit MemoryVar(InstantiationData const & data): Plugin(data), mbChecking(false) {} + explicit MemoryVar(loplugin::InstantiationData const & data): Plugin(data), mbChecking(false) {} virtual void run() override { TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); diff --git a/compilerplugins/clang/mergeclasses.cxx b/compilerplugins/clang/mergeclasses.cxx index 90c5cbe72d5e..c8d3e8107e97 100644 --- a/compilerplugins/clang/mergeclasses.cxx +++ b/compilerplugins/clang/mergeclasses.cxx @@ -50,7 +50,8 @@ class MergeClasses: public RecursiveASTVisitor<MergeClasses>, public loplugin::Plugin { public: - explicit MergeClasses(InstantiationData const & data): Plugin(data) {} + explicit MergeClasses(loplugin::InstantiationData const & data): + Plugin(data) {} virtual void run() override { diff --git a/compilerplugins/clang/nullptr.cxx b/compilerplugins/clang/nullptr.cxx index bcfb88cb6f66..2e4de5d37a1c 100644 --- a/compilerplugins/clang/nullptr.cxx +++ b/compilerplugins/clang/nullptr.cxx @@ -54,7 +54,8 @@ class Nullptr: public RecursiveASTVisitor<Nullptr>, public loplugin::RewritePlugin { public: - explicit Nullptr(InstantiationData const & data): RewritePlugin(data) {} + explicit Nullptr(loplugin::InstantiationData const & data): + RewritePlugin(data) {} void run() override { TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); } diff --git a/compilerplugins/clang/oncevar.cxx b/compilerplugins/clang/oncevar.cxx index 0f2e47219928..79f5a80db0d0 100644 --- a/compilerplugins/clang/oncevar.cxx +++ b/compilerplugins/clang/oncevar.cxx @@ -79,13 +79,13 @@ class OnceVar: public RecursiveASTVisitor<OnceVar>, public loplugin::Plugin { public: - explicit OnceVar(InstantiationData const & data): Plugin(data) {} + explicit OnceVar(loplugin::InstantiationData const & data): Plugin(data) {} virtual void run() override { // ignore some files with problematic macros std::string fn( compiler.getSourceManager().getFileEntryForID( compiler.getSourceManager().getMainFileID())->getName() ); - normalizeDotDotInFilePath(fn); + loplugin::normalizeDotDotInFilePath(fn); // platform-specific stuff if (fn == SRCDIR "/sal/osl/unx/thread.cxx" || fn == SRCDIR "/sot/source/base/formats.cxx" diff --git a/compilerplugins/clang/oslendian.cxx b/compilerplugins/clang/oslendian.cxx index ce71c9cf39e1..2a7bfa6b2efb 100644 --- a/compilerplugins/clang/oslendian.cxx +++ b/compilerplugins/clang/oslendian.cxx @@ -16,7 +16,7 @@ namespace { class OslEndian: public loplugin::Plugin, public PPCallbacks { public: - explicit OslEndian(InstantiationData const & data): Plugin(data) { + explicit OslEndian(loplugin::InstantiationData const & data): Plugin(data) { compat::addPPCallbacks(compiler.getPreprocessor(), this); } diff --git a/compilerplugins/clang/override.cxx b/compilerplugins/clang/override.cxx index 412846c5b521..c25405b8ef4a 100644 --- a/compilerplugins/clang/override.cxx +++ b/compilerplugins/clang/override.cxx @@ -23,7 +23,8 @@ class Override: public RecursiveASTVisitor<Override>, public loplugin::RewritePlugin { public: - explicit Override(InstantiationData const & data): RewritePlugin(data) {} + explicit Override(loplugin::InstantiationData const & data): + RewritePlugin(data) {} virtual void run() override; diff --git a/compilerplugins/clang/overrideparam.cxx b/compilerplugins/clang/overrideparam.cxx index 28e57393d6dc..e3b8a4e0fd88 100644 --- a/compilerplugins/clang/overrideparam.cxx +++ b/compilerplugins/clang/overrideparam.cxx @@ -29,7 +29,8 @@ class OverrideParam: public RecursiveASTVisitor<OverrideParam>, public loplugin::Plugin { public: - explicit OverrideParam(InstantiationData const & data): Plugin(data) {} + explicit OverrideParam(loplugin::InstantiationData const & data): + Plugin(data) {} virtual void run() override; diff --git a/compilerplugins/clang/passparamsbyref.cxx b/compilerplugins/clang/passparamsbyref.cxx index 94c910e60cb5..d6ea67871b20 100644 --- a/compilerplugins/clang/passparamsbyref.cxx +++ b/compilerplugins/clang/passparamsbyref.cxx @@ -31,7 +31,7 @@ class PassParamsByRef: public RecursiveASTVisitor<PassParamsByRef>, public loplugin::Plugin { public: - explicit PassParamsByRef(InstantiationData const & data): Plugin(data), mbInsideFunctionDecl(false) {} + explicit PassParamsByRef(loplugin::InstantiationData const & data): Plugin(data), mbInsideFunctionDecl(false) {} virtual void run() override { TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); } diff --git a/compilerplugins/clang/passstuffbyref.cxx b/compilerplugins/clang/passstuffbyref.cxx index 268706c3a60f..f87e668ed4fa 100644 --- a/compilerplugins/clang/passstuffbyref.cxx +++ b/compilerplugins/clang/passstuffbyref.cxx @@ -31,7 +31,7 @@ class PassStuffByRef: public RecursiveASTVisitor<PassStuffByRef>, public loplugin::Plugin { public: - explicit PassStuffByRef(InstantiationData const & data): Plugin(data), mbInsideFunctionDecl(false), mbFoundReturnValueDisqualifier(false) {} + explicit PassStuffByRef(loplugin::InstantiationData const & data): Plugin(data), mbInsideFunctionDecl(false), mbFoundReturnValueDisqualifier(false) {} virtual void run() override { TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); } diff --git a/compilerplugins/clang/plugin.hxx b/compilerplugins/clang/plugin.hxx index 0b9da5e6e9a5..8a8f6f60732e 100644 --- a/compilerplugins/clang/plugin.hxx +++ b/compilerplugins/clang/plugin.hxx @@ -226,9 +226,6 @@ bool isSamePathname(StringRef pathname, StringRef other); } // namespace -using loplugin::InstantiationData; //TODO -using loplugin::normalizeDotDotInFilePath; //TODO - #endif // COMPILEPLUGIN_H /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/compilerplugins/clang/privatebase.cxx b/compilerplugins/clang/privatebase.cxx index d2a125d4851f..60acfc347ed9 100644 --- a/compilerplugins/clang/privatebase.cxx +++ b/compilerplugins/clang/privatebase.cxx @@ -15,7 +15,8 @@ class PrivateBase: public RecursiveASTVisitor<PrivateBase>, public loplugin::Plugin { public: - explicit PrivateBase(InstantiationData const & data): Plugin(data) {} + explicit PrivateBase(loplugin::InstantiationData const & data): Plugin(data) + {} void run() override; diff --git a/compilerplugins/clang/ptrvector.cxx b/compilerplugins/clang/ptrvector.cxx index 2b9db655c578..dc3a69d0a9b7 100644 --- a/compilerplugins/clang/ptrvector.cxx +++ b/compilerplugins/clang/ptrvector.cxx @@ -26,7 +26,8 @@ class PtrVector: public RecursiveASTVisitor<PtrVector>, public loplugin::Plugin { public: - explicit PtrVector(InstantiationData const & data): Plugin(data) {} + explicit PtrVector(loplugin::InstantiationData const & data): Plugin(data) + {} virtual void run() override { diff --git a/compilerplugins/clang/rangedforcopy.cxx b/compilerplugins/clang/rangedforcopy.cxx index 4c4148210004..4baed6b6e5db 100644 --- a/compilerplugins/clang/rangedforcopy.cxx +++ b/compilerplugins/clang/rangedforcopy.cxx @@ -25,7 +25,8 @@ class RangedForCopy: public RecursiveASTVisitor<RangedForCopy>, public loplugin::Plugin { public: - explicit RangedForCopy(InstantiationData const & data): Plugin(data) {} + explicit RangedForCopy(loplugin::InstantiationData const & data): + Plugin(data) {} virtual void run() override { TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); diff --git a/compilerplugins/clang/redundantcast.cxx b/compilerplugins/clang/redundantcast.cxx index c86d7dc1ab73..bdf23d9094cf 100644 --- a/compilerplugins/clang/redundantcast.cxx +++ b/compilerplugins/clang/redundantcast.cxx @@ -93,7 +93,8 @@ class RedundantCast: public RecursiveASTVisitor<RedundantCast>, public loplugin::RewritePlugin { public: - explicit RedundantCast(InstantiationData const & data): RewritePlugin(data) + explicit RedundantCast(loplugin::InstantiationData const & data): + RewritePlugin(data) {} virtual void run() override { diff --git a/compilerplugins/clang/redundantcopy.cxx b/compilerplugins/clang/redundantcopy.cxx index b1216689dbb4..4466339095cc 100644 --- a/compilerplugins/clang/redundantcopy.cxx +++ b/compilerplugins/clang/redundantcopy.cxx @@ -17,7 +17,8 @@ class RedundantCopy final: public RecursiveASTVisitor<RedundantCopy>, public loplugin::Plugin { public: - explicit RedundantCopy(InstantiationData const & data): Plugin(data) {} + explicit RedundantCopy(loplugin::InstantiationData const & data): + Plugin(data) {} bool VisitCXXFunctionalCastExpr(CXXFunctionalCastExpr const * expr) { if (ignoreLocation(expr)) { diff --git a/compilerplugins/clang/redundantinline.cxx b/compilerplugins/clang/redundantinline.cxx index 8ef9e040a997..67347febb443 100644 --- a/compilerplugins/clang/redundantinline.cxx +++ b/compilerplugins/clang/redundantinline.cxx @@ -17,7 +17,7 @@ class RedundantInline: public RecursiveASTVisitor<RedundantInline>, public loplugin::RewritePlugin { public: - explicit RedundantInline(InstantiationData const & data): + explicit RedundantInline(loplugin::InstantiationData const & data): RewritePlugin(data) {} void run() override { diff --git a/compilerplugins/clang/redundantpointerops.cxx b/compilerplugins/clang/redundantpointerops.cxx index 3a971b24d804..0340b7c12c19 100644 --- a/compilerplugins/clang/redundantpointerops.cxx +++ b/compilerplugins/clang/redundantpointerops.cxx @@ -39,7 +39,7 @@ class RedundantPointerOps: public RecursiveASTVisitor<RedundantPointerOps>, public loplugin::Plugin { public: - explicit RedundantPointerOps(InstantiationData const & data): Plugin(data) {} + explicit RedundantPointerOps(loplugin::InstantiationData const & data): Plugin(data) {} virtual void run() override { diff --git a/compilerplugins/clang/refcounting.cxx b/compilerplugins/clang/refcounting.cxx index 05d7fe943b62..8091fb3ee0cd 100644 --- a/compilerplugins/clang/refcounting.cxx +++ b/compilerplugins/clang/refcounting.cxx @@ -44,7 +44,8 @@ class RefCounting: public RecursiveASTVisitor<RefCounting>, public loplugin::Plugin { public: - explicit RefCounting(InstantiationData const & data): Plugin(data) {} + explicit RefCounting(loplugin::InstantiationData const & data): Plugin(data) + {} virtual void run() override { TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); } diff --git a/compilerplugins/clang/rendercontext.cxx b/compilerplugins/clang/rendercontext.cxx index 2ea4a0c3380b..c0f3acf4f3cc 100644 --- a/compilerplugins/clang/rendercontext.cxx +++ b/compilerplugins/clang/rendercontext.cxx @@ -23,7 +23,8 @@ class RenderContext: public RecursiveASTVisitor<RenderContext>, public loplugin::Plugin { public: - explicit RenderContext(InstantiationData const & data): Plugin(data) {} + explicit RenderContext(loplugin::InstantiationData const & data): + Plugin(data) {} virtual void run() override { TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); diff --git a/compilerplugins/clang/reservedid.cxx b/compilerplugins/clang/reservedid.cxx index d7468be463be..6e97303615d3 100644 --- a/compilerplugins/clang/reservedid.cxx +++ b/compilerplugins/clang/reservedid.cxx @@ -36,7 +36,8 @@ class ReservedId: public RecursiveASTVisitor<ReservedId>, public loplugin::Plugin { public: - explicit ReservedId(InstantiationData const & data): Plugin(data) {} + explicit ReservedId(loplugin::InstantiationData const & data): Plugin(data) + {} void run() override; diff --git a/compilerplugins/clang/salbool.cxx b/compilerplugins/clang/salbool.cxx index 19c715e13f9b..2402986467b1 100644 --- a/compilerplugins/clang/salbool.cxx +++ b/compilerplugins/clang/salbool.cxx @@ -146,7 +146,8 @@ class SalBool: public RecursiveASTVisitor<SalBool>, public loplugin::RewritePlugin { public: - explicit SalBool(InstantiationData const & data): RewritePlugin(data) {} + explicit SalBool(loplugin::InstantiationData const & data): + RewritePlugin(data) {} virtual void run() override; diff --git a/compilerplugins/clang/salunicodeliteral.cxx b/compilerplugins/clang/salunicodeliteral.cxx index a095da8267d9..529d20c970eb 100644 --- a/compilerplugins/clang/salunicodeliteral.cxx +++ b/compilerplugins/clang/salunicodeliteral.cxx @@ -23,7 +23,8 @@ class SalUnicodeLiteral final: public RecursiveASTVisitor<SalUnicodeLiteral>, public loplugin::Plugin { public: - explicit SalUnicodeLiteral(InstantiationData const & data): Plugin(data) {} + explicit SalUnicodeLiteral(loplugin::InstantiationData const & data): + Plugin(data) {} bool VisitCXXStaticCastExpr(CXXStaticCastExpr const * expr) { check(expr); diff --git a/compilerplugins/clang/sfxpoolitem.cxx b/compilerplugins/clang/sfxpoolitem.cxx index bac6cf361fd4..d2d469d2f4a3 100644 --- a/compilerplugins/clang/sfxpoolitem.cxx +++ b/compilerplugins/clang/sfxpoolitem.cxx @@ -26,7 +26,8 @@ class SfxPoolItem: public RecursiveASTVisitor<SfxPoolItem>, public loplugin::Plugin { public: - explicit SfxPoolItem(InstantiationData const & data): Plugin(data) {} + explicit SfxPoolItem(loplugin::InstantiationData const & data): Plugin(data) + {} virtual void run() override { TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); } diff --git a/compilerplugins/clang/simplifybool.cxx b/compilerplugins/clang/simplifybool.cxx index d70751fb54eb..faf0849b3f40 100644 --- a/compilerplugins/clang/simplifybool.cxx +++ b/compilerplugins/clang/simplifybool.cxx @@ -54,7 +54,8 @@ class SimplifyBool: public RecursiveASTVisitor<SimplifyBool>, public loplugin::Plugin { public: - explicit SimplifyBool(InstantiationData const & data): Plugin(data) {} + explicit SimplifyBool(loplugin::InstantiationData const & data): + Plugin(data) {} void run() override; diff --git a/compilerplugins/clang/singlevalfields.cxx b/compilerplugins/clang/singlevalfields.cxx index 6e158ea872f6..91b23ef784f0 100644 --- a/compilerplugins/clang/singlevalfields.cxx +++ b/compilerplugins/clang/singlevalfields.cxx @@ -71,7 +71,8 @@ class SingleValFields: public RecursiveASTVisitor<SingleValFields>, public loplugin::Plugin { public: - explicit SingleValFields(InstantiationData const & data): Plugin(data) {} + explicit SingleValFields(loplugin::InstantiationData const & data): + Plugin(data) {} virtual void run() override { @@ -116,7 +117,7 @@ void SingleValFields::niceName(const FieldDecl* fieldDecl, MyFieldInfo& aInfo) SourceLocation expansionLoc = compiler.getSourceManager().getExpansionLoc( fieldDecl->getLocation() ); StringRef name = compiler.getSourceManager().getFilename(expansionLoc); aInfo.sourceLocation = std::string(name.substr(strlen(SRCDIR)+1)) + ":" + std::to_string(compiler.getSourceManager().getSpellingLineNumber(expansionLoc)); - normalizeDotDotInFilePath(aInfo.sourceLocation); + loplugin::normalizeDotDotInFilePath(aInfo.sourceLocation); } bool SingleValFields::VisitFieldDecl( const FieldDecl* fieldDecl ) diff --git a/compilerplugins/clang/staticaccess.cxx b/compilerplugins/clang/staticaccess.cxx index 7fa1d392edb8..dd8e3b4c5dec 100644 --- a/compilerplugins/clang/staticaccess.cxx +++ b/compilerplugins/clang/staticaccess.cxx @@ -46,7 +46,8 @@ class StaticAccess: public RecursiveASTVisitor<StaticAccess>, public loplugin::Plugin { public: - explicit StaticAccess(InstantiationData const & data): Plugin(data) {} + explicit StaticAccess(loplugin::InstantiationData const & data): + Plugin(data) {} void run() override { TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); } diff --git a/compilerplugins/clang/staticmethods.cxx b/compilerplugins/clang/staticmethods.cxx index cbd395845808..7d5b23a7ba04 100644 --- a/compilerplugins/clang/staticmethods.cxx +++ b/compilerplugins/clang/staticmethods.cxx @@ -24,7 +24,7 @@ class StaticMethods: private: bool bVisitedThis; public: - explicit StaticMethods(InstantiationData const & data): Plugin(data), bVisitedThis(false) {} + explicit StaticMethods(loplugin::InstantiationData const & data): Plugin(data), bVisitedThis(false) {} void run() override { TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); } diff --git a/compilerplugins/clang/stringconcat.cxx b/compilerplugins/clang/stringconcat.cxx index f6e791ee2f37..f5b8d8c2d2ea 100644 --- a/compilerplugins/clang/stringconcat.cxx +++ b/compilerplugins/clang/stringconcat.cxx @@ -45,7 +45,8 @@ class StringConcat: public RecursiveASTVisitor<StringConcat>, public loplugin::Plugin { public: - explicit StringConcat(InstantiationData const & data): Plugin(data) {} + explicit StringConcat(loplugin::InstantiationData const & data): + Plugin(data) {} void run() override { TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); } diff --git a/compilerplugins/clang/stringconstant.cxx b/compilerplugins/clang/stringconstant.cxx index e4372a9e29b4..8eb482accc91 100644 --- a/compilerplugins/clang/stringconstant.cxx +++ b/compilerplugins/clang/stringconstant.cxx @@ -105,8 +105,8 @@ class StringConstant: public RecursiveASTVisitor<StringConstant>, public loplugin::RewritePlugin { public: - explicit StringConstant(InstantiationData const & data): RewritePlugin(data) - {} + explicit StringConstant(loplugin::InstantiationData const & data): + RewritePlugin(data) {} void run() override; diff --git a/compilerplugins/clang/stringstatic.cxx b/compilerplugins/clang/stringstatic.cxx index 4c3be5dc194a..00f1c9f6eab1 100644 --- a/compilerplugins/clang/stringstatic.cxx +++ b/compilerplugins/clang/stringstatic.cxx @@ -27,7 +27,8 @@ class StringStatic { public: - explicit StringStatic(InstantiationData const& rData) : Plugin(rData) {} + explicit StringStatic(loplugin::InstantiationData const& rData): + Plugin(rData) {} void run() override; bool VisitVarDecl(VarDecl const*); diff --git a/compilerplugins/clang/subtlezeroinit.cxx b/compilerplugins/clang/subtlezeroinit.cxx index 0871dbbabc67..5e98bfcccc59 100644 --- a/compilerplugins/clang/subtlezeroinit.cxx +++ b/compilerplugins/clang/subtlezeroinit.cxx @@ -21,7 +21,8 @@ class SubtleZeroInit final: public RecursiveASTVisitor<SubtleZeroInit>, public loplugin::Plugin { public: - explicit SubtleZeroInit(InstantiationData const & data): Plugin(data) {} + explicit SubtleZeroInit(loplugin::InstantiationData const & data): + Plugin(data) {} bool VisitCXXNewExpr(CXXNewExpr const * expr) { if (ignoreLocation(expr)) { diff --git a/compilerplugins/clang/unicodetochar.cxx b/compilerplugins/clang/unicodetochar.cxx index ad25c9b4508e..85d74e405eb3 100644 --- a/compilerplugins/clang/unicodetochar.cxx +++ b/compilerplugins/clang/unicodetochar.cxx @@ -21,7 +21,8 @@ class UnicodeToChar final: public RecursiveASTVisitor<UnicodeToChar>, public loplugin::Plugin { public: - explicit UnicodeToChar(InstantiationData const & data): Plugin(data) {} + explicit UnicodeToChar(loplugin::InstantiationData const & data): + Plugin(data) {} bool TraverseCStyleCastExpr(CStyleCastExpr * expr) { subExprs_.push(expr->getSubExpr()); diff --git a/compilerplugins/clang/unnecessarycatchthrow.cxx b/compilerplugins/clang/unnecessarycatchthrow.cxx index 948394e9e37a..1802cde2073d 100644 --- a/compilerplugins/clang/unnecessarycatchthrow.cxx +++ b/compilerplugins/clang/unnecessarycatchthrow.cxx @@ -32,7 +32,7 @@ class UnnecessaryCatchThrow: public RecursiveASTVisitor<UnnecessaryCatchThrow>, public loplugin::Plugin { public: - explicit UnnecessaryCatchThrow(InstantiationData const & data): Plugin(data) {} + explicit UnnecessaryCatchThrow(loplugin::InstantiationData const & data): Plugin(data) {} virtual void run() override { diff --git a/compilerplugins/clang/unnecessaryoverride.cxx b/compilerplugins/clang/unnecessaryoverride.cxx index 0b1f572560c2..b54c821e0fe0 100644 --- a/compilerplugins/clang/unnecessaryoverride.cxx +++ b/compilerplugins/clang/unnecessaryoverride.cxx @@ -27,7 +27,7 @@ class UnnecessaryOverride: public RecursiveASTVisitor<UnnecessaryOverride>, public loplugin::Plugin { public: - explicit UnnecessaryOverride(InstantiationData const & data): Plugin(data) {} + explicit UnnecessaryOverride(loplugin::InstantiationData const & data): Plugin(data) {} virtual void run() override { diff --git a/compilerplugins/clang/unnecessaryparen.cxx b/compilerplugins/clang/unnecessaryparen.cxx index bb601fbc096c..43fc13be8eea 100644 --- a/compilerplugins/clang/unnecessaryparen.cxx +++ b/compilerplugins/clang/unnecessaryparen.cxx @@ -47,7 +47,8 @@ class UnnecessaryParen: public RecursiveASTVisitor<UnnecessaryParen>, public loplugin::Plugin { public: - explicit UnnecessaryParen(InstantiationData const & data): Plugin(data) {} + explicit UnnecessaryParen(loplugin::InstantiationData const & data): + Plugin(data) {} virtual void run() override { diff --git a/compilerplugins/clang/unnecessaryvirtual.cxx b/compilerplugins/clang/unnecessaryvirtual.cxx index 2655968c8b7c..9ff389d1290e 100644 --- a/compilerplugins/clang/unnecessaryvirtual.cxx +++ b/compilerplugins/clang/unnecessaryvirtual.cxx @@ -53,7 +53,8 @@ class UnnecessaryVirtual: public RecursiveASTVisitor<UnnecessaryVirtual>, public loplugin::Plugin { public: - explicit UnnecessaryVirtual(InstantiationData const & data): Plugin(data) {} + explicit UnnecessaryVirtual(loplugin::InstantiationData const & data): + Plugin(data) {} virtual void run() override { @@ -158,7 +159,7 @@ std::string UnnecessaryVirtual::toString(SourceLocation loc) SourceLocation expansionLoc = compiler.getSourceManager().getExpansionLoc( loc ); StringRef name = compiler.getSourceManager().getFilename(expansionLoc); std::string sourceLocation = std::string(name.substr(strlen(SRCDIR)+1)) + ":" + std::to_string(compiler.getSourceManager().getSpellingLineNumber(expansionLoc)); - normalizeDotDotInFilePath(sourceLocation); + loplugin::normalizeDotDotInFilePath(sourceLocation); return sourceLocation; } diff --git a/compilerplugins/clang/unoany.cxx b/compilerplugins/clang/unoany.cxx index 1db0f993f13b..db20779746bc 100644 --- a/compilerplugins/clang/unoany.cxx +++ b/compilerplugins/clang/unoany.cxx @@ -15,7 +15,7 @@ class UnoAny: public RecursiveASTVisitor<UnoAny>, public loplugin::Plugin { public: - explicit UnoAny(InstantiationData const & data): Plugin(data) {} + explicit UnoAny(loplugin::InstantiationData const & data): Plugin(data) {} void run() override { TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); diff --git a/compilerplugins/clang/unreffun.cxx b/compilerplugins/clang/unreffun.cxx index dae7efcab9c0..d825423bfeaa 100644 --- a/compilerplugins/clang/unreffun.cxx +++ b/compilerplugins/clang/unreffun.cxx @@ -53,7 +53,7 @@ Decl const * getPreviousNonFriendDecl(Decl const * decl) { class UnrefFun: public RecursiveASTVisitor<UnrefFun>, public loplugin::Plugin { public: - explicit UnrefFun(InstantiationData const & data): Plugin(data) {} + explicit UnrefFun(loplugin::InstantiationData const & data): Plugin(data) {} void run() override { TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); } diff --git a/compilerplugins/clang/unusedenumconstants.cxx b/compilerplugins/clang/unusedenumconstants.cxx index 88461c1075fd..69b554064ae9 100644 --- a/compilerplugins/clang/unusedenumconstants.cxx +++ b/compilerplugins/clang/unusedenumconstants.cxx @@ -62,7 +62,7 @@ class UnusedEnumConstants: public RecursiveASTVisitor<UnusedEnumConstants>, public loplugin::Plugin { public: - explicit UnusedEnumConstants(InstantiationData const & data): Plugin(data) {} + explicit UnusedEnumConstants(loplugin::InstantiationData const & data): Plugin(data) {} virtual void run() override { @@ -107,7 +107,7 @@ MyFieldInfo UnusedEnumConstants::niceName(const EnumConstantDecl* enumConstantDe SourceLocation expansionLoc = compiler.getSourceManager().getExpansionLoc( enumConstantDecl->getLocation() ); StringRef name = compiler.getSourceManager().getFilename(expansionLoc); aInfo.sourceLocation = std::string(name.substr(strlen(SRCDIR)+1)) + ":" + std::to_string(compiler.getSourceManager().getSpellingLineNumber(expansionLoc)); - normalizeDotDotInFilePath(aInfo.sourceLocation); + loplugin::normalizeDotDotInFilePath(aInfo.sourceLocation); return aInfo; } diff --git a/compilerplugins/clang/unusedfields.cxx b/compilerplugins/clang/unusedfields.cxx index 1f15404cb697..22d13f37eddc 100644 --- a/compilerplugins/clang/unusedfields.cxx +++ b/compilerplugins/clang/unusedfields.cxx @@ -132,7 +132,8 @@ class UnusedFields: public RecursiveASTVisitor<UnusedFields>, public loplugin::Plugin { public: - explicit UnusedFields(InstantiationData const & data): Plugin(data) {} + explicit UnusedFields(loplugin::InstantiationData const & data): + Plugin(data) {} virtual void run() override; @@ -237,7 +238,7 @@ MyFieldInfo UnusedFields::niceName(const FieldDecl* fieldDecl) SourceLocation expansionLoc = compiler.getSourceManager().getExpansionLoc( fieldDecl->getLocation() ); StringRef name = compiler.getSourceManager().getFilename(expansionLoc); aInfo.sourceLocation = std::string(name.substr(strlen(SRCDIR)+1)) + ":" + std::to_string(compiler.getSourceManager().getSpellingLineNumber(expansionLoc)); - normalizeDotDotInFilePath(aInfo.sourceLocation); + loplugin::normalizeDotDotInFilePath(aInfo.sourceLocation); switch (fieldDecl->getAccess()) { diff --git a/compilerplugins/clang/unusedfieldsremove.cxx b/compilerplugins/clang/unusedfieldsremove.cxx index eebc2bcfb51e..31997fe1817a 100644 --- a/compilerplugins/clang/unusedfieldsremove.cxx +++ b/compilerplugins/clang/unusedfieldsremove.cxx @@ -31,7 +31,7 @@ class UnusedFieldsRemove: public RecursiveASTVisitor<UnusedFieldsRemove>, public loplugin::RewritePlugin { public: - explicit UnusedFieldsRemove(InstantiationData const & data); + explicit UnusedFieldsRemove(loplugin::InstantiationData const & data); ~UnusedFieldsRemove(); virtual void run() override { TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); } @@ -52,7 +52,7 @@ size_t getFilesize(const char* filename) return st.st_size; } -UnusedFieldsRemove::UnusedFieldsRemove(InstantiationData const & data): RewritePlugin(data) +UnusedFieldsRemove::UnusedFieldsRemove(loplugin::InstantiationData const & data): RewritePlugin(data) { static const char sInputFile[] = SRCDIR "/result.txt"; mmapFilesize = getFilesize(sInputFile); diff --git a/compilerplugins/clang/unusedmethods.cxx b/compilerplugins/clang/unusedmethods.cxx index 73bc1ac5d66a..53514db91cfe 100644 --- a/compilerplugins/clang/unusedmethods.cxx +++ b/compilerplugins/clang/unusedmethods.cxx @@ -78,7 +78,8 @@ class UnusedMethods: public RecursiveASTVisitor<UnusedMethods>, public loplugin::Plugin { public: - explicit UnusedMethods(InstantiationData const & data): Plugin(data) {} + explicit UnusedMethods(loplugin::InstantiationData const & data): + Plugin(data) {} virtual void run() override { @@ -177,7 +178,7 @@ std::string UnusedMethods::toString(SourceLocation loc) SourceLocation expansionLoc = compiler.getSourceManager().getExpansionLoc( loc ); StringRef name = compiler.getSourceManager().getFilename(expansionLoc); std::string sourceLocation = std::string(name.substr(strlen(SRCDIR)+1)) + ":" + std::to_string(compiler.getSourceManager().getSpellingLineNumber(expansionLoc)); - normalizeDotDotInFilePath(sourceLocation); + loplugin::normalizeDotDotInFilePath(sourceLocation); return sourceLocation; } diff --git a/compilerplugins/clang/unusedmethodsremove.cxx b/compilerplugins/clang/unusedmethodsremove.cxx index 5452b51f42a2..3d3886ace0db 100644 --- a/compilerplugins/clang/unusedmethodsremove.cxx +++ b/compilerplugins/clang/unusedmethodsremove.cxx @@ -32,7 +32,7 @@ class UnusedMethodsRemove: public RecursiveASTVisitor<UnusedMethodsRemove>, public loplugin::RewritePlugin { public: - explicit UnusedMethodsRemove(InstantiationData const & data); + explicit UnusedMethodsRemove(loplugin::InstantiationData const & data); ~UnusedMethodsRemove(); virtual void run() override { TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); } @@ -53,7 +53,7 @@ size_t getFilesize(const char* filename) return st.st_size; } -UnusedMethodsRemove::UnusedMethodsRemove(InstantiationData const & data): RewritePlugin(data) +UnusedMethodsRemove::UnusedMethodsRemove(loplugin::InstantiationData const & data): RewritePlugin(data) { static const char sInputFile[] = SRCDIR "/result.txt"; mmapFilesize = getFilesize(sInputFile); diff --git a/compilerplugins/clang/useuniqueptr.cxx b/compilerplugins/clang/useuniqueptr.cxx index 05b9dad2c801..8d75c4fa347b 100644 --- a/compilerplugins/clang/useuniqueptr.cxx +++ b/compilerplugins/clang/useuniqueptr.cxx @@ -27,7 +27,8 @@ class UseUniquePtr: public RecursiveASTVisitor<UseUniquePtr>, public loplugin::Plugin { public: - explicit UseUniquePtr(InstantiationData const & data): Plugin(data) {} + explicit UseUniquePtr(loplugin::InstantiationData const & data): + Plugin(data) {} virtual void run() override { diff --git a/compilerplugins/clang/vclwidgets.cxx b/compilerplugins/clang/vclwidgets.cxx index 1a9589d2e40d..0f966708bc2d 100644 --- a/compilerplugins/clang/vclwidgets.cxx +++ b/compilerplugins/clang/vclwidgets.cxx @@ -30,7 +30,8 @@ class VCLWidgets: public RecursiveASTVisitor<VCLWidgets>, public loplugin::Plugin { public: - explicit VCLWidgets(InstantiationData const & data): Plugin(data) {} + explicit VCLWidgets(loplugin::InstantiationData const & data): Plugin(data) + {} virtual void run() override { TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); } diff --git a/compilerplugins/clang/weakobject.cxx b/compilerplugins/clang/weakobject.cxx index 889835051c10..13144f541d82 100644 --- a/compilerplugins/clang/weakobject.cxx +++ b/compilerplugins/clang/weakobject.cxx @@ -24,7 +24,8 @@ class WeakObject { public: - explicit WeakObject(InstantiationData const& rData) : Plugin(rData) {} + explicit WeakObject(loplugin::InstantiationData const& rData): Plugin(rData) + {} void run() override { if (compiler.getLangOpts().CPlusPlus) { // no OWeakObject in C |