Wholesale cruft removal part 1

(bzr r9508.1.44)

1 files changed, 0 insertions, 92 deletions

diff --git a/src/sp-paint-server.cpp b/src/sp-paint-server.cpp
index e49e6a378..35a5ff1f1 100644
--- a/src/sp-paint-server.cpp
+++ b/src/sp-paint-server.cpp
@@ -14,7 +14,6 @@
  */
 
 #include <string.h>
-#include "libnr/nr-pixblock-pattern.h"
 #include "sp-paint-server.h"
 
 #include "sp-gradient.h"
@@ -25,11 +24,9 @@ static void sp_paint_server_init(SPPaintServer *ps);
 
 static void sp_paint_server_release(SPObject *object);
 
-static void sp_painter_stale_fill(SPPainter *painter, NRPixBlock *pb);
 static cairo_pattern_t *sp_paint_server_create_dummy_pattern(SPPaintServer *ps, cairo_t *ct, NRRect const *bbox, double opacity);
 
 static SPObjectClass *parent_class;
-static GSList *stale_painters = NULL;
 
 GType sp_paint_server_get_type (void)
 {
@@ -62,52 +59,15 @@ static void sp_paint_server_class_init(SPPaintServerClass *psc)
 
 static void sp_paint_server_init(SPPaintServer *ps)
 {
-    ps->painters = NULL;
 }
 
 static void sp_paint_server_release(SPObject *object)
 {
-    SPPaintServer *ps = SP_PAINT_SERVER(object);
-
-    while (ps->painters) {
-        SPPainter *painter = ps->painters;
-        ps->painters = painter->next;
-        stale_painters = g_slist_prepend(stale_painters, painter);
-        painter->next = NULL;
-        painter->server = NULL;
-        painter->fill = sp_painter_stale_fill;
-    }
-
     if (((SPObjectClass *) parent_class)->release) {
         ((SPObjectClass *) parent_class)->release(object);
     }
 }
 
-SPPainter *sp_paint_server_painter_new(SPPaintServer *ps,
-                                       Geom::Matrix const &full_transform,
-                                       Geom::Matrix const &parent_transform,
-                                       const NRRect *bbox)
-{
-    g_return_val_if_fail(ps != NULL, NULL);
-    g_return_val_if_fail(SP_IS_PAINT_SERVER(ps), NULL);
-    g_return_val_if_fail(bbox != NULL, NULL);
-
-    SPPainter *painter = NULL;
-    SPPaintServerClass *psc = (SPPaintServerClass *) G_OBJECT_GET_CLASS(ps);
-    if ( psc->painter_new ) {
-        painter = (*psc->painter_new)(ps, full_transform, parent_transform, bbox);
-    }
-
-    if (painter) {
-        painter->next = ps->painters;
-        painter->server = ps;
-        painter->type = (SPPainterType) G_OBJECT_TYPE(ps);
-        ps->painters = painter;
-    }
-
-    return painter;
-}
-
 cairo_pattern_t *sp_paint_server_create_pattern(SPPaintServer *ps,
                                                 cairo_t *ct,
                                                 NRRect const *bbox,
@@ -138,55 +98,6 @@ sp_paint_server_create_dummy_pattern(SPPaintServer */*ps*/,
     return cp;
 }
 
-static void sp_paint_server_painter_free(SPPaintServer *ps, SPPainter *painter)
-{
-    g_return_if_fail(ps != NULL);
-    g_return_if_fail(SP_IS_PAINT_SERVER(ps));
-    g_return_if_fail(painter != NULL);
-
-    SPPaintServerClass *psc = (SPPaintServerClass *) G_OBJECT_GET_CLASS(ps);
-
-    SPPainter *r = NULL;
-    for (SPPainter *p = ps->painters; p != NULL; p = p->next) {
-        if (p == painter) {
-            if (r) {
-                r->next = p->next;
-            } else {
-                ps->painters = p->next;
-            }
-            p->next = NULL;
-            if (psc->painter_free) {
-                (*psc->painter_free) (ps, painter);
-            }
-            return;
-        }
-        r = p;
-    }
-
-    g_assert_not_reached();
-}
-
-SPPainter *sp_painter_free(SPPainter *painter)
-{
-    g_return_val_if_fail(painter != NULL, NULL);
-
-    if (painter->server) {
-        sp_paint_server_painter_free(painter->server, painter);
-    } else {
-        SPPaintServerClass *psc = (SPPaintServerClass *) g_type_class_ref(painter->type);
-        if (psc->painter_free)
-            (*psc->painter_free)(NULL, painter);
-        stale_painters = g_slist_remove(stale_painters, painter);
-    }
-
-    return NULL;
-}
-
-static void sp_painter_stale_fill(SPPainter */*painter*/, NRPixBlock *pb)
-{
-    nr_pixblock_render_gray_noise(pb, NULL);
-}
-
 bool SPPaintServer::isSwatch() const
 {
     bool swatch = false;
@@ -217,9 +128,6 @@ bool SPPaintServer::isSolid() const
     return solid;
 }
 
-
-
-
 /*
   Local Variables:
   mode:c++