![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b45b3ca)
raw | patch | inline | side by side (parent: b45b3ca)
| author | johnce <johnce@users.sourceforge.net> | |
| Wed, 5 Aug 2009 05:56:35 +0000 (05:56 +0000) | ||
| committer | johnce <johnce@users.sourceforge.net> | |
| Wed, 5 Aug 2009 05:56:35 +0000 (05:56 +0000) |
46 files changed:
index 49010efdc50dae1291859edfd523471bf9736811..730188bdd0859966d3143946283a34a952ce1fd6 100644 (file)
#endif
/*
#endif
/*
- TODO: Replace SPDocument with the new Inkscape::Document
+ TODO: Replace Document with the new Inkscape::Document
TODO: Change 'desktop's to 'view*'s
TODO: Add derivation from Inkscape::Application::RunMode
*/
TODO: Change 'desktop's to 'view*'s
TODO: Add derivation from Inkscape::Application::RunMode
*/
//
gchar const *tmpl = g_build_filename ((INKSCAPE_TEMPLATESDIR), "default.svg", NULL);
bool have_default = Inkscape::IO::file_test (tmpl, G_FILE_TEST_IS_REGULAR);
//
gchar const *tmpl = g_build_filename ((INKSCAPE_TEMPLATESDIR), "default.svg", NULL);
bool have_default = Inkscape::IO::file_test (tmpl, G_FILE_TEST_IS_REGULAR);
- SPDocument *doc = sp_document_new (have_default? tmpl:0, true, true);
+ Document *doc = sp_document_new (have_default? tmpl:0, true, true);
g_return_val_if_fail (doc != 0, false);
Inkscape::UI::View::EditWidget *ew = new Inkscape::UI::View::EditWidget (doc);
sp_document_unref (doc);
g_return_val_if_fail (doc != 0, false);
Inkscape::UI::View::EditWidget *ew = new Inkscape::UI::View::EditWidget (doc);
sp_document_unref (doc);
}
/// Returns the active document
}
/// Returns the active document
-SPDocument*
+Document*
Editor::getActiveDocument()
{
if (getActiveDesktop()) {
Editor::getActiveDocument()
{
if (getActiveDesktop()) {
}
void
}
void
-Editor::addDocument (SPDocument *doc)
+Editor::addDocument (Document *doc)
{
if ( _instance->_document_set.find(doc) == _instance->_document_set.end() ) {
_instance->_documents = g_slist_append (_instance->_documents, doc);
{
if ( _instance->_document_set.find(doc) == _instance->_document_set.end() ) {
_instance->_documents = g_slist_append (_instance->_documents, doc);
}
void
}
void
-Editor::removeDocument (SPDocument *doc)
+Editor::removeDocument (Document *doc)
{
_instance->_document_set.erase(doc);
if ( _instance->_document_set.find(doc) == _instance->_document_set.end() ) {
{
_instance->_document_set.erase(doc);
if ( _instance->_document_set.find(doc) == _instance->_document_set.end() ) {
}
SPDesktop*
}
SPDesktop*
-Editor::createDesktop (SPDocument* doc)
+Editor::createDesktop (Document* doc)
{
g_assert (doc != 0);
(new Inkscape::UI::View::EditWidget (doc))->present();
{
g_assert (doc != 0);
(new Inkscape::UI::View::EditWidget (doc))->present();
bool
Editor::isDuplicatedView (SPDesktop* dt)
{
bool
Editor::isDuplicatedView (SPDesktop* dt)
{
- SPDocument const* document = dt->doc();
+ Document const* document = dt->doc();
if (!document) {
return false;
}
for ( GSList *iter = _instance->_desktops ; iter ; iter = iter->next ) {
SPDesktop *other_desktop=(SPDesktop *)iter->data;
if (!document) {
return false;
}
for ( GSList *iter = _instance->_desktops ; iter ; iter = iter->next ) {
SPDesktop *other_desktop=(SPDesktop *)iter->data;
- SPDocument *other_document=other_desktop->doc();
+ Document *other_document=other_desktop->doc();
if ( other_document == document && other_desktop != dt ) {
return true;
}
if ( other_document == document && other_desktop != dt ) {
return true;
}
diff --git a/src/bind/javabind.cpp b/src/bind/javabind.cpp
index aedd72e13d269bcd40b0646b24b31731eed19a12..02648694894456ae9d3789ec88246b52fff19093 100644 (file)
--- a/src/bind/javabind.cpp
+++ b/src/bind/javabind.cpp
@@ -742,7 +742,7 @@ jboolean JNICALL documentSet(JNIEnv */*env*/, jobject /*obj*/, jlong /*ptr*/, js
/*
JavaBinderyImpl *bind = (JavaBinderyImpl *)ptr;
String s = getString(env, jstr);
/*
JavaBinderyImpl *bind = (JavaBinderyImpl *)ptr;
String s = getString(env, jstr);
- SPDocument *doc = sp_document_new_from_mem(s.c_str(), s.size(), true);
+ Document *doc = sp_document_new_from_mem(s.c_str(), s.size(), true);
*/
return JNI_TRUE;
}
*/
return JNI_TRUE;
}
index 55884fe4af10b87f5182a9b0ce5fe47490714179..cd690a0d43a06e33b6c7dedd908e898c29f402e6 100644 (file)
static unsigned trace_visionkey;
static NRArenaItem *trace_root;
static gdouble trace_zoom;
static unsigned trace_visionkey;
static NRArenaItem *trace_root;
static gdouble trace_zoom;
-static SPDocument *trace_doc;
+static Document *trace_doc;
static void
clonetiler_trace_hide_tiled_clones_recursively (SPObject *from)
static void
clonetiler_trace_hide_tiled_clones_recursively (SPObject *from)
}
static void
}
static void
-clonetiler_trace_setup (SPDocument *doc, gdouble zoom, SPItem *original)
+clonetiler_trace_setup (Document *doc, gdouble zoom, SPItem *original)
{
trace_arena = NRArena::create();
/* Create ArenaItem and set transform */
{
trace_arena = NRArena::create();
/* Create ArenaItem and set transform */
diff --git a/src/dialogs/export.cpp b/src/dialogs/export.cpp
index 0cde76657c99fd1a861f9034693744d39fac3061..56d50596ce57b9835fcc34a242676eb01cbcb86d 100644 (file)
--- a/src/dialogs/export.cpp
+++ b/src/dialogs/export.cpp
if (SP_ACTIVE_DOCUMENT && SP_DOCUMENT_URI (SP_ACTIVE_DOCUMENT))
{
gchar *name;
if (SP_ACTIVE_DOCUMENT && SP_DOCUMENT_URI (SP_ACTIVE_DOCUMENT))
{
gchar *name;
- SPDocument * doc = SP_ACTIVE_DOCUMENT;
+ Document * doc = SP_ACTIVE_DOCUMENT;
const gchar *uri = SP_DOCUMENT_URI (doc);
Inkscape::XML::Node * repr = sp_document_repr_root(doc);
const gchar * text_extension = repr->attribute("inkscape:output_extension");
const gchar *uri = SP_DOCUMENT_URI (doc);
Inkscape::XML::Node * repr = sp_document_repr_root(doc);
const gchar * text_extension = repr->attribute("inkscape:output_extension");
switch (current_key) {
case SELECTION_DRAWING:
if ( SP_ACTIVE_DESKTOP ) {
switch (current_key) {
case SELECTION_DRAWING:
if ( SP_ACTIVE_DESKTOP ) {
- SPDocument *doc;
+ Document *doc;
doc = sp_desktop_document (SP_ACTIVE_DESKTOP);
Geom::OptRect bbox = sp_item_bbox_desktop (SP_ITEM (SP_DOCUMENT_ROOT (doc)));
if (bbox) {
doc = sp_desktop_document (SP_ACTIVE_DESKTOP);
Geom::OptRect bbox = sp_item_bbox_desktop (SP_ITEM (SP_DOCUMENT_ROOT (doc)));
if (bbox) {
if ( SP_ACTIVE_DESKTOP )
{
if ( SP_ACTIVE_DESKTOP )
{
- SPDocument *doc;
+ Document *doc;
Geom::OptRect bbox;
doc = sp_desktop_document (SP_ACTIVE_DESKTOP);
Geom::OptRect bbox;
doc = sp_desktop_document (SP_ACTIVE_DESKTOP);
switch (key) {
case SELECTION_PAGE:
case SELECTION_DRAWING: {
switch (key) {
case SELECTION_PAGE:
case SELECTION_DRAWING: {
- SPDocument * doc = SP_ACTIVE_DOCUMENT;
+ Document * doc = SP_ACTIVE_DOCUMENT;
sp_document_get_export_hints (doc, &filename, &xdpi, &ydpi);
if (filename == NULL) {
sp_document_get_export_hints (doc, &filename, &xdpi, &ydpi);
if (filename == NULL) {
switch ((selection_type)(GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(base), "selection-type")))) {
case SELECTION_PAGE:
case SELECTION_DRAWING: {
switch ((selection_type)(GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(base), "selection-type")))) {
case SELECTION_PAGE:
case SELECTION_DRAWING: {
- SPDocument * doc = SP_ACTIVE_DOCUMENT;
+ Document * doc = SP_ACTIVE_DOCUMENT;
Inkscape::XML::Node * repr = sp_document_repr_root(doc);
bool modified = false;
const gchar * temp_string;
Inkscape::XML::Node * repr = sp_document_repr_root(doc);
bool modified = false;
const gchar * temp_string;
}
case SELECTION_SELECTION: {
const GSList * reprlst;
}
case SELECTION_SELECTION: {
const GSList * reprlst;
- SPDocument * doc = SP_ACTIVE_DOCUMENT;
+ Document * doc = SP_ACTIVE_DOCUMENT;
bool modified = false;
bool saved = sp_document_get_undo_sensitive(doc);
bool modified = false;
bool saved = sp_document_get_undo_sensitive(doc);
}
break;
case SELECTION_DRAWING: {
}
break;
case SELECTION_DRAWING: {
- SPDocument *doc = sp_desktop_document (SP_ACTIVE_DESKTOP);
+ Document *doc = sp_desktop_document (SP_ACTIVE_DESKTOP);
Geom::OptRect bbox = sp_item_bbox_desktop (SP_ITEM (SP_DOCUMENT_ROOT (doc)));
Geom::OptRect bbox = sp_item_bbox_desktop (SP_ITEM (SP_DOCUMENT_ROOT (doc)));
}
case SELECTION_PAGE: {
}
case SELECTION_PAGE: {
- SPDocument *doc;
+ Document *doc;
doc = sp_desktop_document (SP_ACTIVE_DESKTOP);
doc = sp_desktop_document (SP_ACTIVE_DESKTOP);
index c8644fef962ef2b3af6adddb79be4791f2d50f19..32dee453ac286fc70c1c5e2f1b55ecd8fd442fe7 100644 (file)
--- a/src/dialogs/xml-tree.cpp
+++ b/src/dialogs/xml-tree.cpp
static gint blocked = 0;
static SPDesktop *current_desktop = NULL;
static gint blocked = 0;
static SPDesktop *current_desktop = NULL;
-static SPDocument *current_document = NULL;
+static Document *current_document = NULL;
static gint selected_attr = 0;
static Inkscape::XML::Node *selected_repr = NULL;
static gint selected_attr = 0;
static Inkscape::XML::Node *selected_repr = NULL;
static void sp_xmltree_desktop_deactivate( Inkscape::Application *inkscape, SPDesktop *desktop, GtkWidget *dialog );
static void set_tree_desktop(SPDesktop *desktop);
static void sp_xmltree_desktop_deactivate( Inkscape::Application *inkscape, SPDesktop *desktop, GtkWidget *dialog );
static void set_tree_desktop(SPDesktop *desktop);
-static void set_tree_document(SPDocument *document);
+static void set_tree_document(Document *document);
static void set_tree_repr(Inkscape::XML::Node *repr);
static void set_tree_select(Inkscape::XML::Node *repr);
static void set_tree_repr(Inkscape::XML::Node *repr);
static void set_tree_select(Inkscape::XML::Node *repr);
@@ -119,8 +119,8 @@ static void on_attr_unselect_row_clear_text(GtkCList *list, gint row, gint colum
static void on_editable_changed_enable_if_valid_xml_name(GtkEditable *editable, gpointer data);
static void on_desktop_selection_changed(Inkscape::Selection *selection);
static void on_editable_changed_enable_if_valid_xml_name(GtkEditable *editable, gpointer data);
static void on_desktop_selection_changed(Inkscape::Selection *selection);
-static void on_document_replaced(SPDesktop *dt, SPDocument *document);
-static void on_document_uri_set(gchar const *uri, SPDocument *document);
+static void on_document_replaced(SPDesktop *dt, Document *document);
+static void on_document_uri_set(gchar const *uri, Document *document);
static void on_clicked_get_editable_text(GtkWidget *widget, gpointer data);
static void on_clicked_get_editable_text(GtkWidget *widget, gpointer data);
-void set_tree_document(SPDocument *document)
+void set_tree_document(Document *document)
{
if (document == current_document) {
return;
{
if (document == current_document) {
return;
blocked--;
}
blocked--;
}
-static void on_document_replaced(SPDesktop *dt, SPDocument *doc)
+static void on_document_replaced(SPDesktop *dt, Document *doc)
{
if (current_desktop)
sel_changed_connection.disconnect();
{
if (current_desktop)
sel_changed_connection.disconnect();
set_tree_document(doc);
}
set_tree_document(doc);
}
-void on_document_uri_set(gchar const */*uri*/, SPDocument *document)
+void on_document_uri_set(gchar const */*uri*/, Document *document)
{
gchar title[500];
sp_ui_dialog_title_string(Inkscape::Verb::get(SP_VERB_DIALOG_XML_EDITOR), title);
{
gchar title[500];
sp_ui_dialog_title_string(Inkscape::Verb::get(SP_VERB_DIALOG_XML_EDITOR), title);
index a92e7cf5bb993f758afd88e609cb3b5b8b211c10..90bac605318c08e6ccb72472516e742e6c4a6b72 100644 (file)
@@ -190,7 +190,7 @@ attach_all(Gtk::Table &table, Gtk::Widget const *const arr[], unsigned size, int
}
}
}
}
-CanvasAxonomGrid::CanvasAxonomGrid (SPNamedView * nv, Inkscape::XML::Node * in_repr, SPDocument * in_doc)
+CanvasAxonomGrid::CanvasAxonomGrid (SPNamedView * nv, Inkscape::XML::Node * in_repr, Document * in_doc)
: CanvasGrid(nv, in_repr, in_doc, GRID_AXONOMETRIC)
{
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
: CanvasGrid(nv, in_repr, in_doc, GRID_AXONOMETRIC)
{
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
index 5037c0375a695e2d093023505a4613cdbe1c27b2..710074a970c0f6a72f0846da3b35214b59cb4dbf 100644 (file)
@@ -155,7 +155,7 @@ grid_canvasitem_update (SPCanvasItem *item, Geom::Matrix const &affine, unsigned
NULL /* order_changed */
};
NULL /* order_changed */
};
-CanvasGrid::CanvasGrid(SPNamedView * nv, Inkscape::XML::Node * in_repr, SPDocument *in_doc, GridType type)
+CanvasGrid::CanvasGrid(SPNamedView * nv, Inkscape::XML::Node * in_repr, Document *in_doc, GridType type)
: visible(true), gridtype(type)
{
repr = in_repr;
: visible(true), gridtype(type)
{
repr = in_repr;
* writes an <inkscape:grid> child to repr.
*/
void
* writes an <inkscape:grid> child to repr.
*/
void
-CanvasGrid::writeNewGridToRepr(Inkscape::XML::Node * repr, SPDocument * doc, GridType gridtype)
+CanvasGrid::writeNewGridToRepr(Inkscape::XML::Node * repr, Document * doc, GridType gridtype)
{
if (!repr) return;
if (gridtype > GRID_MAXTYPENR) return;
{
if (!repr) return;
if (gridtype > GRID_MAXTYPENR) return;
@@ -262,7 +262,7 @@ CanvasGrid::writeNewGridToRepr(Inkscape::XML::Node * repr, SPDocument * doc, Gri
* Creates a new CanvasGrid object of type gridtype
*/
CanvasGrid*
* Creates a new CanvasGrid object of type gridtype
*/
CanvasGrid*
-CanvasGrid::NewGrid(SPNamedView * nv, Inkscape::XML::Node * repr, SPDocument * doc, GridType gridtype)
+CanvasGrid::NewGrid(SPNamedView * nv, Inkscape::XML::Node * repr, Document * doc, GridType gridtype)
{
if (!repr) return NULL;
if (!doc) {
{
if (!repr) return NULL;
if (!doc) {
@@ -420,7 +420,7 @@ attach_all(Gtk::Table &table, Gtk::Widget const *const arr[], unsigned size, int
}
}
}
}
-CanvasXYGrid::CanvasXYGrid (SPNamedView * nv, Inkscape::XML::Node * in_repr, SPDocument * in_doc)
+CanvasXYGrid::CanvasXYGrid (SPNamedView * nv, Inkscape::XML::Node * in_repr, Document * in_doc)
: CanvasGrid(nv, in_repr, in_doc, GRID_RECTANGULAR)
{
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
: CanvasGrid(nv, in_repr, in_doc, GRID_RECTANGULAR)
{
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
index 2b799f8d26d3116979f0a47f8ab80179540549d1..4430907dab8b98f40a6eeb9cba8aaab66315c6c4 100644 (file)
feImageHref = (href) ? g_strdup (href) : NULL;
}
feImageHref = (href) ? g_strdup (href) : NULL;
}
-void FilterImage::set_document(SPDocument *doc){
+void FilterImage::set_document(Document *doc){
document = doc;
}
document = doc;
}
index afc0668a9eb967eff6dbe7429b2281903a4198b6..c6b731a848486a46480e65c425efbca9c4761933 100644 (file)
--- a/src/extension/effect.cpp
+++ b/src/extension/effect.cpp
Effect::EffectVerb::perform( SPAction *action, void * data, void */*pdata*/ )
{
Inkscape::UI::View::View * current_view = sp_action_get_view(action);
Effect::EffectVerb::perform( SPAction *action, void * data, void */*pdata*/ )
{
Inkscape::UI::View::View * current_view = sp_action_get_view(action);
-// SPDocument * current_document = current_view->doc;
+// Document * current_document = current_view->doc;
Effect::EffectVerb * ev = reinterpret_cast<Effect::EffectVerb *>(data);
Effect * effect = ev->_effect;
Effect::EffectVerb * ev = reinterpret_cast<Effect::EffectVerb *>(data);
Effect * effect = ev->_effect;
index 4a13890d78c4137b8c5aa6dd9e2662d4d5299ded..a87cc6b6436e452a61b4bfe83962108bdd2f8145 100644 (file)
void
ExecutionEnv::reselect (void) {
if (_doc == NULL) { return; }
void
ExecutionEnv::reselect (void) {
if (_doc == NULL) { return; }
- SPDocument * doc = _doc->doc();
+ Document * doc = _doc->doc();
if (doc == NULL) { return; }
SPDesktop *desktop = (SPDesktop *)_doc;
if (doc == NULL) { return; }
SPDesktop *desktop = (SPDesktop *)_doc;
index 52d5f5148b540e3915a1bf1f5354ca2764dad108..c8dc30d8bc1766977b4c6f825a60caf106b08aa9 100644 (file)
found parameter.
*/
const gchar *
found parameter.
*/
const gchar *
-Extension::get_param_string (const gchar * name, const SPDocument * doc, const Inkscape::XML::Node * node)
+Extension::get_param_string (const gchar * name, const Document * doc, const Inkscape::XML::Node * node)
{
Parameter * param;
{
Parameter * param;
@@ -432,7 +432,7 @@ Extension::get_param_string (const gchar * name, const SPDocument * doc, const I
}
const gchar *
}
const gchar *
-Extension::get_param_enum (const gchar * name, const SPDocument * doc, const Inkscape::XML::Node * node)
+Extension::get_param_enum (const gchar * name, const Document * doc, const Inkscape::XML::Node * node)
{
Parameter* param = param_shared(name, parameters);
return param->get_enum(doc, node);
{
Parameter* param = param_shared(name, parameters);
return param->get_enum(doc, node);
@@ -450,7 +450,7 @@ Extension::get_param_enum (const gchar * name, const SPDocument * doc, const Ink
found parameter.
*/
bool
found parameter.
*/
bool
-Extension::get_param_bool (const gchar * name, const SPDocument * doc, const Inkscape::XML::Node * node)
+Extension::get_param_bool (const gchar * name, const Document * doc, const Inkscape::XML::Node * node)
{
Parameter * param;
{
Parameter * param;
@@ -470,7 +470,7 @@ Extension::get_param_bool (const gchar * name, const SPDocument * doc, const Ink
found parameter.
*/
int
found parameter.
*/
int
-Extension::get_param_int (const gchar * name, const SPDocument * doc, const Inkscape::XML::Node * node)
+Extension::get_param_int (const gchar * name, const Document * doc, const Inkscape::XML::Node * node)
{
Parameter * param;
{
Parameter * param;
@@ -490,7 +490,7 @@ Extension::get_param_int (const gchar * name, const SPDocument * doc, const Inks
found parameter.
*/
float
found parameter.
*/
float
-Extension::get_param_float (const gchar * name, const SPDocument * doc, const Inkscape::XML::Node * node)
+Extension::get_param_float (const gchar * name, const Document * doc, const Inkscape::XML::Node * node)
{
Parameter * param;
param = param_shared(name, parameters);
{
Parameter * param;
param = param_shared(name, parameters);
@@ -509,7 +509,7 @@ Extension::get_param_float (const gchar * name, const SPDocument * doc, const In
found parameter.
*/
guint32
found parameter.
*/
guint32
-Extension::get_param_color (const gchar * name, const SPDocument * doc, const Inkscape::XML::Node * node)
+Extension::get_param_color (const gchar * name, const Document * doc, const Inkscape::XML::Node * node)
{
Parameter* param = param_shared(name, parameters);
return param->get_color(doc, node);
{
Parameter* param = param_shared(name, parameters);
return param->get_color(doc, node);
@@ -528,7 +528,7 @@ Extension::get_param_color (const gchar * name, const SPDocument * doc, const In
found parameter.
*/
bool
found parameter.
*/
bool
-Extension::set_param_bool (const gchar * name, bool value, SPDocument * doc, Inkscape::XML::Node * node)
+Extension::set_param_bool (const gchar * name, bool value, Document * doc, Inkscape::XML::Node * node)
{
Parameter * param;
param = param_shared(name, parameters);
{
Parameter * param;
param = param_shared(name, parameters);
@@ -548,7 +548,7 @@ Extension::set_param_bool (const gchar * name, bool value, SPDocument * doc, Ink
found parameter.
*/
int
found parameter.
*/
int
-Extension::set_param_int (const gchar * name, int value, SPDocument * doc, Inkscape::XML::Node * node)
+Extension::set_param_int (const gchar * name, int value, Document * doc, Inkscape::XML::Node * node)
{
Parameter * param;
param = param_shared(name, parameters);
{
Parameter * param;
param = param_shared(name, parameters);
@@ -568,7 +568,7 @@ Extension::set_param_int (const gchar * name, int value, SPDocument * doc, Inksc
found parameter.
*/
float
found parameter.
*/
float
-Extension::set_param_float (const gchar * name, float value, SPDocument * doc, Inkscape::XML::Node * node)
+Extension::set_param_float (const gchar * name, float value, Document * doc, Inkscape::XML::Node * node)
{
Parameter * param;
param = param_shared(name, parameters);
{
Parameter * param;
param = param_shared(name, parameters);
@@ -588,7 +588,7 @@ Extension::set_param_float (const gchar * name, float value, SPDocument * doc, I
found parameter.
*/
const gchar *
found parameter.
*/
const gchar *
-Extension::set_param_string (const gchar * name, const gchar * value, SPDocument * doc, Inkscape::XML::Node * node)
+Extension::set_param_string (const gchar * name, const gchar * value, Document * doc, Inkscape::XML::Node * node)
{
Parameter * param;
param = param_shared(name, parameters);
{
Parameter * param;
param = param_shared(name, parameters);
@@ -608,7 +608,7 @@ Extension::set_param_string (const gchar * name, const gchar * value, SPDocument
found parameter.
*/
guint32
found parameter.
*/
guint32
-Extension::set_param_color (const gchar * name, guint32 color, SPDocument * doc, Inkscape::XML::Node * node)
+Extension::set_param_color (const gchar * name, guint32 color, Document * doc, Inkscape::XML::Node * node)
{
Parameter* param = param_shared(name, parameters);
return param->set_color(color, doc, node);
{
Parameter* param = param_shared(name, parameters);
return param->set_color(color, doc, node);
If all parameters are gui_visible = false NULL is returned as well.
*/
Gtk::Widget *
If all parameters are gui_visible = false NULL is returned as well.
*/
Gtk::Widget *
-Extension::autogui (SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal)
+Extension::autogui (Document * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal)
{
if (param_visible_count() == 0) return NULL;
{
if (param_visible_count() == 0) return NULL;
index 689c1286f6e96155694f7b13c3868f075e6c976b..ca5fdc29f326ac3f2270cc0d1ea18c646ff627c9 100644 (file)
--- a/src/extension/input.cpp
+++ b/src/extension/input.cpp
Adobe Illustrator file can be transparent (not recommended, but
transparent). This is all done with undo being turned off.
*/
Adobe Illustrator file can be transparent (not recommended, but
transparent). This is all done with undo being turned off.
*/
-SPDocument *
+Document *
Input::open (const gchar *uri)
{
if (!loaded()) {
Input::open (const gchar *uri)
{
if (!loaded()) {
}
timer->touch();
}
timer->touch();
- SPDocument *const doc = imp->open(this, uri);
+ Document *const doc = imp->open(this, uri);
if (doc != NULL) {
Inkscape::XML::Node * repr = sp_document_repr_root(doc);
bool saved = sp_document_get_undo_sensitive(doc);
if (doc != NULL) {
Inkscape::XML::Node * repr = sp_document_repr_root(doc);
bool saved = sp_document_get_undo_sensitive(doc);
index 742e938de20307e62f3d74763f4a34a2dec4f486..8e2fa54867d3bca02139dd91965e89f806580a94 100644 (file)
--- a/src/extension/output.cpp
+++ b/src/extension/output.cpp
could be changed, and old files will still work properly.
*/
void
could be changed, and old files will still work properly.
*/
void
-Output::save(SPDocument *doc, gchar const *filename)
+Output::save(Document *doc, gchar const *filename)
{
try {
imp->save(this, doc, filename);
{
try {
imp->save(this, doc, filename);
index 8e3fc13f19486998fc2636ba1dfbf6586fc05cb8..f6fa84f5b55bd5183d6aab4d322af6587ee553f1 100644 (file)
}
void
}
void
-PathEffect::processPath (SPDocument * /*doc*/, Inkscape::XML::Node * /*path*/, Inkscape::XML::Node * /*def*/)
+PathEffect::processPath (Document * /*doc*/, Inkscape::XML::Node * /*path*/, Inkscape::XML::Node * /*def*/)
{
}
void
{
}
void
-PathEffect::processPathEffects (SPDocument * doc, Inkscape::XML::Node * path)
+PathEffect::processPathEffects (Document * doc, Inkscape::XML::Node * path)
{
gchar const * patheffectlist = path->attribute("inkscape:path-effects");
if (patheffectlist == NULL)
{
gchar const * patheffectlist = path->attribute("inkscape:path-effects");
if (patheffectlist == NULL)
index 2d4177d606376c77bb1e9d1806804c62e5693f8c..f6f6bb1e54adc5f4489863ef8f4121f0ed0176eb 100644 (file)
--- a/src/extension/print.cpp
+++ b/src/extension/print.cpp
}
unsigned int
}
unsigned int
-Print::begin (SPDocument *doc)
+Print::begin (Document *doc)
{
return imp->begin(this, doc);
}
{
return imp->begin(this, doc);
}
index d7e0eebf3794515a9a07e94b8143219f8ecfb401..ad49c3d2ae1300c3e93dd8222dca7d3bc7c9a999 100644 (file)
--- a/src/extension/system.cpp
+++ b/src/extension/system.cpp
*
* Lastly, the open function is called in the module itself.
*/
*
* Lastly, the open function is called in the module itself.
*/
-SPDocument *
+Document *
open(Extension *key, gchar const *filename)
{
Input *imod = NULL;
open(Extension *key, gchar const *filename)
{
Input *imod = NULL;
if (!imod->prefs(filename))
return NULL;
if (!imod->prefs(filename))
return NULL;
- SPDocument *doc = imod->open(filename);
+ Document *doc = imod->open(filename);
if (!doc) {
throw Input::open_failed();
}
if (!doc) {
throw Input::open_failed();
}
* Lastly, the save function is called in the module itself.
*/
void
* Lastly, the save function is called in the module itself.
*/
void
-save(Extension *key, SPDocument *doc, gchar const *filename, bool setextension, bool check_overwrite, bool official)
+save(Extension *key, Document *doc, gchar const *filename, bool setextension, bool check_overwrite, bool official)
{
Output *omod;
if (key == NULL) {
{
Output *omod;
if (key == NULL) {
diff --git a/src/filters/blend.cpp b/src/filters/blend.cpp
index 5998d7be335021cb0ea6b4aeefa97e69c8a9efb9..26db781a08f00e3e885ecb0fa742540902e3530f 100644 (file)
--- a/src/filters/blend.cpp
+++ b/src/filters/blend.cpp
static void sp_feBlend_class_init(SPFeBlendClass *klass);
static void sp_feBlend_init(SPFeBlend *feBlend);
static void sp_feBlend_class_init(SPFeBlendClass *klass);
static void sp_feBlend_init(SPFeBlend *feBlend);
-static void sp_feBlend_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr);
+static void sp_feBlend_build(SPObject *object, Document *document, Inkscape::XML::Node *repr);
static void sp_feBlend_release(SPObject *object);
static void sp_feBlend_set(SPObject *object, unsigned int key, gchar const *value);
static void sp_feBlend_update(SPObject *object, SPCtx *ctx, guint flags);
static void sp_feBlend_release(SPObject *object);
static void sp_feBlend_set(SPObject *object, unsigned int key, gchar const *value);
static void sp_feBlend_update(SPObject *object, SPCtx *ctx, guint flags);
* sp-object-repr.cpp's repr_name_entries array.
*/
static void
* sp-object-repr.cpp's repr_name_entries array.
*/
static void
-sp_feBlend_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
+sp_feBlend_build(SPObject *object, Document *document, Inkscape::XML::Node *repr)
{
SPFeBlend *blend = SP_FEBLEND(object);
{
SPFeBlend *blend = SP_FEBLEND(object);
index 55cfcbeb78ed20c6b0833d2210e592a536bc9f01..f3c336d715381944bd7334b015813c617f6f57ea 100644 (file)
static void sp_feColorMatrix_class_init(SPFeColorMatrixClass *klass);
static void sp_feColorMatrix_init(SPFeColorMatrix *feColorMatrix);
static void sp_feColorMatrix_class_init(SPFeColorMatrixClass *klass);
static void sp_feColorMatrix_init(SPFeColorMatrix *feColorMatrix);
-static void sp_feColorMatrix_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr);
+static void sp_feColorMatrix_build(SPObject *object, Document *document, Inkscape::XML::Node *repr);
static void sp_feColorMatrix_release(SPObject *object);
static void sp_feColorMatrix_set(SPObject *object, unsigned int key, gchar const *value);
static void sp_feColorMatrix_update(SPObject *object, SPCtx *ctx, guint flags);
static void sp_feColorMatrix_release(SPObject *object);
static void sp_feColorMatrix_set(SPObject *object, unsigned int key, gchar const *value);
static void sp_feColorMatrix_update(SPObject *object, SPCtx *ctx, guint flags);
* sp-object-repr.cpp's repr_name_entries array.
*/
static void
* sp-object-repr.cpp's repr_name_entries array.
*/
static void
-sp_feColorMatrix_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
+sp_feColorMatrix_build(SPObject *object, Document *document, Inkscape::XML::Node *repr)
{
if (((SPObjectClass *) feColorMatrix_parent_class)->build) {
((SPObjectClass *) feColorMatrix_parent_class)->build(object, document, repr);
{
if (((SPObjectClass *) feColorMatrix_parent_class)->build) {
((SPObjectClass *) feColorMatrix_parent_class)->build(object, document, repr);
diff --git a/src/filters/componenttransfer-funcnode.cpp b/src/filters/componenttransfer-funcnode.cpp
index e66f85e70b8399b99d94637519fa90ca0e929297..f74da8154f65a0ac026ffbf5cbc0b94a0f273abc 100644 (file)
static void sp_fefuncnode_class_init(SPFeFuncNodeClass *klass);
static void sp_fefuncnode_init(SPFeFuncNode *fefuncnode);
static void sp_fefuncnode_class_init(SPFeFuncNodeClass *klass);
static void sp_fefuncnode_init(SPFeFuncNode *fefuncnode);
-static void sp_fefuncnode_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr);
+static void sp_fefuncnode_build(SPObject *object, Document *document, Inkscape::XML::Node *repr);
static void sp_fefuncnode_release(SPObject *object);
static void sp_fefuncnode_set(SPObject *object, unsigned int key, gchar const *value);
static void sp_fefuncnode_update(SPObject *object, SPCtx *ctx, guint flags);
static void sp_fefuncnode_release(SPObject *object);
static void sp_fefuncnode_set(SPObject *object, unsigned int key, gchar const *value);
static void sp_fefuncnode_update(SPObject *object, SPCtx *ctx, guint flags);
* sp-object-repr.cpp's repr_name_entries array.
*/
static void
* sp-object-repr.cpp's repr_name_entries array.
*/
static void
-sp_fefuncnode_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
+sp_fefuncnode_build(SPObject *object, Document *document, Inkscape::XML::Node *repr)
{
if (((SPObjectClass *) feFuncNode_parent_class)->build) {
((SPObjectClass *) feFuncNode_parent_class)->build(object, document, repr);
{
if (((SPObjectClass *) feFuncNode_parent_class)->build) {
((SPObjectClass *) feFuncNode_parent_class)->build(object, document, repr);
index 557d884e0ffb797f3d2fe5f1d90d5bc1e9488b9e..fbfca3a354aabfd24e647023092993ff33b0e390 100644 (file)
static void sp_feComponentTransfer_class_init(SPFeComponentTransferClass *klass);
static void sp_feComponentTransfer_init(SPFeComponentTransfer *feComponentTransfer);
static void sp_feComponentTransfer_class_init(SPFeComponentTransferClass *klass);
static void sp_feComponentTransfer_init(SPFeComponentTransfer *feComponentTransfer);
-static void sp_feComponentTransfer_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr);
+static void sp_feComponentTransfer_build(SPObject *object, Document *document, Inkscape::XML::Node *repr);
static void sp_feComponentTransfer_release(SPObject *object);
static void sp_feComponentTransfer_set(SPObject *object, unsigned int key, gchar const *value);
static void sp_feComponentTransfer_update(SPObject *object, SPCtx *ctx, guint flags);
static void sp_feComponentTransfer_release(SPObject *object);
static void sp_feComponentTransfer_set(SPObject *object, unsigned int key, gchar const *value);
static void sp_feComponentTransfer_update(SPObject *object, SPCtx *ctx, guint flags);
* sp-object-repr.cpp's repr_name_entries array.
*/
static void
* sp-object-repr.cpp's repr_name_entries array.
*/
static void
-sp_feComponentTransfer_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
+sp_feComponentTransfer_build(SPObject *object, Document *document, Inkscape::XML::Node *repr)
{
if (((SPObjectClass *) feComponentTransfer_parent_class)->build) {
((SPObjectClass *) feComponentTransfer_parent_class)->build(object, document, repr);
{
if (((SPObjectClass *) feComponentTransfer_parent_class)->build) {
((SPObjectClass *) feComponentTransfer_parent_class)->build(object, document, repr);
index 93c692f94d14f24749b9c116e954b1340ab4106c..8265a611c17ea913c2a85ecbd6d7543e811d0964 100644 (file)
static void sp_feComposite_class_init(SPFeCompositeClass *klass);
static void sp_feComposite_init(SPFeComposite *feComposite);
static void sp_feComposite_class_init(SPFeCompositeClass *klass);
static void sp_feComposite_init(SPFeComposite *feComposite);
-static void sp_feComposite_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr);
+static void sp_feComposite_build(SPObject *object, Document *document, Inkscape::XML::Node *repr);
static void sp_feComposite_release(SPObject *object);
static void sp_feComposite_set(SPObject *object, unsigned int key, gchar const *value);
static void sp_feComposite_update(SPObject *object, SPCtx *ctx, guint flags);
static void sp_feComposite_release(SPObject *object);
static void sp_feComposite_set(SPObject *object, unsigned int key, gchar const *value);
static void sp_feComposite_update(SPObject *object, SPCtx *ctx, guint flags);
* sp-object-repr.cpp's repr_name_entries array.
*/
static void
* sp-object-repr.cpp's repr_name_entries array.
*/
static void
-sp_feComposite_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
+sp_feComposite_build(SPObject *object, Document *document, Inkscape::XML::Node *repr)
{
if (((SPObjectClass *) feComposite_parent_class)->build) {
((SPObjectClass *) feComposite_parent_class)->build(object, document, repr);
{
if (((SPObjectClass *) feComposite_parent_class)->build) {
((SPObjectClass *) feComposite_parent_class)->build(object, document, repr);
index 3e1c36f0ad994afd8f6d3cc3edfc88a174a658c4..cc9d62f8fd4f39bda3574d3ec0477a5e36639e70 100644 (file)
static void sp_feConvolveMatrix_class_init(SPFeConvolveMatrixClass *klass);
static void sp_feConvolveMatrix_init(SPFeConvolveMatrix *feConvolveMatrix);
static void sp_feConvolveMatrix_class_init(SPFeConvolveMatrixClass *klass);
static void sp_feConvolveMatrix_init(SPFeConvolveMatrix *feConvolveMatrix);
-static void sp_feConvolveMatrix_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr);
+static void sp_feConvolveMatrix_build(SPObject *object, Document *document, Inkscape::XML::Node *repr);
static void sp_feConvolveMatrix_release(SPObject *object);
static void sp_feConvolveMatrix_set(SPObject *object, unsigned int key, gchar const *value);
static void sp_feConvolveMatrix_update(SPObject *object, SPCtx *ctx, guint flags);
static void sp_feConvolveMatrix_release(SPObject *object);
static void sp_feConvolveMatrix_set(SPObject *object, unsigned int key, gchar const *value);
static void sp_feConvolveMatrix_update(SPObject *object, SPCtx *ctx, guint flags);
* sp-object-repr.cpp's repr_name_entries array.
*/
static void
* sp-object-repr.cpp's repr_name_entries array.
*/
static void
-sp_feConvolveMatrix_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
+sp_feConvolveMatrix_build(SPObject *object, Document *document, Inkscape::XML::Node *repr)
{
if (((SPObjectClass *) feConvolveMatrix_parent_class)->build) {
((SPObjectClass *) feConvolveMatrix_parent_class)->build(object, document, repr);
{
if (((SPObjectClass *) feConvolveMatrix_parent_class)->build) {
((SPObjectClass *) feConvolveMatrix_parent_class)->build(object, document, repr);
index bdc569083564712f170bc94d0b69e72105db86cc..e494e8ccdc482be621448d528d87d3388888a69f 100644 (file)
static void sp_feDiffuseLighting_class_init(SPFeDiffuseLightingClass *klass);
static void sp_feDiffuseLighting_init(SPFeDiffuseLighting *feDiffuseLighting);
static void sp_feDiffuseLighting_class_init(SPFeDiffuseLightingClass *klass);
static void sp_feDiffuseLighting_init(SPFeDiffuseLighting *feDiffuseLighting);
-static void sp_feDiffuseLighting_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr);
+static void sp_feDiffuseLighting_build(SPObject *object, Document *document, Inkscape::XML::Node *repr);
static void sp_feDiffuseLighting_release(SPObject *object);
static void sp_feDiffuseLighting_set(SPObject *object, unsigned int key, gchar const *value);
static void sp_feDiffuseLighting_update(SPObject *object, SPCtx *ctx, guint flags);
static void sp_feDiffuseLighting_release(SPObject *object);
static void sp_feDiffuseLighting_set(SPObject *object, unsigned int key, gchar const *value);
static void sp_feDiffuseLighting_update(SPObject *object, SPCtx *ctx, guint flags);
* sp-object-repr.cpp's repr_name_entries array.
*/
static void
* sp-object-repr.cpp's repr_name_entries array.
*/
static void
-sp_feDiffuseLighting_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
+sp_feDiffuseLighting_build(SPObject *object, Document *document, Inkscape::XML::Node *repr)
{
if (((SPObjectClass *) feDiffuseLighting_parent_class)->build) {
((SPObjectClass *) feDiffuseLighting_parent_class)->build(object, document, repr);
{
if (((SPObjectClass *) feDiffuseLighting_parent_class)->build) {
((SPObjectClass *) feDiffuseLighting_parent_class)->build(object, document, repr);
index baa17d785f00452de09356050bfe7d599a259ade..b05ee4db139937f3cfaea0af66d0271458ae245a 100644 (file)
static void sp_feDisplacementMap_class_init(SPFeDisplacementMapClass *klass);
static void sp_feDisplacementMap_init(SPFeDisplacementMap *feDisplacementMap);
static void sp_feDisplacementMap_class_init(SPFeDisplacementMapClass *klass);
static void sp_feDisplacementMap_init(SPFeDisplacementMap *feDisplacementMap);
-static void sp_feDisplacementMap_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr);
+static void sp_feDisplacementMap_build(SPObject *object, Document *document, Inkscape::XML::Node *repr);
static void sp_feDisplacementMap_release(SPObject *object);
static void sp_feDisplacementMap_set(SPObject *object, unsigned int key, gchar const *value);
static void sp_feDisplacementMap_update(SPObject *object, SPCtx *ctx, guint flags);
static void sp_feDisplacementMap_release(SPObject *object);
static void sp_feDisplacementMap_set(SPObject *object, unsigned int key, gchar const *value);
static void sp_feDisplacementMap_update(SPObject *object, SPCtx *ctx, guint flags);
* sp-object-repr.cpp's repr_name_entries array.
*/
static void
* sp-object-repr.cpp's repr_name_entries array.
*/
static void
-sp_feDisplacementMap_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
+sp_feDisplacementMap_build(SPObject *object, Document *document, Inkscape::XML::Node *repr)
{
if (((SPObjectClass *) feDisplacementMap_parent_class)->build) {
((SPObjectClass *) feDisplacementMap_parent_class)->build(object, document, repr);
{
if (((SPObjectClass *) feDisplacementMap_parent_class)->build) {
((SPObjectClass *) feDisplacementMap_parent_class)->build(object, document, repr);
index 41584c4a4c17c664bdb41adf50b3727e9ca42cfd..f250947987331632ed36d49efed2f0a77b9f16cd 100644 (file)
static void sp_fedistantlight_class_init(SPFeDistantLightClass *klass);
static void sp_fedistantlight_init(SPFeDistantLight *fedistantlight);
static void sp_fedistantlight_class_init(SPFeDistantLightClass *klass);
static void sp_fedistantlight_init(SPFeDistantLight *fedistantlight);
-static void sp_fedistantlight_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr);
+static void sp_fedistantlight_build(SPObject *object, Document *document, Inkscape::XML::Node *repr);
static void sp_fedistantlight_release(SPObject *object);
static void sp_fedistantlight_set(SPObject *object, unsigned int key, gchar const *value);
static void sp_fedistantlight_update(SPObject *object, SPCtx *ctx, guint flags);
static void sp_fedistantlight_release(SPObject *object);
static void sp_fedistantlight_set(SPObject *object, unsigned int key, gchar const *value);
static void sp_fedistantlight_update(SPObject *object, SPCtx *ctx, guint flags);
* sp-object-repr.cpp's repr_name_entries array.
*/
static void
* sp-object-repr.cpp's repr_name_entries array.
*/
static void
-sp_fedistantlight_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
+sp_fedistantlight_build(SPObject *object, Document *document, Inkscape::XML::Node *repr)
{
if (((SPObjectClass *) feDistantLight_parent_class)->build) {
((SPObjectClass *) feDistantLight_parent_class)->build(object, document, repr);
{
if (((SPObjectClass *) feDistantLight_parent_class)->build) {
((SPObjectClass *) feDistantLight_parent_class)->build(object, document, repr);
diff --git a/src/filters/flood.cpp b/src/filters/flood.cpp
index 625e35d42bf765183611c38561bbe824d25e3258..941f361131bb6958b1c05cf61e998dc738318654 100644 (file)
--- a/src/filters/flood.cpp
+++ b/src/filters/flood.cpp
static void sp_feFlood_class_init(SPFeFloodClass *klass);
static void sp_feFlood_init(SPFeFlood *feFlood);
static void sp_feFlood_class_init(SPFeFloodClass *klass);
static void sp_feFlood_init(SPFeFlood *feFlood);
-static void sp_feFlood_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr);
+static void sp_feFlood_build(SPObject *object, Document *document, Inkscape::XML::Node *repr);
static void sp_feFlood_release(SPObject *object);
static void sp_feFlood_set(SPObject *object, unsigned int key, gchar const *value);
static void sp_feFlood_update(SPObject *object, SPCtx *ctx, guint flags);
static void sp_feFlood_release(SPObject *object);
static void sp_feFlood_set(SPObject *object, unsigned int key, gchar const *value);
static void sp_feFlood_update(SPObject *object, SPCtx *ctx, guint flags);
* sp-object-repr.cpp's repr_name_entries array.
*/
static void
* sp-object-repr.cpp's repr_name_entries array.
*/
static void
-sp_feFlood_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
+sp_feFlood_build(SPObject *object, Document *document, Inkscape::XML::Node *repr)
{
if (((SPObjectClass *) feFlood_parent_class)->build) {
((SPObjectClass *) feFlood_parent_class)->build(object, document, repr);
{
if (((SPObjectClass *) feFlood_parent_class)->build) {
((SPObjectClass *) feFlood_parent_class)->build(object, document, repr);
diff --git a/src/filters/image.cpp b/src/filters/image.cpp
index 0002ef94c74a36b336aa2e40350a2027e5266fd3..bdfbadee091eb758f567285e4d376a59c49b16e8 100644 (file)
--- a/src/filters/image.cpp
+++ b/src/filters/image.cpp
static void sp_feImage_class_init(SPFeImageClass *klass);
static void sp_feImage_init(SPFeImage *feImage);
static void sp_feImage_class_init(SPFeImageClass *klass);
static void sp_feImage_init(SPFeImage *feImage);
-static void sp_feImage_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr);
+static void sp_feImage_build(SPObject *object, Document *document, Inkscape::XML::Node *repr);
static void sp_feImage_release(SPObject *object);
static void sp_feImage_set(SPObject *object, unsigned int key, gchar const *value);
static void sp_feImage_update(SPObject *object, SPCtx *ctx, guint flags);
static void sp_feImage_release(SPObject *object);
static void sp_feImage_set(SPObject *object, unsigned int key, gchar const *value);
static void sp_feImage_update(SPObject *object, SPCtx *ctx, guint flags);
* sp-object-repr.cpp's repr_name_entries array.
*/
static void
* sp-object-repr.cpp's repr_name_entries array.
*/
static void
-sp_feImage_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
+sp_feImage_build(SPObject *object, Document *document, Inkscape::XML::Node *repr)
{
// Save document reference so we can load images with relative paths.
SPFeImage *feImage = SP_FEIMAGE(object);
{
// Save document reference so we can load images with relative paths.
SPFeImage *feImage = SP_FEIMAGE(object);
diff --git a/src/filters/merge.cpp b/src/filters/merge.cpp
index 437cb4b5511caf21724301aa24594a4dca167020..9d82da7ae6987a5341608f03fe56ab4f518145e3 100644 (file)
--- a/src/filters/merge.cpp
+++ b/src/filters/merge.cpp
static void sp_feMerge_class_init(SPFeMergeClass *klass);
static void sp_feMerge_init(SPFeMerge *feMerge);
static void sp_feMerge_class_init(SPFeMergeClass *klass);
static void sp_feMerge_init(SPFeMerge *feMerge);
-static void sp_feMerge_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr);
+static void sp_feMerge_build(SPObject *object, Document *document, Inkscape::XML::Node *repr);
static void sp_feMerge_release(SPObject *object);
static void sp_feMerge_set(SPObject *object, unsigned int key, gchar const *value);
static void sp_feMerge_update(SPObject *object, SPCtx *ctx, guint flags);
static void sp_feMerge_release(SPObject *object);
static void sp_feMerge_set(SPObject *object, unsigned int key, gchar const *value);
static void sp_feMerge_update(SPObject *object, SPCtx *ctx, guint flags);
* sp-object-repr.cpp's repr_name_entries array.
*/
static void
* sp-object-repr.cpp's repr_name_entries array.
*/
static void
-sp_feMerge_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
+sp_feMerge_build(SPObject *object, Document *document, Inkscape::XML::Node *repr)
{
if (((SPObjectClass *) feMerge_parent_class)->build) {
((SPObjectClass *) feMerge_parent_class)->build(object, document, repr);
{
if (((SPObjectClass *) feMerge_parent_class)->build) {
((SPObjectClass *) feMerge_parent_class)->build(object, document, repr);
index 8a4e0dd0ac179691fbb754e3cfeae9ab056cd514..42b4bc8dbadb8966d7009c541563502be7a21125 100644 (file)
static void sp_feMergeNode_class_init(SPFeMergeNodeClass *klass);
static void sp_feMergeNode_init(SPFeMergeNode *skeleton);
static void sp_feMergeNode_class_init(SPFeMergeNodeClass *klass);
static void sp_feMergeNode_init(SPFeMergeNode *skeleton);
-static void sp_feMergeNode_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr);
+static void sp_feMergeNode_build(SPObject *object, Document *document, Inkscape::XML::Node *repr);
static void sp_feMergeNode_release(SPObject *object);
static void sp_feMergeNode_set(SPObject *object, unsigned int key, gchar const *value);
static void sp_feMergeNode_update(SPObject *object, SPCtx *ctx, guint flags);
static void sp_feMergeNode_release(SPObject *object);
static void sp_feMergeNode_set(SPObject *object, unsigned int key, gchar const *value);
static void sp_feMergeNode_update(SPObject *object, SPCtx *ctx, guint flags);
* sp-object-repr.cpp's repr_name_entries array.
*/
static void
* sp-object-repr.cpp's repr_name_entries array.
*/
static void
-sp_feMergeNode_build(SPObject *object, SPDocument */*document*/, Inkscape::XML::Node */*repr*/)
+sp_feMergeNode_build(SPObject *object, Document */*document*/, Inkscape::XML::Node */*repr*/)
{
sp_object_read_attr(object, "in");
}
{
sp_object_read_attr(object, "in");
}
index 9a34bbccba3634a472dd93a342099160608ecdf6..6d91d99056682a9e1e856f6cbd77560aab5a2dd5 100644 (file)
static void sp_feMorphology_class_init(SPFeMorphologyClass *klass);
static void sp_feMorphology_init(SPFeMorphology *feMorphology);
static void sp_feMorphology_class_init(SPFeMorphologyClass *klass);
static void sp_feMorphology_init(SPFeMorphology *feMorphology);
-static void sp_feMorphology_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr);
+static void sp_feMorphology_build(SPObject *object, Document *document, Inkscape::XML::Node *repr);
static void sp_feMorphology_release(SPObject *object);
static void sp_feMorphology_set(SPObject *object, unsigned int key, gchar const *value);
static void sp_feMorphology_update(SPObject *object, SPCtx *ctx, guint flags);
static void sp_feMorphology_release(SPObject *object);
static void sp_feMorphology_set(SPObject *object, unsigned int key, gchar const *value);
static void sp_feMorphology_update(SPObject *object, SPCtx *ctx, guint flags);
* sp-object-repr.cpp's repr_name_entries array.
*/
static void
* sp-object-repr.cpp's repr_name_entries array.
*/
static void
-sp_feMorphology_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
+sp_feMorphology_build(SPObject *object, Document *document, Inkscape::XML::Node *repr)
{
if (((SPObjectClass *) feMorphology_parent_class)->build) {
((SPObjectClass *) feMorphology_parent_class)->build(object, document, repr);
{
if (((SPObjectClass *) feMorphology_parent_class)->build) {
((SPObjectClass *) feMorphology_parent_class)->build(object, document, repr);
diff --git a/src/filters/offset.cpp b/src/filters/offset.cpp
index 61ea45ff2a5549b1f1cf365b9af41e46719f1970..3ae6994ce5c349dc6add3e33530a76f36ab870a1 100644 (file)
--- a/src/filters/offset.cpp
+++ b/src/filters/offset.cpp
static void sp_feOffset_class_init(SPFeOffsetClass *klass);
static void sp_feOffset_init(SPFeOffset *feOffset);
static void sp_feOffset_class_init(SPFeOffsetClass *klass);
static void sp_feOffset_init(SPFeOffset *feOffset);
-static void sp_feOffset_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr);
+static void sp_feOffset_build(SPObject *object, Document *document, Inkscape::XML::Node *repr);
static void sp_feOffset_release(SPObject *object);
static void sp_feOffset_set(SPObject *object, unsigned int key, gchar const *value);
static void sp_feOffset_update(SPObject *object, SPCtx *ctx, guint flags);
static void sp_feOffset_release(SPObject *object);
static void sp_feOffset_set(SPObject *object, unsigned int key, gchar const *value);
static void sp_feOffset_update(SPObject *object, SPCtx *ctx, guint flags);
* sp-object-repr.cpp's repr_name_entries array.
*/
static void
* sp-object-repr.cpp's repr_name_entries array.
*/
static void
-sp_feOffset_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
+sp_feOffset_build(SPObject *object, Document *document, Inkscape::XML::Node *repr)
{
if (((SPObjectClass *) feOffset_parent_class)->build) {
((SPObjectClass *) feOffset_parent_class)->build(object, document, repr);
{
if (((SPObjectClass *) feOffset_parent_class)->build) {
((SPObjectClass *) feOffset_parent_class)->build(object, document, repr);
index ce58cf13e34f52d0719fb054a7ad2f87e33deccf..cc56b5f01014b89823d699dfbf89e6391e032b8c 100644 (file)
static void sp_fepointlight_class_init(SPFePointLightClass *klass);
static void sp_fepointlight_init(SPFePointLight *fepointlight);
static void sp_fepointlight_class_init(SPFePointLightClass *klass);
static void sp_fepointlight_init(SPFePointLight *fepointlight);
-static void sp_fepointlight_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr);
+static void sp_fepointlight_build(SPObject *object, Document *document, Inkscape::XML::Node *repr);
static void sp_fepointlight_release(SPObject *object);
static void sp_fepointlight_set(SPObject *object, unsigned int key, gchar const *value);
static void sp_fepointlight_update(SPObject *object, SPCtx *ctx, guint flags);
static void sp_fepointlight_release(SPObject *object);
static void sp_fepointlight_set(SPObject *object, unsigned int key, gchar const *value);
static void sp_fepointlight_update(SPObject *object, SPCtx *ctx, guint flags);
* sp-object-repr.cpp's repr_name_entries array.
*/
static void
* sp-object-repr.cpp's repr_name_entries array.
*/
static void
-sp_fepointlight_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
+sp_fepointlight_build(SPObject *object, Document *document, Inkscape::XML::Node *repr)
{
if (((SPObjectClass *) fePointLight_parent_class)->build) {
((SPObjectClass *) fePointLight_parent_class)->build(object, document, repr);
{
if (((SPObjectClass *) fePointLight_parent_class)->build) {
((SPObjectClass *) fePointLight_parent_class)->build(object, document, repr);
index 03a0c7f9687d2f844ed4629086c4f7ed8c1d586e..9a3ac68112c97d976d3f900ac83aad07a84644fc 100644 (file)
static void sp_feSpecularLighting_class_init(SPFeSpecularLightingClass *klass);
static void sp_feSpecularLighting_init(SPFeSpecularLighting *feSpecularLighting);
static void sp_feSpecularLighting_class_init(SPFeSpecularLightingClass *klass);
static void sp_feSpecularLighting_init(SPFeSpecularLighting *feSpecularLighting);
-static void sp_feSpecularLighting_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr);
+static void sp_feSpecularLighting_build(SPObject *object, Document *document, Inkscape::XML::Node *repr);
static void sp_feSpecularLighting_release(SPObject *object);
static void sp_feSpecularLighting_set(SPObject *object, unsigned int key, gchar const *value);
static void sp_feSpecularLighting_update(SPObject *object, SPCtx *ctx, guint flags);
static void sp_feSpecularLighting_release(SPObject *object);
static void sp_feSpecularLighting_set(SPObject *object, unsigned int key, gchar const *value);
static void sp_feSpecularLighting_update(SPObject *object, SPCtx *ctx, guint flags);
* sp-object-repr.cpp's repr_name_entries array.
*/
static void
* sp-object-repr.cpp's repr_name_entries array.
*/
static void
-sp_feSpecularLighting_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
+sp_feSpecularLighting_build(SPObject *object, Document *document, Inkscape::XML::Node *repr)
{
if (((SPObjectClass *) feSpecularLighting_parent_class)->build) {
((SPObjectClass *) feSpecularLighting_parent_class)->build(object, document, repr);
{
if (((SPObjectClass *) feSpecularLighting_parent_class)->build) {
((SPObjectClass *) feSpecularLighting_parent_class)->build(object, document, repr);
index 3b518f0b430653e24f71ffa8a9f478f94e6fd3fe..bd5d06f737b025a978b011f430f5c120690321cb 100644 (file)
static void sp_fespotlight_class_init(SPFeSpotLightClass *klass);
static void sp_fespotlight_init(SPFeSpotLight *fespotlight);
static void sp_fespotlight_class_init(SPFeSpotLightClass *klass);
static void sp_fespotlight_init(SPFeSpotLight *fespotlight);
-static void sp_fespotlight_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr);
+static void sp_fespotlight_build(SPObject *object, Document *document, Inkscape::XML::Node *repr);
static void sp_fespotlight_release(SPObject *object);
static void sp_fespotlight_set(SPObject *object, unsigned int key, gchar const *value);
static void sp_fespotlight_update(SPObject *object, SPCtx *ctx, guint flags);
static void sp_fespotlight_release(SPObject *object);
static void sp_fespotlight_set(SPObject *object, unsigned int key, gchar const *value);
static void sp_fespotlight_update(SPObject *object, SPCtx *ctx, guint flags);
* sp-object-repr.cpp's repr_name_entries array.
*/
static void
* sp-object-repr.cpp's repr_name_entries array.
*/
static void
-sp_fespotlight_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
+sp_fespotlight_build(SPObject *object, Document *document, Inkscape::XML::Node *repr)
{
if (((SPObjectClass *) feSpotLight_parent_class)->build) {
((SPObjectClass *) feSpotLight_parent_class)->build(object, document, repr);
{
if (((SPObjectClass *) feSpotLight_parent_class)->build) {
((SPObjectClass *) feSpotLight_parent_class)->build(object, document, repr);
diff --git a/src/filters/tile.cpp b/src/filters/tile.cpp
index 877f70b27d0f72223a1cd83a8c7217c27001d02d..7bf03cde31488934269502939969707f161182d9 100644 (file)
--- a/src/filters/tile.cpp
+++ b/src/filters/tile.cpp
static void sp_feTile_class_init(SPFeTileClass *klass);
static void sp_feTile_init(SPFeTile *feTile);
static void sp_feTile_class_init(SPFeTileClass *klass);
static void sp_feTile_init(SPFeTile *feTile);
-static void sp_feTile_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr);
+static void sp_feTile_build(SPObject *object, Document *document, Inkscape::XML::Node *repr);
static void sp_feTile_release(SPObject *object);
static void sp_feTile_set(SPObject *object, unsigned int key, gchar const *value);
static void sp_feTile_update(SPObject *object, SPCtx *ctx, guint flags);
static void sp_feTile_release(SPObject *object);
static void sp_feTile_set(SPObject *object, unsigned int key, gchar const *value);
static void sp_feTile_update(SPObject *object, SPCtx *ctx, guint flags);
* sp-object-repr.cpp's repr_name_entries array.
*/
static void
* sp-object-repr.cpp's repr_name_entries array.
*/
static void
-sp_feTile_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
+sp_feTile_build(SPObject *object, Document *document, Inkscape::XML::Node *repr)
{
if (((SPObjectClass *) feTile_parent_class)->build) {
((SPObjectClass *) feTile_parent_class)->build(object, document, repr);
{
if (((SPObjectClass *) feTile_parent_class)->build) {
((SPObjectClass *) feTile_parent_class)->build(object, document, repr);
index f3c1430565863e1e7882517b0bbd2a3c5c357005..e348f796f6a35aeaae4b490ff95cf56663621aa4 100644 (file)
static void sp_feTurbulence_class_init(SPFeTurbulenceClass *klass);
static void sp_feTurbulence_init(SPFeTurbulence *feTurbulence);
static void sp_feTurbulence_class_init(SPFeTurbulenceClass *klass);
static void sp_feTurbulence_init(SPFeTurbulence *feTurbulence);
-static void sp_feTurbulence_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr);
+static void sp_feTurbulence_build(SPObject *object, Document *document, Inkscape::XML::Node *repr);
static void sp_feTurbulence_release(SPObject *object);
static void sp_feTurbulence_set(SPObject *object, unsigned int key, gchar const *value);
static void sp_feTurbulence_update(SPObject *object, SPCtx *ctx, guint flags);
static void sp_feTurbulence_release(SPObject *object);
static void sp_feTurbulence_set(SPObject *object, unsigned int key, gchar const *value);
static void sp_feTurbulence_update(SPObject *object, SPCtx *ctx, guint flags);
* sp-object-repr.cpp's repr_name_entries array.
*/
static void
* sp-object-repr.cpp's repr_name_entries array.
*/
static void
-sp_feTurbulence_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
+sp_feTurbulence_build(SPObject *object, Document *document, Inkscape::XML::Node *repr)
{
if (((SPObjectClass *) feTurbulence_parent_class)->build) {
((SPObjectClass *) feTurbulence_parent_class)->build(object, document, repr);
{
if (((SPObjectClass *) feTurbulence_parent_class)->build) {
((SPObjectClass *) feTurbulence_parent_class)->build(object, document, repr);
diff --git a/src/helper/action.cpp b/src/helper/action.cpp
index 84d150615388fcae9c58853087dd77c0543e1fe8..8c2705e4528aa3adcd70a728046c932b6ff839d1 100644 (file)
--- a/src/helper/action.cpp
+++ b/src/helper/action.cpp
{
_addProperty(share_static_string("timestamp"), timestamp());
if (action->view) {
{
_addProperty(share_static_string("timestamp"), timestamp());
if (action->view) {
- SPDocument *document = action->view->doc();
+ Document *document = action->view->doc();
if (document) {
_addProperty(share_static_string("document"), document->serial());
}
if (document) {
_addProperty(share_static_string("document"), document->serial());
}
index f41342e42271ce41712884e8eca1ff49f63b689a..1e364a37c10ffdf2b842152fd23d478127a2eb67 100644 (file)
// to the call for the interface to the png writing.
bool
// to the call for the interface to the png writing.
bool
-sp_export_jpg_file(SPDocument *doc, gchar const *filename,
+sp_export_jpg_file(Document *doc, gchar const *filename,
double x0, double y0, double x1, double y1,
unsigned width, unsigned height, double xdpi, double ydpi,
unsigned long bgcolor, double quality,GSList *items)
double x0, double y0, double x1, double y1,
unsigned width, unsigned height, double xdpi, double ydpi,
unsigned long bgcolor, double quality,GSList *items)
}
GdkPixbuf*
}
GdkPixbuf*
-sp_generate_internal_bitmap(SPDocument *doc, gchar const */*filename*/,
+sp_generate_internal_bitmap(Document *doc, gchar const */*filename*/,
double x0, double y0, double x1, double y1,
unsigned width, unsigned height, double xdpi, double ydpi,
unsigned long bgcolor,
double x0, double y0, double x1, double y1,
unsigned width, unsigned height, double xdpi, double ydpi,
unsigned long bgcolor,
index 3ac9006800b30f978e6906d999bce4878f26cbca..ad1b43c55955ccb159ae335128768a217dd498d9 100644 (file)
--- a/src/helper/png-write.cpp
+++ b/src/helper/png-write.cpp
}
static bool
}
static bool
-sp_png_write_rgba_striped(SPDocument *doc,
+sp_png_write_rgba_striped(Document *doc,
gchar const *filename, unsigned long int width, unsigned long int height, double xdpi, double ydpi,
int (* get_rows)(guchar const **rows, int row, int num_rows, void *data),
void *data)
gchar const *filename, unsigned long int width, unsigned long int height, double xdpi, double ydpi,
int (* get_rows)(guchar const **rows, int row, int num_rows, void *data),
void *data)
*
* \return true if succeeded (or if no action was taken), false if an error occurred.
*/
*
* \return true if succeeded (or if no action was taken), false if an error occurred.
*/
-bool sp_export_png_file (SPDocument *doc, gchar const *filename,
+bool sp_export_png_file (Document *doc, gchar const *filename,
double x0, double y0, double x1, double y1,
unsigned long int width, unsigned long int height, double xdpi, double ydpi,
unsigned long bgcolor,
double x0, double y0, double x1, double y1,
unsigned long int width, unsigned long int height, double xdpi, double ydpi,
unsigned long bgcolor,
width, height, xdpi, ydpi, bgcolor, status, data, force_overwrite, items_only);
}
bool
width, height, xdpi, ydpi, bgcolor, status, data, force_overwrite, items_only);
}
bool
-sp_export_png_file(SPDocument *doc, gchar const *filename,
+sp_export_png_file(Document *doc, gchar const *filename,
Geom::Rect const &area,
unsigned long width, unsigned long height, double xdpi, double ydpi,
unsigned long bgcolor,
Geom::Rect const &area,
unsigned long width, unsigned long height, double xdpi, double ydpi,
unsigned long bgcolor,
index 575197fee3109deef8efe245edd39aef92dc4786..9363974801a4e25312e22fa9f9b0a1fbec6e676a 100644 (file)
-static SPObject *sp_gradient_load_from_svg(gchar const *name, SPDocument *current_doc);
-static SPObject *sp_marker_load_from_svg(gchar const *name, SPDocument *current_doc);
-static SPObject *sp_gradient_load_from_svg(gchar const *name, SPDocument *current_doc);
+static SPObject *sp_gradient_load_from_svg(gchar const *name, Document *current_doc);
+static SPObject *sp_marker_load_from_svg(gchar const *name, Document *current_doc);
+static SPObject *sp_gradient_load_from_svg(gchar const *name, Document *current_doc);
// FIXME: these should be merged with the icon loading code so they
// FIXME: these should be merged with the icon loading code so they
// take the dir to look in, and the file to check for, and cache
// against that, rather than the existing copy/paste code seen here.
// take the dir to look in, and the file to check for, and cache
// against that, rather than the existing copy/paste code seen here.
-static SPObject * sp_marker_load_from_svg(gchar const *name, SPDocument *current_doc)
+static SPObject * sp_marker_load_from_svg(gchar const *name, Document *current_doc)
{
{
- static SPDocument *doc = NULL;
+ static Document *doc = NULL;
static unsigned int edoc = FALSE;
if (!current_doc) {
return NULL;
static unsigned int edoc = FALSE;
if (!current_doc) {
return NULL;
static SPObject *
static SPObject *
-sp_pattern_load_from_svg(gchar const *name, SPDocument *current_doc)
+sp_pattern_load_from_svg(gchar const *name, Document *current_doc)
{
{
- static SPDocument *doc = NULL;
+ static Document *doc = NULL;
static unsigned int edoc = FALSE;
if (!current_doc) {
return NULL;
static unsigned int edoc = FALSE;
if (!current_doc) {
return NULL;
static SPObject *
static SPObject *
-sp_gradient_load_from_svg(gchar const *name, SPDocument *current_doc)
+sp_gradient_load_from_svg(gchar const *name, Document *current_doc)
{
{
- static SPDocument *doc = NULL;
+ static Document *doc = NULL;
static unsigned int edoc = FALSE;
if (!current_doc) {
return NULL;
static unsigned int edoc = FALSE;
if (!current_doc) {
return NULL;
gchar * base = g_strndup(e, a);
SPDesktop *desktop = inkscape_active_desktop();
gchar * base = g_strndup(e, a);
SPDesktop *desktop = inkscape_active_desktop();
- SPDocument *doc = sp_desktop_document(desktop);
+ Document *doc = sp_desktop_document(desktop);
SPDefs *defs= (SPDefs *) SP_DOCUMENT_DEFS(doc);
SPObject *object = NULL;
SPDefs *defs= (SPDefs *) SP_DOCUMENT_DEFS(doc);
SPObject *object = NULL;
else {
SPDesktop *desktop = inkscape_active_desktop();
else {
SPDesktop *desktop = inkscape_active_desktop();
- SPDocument *doc = sp_desktop_document(desktop);
+ Document *doc = sp_desktop_document(desktop);
SPObject *object = doc->getObjectById(urn);
return object;
SPObject *object = doc->getObjectById(urn);
return object;
index a04ab05f00e39fa1f424141140e37e0e72260670..b6d236be93210107680765b9fb1481f1d8a51a7b 100644 (file)
SessionManager::initialiseSession(Glib::ustring const& to, State::SessionType type)
{
SessionManager::initialiseSession(Glib::ustring const& to, State::SessionType type)
{
- SPDocument* doc = makeInkboardDocument(g_quark_from_static_string("xml"), "svg:svg", type, to);
+ Document* doc = makeInkboardDocument(g_quark_from_static_string("xml"), "svg:svg", type, to);
InkboardDocument* inkdoc = dynamic_cast< InkboardDocument* >(doc->rdoc);
if(inkdoc == NULL) return;
InkboardDocument* inkdoc = dynamic_cast< InkboardDocument* >(doc->rdoc);
if(inkdoc == NULL) return;
Dialog::DialogReply reply = static_cast< Dialog::DialogReply >(dialog.run());
Dialog::DialogReply reply = static_cast< Dialog::DialogReply >(dialog.run());
- SPDocument* doc = makeInkboardDocument(g_quark_from_static_string("xml"), "svg:svg", State::WHITEBOARD_PEER, from);
+ Document* doc = makeInkboardDocument(g_quark_from_static_string("xml"), "svg:svg", State::WHITEBOARD_PEER, from);
InkboardDocument* inkdoc = dynamic_cast< InkboardDocument* >(doc->rdoc);
if(inkdoc == NULL) return true;
InkboardDocument* inkdoc = dynamic_cast< InkboardDocument* >(doc->rdoc);
if(inkdoc == NULL) return true;
//# HELPER FUNCTIONS
//#########################################################################
//# HELPER FUNCTIONS
//#########################################################################
-SPDocument*
+Document*
makeInkboardDocument(int code, gchar const* rootname, State::SessionType type, Glib::ustring const& to)
{
makeInkboardDocument(int code, gchar const* rootname, State::SessionType type, Glib::ustring const& to)
{
- SPDocument* doc;
+ Document* doc;
InkboardDocument* rdoc = new InkboardDocument(g_quark_from_static_string("xml"), type, to);
rdoc->setAttribute("version", "1.0");
InkboardDocument* rdoc = new InkboardDocument(g_quark_from_static_string("xml"), type, to);
rdoc->setAttribute("version", "1.0");
@@ -382,7 +382,7 @@ makeInkboardDocument(int code, gchar const* rootname, State::SessionType type, G
//
// \see sp_file_new
SPDesktop*
//
// \see sp_file_new
SPDesktop*
-makeInkboardDesktop(SPDocument* doc)
+makeInkboardDesktop(Document* doc)
{
SPDesktop* dt;
{
SPDesktop* dt;
index de0535448c4ead1a5f6f842f4bd05139fad94955..f92f7c2ab9949b96c40c3001ea5c9164f6d8cc6c 100644 (file)
}
void
}
void
-Effect::createAndApply(const char* name, SPDocument *doc, SPItem *item)
+Effect::createAndApply(const char* name, Document *doc, SPItem *item)
{
// Path effect definition
Inkscape::XML::Document *xml_doc = sp_document_repr_doc(doc);
{
// Path effect definition
Inkscape::XML::Document *xml_doc = sp_document_repr_doc(doc);
}
void
}
void
-Effect::createAndApply(EffectType type, SPDocument *doc, SPItem *item)
+Effect::createAndApply(EffectType type, Document *doc, SPItem *item)
{
createAndApply(LPETypeConverter.get_key(type).c_str(), doc, item);
}
{
createAndApply(LPETypeConverter.get_key(type).c_str(), doc, item);
}
return SP_OBJECT_REPR(lpeobj);
}
return SP_OBJECT_REPR(lpeobj);
}
-SPDocument *
+Document *
Effect::getSPDoc()
{
if (SP_OBJECT_DOCUMENT(lpeobj) == NULL) g_message("Effect::getSPDoc() returns NULL");
Effect::getSPDoc()
{
if (SP_OBJECT_DOCUMENT(lpeobj) == NULL) g_message("Effect::getSPDoc() returns NULL");
index ec0dee0beb1c5e41d9281efa2d9a28e9f939fdd7..c7ca5e4aab448e79a3dc54e3daf4db81af270801 100644 (file)
* Virtual build: set livepatheffect attributes from its associated XML node.
*/
void
* Virtual build: set livepatheffect attributes from its associated XML node.
*/
void
-LivePathEffectObject::livepatheffect_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr)
+LivePathEffectObject::livepatheffect_build(SPObject *object, Document *document, Inkscape::XML::Node *repr)
{
#ifdef LIVEPATHEFFECT_VERBOSE
g_message("Build livepatheffect");
{
#ifdef LIVEPATHEFFECT_VERBOSE
g_message("Build livepatheffect");
LivePathEffectObject::fork_private_if_necessary(unsigned int nr_of_allowed_users)
{
if (SP_OBJECT_HREFCOUNT(this) > nr_of_allowed_users) {
LivePathEffectObject::fork_private_if_necessary(unsigned int nr_of_allowed_users)
{
if (SP_OBJECT_HREFCOUNT(this) > nr_of_allowed_users) {
- SPDocument *doc = SP_OBJECT_DOCUMENT(this);
+ Document *doc = SP_OBJECT_DOCUMENT(this);
Inkscape::XML::Document *xml_doc = sp_document_repr_doc(doc);
Inkscape::XML::Node *repr = SP_OBJECT_REPR (this)->duplicate(xml_doc);
Inkscape::XML::Document *xml_doc = sp_document_repr_doc(doc);
Inkscape::XML::Node *repr = SP_OBJECT_REPR (this)->duplicate(xml_doc);
diff --git a/src/trace/trace.cpp b/src/trace/trace.cpp
index e2bd0e9f583581cc9dba0a9fc01c36f06644789a..9afadbeaf1bc1606ef11e5afc0bec88aa021c06d 100644 (file)
--- a/src/trace/trace.cpp
+++ b/src/trace/trace.cpp
engine = NULL;
return;
}
engine = NULL;
return;
}
- SPDocument *doc = SP_ACTIVE_DOCUMENT;
+ Document *doc = SP_ACTIVE_DOCUMENT;
sp_document_ensure_up_to_date(doc);
sp_document_ensure_up_to_date(doc);
diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp
index 7e41006bec7832908135b1423526b39a18d97e12..e7e8a29dc088fba074f5309030ccfae4815444e7 100644 (file)
--- a/src/ui/clipboard.cpp
+++ b/src/ui/clipboard.cpp
void _copyTextPath(SPTextPath *);
Inkscape::XML::Node *_copyNode(Inkscape::XML::Node *, Inkscape::XML::Document *, Inkscape::XML::Node *);
void _copyTextPath(SPTextPath *);
Inkscape::XML::Node *_copyNode(Inkscape::XML::Node *, Inkscape::XML::Document *, Inkscape::XML::Node *);
- void _pasteDocument(SPDocument *, bool in_place);
- void _pasteDefs(SPDocument *);
+ void _pasteDocument(Document *, bool in_place);
+ void _pasteDefs(Document *);
bool _pasteImage();
bool _pasteText();
SPCSSAttr *_parseColor(const Glib::ustring &);
void _applyPathEffect(SPItem *, gchar const *);
bool _pasteImage();
bool _pasteText();
SPCSSAttr *_parseColor(const Glib::ustring &);
void _applyPathEffect(SPItem *, gchar const *);
- SPDocument *_retrieveClipboard(Glib::ustring = "");
+ Document *_retrieveClipboard(Glib::ustring = "");
// clipboard callbacks
void _onGet(Gtk::SelectionData &, guint);
// clipboard callbacks
void _onGet(Gtk::SelectionData &, guint);
void _userWarn(SPDesktop *, char const *);
// private properites
void _userWarn(SPDesktop *, char const *);
// private properites
- SPDocument *_clipboardSPDoc; ///< Document that stores the clipboard until someone requests it
+ Document *_clipboardSPDoc; ///< Document that stores the clipboard until someone requests it
Inkscape::XML::Node *_defs; ///< Reference to the clipboard document's defs node
Inkscape::XML::Node *_root; ///< Reference to the clipboard's root node
Inkscape::XML::Node *_clipnode; ///< The node that holds extra information
Inkscape::XML::Node *_defs; ///< Reference to the clipboard document's defs node
Inkscape::XML::Node *_root; ///< Reference to the clipboard's root node
Inkscape::XML::Node *_clipnode; ///< The node that holds extra information
if ( target == CLIPBOARD_TEXT_TARGET ) return _pasteText();
// otherwise, use the import extensions
if ( target == CLIPBOARD_TEXT_TARGET ) return _pasteText();
// otherwise, use the import extensions
- SPDocument *tempdoc = _retrieveClipboard(target);
+ Document *tempdoc = _retrieveClipboard(target);
if ( tempdoc == NULL ) {
_userWarn(desktop, _("Nothing on the clipboard."));
return false;
if ( tempdoc == NULL ) {
_userWarn(desktop, _("Nothing on the clipboard."));
return false;
*/
const gchar *ClipboardManagerImpl::getFirstObjectID()
{
*/
const gchar *ClipboardManagerImpl::getFirstObjectID()
{
- SPDocument *tempdoc = _retrieveClipboard("image/x-inkscape-svg");
+ Document *tempdoc = _retrieveClipboard("image/x-inkscape-svg");
if ( tempdoc == NULL ) {
return NULL;
}
if ( tempdoc == NULL ) {
return NULL;
}
return false;
}
return false;
}
- SPDocument *tempdoc = _retrieveClipboard("image/x-inkscape-svg");
+ Document *tempdoc = _retrieveClipboard("image/x-inkscape-svg");
if ( tempdoc == NULL ) {
// no document, but we can try _text_style
if (_text_style) {
if ( tempdoc == NULL ) {
// no document, but we can try _text_style
if (_text_style) {
@@ -425,7 +425,7 @@ bool ClipboardManagerImpl::pasteSize(bool separately, bool apply_x, bool apply_y
}
// FIXME: actually, this should accept arbitrary documents
}
// FIXME: actually, this should accept arbitrary documents
- SPDocument *tempdoc = _retrieveClipboard("image/x-inkscape-svg");
+ Document *tempdoc = _retrieveClipboard("image/x-inkscape-svg");
if ( tempdoc == NULL ) {
_userWarn(desktop, _("No size on the clipboard."));
return false;
if ( tempdoc == NULL ) {
_userWarn(desktop, _("No size on the clipboard."));
return false;
return false;
}
return false;
}
- SPDocument *tempdoc = _retrieveClipboard("image/x-inkscape-svg");
+ Document *tempdoc = _retrieveClipboard("image/x-inkscape-svg");
if ( tempdoc ) {
Inkscape::XML::Node *root = sp_document_repr_root(tempdoc);
Inkscape::XML::Node *clipnode = sp_repr_lookup_name(root, "inkscape:clipboard", 1);
if ( tempdoc ) {
Inkscape::XML::Node *root = sp_document_repr_root(tempdoc);
Inkscape::XML::Node *clipnode = sp_repr_lookup_name(root, "inkscape:clipboard", 1);
*/
Glib::ustring ClipboardManagerImpl::getPathParameter()
{
*/
Glib::ustring ClipboardManagerImpl::getPathParameter()
{
- SPDocument *tempdoc = _retrieveClipboard(); // any target will do here
+ Document *tempdoc = _retrieveClipboard(); // any target will do here
if ( tempdoc == NULL ) {
_userWarn(SP_ACTIVE_DESKTOP, _("Nothing on the clipboard."));
return "";
if ( tempdoc == NULL ) {
_userWarn(SP_ACTIVE_DESKTOP, _("Nothing on the clipboard."));
return "";
*/
Glib::ustring ClipboardManagerImpl::getShapeOrTextObjectId()
{
*/
Glib::ustring ClipboardManagerImpl::getShapeOrTextObjectId()
{
- SPDocument *tempdoc = _retrieveClipboard(); // any target will do here
+ Document *tempdoc = _retrieveClipboard(); // any target will do here
if ( tempdoc == NULL ) {
_userWarn(SP_ACTIVE_DESKTOP, _("Nothing on the clipboard."));
return "";
if ( tempdoc == NULL ) {
_userWarn(SP_ACTIVE_DESKTOP, _("Nothing on the clipboard."));
return "";
@@ -769,10 +769,10 @@ Inkscape::XML::Node *ClipboardManagerImpl::_copyNode(Inkscape::XML::Node *node,
* @param in_place Whether to paste the selection where it was when copied
* @pre @c clipdoc is not empty and items can be added to the current layer
*/
* @param in_place Whether to paste the selection where it was when copied
* @pre @c clipdoc is not empty and items can be added to the current layer
*/
-void ClipboardManagerImpl::_pasteDocument(SPDocument *clipdoc, bool in_place)
+void ClipboardManagerImpl::_pasteDocument(Document *clipdoc, bool in_place)
{
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
{
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
- SPDocument *target_document = sp_desktop_document(desktop);
+ Document *target_document = sp_desktop_document(desktop);
Inkscape::XML::Node
*root = sp_document_repr_root(clipdoc),
*target_parent = SP_OBJECT_REPR(desktop->currentLayer());
Inkscape::XML::Node
*root = sp_document_repr_root(clipdoc),
*target_parent = SP_OBJECT_REPR(desktop->currentLayer());
* @param clipdoc The document to paste
* @pre @c clipdoc != NULL and pasting into the active document is possible
*/
* @param clipdoc The document to paste
* @pre @c clipdoc != NULL and pasting into the active document is possible
*/
-void ClipboardManagerImpl::_pasteDefs(SPDocument *clipdoc)
+void ClipboardManagerImpl::_pasteDefs(Document *clipdoc)
{
// boilerplate vars copied from _pasteDocument
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
{
// boilerplate vars copied from _pasteDocument
SPDesktop *desktop = SP_ACTIVE_DESKTOP;
- SPDocument *target_document = sp_desktop_document(desktop);
+ Document *target_document = sp_desktop_document(desktop);
Inkscape::XML::Node
*root = sp_document_repr_root(clipdoc),
*defs = sp_repr_lookup_name(root, "svg:defs", 1),
Inkscape::XML::Node
*root = sp_document_repr_root(clipdoc),
*defs = sp_repr_lookup_name(root, "svg:defs", 1),
*/
bool ClipboardManagerImpl::_pasteImage()
{
*/
bool ClipboardManagerImpl::_pasteImage()
{
- SPDocument *doc = SP_ACTIVE_DOCUMENT;
+ Document *doc = SP_ACTIVE_DOCUMENT;
if ( doc == NULL ) return false;
// retrieve image data
if ( doc == NULL ) return false;
// retrieve image data
/**
* @brief Retrieve the clipboard contents as a document
/**
* @brief Retrieve the clipboard contents as a document
- * @return Clipboard contents converted to SPDocument, or NULL if no suitable content was present
+ * @return Clipboard contents converted to Document, or NULL if no suitable content was present
*/
*/
-SPDocument *ClipboardManagerImpl::_retrieveClipboard(Glib::ustring required_target)
+Document *ClipboardManagerImpl::_retrieveClipboard(Glib::ustring required_target)
{
Glib::ustring best_target;
if ( required_target == "" )
{
Glib::ustring best_target;
if ( required_target == "" )
@@ -1061,7 +1061,7 @@ SPDocument *ClipboardManagerImpl::_retrieveClipboard(Glib::ustring required_targ
if ( in == inlist.end() )
return NULL; // this shouldn't happen unless _getBestTarget returns something bogus
if ( in == inlist.end() )
return NULL; // this shouldn't happen unless _getBestTarget returns something bogus
- SPDocument *tempdoc = NULL;
+ Document *tempdoc = NULL;
try {
tempdoc = (*in)->open(filename);
} catch (...) {
try {
tempdoc = (*in)->open(filename);
} catch (...) {
index ec43bb178b99fc6f6cefb1f935fb794d4f67fadf..8d771fef2d597c8eb4a4a722135abe01ed07ce9a 100644 (file)
--- a/src/xml/rebase-hrefs.cpp
+++ b/src/xml/rebase-hrefs.cpp
*
* \param spns True iff doc should contain sodipodi:absref attributes.
*/
*
* \param spns True iff doc should contain sodipodi:absref attributes.
*/
-void Inkscape::XML::rebase_hrefs(SPDocument *const doc, gchar const *const new_base, bool const spns)
+void Inkscape::XML::rebase_hrefs(Document *const doc, gchar const *const new_base, bool const spns)
{
gchar *const old_abs_base = calc_abs_doc_base(doc->base);
gchar *const new_abs_base = calc_abs_doc_base(new_base);
{
gchar *const old_abs_base = calc_abs_doc_base(doc->base);
gchar *const new_abs_base = calc_abs_doc_base(new_base);