index 258323a93d36399baffacada5af08aae80125106..4b5366a46f5749113af6f67668054cb580f33f4b 100644 (file)
--- a/src/sp-paint-server.cpp
+++ b/src/sp-paint-server.cpp
#include "xml/node.h"
static void sp_paint_server_class_init(SPPaintServerClass *psc);
-static void sp_paint_server_init(SPPaintServer *ps);
static void sp_paint_server_release(SPObject *object);
static SPObjectClass *parent_class;
static GSList *stale_painters = NULL;
-GType sp_paint_server_get_type (void)
+GType SPPaintServer::getType(void)
{
static GType type = 0;
if (!type) {
NULL, /* class_data */
sizeof(SPPaintServer),
16, /* n_preallocs */
- (GInstanceInitFunc) sp_paint_server_init,
+ (GInstanceInitFunc) SPPaintServer::init,
NULL, /* value_table */
};
type = g_type_register_static(SP_TYPE_OBJECT, "SPPaintServer", &info, (GTypeFlags) 0);
parent_class = (SPObjectClass *) g_type_class_ref(SP_TYPE_OBJECT);
}
-static void sp_paint_server_init(SPPaintServer *ps)
+void SPPaintServer::init(SPPaintServer *ps)
{
ps->painters = NULL;
+ ps->swatch = false;
}
static void sp_paint_server_release(SPObject *object)
bool SPPaintServer::isSwatch() const
{
- bool swatch = false;
- if (SP_IS_GRADIENT(this)) {
- SPGradient *grad = SP_GRADIENT(this);
- if ( SP_GRADIENT_HAS_STOPS(grad) ) {
- gchar const * attr = repr->attribute("osb:paint");
- if (attr && !strcmp(attr, "solid")) {
- swatch = true;
- }
- }
- }
return swatch;
}
bool SPPaintServer::isSolid() const
{
bool solid = false;
- if (SP_IS_GRADIENT(this)) {
+ if (swatch && SP_IS_GRADIENT(this)) {
SPGradient *grad = SP_GRADIENT(this);
- if ( SP_GRADIENT_HAS_STOPS(grad) && (grad->getStopCount() == 0) ) {
- gchar const * attr = repr->attribute("osb:paint");
- if (attr && !strcmp(attr, "solid")) {
- solid = true;
- }
+ if ( grad->hasStops() && (grad->getStopCount() == 0) ) {
+ solid = true;
}
}
return solid;