summaryrefslogtreecommitdiffstats
path: root/compilerplugins
diff options
context:
space:
mode:
authorJan-Marek Glogowski <glogow@fbihome.de>2022-01-16 14:37:24 +0100
committerJan-Marek Glogowski <glogow@fbihome.de>2022-01-17 12:44:39 +0100
commit5da906d07bf88bb9c56325d03272006d5a0662c4 (patch)
tree16763a743098db8f184bcd7cc9060ddeb8815a6f /compilerplugins
parentUpdate git submodules (diff)
downloadcore-5da906d07bf88bb9c56325d03272006d5a0662c4.tar.gz
core-5da906d07bf88bb9c56325d03272006d5a0662c4.zip
iOS+SVP convert remaining VCL plugins to salplug
While this makes the preprocessor usage even larger, the code in salplug.cxx is now hopefully easier to follow. I added a comment about the main code structure at the beginning. It also includes changes to the generic plugin list to include gtk3_kde5 before gen, qt5 and qt6 after gen, but still skips the headless / svp plugin. And I explicitly excluded salplug.cxx from the externandnotdefined compiler plugin. I could have added a dummy, but that seemed not worth the effort. My try on a non-dummy with correct includes and defines made the code in salplug.cxx much harder to follow. FWIW, the iOS VCL plugin actually seems to use the osx SalData, so I think these changes to iosinst.cxx are more correct then commit 7d990aafdc363b2a12b5db78637d7f3bef7780bd ("VCL drop m_pInstance from *nix SalData"). But hard to tell without a compiler. Change-Id: I0e2944d4221ca5910fb2120cc8b24def5c5b3f33 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128477 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'compilerplugins')
-rw-r--r--compilerplugins/clang/externandnotdefined.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/compilerplugins/clang/externandnotdefined.cxx b/compilerplugins/clang/externandnotdefined.cxx
index 5d65579a6af1..a45c5c9f9a9d 100644
--- a/compilerplugins/clang/externandnotdefined.cxx
+++ b/compilerplugins/clang/externandnotdefined.cxx
@@ -64,6 +64,10 @@ bool ExternAndNotDefined::VisitFunctionDecl(const FunctionDecl * functionDecl) {
if (loplugin::hasPathnamePrefix(fileName, SRCDIR "/filter/qa/")) {
return true;
}
+ // keeps the code structure of salplug.cxx easier to follow
+ if (fileName == SRCDIR "/vcl/source/app/salplug.cxx") {
+ return true;
+ }
report(
DiagnosticsEngine::Warning,
"extern prototype in main file without definition",