From 805747f6b136ad2e89f5ca1020ca43506d2b5391 Mon Sep 17 00:00:00 2001 From: MenTaLguY Date: Mon, 17 Apr 2006 04:46:51 +0000 Subject: 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) --- src/application/editor.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'src/application/editor.cpp') diff --git a/src/application/editor.cpp b/src/application/editor.cpp index 6c3dbf896..1cc45f3c7 100644 --- a/src/application/editor.cpp +++ b/src/application/editor.cpp @@ -100,7 +100,7 @@ SPDocument* Editor::getActiveDocument() { if (getActiveDesktop()) { - return SP_DT_DOCUMENT (getActiveDesktop()); + return sp_desktop_document (getActiveDesktop()); } return NULL; @@ -153,9 +153,9 @@ Editor::addDesktop (SPDesktop *dt) if (isDesktopActive (dt)) { _instance->_desktop_activated_signal.emit (dt); - _instance->_event_context_set_signal.emit (SP_DT_EVENTCONTEXT (dt)); - _instance->_selection_set_signal.emit (SP_DT_SELECTION (dt)); - _instance->_selection_changed_signal.emit (SP_DT_SELECTION (dt)); + _instance->_event_context_set_signal.emit (sp_desktop_event_context (dt)); + _instance->_selection_set_signal.emit (sp_desktop_selection (dt)); + _instance->_selection_changed_signal.emit (sp_desktop_selection (dt)); } } @@ -173,13 +173,13 @@ Editor::removeDesktop (SPDesktop *dt) _instance->_desktops = g_slist_remove (_instance->_desktops, new_desktop); _instance->_desktops = g_slist_prepend (_instance->_desktops, new_desktop); _instance->_desktop_activated_signal.emit (new_desktop); - _instance->_event_context_set_signal.emit (SP_DT_EVENTCONTEXT (new_desktop)); - _instance->_selection_set_signal.emit (SP_DT_SELECTION (new_desktop)); - _instance->_selection_changed_signal.emit (SP_DT_SELECTION (new_desktop)); + _instance->_event_context_set_signal.emit (sp_desktop_event_context (new_desktop)); + _instance->_selection_set_signal.emit (sp_desktop_selection (new_desktop)); + _instance->_selection_changed_signal.emit (sp_desktop_selection (new_desktop)); } else { _instance->_event_context_set_signal.emit (0); - if (SP_DT_SELECTION(dt)) - SP_DT_SELECTION(dt)->clear(); + if (sp_desktop_selection(dt)) + sp_desktop_selection(dt)->clear(); } } @@ -207,9 +207,9 @@ Editor::activateDesktop (SPDesktop* dt) _instance->_desktops = g_slist_prepend (_instance->_desktops, dt); _instance->_desktop_activated_signal.emit (dt); - _instance->_event_context_set_signal.emit (SP_DT_EVENTCONTEXT(dt)); - _instance->_selection_set_signal.emit (SP_DT_SELECTION(dt)); - _instance->_selection_changed_signal.emit (SP_DT_SELECTION(dt)); + _instance->_event_context_set_signal.emit (sp_desktop_event_context(dt)); + _instance->_selection_set_signal.emit (sp_desktop_selection(dt)); + _instance->_selection_changed_signal.emit (sp_desktop_selection(dt)); } void @@ -242,7 +242,7 @@ Editor::isDuplicatedView (SPDesktop* dt) //Editor::getEventContext() //{ // if (getActiveDesktop()) { -// return SP_DT_EVENTCONTEXT (getActiveDesktop()); +// return sp_desktop_event_context (getActiveDesktop()); // } // // return NULL; -- cgit v1.2.3