CPPification: almost all sp_object_set_whatever and sp_selection_whatever global functions are now methods of ObjectSet*, with these additional benefits:

- They can now act on any SelectionSet, not just the current selection;
- Whenever possible, they don't need a desktop anymore and can run if called from GUI.

I hope I did not break too many things in the process.

*: So instead of callink sp_selection_move(desktop,x,y), you call myobjectset->move(x,y)

(bzr r15189)

1 files changed, 1 insertions, 72 deletions

diff --git a/src/selection-chemistry.h b/src/selection-chemistry.h
index 72e4acc66..969a6e35a 100644
--- a/src/selection-chemistry.h
+++ b/src/selection-chemistry.h
@@ -51,8 +51,6 @@ namespace LivePathEffect {
     };
 } // namespace Inkscape
 
-void sp_selection_delete(SPDesktop *desktop);
-void sp_selection_duplicate(SPDesktop *desktop, bool suppressDone = false, bool duplicateLayer = false);
 void sp_edit_clear_all(Inkscape::Selection *selection);
 
 void sp_edit_select_all(SPDesktop *desktop);
@@ -60,82 +58,20 @@ void sp_edit_select_all_in_all_layers (SPDesktop *desktop);
 void sp_edit_invert (SPDesktop *desktop);
 void sp_edit_invert_in_all_layers (SPDesktop *desktop);
 
-void sp_selection_clone(SPDesktop *desktop);
-void sp_selection_unlink(SPDesktop *desktop);
-void sp_selection_relink(SPDesktop *desktop);
-void sp_select_clone_original(SPDesktop *desktop);
-void sp_selection_clone_original_path_lpe(SPDesktop *desktop);
-
-void sp_selection_to_marker(SPDesktop *desktop, bool apply = true);
-void sp_selection_to_guides(SPDesktop *desktop);
-
-void sp_selection_symbol(SPDesktop *desktop, bool apply = true);
-void sp_selection_unsymbol(SPDesktop *desktop);
-
-void sp_selection_tile(SPDesktop *desktop, bool apply = true);
-void sp_selection_untile(SPDesktop *desktop);
-
-void sp_selection_group(Inkscape::Selection *selection, SPDesktop *desktop);
-void sp_selection_ungroup(Inkscape::Selection *selection, SPDesktop *desktop);
-void sp_selection_ungroup_pop_selection(Inkscape::Selection *selection, SPDesktop *desktop);
-
-void sp_object_set_raise(Inkscape::ObjectSet *set);
-void sp_object_set_raise_to_top(Inkscape::ObjectSet *set);
-void sp_object_set_lower(Inkscape::ObjectSet *set);
-void sp_object_set_lower_to_bottom(Inkscape::ObjectSet *set);
-
-void sp_selection_raise(Inkscape::Selection *selection, SPDesktop *desktop);
-void sp_selection_raise_to_top(Inkscape::Selection *selection, SPDesktop *desktop, bool skip_undo = false);
-void sp_selection_lower(Inkscape::Selection *selection, SPDesktop *desktop);
-void sp_selection_lower_to_bottom(Inkscape::Selection *selection, SPDesktop *desktop, bool skip_undo = false);
 
 SPCSSAttr *take_style_from_item (SPObject *object);
 
-void sp_selection_cut(SPDesktop *desktop);
-void sp_selection_copy(SPDesktop *desktop);
 void sp_selection_paste(SPDesktop *desktop, bool in_place);
-void sp_selection_paste_style(SPDesktop *desktop);
-void sp_selection_paste_livepatheffect(SPDesktop *desktop);
-void sp_selection_remove_livepatheffect(SPDesktop *desktop);
-
-void sp_selection_remove_filter(SPDesktop *desktop);
 
 void sp_set_style_clipboard (SPCSSAttr *css);
 
-void sp_selection_paste_size(SPDesktop *desktop, bool apply_x, bool apply_y);
-void sp_selection_paste_size_separately(SPDesktop *desktop, bool apply_x, bool apply_y);
-
-void sp_selection_to_next_layer( SPDesktop *desktop, bool suppressDone = false );
-void sp_selection_to_prev_layer( SPDesktop *desktop, bool suppressDone = false );
-void sp_selection_to_layer( SPDesktop *desktop, SPObject *layer, bool suppressDone = false );
-
-void sp_object_set_apply_affine(Inkscape::ObjectSet *set, Geom::Affine const &affine, bool set_i2d = true,
-                                bool compensate = true, bool adjust_transf_center = true);
-void sp_object_set_remove_transform(SPDesktop *desktop);
-void sp_object_set_scale_absolute(Inkscape::ObjectSet *set, double x0, double x1, double y0, double y1);
-void sp_object_set_scale_relative(Inkscape::ObjectSet *set, Geom::Point const &align, Geom::Scale const &scale);
-void sp_object_set_rotate_relative(Inkscape::ObjectSet *set, Geom::Point const &center, double angle);
-void sp_object_set_skew_relative(Inkscape::ObjectSet *set, Geom::Point const &align, double dx, double dy);
-void sp_object_set_move_relative(Inkscape::ObjectSet *set, Geom::Point const &move, bool compensate = true);
-void sp_object_set_move_relative(Inkscape::ObjectSet *set, double dx, double dy);
-
-void sp_selection_rotate_90 (SPDesktop *desktop, bool ccw);
-void sp_selection_rotate (Inkscape::Selection *selection, double angle);
-void sp_selection_rotate_screen (Inkscape::Selection *selection, double angle);
-
-void sp_selection_scale (Inkscape::Selection *selection, double grow);
-void sp_selection_scale_screen (Inkscape::Selection *selection, double grow_pixels);
-void sp_selection_scale_times (Inkscape::Selection *selection, double times);
-
-void sp_selection_move (Inkscape::Selection *selection, double dx, double dy);
-void sp_selection_move_screen (Inkscape::Selection *selection, double dx, double dy);
 
 void sp_selection_item_next (SPDesktop *desktop);
 void sp_selection_item_prev (SPDesktop *desktop);
 
 void sp_selection_next_patheffect_param(SPDesktop * dt);
 
-void sp_selection_edit_clip_or_mask(SPDesktop * dt, bool clip);
+//void sp_selection_edit_clip_or_mask(SPDesktop * dt, bool clip);
 
 enum SPSelectStrokeStyleType {
     SP_FILL_COLOR  = 0,
@@ -158,15 +94,8 @@ void scroll_to_show_item(SPDesktop *desktop, SPItem *item);
 void sp_undo (SPDesktop *desktop, SPDocument *doc);
 void sp_redo (SPDesktop *desktop, SPDocument *doc);
 
-void sp_object_set_get_export_hints(Inkscape::ObjectSet *set, Glib::ustring &filename, float *xdpi, float *ydpi);
 void sp_document_get_export_hints (SPDocument * doc, Glib::ustring &filename, float *xdpi, float *ydpi);
 
-void sp_selection_create_bitmap_copy (SPDesktop *desktop);
-
-void sp_selection_set_clipgroup(SPDesktop *desktop);
-void sp_selection_set_mask(SPDesktop *desktop, bool apply_clip_path, bool apply_to_layer, bool skip_undo = false);
-void sp_selection_unset_mask(SPDesktop *desktop, bool apply_clip_path);
-
 bool fit_canvas_to_selection(SPDesktop *, bool with_margins = false);
 void verb_fit_canvas_to_selection(SPDesktop *);
 bool fit_canvas_to_drawing(SPDocument *, bool with_margins = false);