v0.2.54..v0.2.55 changeset ElementVisitor.h - ngageoint/hootenanny GitHub Wiki

diff --git a/hoot-core/src/main/cpp/hoot/core/elements/ElementVisitor.h b/hoot-core/src/main/cpp/hoot/core/elements/ElementVisitor.h
index 7d48acc..207fc94 100644
--- a/hoot-core/src/main/cpp/hoot/core/elements/ElementVisitor.h
+++ b/hoot-core/src/main/cpp/hoot/core/elements/ElementVisitor.h
@@ -30,7 +30,7 @@
 // hoot
 #include <hoot/core/elements/Element.h>
 #include <hoot/core/info/ApiEntityInfo.h>
-#include <hoot/core/criterion/FilteredByCriteria.h>
+#include <hoot/core/criterion/FilteredByGeometryTypeCriteria.h>
 #include <hoot/core/info/OperationStatusInfo.h>
 
 namespace hoot
@@ -47,7 +47,8 @@ namespace hoot
  * @todo We could eventually remove the default empty string implementations of OperationStatusInfo
  * methods and require them to be implemented in children.
  */
-class ElementVisitor : public ApiEntityInfo, public FilteredByCriteria, public OperationStatusInfo
+class ElementVisitor : public ApiEntityInfo, public FilteredByGeometryTypeCriteria,
+  public OperationStatusInfo
 {
 public:
 
@@ -66,32 +67,32 @@ public:
   /**
    * @see OperationStatusInfo
    */
-  virtual long getNumFeaturesAffected() const { return _numAffected; }
+  long getNumFeaturesAffected() const override { return _numAffected; }
 
   /**
    * @see OperationStatusInfo
    */
-  virtual long getNumFeaturesProcessed() const { return _numProcessed; }
+  long getNumFeaturesProcessed() const override { return _numProcessed; }
 
   /**
    * @see OperationStatusInfo
    */
-  virtual QString getInitStatusMessage() const { return ""; }
+  QString getInitStatusMessage() const override { return ""; }
 
   /**
    * @see OperationStatusInfo
    */
-  virtual QString getCompletedStatusMessage() const { return ""; }
+  QString getCompletedStatusMessage() const override { return ""; }
 
   /**
-   * @see FilteredByCriteria
+   * @see FilteredByGeometryTypeCriteria
    *
    * An empty list returned here means that the visitor is associated no specific criteria and
    * can be run against any feature type. Any visitors that want to control which feature types
    * they are run against during conflation should populate this list. The list is treated in a
    * logical OR fashion.
    */
-  virtual QStringList getCriteria() const { return QStringList(); }
+  QStringList getCriteria() const override { return QStringList(); }
 
   /**
    * Returns the visitor's class name