[Libreoffice-commits] core.git: compilerplugins/clang include/systools

[Stephan Bergmann (via logerrit)]

 compilerplugins/clang/finalclasses.py |    1 -
 compilerplugins/clang/methodcycles.py |    1 -
 compilerplugins/clang/plugin.cxx      |    1 -
 include/systools/win32/uwinapi.h      |    6 +++---
 4 files changed, 3 insertions(+), 6 deletions(-)

New commits:
commit f416acdc3a142c7bf54ae5ea5d5fdcd690e0e810
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Mar 16 14:11:53 2021 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Tue Mar 16 14:53:44 2021 +0100

    systools is no longer part of the URE interface
    
    ...since de030cd7a234fd9191364647deb1a4836ca992cb "gbuild: Remove MSVC 2013
    legacy code", so no longer treat it as such in compilerplugins.  (Which caused a
    few loplugin:includeform and loplugin:nullptr warnings.)
    
    Change-Id: I99b42e76992e31aff56b417c05738d4d29e3faf9
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112575
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/compilerplugins/clang/finalclasses.py b/compilerplugins/clang/finalclasses.py
index 8b6f505fdd90..dfaa402f9513 100755
--- a/compilerplugins/clang/finalclasses.py
+++ b/compilerplugins/clang/finalclasses.py
@@ -54,7 +54,6 @@ for clazz in sorted(definitionSet - inheritFromSet):
     if file.startswith("include/rtl/"): continue
     if file.startswith("include/sal/"): continue
     if file.startswith("include/salhelper/"): continue
-    if file.startswith("include/systools/"): continue
     if file.startswith("include/typelib/"): continue
     if file.startswith("include/uno/"): continue
     # some kind of template noise
diff --git a/compilerplugins/clang/methodcycles.py b/compilerplugins/clang/methodcycles.py
index 4a153ae1c0e5..1b0ef2b1ef71 100755
--- a/compilerplugins/clang/methodcycles.py
+++ b/compilerplugins/clang/methodcycles.py
@@ -106,7 +106,6 @@ for caller in definitionSet:
       or "include/rtl/" in location \
       or "include/sal/" in location \
       or "include/salhelper/" in location \
-      or "include/systools/" in location \
       or "include/typelib/" in location \
       or "include/uno/" in location \
       or "workdir/UnpackedTarball/" in location \
diff --git a/compilerplugins/clang/plugin.cxx b/compilerplugins/clang/plugin.cxx
index 4e640cfb2c3b..753c548cf252 100644
--- a/compilerplugins/clang/plugin.cxx
+++ b/compilerplugins/clang/plugin.cxx
@@ -278,7 +278,6 @@ bool Plugin::isInUnoIncludeFile(SourceLocation spellingLocation) const
            || hasPathnamePrefix(name, SRCDIR "/include/rtl/")
            || hasPathnamePrefix(name, SRCDIR "/include/sal/")
            || hasPathnamePrefix(name, SRCDIR "/include/salhelper/")
-           || hasPathnamePrefix(name, SRCDIR "/include/systools/")
            || hasPathnamePrefix(name, SRCDIR "/include/typelib/")
            || hasPathnamePrefix(name, SRCDIR "/include/uno/"));
 }
diff --git a/include/systools/win32/uwinapi.h b/include/systools/win32/uwinapi.h
index 52daae944974..501c9aa38e0f 100644
--- a/include/systools/win32/uwinapi.h
+++ b/include/systools/win32/uwinapi.h
@@ -20,14 +20,14 @@
 #ifndef INCLUDED_SYSTOOLS_WIN32_UWINAPI_H
 #define INCLUDED_SYSTOOLS_WIN32_UWINAPI_H
 
-#include "prewin.h"
-#include "postwin.h"
+#include <prewin.h>
+#include <postwin.h>
 
 #ifdef __cplusplus
 
 inline bool IsValidHandle(HANDLE handle)
 {
-    return handle != INVALID_HANDLE_VALUE && handle != NULL;
+    return handle != INVALID_HANDLE_VALUE && handle != nullptr;
 }
 
 #else /* __cplusplus */