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, 7 insertions, 6 deletions

diff --git a/compilerplugins/clang/shouldreturnbool.cxx b/compilerplugins/clang/shouldreturnbool.cxx
index a15e9d9b872b..23749d6b6428 100644
--- a/compilerplugins/clang/shouldreturnbool.cxx
+++ b/compilerplugins/clang/shouldreturnbool.cxx
@@ -24,11 +24,12 @@
 
 namespace
 {
-class ShouldReturnBool : public loplugin::FunctionAddress<ShouldReturnBool>
+class ShouldReturnBool
+    : public loplugin::FunctionAddress<loplugin::FilteringPlugin<ShouldReturnBool>>
 {
 public:
     explicit ShouldReturnBool(loplugin::InstantiationData const& data)
-        : loplugin::FunctionAddress<ShouldReturnBool>(data)
+        : FunctionAddress(data)
     {
     }
 
@@ -143,13 +144,13 @@ bool ShouldReturnBool::TraverseFunctionDecl(FunctionDecl* functionDecl)
     {
         mbInsideFunction = true;
         mbFunctionOnlyReturningOneOrZero = true;
-        ret = loplugin::FunctionAddress<ShouldReturnBool>::TraverseFunctionDecl(functionDecl);
+        ret = FunctionAddress::TraverseFunctionDecl(functionDecl);
         mbInsideFunction = false;
         if (mbFunctionOnlyReturningOneOrZero)
             problemFunctions.insert(functionDecl);
     }
     else
-        ret = loplugin::FunctionAddress<ShouldReturnBool>::TraverseFunctionDecl(functionDecl);
+        ret = FunctionAddress::TraverseFunctionDecl(functionDecl);
     return ret;
 }
 
@@ -160,13 +161,13 @@ bool ShouldReturnBool::TraverseCXXMethodDecl(CXXMethodDecl* methodDecl)
     {
         mbInsideFunction = true;
         mbFunctionOnlyReturningOneOrZero = true;
-        ret = loplugin::FunctionAddress<ShouldReturnBool>::TraverseCXXMethodDecl(methodDecl);
+        ret = FunctionAddress::TraverseCXXMethodDecl(methodDecl);
         mbInsideFunction = false;
         if (mbFunctionOnlyReturningOneOrZero)
             problemFunctions.insert(methodDecl);
     }
     else
-        ret = loplugin::FunctionAddress<ShouldReturnBool>::TraverseCXXMethodDecl(methodDecl);
+        ret = FunctionAddress::TraverseCXXMethodDecl(methodDecl);
     return ret;
 }