Mat: fix several compiler warnings:
* -Winconsistent-missing-override * -Wtautological-undefined-compare
This commit is contained in:
@@ -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();
|
||||
|
||||
@@ -40,7 +40,7 @@ typedef FolderTreeNode<Material> MaterialTreeNode;
|
||||
|
||||
class MaterialsExport MaterialManager: public Base::BaseClass
|
||||
{
|
||||
TYPESYSTEM_HEADER();
|
||||
TYPESYSTEM_HEADER_WITH_OVERRIDE();
|
||||
|
||||
public:
|
||||
MaterialManager();
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -41,7 +41,7 @@ typedef FolderTreeNode<Model> ModelTreeNode;
|
||||
|
||||
class MaterialsExport ModelManager: public Base::BaseClass
|
||||
{
|
||||
TYPESYSTEM_HEADER();
|
||||
TYPESYSTEM_HEADER_WITH_OVERRIDE();
|
||||
|
||||
public:
|
||||
enum ModelFilter
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user