From 1028e5192c5e131513b6f2df02d39e7ed5e4dcb5 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Wed, 1 Feb 2017 15:38:17 +0100
Subject: More ctor check fixes

Change-Id: Ifcce63b975fb7c4ac7e7545e3eadcc6f7f12e466
---
 compilerplugins/clang/stringconcat.cxx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'compilerplugins/clang/stringconcat.cxx')

diff --git a/compilerplugins/clang/stringconcat.cxx b/compilerplugins/clang/stringconcat.cxx
index 670d8929016a..1efdea8875da 100644
--- a/compilerplugins/clang/stringconcat.cxx
+++ b/compilerplugins/clang/stringconcat.cxx
@@ -28,8 +28,11 @@ Expr const * stripCtor(Expr const * expr) {
         return expr;
     }
     auto qt = loplugin::DeclCheck(e3->getConstructor());
-    if (!qt.Function("OString").Class("OString").Namespace("rtl").GlobalNamespace() &&
-        !qt.Function("OUString").Class("OUString").Namespace("rtl").GlobalNamespace()) {
+    if (!((qt.MemberFunction().Class("OString").Namespace("rtl")
+           .GlobalNamespace())
+          || (qt.MemberFunction().Class("OUString").Namespace("rtl")
+              .GlobalNamespace())))
+    {
         return expr;
     }
     if (e3->getNumArgs() != 2) {
-- 
cgit