From 2dbf36132a8886b94c5fbb2255dfae9e6028a5bd Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 7 May 2021 12:29:47 +0100 Subject: rename to remove the gtk3 prefix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I219798ed42aff11d09fd45c26ca1a018c2d22c08 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115239 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- compilerplugins/clang/badstatics.cxx | 2 +- compilerplugins/clang/store/constantfunction.cxx | 2 +- compilerplugins/clang/useuniqueptr.cxx | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) (limited to 'compilerplugins') diff --git a/compilerplugins/clang/badstatics.cxx b/compilerplugins/clang/badstatics.cxx index 3f4d6cddecd3..bb6241eafa5e 100644 --- a/compilerplugins/clang/badstatics.cxx +++ b/compilerplugins/clang/badstatics.cxx @@ -197,7 +197,7 @@ public: // sc/source/core/tool/adiasync.cxx, would leak // ScAddInAsync* keys if that set is not empty at exit || name == "g_aWindowList" - //vcl/unx/gtk3/a11y/gtk3atkutil.cxx, asserted empty at exit + //vcl/unx/gtk3/a11y/atkutil.cxx, asserted empty at exit || name == "gFontPreviewVirDevs" //svtools/source/control/ctrlbox.cxx, empty at exit || name == "aLogger" // FormulaLogger& FormulaLogger::get() in sc/source/core/tool/formulalogger.cxx diff --git a/compilerplugins/clang/store/constantfunction.cxx b/compilerplugins/clang/store/constantfunction.cxx index a29556723748..a7b88704c09e 100644 --- a/compilerplugins/clang/store/constantfunction.cxx +++ b/compilerplugins/clang/store/constantfunction.cxx @@ -32,7 +32,7 @@ public: if (strstr(compiler.getSourceManager().getFileEntryForID(mainFileID)->getName(), "bootstrapfixture.cxx") != 0) { return; } - if (strstr(compiler.getSourceManager().getFileEntryForID(mainFileID)->getName(), "gtk3gtkinst.cxx") != 0) { + if (strstr(compiler.getSourceManager().getFileEntryForID(mainFileID)->getName(), "gtkinst.cxx") != 0) { return; }*/ diff --git a/compilerplugins/clang/useuniqueptr.cxx b/compilerplugins/clang/useuniqueptr.cxx index a25b016c6799..c26e3db11365 100644 --- a/compilerplugins/clang/useuniqueptr.cxx +++ b/compilerplugins/clang/useuniqueptr.cxx @@ -351,8 +351,7 @@ void UseUniquePtr::CheckDeleteLocalVar(const FunctionDecl* functionDecl, const C if (loplugin::TypeCheck(varDecl->getType()).Pointer().Class("IMapCompat").GlobalNamespace()) return; // passing data to gtk API and I can't figure out the types - if (fn == SRCDIR "/vcl/unx/gtk3/gtk3gtkdata.cxx" - || fn == SRCDIR "/vcl/unx/gtk/gtkdata.cxx") + if (fn == SRCDIR "/vcl/unx/gtk3/gtkdata.cxx") return; // sometimes this stuff is held by tools::SvRef, sometimes by std::unique_ptr... if (fn == SRCDIR "/sot/source/unoolestorage/xolesimplestorage.cxx") -- cgit