diff options
| author | Maximilian Albert <maximilian.albert@gmail.com> | 2009-08-06 14:17:17 +0000 |
|---|---|---|
| committer | cilix42 <cilix42@users.sourceforge.net> | 2009-08-06 14:17:17 +0000 |
| commit | 51c2905fd3e99955db2d823b79abb763d8097028 (patch) | |
| tree | 90128509479f5498e1125d1e4eb9cdc05bf6b6e6 /src/verbs.cpp | |
| parent | Adding one more control to Smart Jelly (diff) | |
| download | inkscape-51c2905fd3e99955db2d823b79abb763d8097028.tar.gz inkscape-51c2905fd3e99955db2d823b79abb763d8097028.zip | |
Revert recent refactoring changes by johnce because they break the build, which cannot be fixed easily.
(bzr r8422)
Diffstat (limited to 'src/verbs.cpp')
| -rw-r--r-- | src/verbs.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/verbs.cpp b/src/verbs.cpp index 10f4f3acc..43ddc1459 100644 --- a/src/verbs.cpp +++ b/src/verbs.cpp @@ -607,7 +607,7 @@ Verb::get_action(Inkscape::UI::View::View *view) } void -Verb::sensitive(Document *in_doc, bool in_sensitive) +Verb::sensitive(SPDocument *in_doc, bool in_sensitive) { // printf("Setting sensitivity of \"%s\" to %d\n", _name, in_sensitive); if (_actions != NULL) { @@ -635,7 +635,7 @@ Verb::get_tip (void) } void -Verb::name(Document *in_doc, Glib::ustring in_name) +Verb::name(SPDocument *in_doc, Glib::ustring in_name) { if (_actions != NULL) { for (ActionTable::iterator cur_action = _actions->begin(); @@ -759,7 +759,7 @@ FileVerb::perform(SPAction *action, void *data, void */*pdata*/) /* These aren't used, but are here to remind people not to use the CURRENT_DOCUMENT macros unless they really have to. */ Inkscape::UI::View::View *current_view = sp_action_get_view(action); - Document *current_document = current_view->doc(); + SPDocument *current_document = current_view->doc(); #endif SPDesktop *desktop = dynamic_cast<SPDesktop*>(sp_action_get_view(action)); @@ -1605,7 +1605,7 @@ TextVerb::perform(SPAction *action, void */*data*/, void */*pdata*/) if (!dt) return; - Document *doc = sp_desktop_document(dt); + SPDocument *doc = sp_desktop_document(dt); (void)doc; Inkscape::XML::Node *repr = SP_OBJECT_REPR(dt->namedview); (void)repr; @@ -1620,7 +1620,7 @@ ZoomVerb::perform(SPAction *action, void *data, void */*pdata*/) return; SPEventContext *ec = dt->event_context; - Document *doc = sp_desktop_document(dt); + SPDocument *doc = sp_desktop_document(dt); Inkscape::XML::Node *repr = SP_OBJECT_REPR(dt->namedview); @@ -2066,7 +2066,7 @@ EffectLastVerb::perform(SPAction *action, void *data, void */*pdata*/) /* These aren't used, but are here to remind people not to use the CURRENT_DOCUMENT macros unless they really have to. */ Inkscape::UI::View::View *current_view = sp_action_get_view(action); - // Document *current_document = SP_VIEW_DOCUMENT(current_view); + // SPDocument *current_document = SP_VIEW_DOCUMENT(current_view); Inkscape::Extension::Effect *effect = Inkscape::Extension::Effect::get_last_effect(); if (effect == NULL) return; @@ -2134,7 +2134,7 @@ FitCanvasVerb::perform(SPAction *action, void *data, void */*pdata*/) { SPDesktop *dt = static_cast<SPDesktop*>(sp_action_get_view(action)); if (!dt) return; - Document *doc = sp_desktop_document(dt); + SPDocument *doc = sp_desktop_document(dt); if (!doc) return; switch ((long) data) { @@ -2203,7 +2203,7 @@ LockAndHideVerb::perform(SPAction *action, void *data, void */*pdata*/) { SPDesktop *dt = static_cast<SPDesktop*>(sp_action_get_view(action)); if (!dt) return; - Document *doc = sp_desktop_document(dt); + SPDocument *doc = sp_desktop_document(dt); if (!doc) return; switch ((long) data) { |