Revert "Add a simple rectangle node"

This reverts commit 7d516abb39081c7ce58bb78a644f5bb5ff88f98a. Gunnar
preferred routing the text cursor rectangles through the regular
QSGRectangleNode.

Change-Id: I40dc44451a10c9ccfe436974c21995a2b3bf86c2
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

6 files changed, 0 insertions, 64 deletions

diff --git a/softwarecontext/context.cpp b/softwarecontext/context.cpp
index a0b2dd98c5..26b7dc4678 100644
--- a/softwarecontext/context.cpp
+++ b/softwarecontext/context.cpp
@@ -130,11 +130,6 @@ Context::Context(QObject *parent)
     setDistanceFieldEnabled(false);
 }
 
-QSGSimpleRectangleNode *Context::createSimpleRectangleNode(const QRectF &rect, const QColor &color)
-{
-    return new SimpleRectangleNode(rect, color);
-}
-
 QSGRectangleNode *Context::createRectangleNode()
 {
     return new RectangleNode();
diff --git a/softwarecontext/context.h b/softwarecontext/context.h
index 11da963b4d..8f42b2d13c 100644
--- a/softwarecontext/context.h
+++ b/softwarecontext/context.h
@@ -80,7 +80,6 @@ public:
 
     QSGRenderContext *createRenderContext() { return new RenderContext(this); }
 
-    virtual QSGSimpleRectangleNode *createSimpleRectangleNode(const QRectF &rect, const QColor &color);
     virtual QSGRectangleNode *createRectangleNode();
     virtual QSGImageNode *createImageNode();
     virtual QSGGlyphNode *createGlyphNode(QSGRenderContext *rc, bool preferNativeGlyphNode);
diff --git a/softwarecontext/rectanglenode.cpp b/softwarecontext/rectanglenode.cpp
index 38e242e8bf..a27d3bf93e 100644
--- a/softwarecontext/rectanglenode.cpp
+++ b/softwarecontext/rectanglenode.cpp
@@ -19,34 +19,6 @@
 ****************************************************************************/
 #include "rectanglenode.h"
 
-SimpleRectangleNode::SimpleRectangleNode(const QRectF &rect, const QColor &color)
-    : m_rect(rect)
-    , m_color(color)
-{
-    setMaterial((QSGMaterial*)1);
-    setGeometry((QSGGeometry*)1);
-}
-
-void SimpleRectangleNode::setRect(const QRectF &rect)
-{
-    m_rect = rect;
-}
-
-void SimpleRectangleNode::setColor(const QColor &color)
-{
-    m_color = color;
-}
-
-void SimpleRectangleNode::update()
-{
-}
-
-void SimpleRectangleNode::paint(QPainter *p)
-{
-    p->fillRect(m_rect, m_color);
-}
-
-
 RectangleNode::RectangleNode()
     : m_penWidth(0)
     , m_radius(0)
diff --git a/softwarecontext/rectanglenode.h b/softwarecontext/rectanglenode.h
index dff5b3590c..bdf0705b1c 100644
--- a/softwarecontext/rectanglenode.h
+++ b/softwarecontext/rectanglenode.h
@@ -25,24 +25,6 @@
 #include <QPen>
 #include <QBrush>
 
-class SimpleRectangleNode : public QSGSimpleRectangleNode
-{
-public:
-    SimpleRectangleNode(const QRectF &rect, const QColor &color);
-
-    virtual void setRect(const QRectF &rect);
-    virtual void setColor(const QColor &color);
-
-    virtual void update();
-
-    void paint(QPainter *);
-
-private:
-    QRectF m_rect;
-    QColor m_color;
-};
-
-
 class RectangleNode : public QSGRectangleNode
 {
 public:
diff --git a/softwarecontext/renderingvisitor.cpp b/softwarecontext/renderingvisitor.cpp
index 112a0c12ba..7d3acf0083 100644
--- a/softwarecontext/renderingvisitor.cpp
+++ b/softwarecontext/renderingvisitor.cpp
@@ -82,16 +82,6 @@ void RenderingVisitor::endVisit(QSGImageNode *)
 {
 }
 
-void RenderingVisitor::visit(QSGSimpleRectangleNode *node)
-{
-    static_cast<SimpleRectangleNode *>(node)->paint(painter);
-}
-
-void RenderingVisitor::endVisit(QSGSimpleRectangleNode *)
-{
-
-}
-
 void RenderingVisitor::visit(QSGRectangleNode *node)
 {
     static_cast<RectangleNode*>(node)->paint(painter);
diff --git a/softwarecontext/renderingvisitor.h b/softwarecontext/renderingvisitor.h
index f3feb691b8..e91ed01a81 100644
--- a/softwarecontext/renderingvisitor.h
+++ b/softwarecontext/renderingvisitor.h
@@ -37,8 +37,6 @@ public:
     virtual void endVisit(QSGOpacityNode *node);
     virtual void visit(QSGImageNode *node);
     virtual void endVisit(QSGImageNode *node);
-    virtual void visit(QSGSimpleRectangleNode *node);
-    virtual void endVisit(QSGSimpleRectangleNode *node);
     virtual void visit(QSGRectangleNode *node);
     virtual void endVisit(QSGRectangleNode *node);
     virtual void visit(QSGGlyphNode *node);