From 0d7880a902154adc22ee24df40b443c9aa3a7d8a Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Thu, 28 Sep 2023 01:03:49 +0200
Subject: [PATCH] Mat: fix several compiler warnings:

* -Winconsistent-missing-override
* -Wtautological-undefined-compare
---
 src/Mod/Material/App/MaterialLibrary.h | 5 +++--
 src/Mod/Material/App/MaterialManager.h | 2 +-
 src/Mod/Material/App/Model.h           | 4 ++--
 src/Mod/Material/App/ModelLibrary.h    | 4 ++--
 src/Mod/Material/App/ModelManager.h    | 2 +-
 tests/src/Mod/Material/App/Model.cpp   | 7 +++++--
 6 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/Mod/Material/App/MaterialLibrary.h b/src/Mod/Material/App/MaterialLibrary.h
index a217bbec13..8bb16f34f8 100644
--- a/src/Mod/Material/App/MaterialLibrary.h
+++ b/src/Mod/Material/App/MaterialLibrary.h
@@ -25,6 +25,7 @@
 #include <Mod/Material/MaterialGlobal.h>
 
 #include <Base/BaseClass.h>
+#include <memory>
 #include <QDir>
 #include <QString>
 #include <QVariant>
@@ -39,7 +40,7 @@ class Material;
 
 class MaterialsExport MaterialLibrary: public LibraryBase
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     MaterialLibrary();
@@ -77,7 +78,7 @@ protected:
 
 class MaterialsExport MaterialExternalLibrary: public MaterialLibrary
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     MaterialExternalLibrary();
diff --git a/src/Mod/Material/App/MaterialManager.h b/src/Mod/Material/App/MaterialManager.h
index 200bdf6d76..03c423326d 100644
--- a/src/Mod/Material/App/MaterialManager.h
+++ b/src/Mod/Material/App/MaterialManager.h
@@ -40,7 +40,7 @@ typedef FolderTreeNode<Material> MaterialTreeNode;
 
 class MaterialsExport MaterialManager: public Base::BaseClass
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     MaterialManager();
diff --git a/src/Mod/Material/App/Model.h b/src/Mod/Material/App/Model.h
index 5202e4d9c6..c286ffeb0c 100644
--- a/src/Mod/Material/App/Model.h
+++ b/src/Mod/Material/App/Model.h
@@ -37,7 +37,7 @@ namespace Materials
 
 class MaterialsExport ModelProperty: public Base::BaseClass
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     ModelProperty();
@@ -130,7 +130,7 @@ private:
 
 class MaterialsExport Model: public Base::BaseClass
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     enum ModelType
diff --git a/src/Mod/Material/App/ModelLibrary.h b/src/Mod/Material/App/ModelLibrary.h
index 1dfa04cbb1..ea42aa6d9a 100644
--- a/src/Mod/Material/App/ModelLibrary.h
+++ b/src/Mod/Material/App/ModelLibrary.h
@@ -38,7 +38,7 @@ class Model;
 
 class MaterialsExport LibraryBase: public Base::BaseClass
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     LibraryBase();
@@ -77,7 +77,7 @@ private:
 
 class MaterialsExport ModelLibrary: public LibraryBase
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     ModelLibrary();
diff --git a/src/Mod/Material/App/ModelManager.h b/src/Mod/Material/App/ModelManager.h
index 6fc79bc3c9..5a5eed39ba 100644
--- a/src/Mod/Material/App/ModelManager.h
+++ b/src/Mod/Material/App/ModelManager.h
@@ -41,7 +41,7 @@ typedef FolderTreeNode<Model> ModelTreeNode;
 
 class MaterialsExport ModelManager: public Base::BaseClass
 {
-    TYPESYSTEM_HEADER();
+    TYPESYSTEM_HEADER_WITH_OVERRIDE();
 
 public:
     enum ModelFilter
diff --git a/tests/src/Mod/Material/App/Model.cpp b/tests/src/Mod/Material/App/Model.cpp
index 9fb76575d8..19300f1231 100644
--- a/tests/src/Mod/Material/App/Model.cpp
+++ b/tests/src/Mod/Material/App/Model.cpp
@@ -59,9 +59,12 @@ class MaterialTest : public ::testing::Test {
 
 TEST_F(MaterialTest, TestApplication)
 {
-    App::Application& application = App::GetApplication();
-    if (&application == nullptr)
+    try {
+        App::GetApplication();
+    }
+    catch (...) {
         ADD_FAILURE() << "Application failure\n";
+    }
 
     SUCCEED();
 }