diff options
| author | MenTaLguY <mental@rydia.net> | 2006-04-17 04:46:51 +0000 |
|---|---|---|
| committer | mental <mental@users.sourceforge.net> | 2006-04-17 04:46:51 +0000 |
| commit | 805747f6b136ad2e89f5ca1020ca43506d2b5391 (patch) | |
| tree | beded9b49a5f2f5a3ac956ded5604cee5d61cd0c /src/inkscape.cpp | |
| parent | SP_DT_DOCUMENT -> sp_desktop_document (diff) | |
| download | inkscape-805747f6b136ad2e89f5ca1020ca43506d2b5391.tar.gz inkscape-805747f6b136ad2e89f5ca1020ca43506d2b5391.zip | |
Get rid of the SP_DT_* macros which do nothing more than provide additional, confusing, names for other functions. If shorter names are desired, the actual functions should be renamed -- or better, made into member functions.
(bzr r532)
Diffstat (limited to 'src/inkscape.cpp')
| -rw-r--r-- | src/inkscape.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/inkscape.cpp b/src/inkscape.cpp index 71c5d422f..4051a453c 100644 --- a/src/inkscape.cpp +++ b/src/inkscape.cpp @@ -839,9 +839,9 @@ inkscape_add_desktop (SPDesktop * desktop) if (DESKTOP_IS_ACTIVE (desktop)) { g_signal_emit (G_OBJECT (inkscape), inkscape_signals[ACTIVATE_DESKTOP], 0, desktop); - g_signal_emit (G_OBJECT (inkscape), inkscape_signals[SET_EVENTCONTEXT], 0, SP_DT_EVENTCONTEXT (desktop)); - g_signal_emit (G_OBJECT (inkscape), inkscape_signals[SET_SELECTION], 0, SP_DT_SELECTION (desktop)); - g_signal_emit (G_OBJECT (inkscape), inkscape_signals[CHANGE_SELECTION], 0, SP_DT_SELECTION (desktop)); + g_signal_emit (G_OBJECT (inkscape), inkscape_signals[SET_EVENTCONTEXT], 0, sp_desktop_event_context (desktop)); + g_signal_emit (G_OBJECT (inkscape), inkscape_signals[SET_SELECTION], 0, sp_desktop_selection (desktop)); + g_signal_emit (G_OBJECT (inkscape), inkscape_signals[CHANGE_SELECTION], 0, sp_desktop_selection (desktop)); } } @@ -867,13 +867,13 @@ inkscape_remove_desktop (SPDesktop * desktop) inkscape->desktops = g_slist_remove (inkscape->desktops, new_desktop); inkscape->desktops = g_slist_prepend (inkscape->desktops, new_desktop); g_signal_emit (G_OBJECT (inkscape), inkscape_signals[ACTIVATE_DESKTOP], 0, new_desktop); - g_signal_emit (G_OBJECT (inkscape), inkscape_signals[SET_EVENTCONTEXT], 0, SP_DT_EVENTCONTEXT (new_desktop)); - g_signal_emit (G_OBJECT (inkscape), inkscape_signals[SET_SELECTION], 0, SP_DT_SELECTION (new_desktop)); - g_signal_emit (G_OBJECT (inkscape), inkscape_signals[CHANGE_SELECTION], 0, SP_DT_SELECTION (new_desktop)); + g_signal_emit (G_OBJECT (inkscape), inkscape_signals[SET_EVENTCONTEXT], 0, sp_desktop_event_context (new_desktop)); + g_signal_emit (G_OBJECT (inkscape), inkscape_signals[SET_SELECTION], 0, sp_desktop_selection (new_desktop)); + g_signal_emit (G_OBJECT (inkscape), inkscape_signals[CHANGE_SELECTION], 0, sp_desktop_selection (new_desktop)); } else { g_signal_emit (G_OBJECT (inkscape), inkscape_signals[SET_EVENTCONTEXT], 0, NULL); - if (SP_DT_SELECTION(desktop)) - SP_DT_SELECTION(desktop)->clear(); + if (sp_desktop_selection(desktop)) + sp_desktop_selection(desktop)->clear(); } } @@ -912,9 +912,9 @@ inkscape_activate_desktop (SPDesktop * desktop) inkscape->desktops = g_slist_prepend (inkscape->desktops, desktop); g_signal_emit (G_OBJECT (inkscape), inkscape_signals[ACTIVATE_DESKTOP], 0, desktop); - g_signal_emit (G_OBJECT (inkscape), inkscape_signals[SET_EVENTCONTEXT], 0, SP_DT_EVENTCONTEXT (desktop)); - g_signal_emit (G_OBJECT (inkscape), inkscape_signals[SET_SELECTION], 0, SP_DT_SELECTION (desktop)); - g_signal_emit (G_OBJECT (inkscape), inkscape_signals[CHANGE_SELECTION], 0, SP_DT_SELECTION (desktop)); + g_signal_emit (G_OBJECT (inkscape), inkscape_signals[SET_EVENTCONTEXT], 0, sp_desktop_event_context (desktop)); + g_signal_emit (G_OBJECT (inkscape), inkscape_signals[SET_SELECTION], 0, sp_desktop_selection (desktop)); + g_signal_emit (G_OBJECT (inkscape), inkscape_signals[CHANGE_SELECTION], 0, sp_desktop_selection (desktop)); } @@ -1145,7 +1145,7 @@ inkscape_active_document (void) return Inkscape::NSApplication::Editor::getActiveDocument(); if (SP_ACTIVE_DESKTOP) { - return SP_DT_DOCUMENT (SP_ACTIVE_DESKTOP); + return sp_desktop_document (SP_ACTIVE_DESKTOP); } return NULL; @@ -1170,7 +1170,7 @@ SPEventContext * inkscape_active_event_context (void) { if (SP_ACTIVE_DESKTOP) { - return SP_DT_EVENTCONTEXT (SP_ACTIVE_DESKTOP); + return sp_desktop_event_context (SP_ACTIVE_DESKTOP); } return NULL; |