Make base of loplugin::FunctionAddress more flexible

(I'm planning to use it for a FilteringRewritePlugin.)

And while at it, base its current uses on FilteringPlugin.

Change-Id: I0acdcc6cb0b3a434b425405c8c438dbf65e4d3cb
Reviewed-on: https://gerrit.libreoffice.org/82451
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

1 files changed, 5 insertions, 5 deletions

diff --git a/compilerplugins/clang/constparams.cxx b/compilerplugins/clang/constparams.cxx
index 388c813de18a..28179f30abae 100644
--- a/compilerplugins/clang/constparams.cxx
+++ b/compilerplugins/clang/constparams.cxx
@@ -28,10 +28,10 @@ namespace
 {
 
 class ConstParams:
-    public loplugin::FunctionAddress<ConstParams>
+    public loplugin::FunctionAddress<loplugin::FilteringPlugin<ConstParams>>
 {
 public:
-    explicit ConstParams(loplugin::InstantiationData const & data): loplugin::FunctionAddress<ConstParams>(data) {}
+    explicit ConstParams(loplugin::InstantiationData const & data): FunctionAddress(data) {}
 
     virtual void run() override {
         std::string fn(handler.getMainFileName());
@@ -110,7 +110,7 @@ bool ConstParams::TraverseFunctionDecl(FunctionDecl * functionDecl)
     auto prev = currentFunctionDecl;
     if (CheckTraverseFunctionDecl(functionDecl))
         currentFunctionDecl = functionDecl;
-    auto rv = loplugin::FunctionAddress<ConstParams>::TraverseFunctionDecl(functionDecl);
+    auto rv = FunctionAddress::TraverseFunctionDecl(functionDecl);
     currentFunctionDecl = prev;
     return rv;
 }
@@ -119,7 +119,7 @@ bool ConstParams::TraverseCXXMethodDecl(CXXMethodDecl * f)
     auto prev = currentFunctionDecl;
     if (CheckTraverseFunctionDecl(f))
         currentFunctionDecl = f;
-    auto rv = loplugin::FunctionAddress<ConstParams>::TraverseCXXMethodDecl(f);
+    auto rv = FunctionAddress::TraverseCXXMethodDecl(f);
     currentFunctionDecl = prev;
     return rv;
 }
@@ -128,7 +128,7 @@ bool ConstParams::TraverseCXXConstructorDecl(CXXConstructorDecl * f)
     auto prev = currentFunctionDecl;
     if (CheckTraverseFunctionDecl(f))
         currentFunctionDecl = f;
-    auto rv = loplugin::FunctionAddress<ConstParams>::TraverseCXXConstructorDecl(f);
+    auto rv = FunctionAddress::TraverseCXXConstructorDecl(f);
     currentFunctionDecl = prev;
     return rv;
 }