From 04fcca0a563a0c17805971aaa3521797ecc15b83 Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <github@naumov.de>
Date: Sun, 14 Jul 2019 16:15:37 +0200
Subject: [PATCH] [GL] GeoObject; Drop defaulted ctors, struct.
Update dependencies.
---
Applications/DataExplorer/DataView/GeoTreeModel.h | 2 +-
Applications/DataExplorer/DataView/ProcessModel.h | 2 +-
Applications/DataExplorer/DataView/SelectMeshDialog.h | 2 +-
GeoLib/GeoObject.h | 6 +-----
MeshGeoToolsLib/BoundaryElementsSearcher.h | 2 +-
MeshGeoToolsLib/MeshNodeSearcher.h | 2 +-
6 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/Applications/DataExplorer/DataView/GeoTreeModel.h b/Applications/DataExplorer/DataView/GeoTreeModel.h
index ddfa8becf82..e6840e701c8 100644
--- a/Applications/DataExplorer/DataView/GeoTreeModel.h
+++ b/Applications/DataExplorer/DataView/GeoTreeModel.h
@@ -25,7 +25,7 @@
namespace GeoLib
{
-class GeoObject;
+struct GeoObject;
}
class QString;
diff --git a/Applications/DataExplorer/DataView/ProcessModel.h b/Applications/DataExplorer/DataView/ProcessModel.h
index c0c65838d6e..dc505bc6bda 100644
--- a/Applications/DataExplorer/DataView/ProcessModel.h
+++ b/Applications/DataExplorer/DataView/ProcessModel.h
@@ -24,7 +24,7 @@ class vtkPolyDataAlgorithm;
namespace GeoLib
{
-class GeoObject;
+struct GeoObject;
}
/**
diff --git a/Applications/DataExplorer/DataView/SelectMeshDialog.h b/Applications/DataExplorer/DataView/SelectMeshDialog.h
index 49cd20d1e18..9d10a6c8edd 100644
--- a/Applications/DataExplorer/DataView/SelectMeshDialog.h
+++ b/Applications/DataExplorer/DataView/SelectMeshDialog.h
@@ -17,7 +17,7 @@
#include <QDialog>
namespace GeoLib {
- class GeoObject;
+struct GeoObject;
}
class QDialogButtonBox;
diff --git a/GeoLib/GeoObject.h b/GeoLib/GeoObject.h
index 4c86f63f74c..6a4862cdb59 100644
--- a/GeoLib/GeoObject.h
+++ b/GeoLib/GeoObject.h
@@ -19,12 +19,8 @@
namespace GeoLib
{
-class GeoObject
+struct GeoObject
{
-public:
- GeoObject() = default;
- GeoObject(GeoObject const&) = default;
- GeoObject& operator=(GeoObject const&) = default;
virtual ~GeoObject() = default;
/// return a geometry type
virtual GEOTYPE getGeoType() const = 0;
diff --git a/MeshGeoToolsLib/BoundaryElementsSearcher.h b/MeshGeoToolsLib/BoundaryElementsSearcher.h
index a84a606a7ba..f778fae8d33 100644
--- a/MeshGeoToolsLib/BoundaryElementsSearcher.h
+++ b/MeshGeoToolsLib/BoundaryElementsSearcher.h
@@ -11,7 +11,7 @@
namespace GeoLib
{
-class GeoObject;
+struct GeoObject;
class Point;
class Polyline;
class Surface;
diff --git a/MeshGeoToolsLib/MeshNodeSearcher.h b/MeshGeoToolsLib/MeshNodeSearcher.h
index 0bf0e99117c..910c0dad7d0 100644
--- a/MeshGeoToolsLib/MeshNodeSearcher.h
+++ b/MeshGeoToolsLib/MeshNodeSearcher.h
@@ -22,7 +22,7 @@
// forward declaration
namespace GeoLib
{
-class GeoObject;
+struct GeoObject;
class Point;
class Polyline;
class Surface;
--
GitLab