2 files changed, 14 insertions, 70 deletions

diff --git a/compilerplugins/clang/passsequencebyref.cxx b/compilerplugins/clang/passsequencebyref.cxx
deleted file mode 100644
index 851307bb2710..000000000000
--- a/compilerplugins/clang/passsequencebyref.cxx
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#include <string>
-
-#include "plugin.hxx"
-
-// Find places where com::sun::star::uno::Sequence is passed by value.
-// It's not very efficient, because that copies a whole list
-// They should rather be passed by reference.
-
-namespace {
-
-class PassSequenceByRef:
-    public RecursiveASTVisitor<PassSequenceByRef>, public loplugin::Plugin
-{
-public:
-    explicit PassSequenceByRef(InstantiationData const & data): Plugin(data) {}
-
-    virtual void run() override { TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); }
-
-    bool VisitFunctionDecl(const FunctionDecl * decl);
-};
-
-bool PassSequenceByRef::VisitFunctionDecl(const FunctionDecl * functionDecl) {
-    if (ignoreLocation(functionDecl)) {
-        return true;
-    }
-    // only warn on the definition/prototype of the function,
-    // not on the function implementation
-    if (functionDecl->isThisDeclarationADefinition() && functionDecl->getPreviousDecl() != nullptr) {
-        return true;
-    }
-    unsigned n = functionDecl->getNumParams();
-    for (unsigned i = 0; i != n; ++i) {
-        const ParmVarDecl * pvDecl = functionDecl->getParamDecl(i);
-        QualType t1 { pvDecl->getType() };
-        if (!t1->isClassType()) {
-            continue;
-        }
-        string typeName = t1.getUnqualifiedType().getCanonicalType().getAsString();
-        if (typeName.find("class com::sun::star::uno::Sequence") == 0) {
-            report(
-                DiagnosticsEngine::Warning,
-                "passing css::uno::Sequence by value, rather pass by reference .e.g. 'const css::uno::Sequence&' " + typeName,
-                pvDecl->getSourceRange().getBegin())
-              << pvDecl->getSourceRange();
-        }
-    }
-    return true;
-}
-
-loplugin::Plugin::Registration< PassSequenceByRef > X("passsequencebyref");
-
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/compilerplugins/clang/passstringbyref.cxx b/compilerplugins/clang/passstuffbyref.cxx
index 50e1a859fb11..c4951e82ca7c 100644
--- a/compilerplugins/clang/passstringbyref.cxx
+++ b/compilerplugins/clang/passstuffbyref.cxx
@@ -11,25 +11,25 @@
 
 #include "plugin.hxx"
 
-// Find places where OUString and OString are passed by value.
+// Find places where various things are passed by value.
 // It's not very efficient, because we generally end up copying it twice - once into the parameter and
-// again into the destination OUString.
+// again into the destination.
 // They should rather be passed by reference.
 
 namespace {
 
-class PassStringByRef:
-    public RecursiveASTVisitor<PassStringByRef>, public loplugin::Plugin
+class PassStuffByRef:
+    public RecursiveASTVisitor<PassStuffByRef>, public loplugin::Plugin
 {
 public:
-    explicit PassStringByRef(InstantiationData const & data): Plugin(data) {}
+    explicit PassStuffByRef(InstantiationData const & data): Plugin(data) {}
 
     virtual void run() override { TraverseDecl(compiler.getASTContext().getTranslationUnitDecl()); }
 
     bool VisitFunctionDecl(const FunctionDecl * decl);
 };
 
-bool PassStringByRef::VisitFunctionDecl(const FunctionDecl * functionDecl) {
+bool PassStuffByRef::VisitFunctionDecl(const FunctionDecl * functionDecl) {
     if (ignoreLocation(functionDecl)) {
         return true;
     }
@@ -60,11 +60,18 @@ bool PassStringByRef::VisitFunctionDecl(const FunctionDecl * functionDecl) {
                 pvDecl->getSourceRange().getBegin())
               << pvDecl->getSourceRange();
         }
+        else if (typeName.find("class com::sun::star::uno::Sequence") == 0) {
+            report(
+                DiagnosticsEngine::Warning,
+                "passing css::uno::Sequence by value, rather pass by reference .e.g. 'const css::uno::Sequence&' " + typeName,
+                pvDecl->getSourceRange().getBegin())
+              << pvDecl->getSourceRange();
+        }
     }
     return true;
 }
 
-loplugin::Plugin::Registration< PassStringByRef > X("passstringbyref");
+loplugin::Plugin::Registration< PassStuffByRef > X("passstuffbyref");
 
 }