From 78c7de440d94492490e260777b28030377c64e56 Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sat, 24 Aug 2013 14:49:05 +0200
Subject: [PATCH] simplified filter nodes even more

---
 apps/opencs/model/filter/leafnode.cpp  | 4 ----
 apps/opencs/model/filter/leafnode.hpp  | 3 ---
 apps/opencs/model/filter/narynode.cpp  | 4 ----
 apps/opencs/model/filter/narynode.hpp  | 4 ----
 apps/opencs/model/filter/node.hpp      | 3 ---
 apps/opencs/model/filter/unarynode.cpp | 5 -----
 apps/opencs/model/filter/unarynode.hpp | 3 ---
 7 files changed, 26 deletions(-)

diff --git a/apps/opencs/model/filter/leafnode.cpp b/apps/opencs/model/filter/leafnode.cpp
index a1330f9dc3..055a1747cc 100644
--- a/apps/opencs/model/filter/leafnode.cpp
+++ b/apps/opencs/model/filter/leafnode.cpp
@@ -6,7 +6,3 @@ std::vector<int> CSMFilter::LeafNode::getReferencedColumns() const
     return std::vector<int>();
 }
 
-bool CSMFilter::LeafNode::isSimple() const
-{
-    return true;
-}
diff --git a/apps/opencs/model/filter/leafnode.hpp b/apps/opencs/model/filter/leafnode.hpp
index a9790d01d2..2f3d910708 100644
--- a/apps/opencs/model/filter/leafnode.hpp
+++ b/apps/opencs/model/filter/leafnode.hpp
@@ -14,9 +14,6 @@ namespace CSMFilter
             virtual std::vector<int> getReferencedColumns() const;
             ///< Return a list of the IDs of the columns referenced by this node. The column mapping
             /// passed into test as columns must contain all columns listed here.
-
-            virtual bool isSimple() const;
-            ///< \return Can this filter be displayed in simple mode.
     };
 }
 
diff --git a/apps/opencs/model/filter/narynode.cpp b/apps/opencs/model/filter/narynode.cpp
index b96e7d4b2e..98f706c875 100644
--- a/apps/opencs/model/filter/narynode.cpp
+++ b/apps/opencs/model/filter/narynode.cpp
@@ -57,8 +57,4 @@ std::string CSMFilter::NAryNode::toString (bool numericColumns) const
     return stream.str();
 }
 
-bool CSMFilter::NAryNode::isSimple() const
-{
-    return false;
-}
 
diff --git a/apps/opencs/model/filter/narynode.hpp b/apps/opencs/model/filter/narynode.hpp
index 421847fae4..aa501d0095 100644
--- a/apps/opencs/model/filter/narynode.hpp
+++ b/apps/opencs/model/filter/narynode.hpp
@@ -31,10 +31,6 @@ namespace CSMFilter
             ///< Return a string that represents this node.
             ///
             /// \param numericColumns Use numeric IDs instead of string to represent columns.
-
-            virtual bool isSimple() const;
-            ///< \return Can this filter be displayed in simple mode.
-
     };
 }
 
diff --git a/apps/opencs/model/filter/node.hpp b/apps/opencs/model/filter/node.hpp
index 6783c3b5ec..ef18353a48 100644
--- a/apps/opencs/model/filter/node.hpp
+++ b/apps/opencs/model/filter/node.hpp
@@ -41,9 +41,6 @@ namespace CSMFilter
             ///< Return a list of the IDs of the columns referenced by this node. The column mapping
             /// passed into test as columns must contain all columns listed here.
 
-            virtual bool isSimple() const = 0;
-            ///< \return Can this filter be displayed in simple mode.
-
             virtual std::string toString (bool numericColumns) const = 0;
             ///< Return a string that represents this node.
             ///
diff --git a/apps/opencs/model/filter/unarynode.cpp b/apps/opencs/model/filter/unarynode.cpp
index d1897f4b7a..43a24b76a1 100644
--- a/apps/opencs/model/filter/unarynode.cpp
+++ b/apps/opencs/model/filter/unarynode.cpp
@@ -20,11 +20,6 @@ std::vector<int> CSMFilter::UnaryNode::getReferencedColumns() const
     return mChild->getReferencedColumns();
 }
 
-bool CSMFilter::UnaryNode::isSimple() const
-{
-    return false;
-}
-
 std::string CSMFilter::UnaryNode::toString (bool numericColumns) const
 {
     return mName + " " + mChild->toString (numericColumns);
diff --git a/apps/opencs/model/filter/unarynode.hpp b/apps/opencs/model/filter/unarynode.hpp
index 9fd5faf3f7..6bbc960920 100644
--- a/apps/opencs/model/filter/unarynode.hpp
+++ b/apps/opencs/model/filter/unarynode.hpp
@@ -24,9 +24,6 @@ namespace CSMFilter
             ///< Return a list of the IDs of the columns referenced by this node. The column mapping
             /// passed into test as columns must contain all columns listed here.
 
-            virtual bool isSimple() const;
-            ///< \return Can this filter be displayed in simple mode.
-
             virtual std::string toString (bool numericColumns) const;
             ///< Return a string that represents this node.
             ///