Commit 26729981 authored by Tavmjong Bah's avatar Tavmjong Bah

Move classes derived from SPObject to own directory.

A lot of header clean-up.
parent 37abc4a3
Pipeline #16811470 failed with stages
in 73 minutes and 26 seconds
# List of source files containing translatable strings. # List of source files containing translatable strings.
# Please keep this file sorted alphabetically. # Please keep this file sorted alphabetically.
# Generated by ./generate_POTFILES.sh at Sun Jul 30 23:04:37 CEST 2017 # Generated by ./generate_POTFILES.sh at Sun Jan 28 12:05:47 CET 2018
[encoding: UTF-8] [encoding: UTF-8]
inkscape.appdata.xml.in inkscape.appdata.xml.in
inkscape.desktop.in inkscape.desktop.in
...@@ -9,8 +9,6 @@ share/palettes/palettes.h ...@@ -9,8 +9,6 @@ share/palettes/palettes.h
share/patterns/patterns.svg.h share/patterns/patterns.svg.h
share/symbols/symbols.h share/symbols/symbols.h
share/templates/templates.h share/templates/templates.h
src/box3d.cpp
src/color-profile.cpp
src/context-fns.cpp src/context-fns.cpp
src/desktop-events.cpp src/desktop-events.cpp
src/desktop.cpp src/desktop.cpp
...@@ -143,9 +141,9 @@ src/live_effects/lpe-measure-segments.cpp ...@@ -143,9 +141,9 @@ src/live_effects/lpe-measure-segments.cpp
src/live_effects/lpe-mirror_symmetry.cpp src/live_effects/lpe-mirror_symmetry.cpp
src/live_effects/lpe-patternalongpath.cpp src/live_effects/lpe-patternalongpath.cpp
src/live_effects/lpe-perspective-envelope.cpp src/live_effects/lpe-perspective-envelope.cpp
src/live_effects/lpe-powerstroke.cpp
src/live_effects/lpe-powerclip.cpp src/live_effects/lpe-powerclip.cpp
src/live_effects/lpe-powermask.cpp src/live_effects/lpe-powermask.cpp
src/live_effects/lpe-powerstroke.cpp
src/live_effects/lpe-rough-hatches.cpp src/live_effects/lpe-rough-hatches.cpp
src/live_effects/lpe-roughen.cpp src/live_effects/lpe-roughen.cpp
src/live_effects/lpe-ruler.cpp src/live_effects/lpe-ruler.cpp
...@@ -160,8 +158,8 @@ src/live_effects/parameter/colorpicker.cpp ...@@ -160,8 +158,8 @@ src/live_effects/parameter/colorpicker.cpp
src/live_effects/parameter/enum.h src/live_effects/parameter/enum.h
src/live_effects/parameter/fontbutton.cpp src/live_effects/parameter/fontbutton.cpp
src/live_effects/parameter/item.cpp src/live_effects/parameter/item.cpp
src/live_effects/parameter/originalitemarray.cpp
src/live_effects/parameter/originalitem.cpp src/live_effects/parameter/originalitem.cpp
src/live_effects/parameter/originalitemarray.cpp
src/live_effects/parameter/originalpath.cpp src/live_effects/parameter/originalpath.cpp
src/live_effects/parameter/originalpatharray.cpp src/live_effects/parameter/originalpatharray.cpp
src/live_effects/parameter/parameter.cpp src/live_effects/parameter/parameter.cpp
...@@ -179,8 +177,33 @@ src/main-cmdlineact.cpp ...@@ -179,8 +177,33 @@ src/main-cmdlineact.cpp
src/main-cmdlinexact.cpp src/main-cmdlinexact.cpp
src/main.cpp src/main.cpp
src/menus-skeleton.h src/menus-skeleton.h
src/objects/box3d.cpp
src/objects/color-profile.cpp
src/objects/persp3d.cpp
src/objects/sp-anchor.cpp
src/objects/sp-ellipse.cpp
src/objects/sp-flowregion.cpp
src/objects/sp-flowtext.cpp
src/objects/sp-guide.cpp
src/objects/sp-image.cpp
src/objects/sp-item-group.cpp
src/objects/sp-item.cpp
src/objects/sp-line.cpp
src/objects/sp-lpe-item.cpp
src/objects/sp-namedview.cpp
src/objects/sp-offset.cpp
src/objects/sp-path.cpp
src/objects/sp-polygon.cpp
src/objects/sp-polyline.cpp
src/objects/sp-rect.cpp
src/objects/sp-spiral.cpp
src/objects/sp-star.cpp
src/objects/sp-switch.cpp
src/objects/sp-text.cpp
src/objects/sp-tref.cpp
src/objects/sp-tspan.cpp
src/objects/sp-use.cpp
src/path-chemistry.cpp src/path-chemistry.cpp
src/persp3d.cpp
src/preferences-skeleton.h src/preferences-skeleton.h
src/preferences.cpp src/preferences.cpp
src/rdf.cpp src/rdf.cpp
...@@ -190,29 +213,6 @@ src/selection-describer.cpp ...@@ -190,29 +213,6 @@ src/selection-describer.cpp
src/seltrans-handles.cpp src/seltrans-handles.cpp
src/seltrans.cpp src/seltrans.cpp
src/shortcuts.cpp src/shortcuts.cpp
src/sp-anchor.cpp
src/sp-ellipse.cpp
src/sp-flowregion.cpp
src/sp-flowtext.cpp
src/sp-guide.cpp
src/sp-image.cpp
src/sp-item-group.cpp
src/sp-item.cpp
src/sp-line.cpp
src/sp-lpe-item.cpp
src/sp-namedview.cpp
src/sp-offset.cpp
src/sp-path.cpp
src/sp-polygon.cpp
src/sp-polyline.cpp
src/sp-rect.cpp
src/sp-spiral.cpp
src/sp-star.cpp
src/sp-switch.cpp
src/sp-text.cpp
src/sp-tref.cpp
src/sp-tspan.cpp
src/sp-use.cpp
src/splivarot.cpp src/splivarot.cpp
src/text-chemistry.cpp src/text-chemistry.cpp
src/text-editing.cpp src/text-editing.cpp
...@@ -256,7 +256,6 @@ src/ui/dialog/object-attributes.cpp ...@@ -256,7 +256,6 @@ src/ui/dialog/object-attributes.cpp
src/ui/dialog/object-properties.cpp src/ui/dialog/object-properties.cpp
src/ui/dialog/objects.cpp src/ui/dialog/objects.cpp
src/ui/dialog/ocaldialogs.cpp src/ui/dialog/ocaldialogs.cpp
src/ui/dialog/panel-dialog.h
src/ui/dialog/pixelartdialog.cpp src/ui/dialog/pixelartdialog.cpp
src/ui/dialog/polar-arrange-tab.cpp src/ui/dialog/polar-arrange-tab.cpp
src/ui/dialog/print-colors-preview-dialog.cpp src/ui/dialog/print-colors-preview-dialog.cpp
...@@ -319,7 +318,6 @@ src/ui/widget/layer-selector.cpp ...@@ -319,7 +318,6 @@ src/ui/widget/layer-selector.cpp
src/ui/widget/licensor.cpp src/ui/widget/licensor.cpp
src/ui/widget/object-composite-settings.cpp src/ui/widget/object-composite-settings.cpp
src/ui/widget/page-sizer.cpp src/ui/widget/page-sizer.cpp
src/ui/widget/panel.cpp
src/ui/widget/preferences-widget.cpp src/ui/widget/preferences-widget.cpp
src/ui/widget/random.cpp src/ui/widget/random.cpp
src/ui/widget/rendering-options.cpp src/ui/widget/rendering-options.cpp
...@@ -384,6 +382,7 @@ share/extensions/gimp_xcf.py ...@@ -384,6 +382,7 @@ share/extensions/gimp_xcf.py
share/extensions/guides_creator.py share/extensions/guides_creator.py
share/extensions/guillotine.py share/extensions/guillotine.py
share/extensions/hpgl_decoder.py share/extensions/hpgl_decoder.py
share/extensions/hpgl_encoder.py
share/extensions/hpgl_input.py share/extensions/hpgl_input.py
share/extensions/hpgl_output.py share/extensions/hpgl_output.py
share/extensions/inkex.py share/extensions/inkex.py
......
File mode changed from 100644 to 100755
...@@ -2,188 +2,13 @@ ...@@ -2,188 +2,13 @@
# Define the main source # Define the main source
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
set(sp_SRC set(inkscape_SRC
attribute-rel-css.cpp attribute-rel-css.cpp
attribute-rel-svg.cpp attribute-rel-svg.cpp
attribute-rel-util.cpp attribute-rel-util.cpp
attribute-sort-util.cpp attribute-sort-util.cpp
sp-anchor.cpp
sp-clippath.cpp
sp-conn-end-pair.cpp
sp-conn-end.cpp
sp-cursor.cpp
sp-defs.cpp
sp-desc.cpp
sp-dimensions.cpp
sp-ellipse.cpp
sp-factory.cpp
sp-filter-primitive.cpp
sp-filter-reference.cpp
sp-filter.cpp
sp-flowdiv.cpp
sp-flowregion.cpp
sp-flowtext.cpp
sp-font-face.cpp
sp-font.cpp
sp-glyph-kerning.cpp
sp-glyph.cpp
sp-gradient-reference.cpp
sp-gradient.cpp
sp-guide.cpp
sp-hatch-path.cpp
sp-hatch.cpp
sp-image.cpp
sp-item-group.cpp
sp-item-notify-moveto.cpp
sp-item-rm-unsatisfied-cns.cpp
sp-item-transform.cpp
sp-item-update-cns.cpp
sp-item.cpp
sp-line.cpp
sp-linear-gradient.cpp
sp-lpe-item.cpp
sp-marker.cpp
sp-mask.cpp
sp-mesh-array.cpp
sp-mesh-gradient.cpp
sp-mesh-patch.cpp
sp-mesh-row.cpp
sp-metadata.cpp
sp-missing-glyph.cpp
sp-namedview.cpp
sp-object-group.cpp
sp-object.cpp
sp-offset.cpp
sp-paint-server.cpp
sp-path.cpp
sp-pattern.cpp
sp-polygon.cpp
sp-polyline.cpp
sp-radial-gradient.cpp
sp-rect.cpp
sp-root.cpp
sp-script.cpp
sp-shape.cpp
sp-solid-color.cpp
sp-spiral.cpp
sp-star.cpp
sp-stop.cpp
sp-string.cpp
sp-style-elem.cpp
sp-switch.cpp
sp-symbol.cpp
sp-tag-use-reference.cpp
sp-tag-use.cpp
sp-tag.cpp
sp-text.cpp
sp-title.cpp
sp-tref-reference.cpp
sp-tref.cpp
sp-tspan.cpp
sp-use-reference.cpp
sp-use.cpp
splivarot.cpp
viewbox.cpp
# -------
# Headers
attribute-rel-css.h
attribute-rel-svg.h
attribute-rel-util.h
attribute-sort-util.h
sp-anchor.h
sp-clippath.h
sp-conn-end-pair.h
sp-conn-end.h
sp-cursor.h
sp-defs.h
sp-desc.h
sp-dimensions.h
sp-ellipse.h
sp-factory.h
sp-filter-primitive.h
sp-filter-reference.h
sp-filter-units.h
sp-filter.h
sp-flowdiv.h
sp-flowregion.h
sp-flowtext.h
sp-font-face.h
sp-font.h
sp-glyph-kerning.h
sp-glyph.h
sp-gradient-reference.h
sp-gradient-spread.h
sp-gradient-units.h
sp-gradient-vector.h
sp-gradient.h
sp-guide-attachment.h
sp-guide-constraint.h
sp-guide.h
sp-hatch-path.h
sp-hatch.h
sp-image.h
sp-item-group.h
sp-item-notify-moveto.h
sp-item-rm-unsatisfied-cns.h
sp-item-transform.h
sp-item-update-cns.h
sp-item.h
sp-line.h
sp-linear-gradient.h
sp-lpe-item.h
sp-marker-loc.h
sp-marker.h
sp-mask.h
sp-mesh-array.h
sp-mesh-gradient.h
sp-mesh-patch.h
sp-mesh-row.h
sp-metadata.h
sp-missing-glyph.h
sp-namedview.h
sp-object-group.h
sp-object.h
sp-offset.h
sp-paint-server-reference.h
sp-paint-server.h
sp-path.h
sp-pattern.h
sp-polygon.h
sp-polyline.h
sp-radial-gradient.h
sp-rect.h
sp-root.h
sp-script.h
sp-shape.h
sp-solid-color.h
sp-spiral.h
sp-star.h
sp-stop.h
sp-string.h
sp-style-elem.h
sp-switch.h
sp-symbol.h
sp-tag.h
sp-tag-use.h
sp-tag-use-reference.h
sp-text.h
sp-textpath.h
sp-title.h
sp-tref-reference.h
sp-tref.h
sp-tspan.h
sp-use-reference.h
sp-use.h
viewbox.h
)
set(inkscape_SRC
attributes.cpp attributes.cpp
axis-manip.cpp axis-manip.cpp
box3d-side.cpp
box3d.cpp
color-profile.cpp
color.cpp color.cpp
composite-undo-stack-observer.cpp composite-undo-stack-observer.cpp
conditions.cpp conditions.cpp
...@@ -230,12 +55,9 @@ set(inkscape_SRC ...@@ -230,12 +55,9 @@ set(inkscape_SRC
message-stack.cpp message-stack.cpp
mod360.cpp mod360.cpp
object-hierarchy.cpp object-hierarchy.cpp
object-set.cpp
object-snapper.cpp object-snapper.cpp
path-chemistry.cpp path-chemistry.cpp
path-prefix.cpp path-prefix.cpp
persp3d-reference.cpp
persp3d.cpp
perspective-line.cpp perspective-line.cpp
preferences.cpp preferences.cpp
prefix.cpp prefix.cpp
...@@ -261,6 +83,9 @@ set(inkscape_SRC ...@@ -261,6 +83,9 @@ set(inkscape_SRC
snapped-line.cpp snapped-line.cpp
snapped-point.cpp snapped-point.cpp
snapper.cpp snapper.cpp
splivarot.cpp
sp-cursor.cpp
sp-item-notify-moveto.cpp
style-internal.cpp style-internal.cpp
style.cpp style.cpp
svg-view-slideshow.cpp svg-view-slideshow.cpp
...@@ -271,8 +96,6 @@ set(inkscape_SRC ...@@ -271,8 +96,6 @@ set(inkscape_SRC
transf_mat_3x4.cpp transf_mat_3x4.cpp
unclump.cpp unclump.cpp
unicoderange.cpp unicoderange.cpp
uri-references.cpp
uri.cpp
vanishing-point.cpp vanishing-point.cpp
verbs.cpp verbs.cpp
version.cpp version.cpp
...@@ -282,15 +105,16 @@ set(inkscape_SRC ...@@ -282,15 +105,16 @@ set(inkscape_SRC
MultiPrinter.h MultiPrinter.h
PylogFormatter.h PylogFormatter.h
TRPIFormatter.h TRPIFormatter.h
attribute-rel-css.h
attribute-rel-svg.h
attribute-rel-util.h
attribute-sort-util.h
attributes.h attributes.h
axis-manip.h axis-manip.h
bad-uri-exception.h bad-uri-exception.h
box3d-side.h
box3d.h
cms-color-types.h cms-color-types.h
cms-system.h cms-system.h
color-profile-cms-fns.h color-profile-cms-fns.h
color-profile.h
color-rgba.h color-rgba.h
color.h color.h
colorspace.h colorspace.h
...@@ -350,12 +174,9 @@ set(inkscape_SRC ...@@ -350,12 +174,9 @@ set(inkscape_SRC
mod360.h mod360.h
number-opt-number.h number-opt-number.h
object-hierarchy.h object-hierarchy.h
object-set.h
object-snapper.h object-snapper.h
path-chemistry.h path-chemistry.h
path-prefix.h path-prefix.h
persp3d-reference.h
persp3d.h
perspective-line.h perspective-line.h
preferences-skeleton.h preferences-skeleton.h
preferences.h preferences.h
...@@ -385,6 +206,10 @@ set(inkscape_SRC ...@@ -385,6 +206,10 @@ set(inkscape_SRC
snapped-line.h snapped-line.h
snapped-point.h snapped-point.h
snapper.h snapper.h
sp-cursor.h
sp-guide-attachment.h
sp-guide-constraint.h
sp-item-notify-moveto.h
splivarot.h splivarot.h
streq.h streq.h
strneq.h strneq.h
...@@ -403,8 +228,6 @@ set(inkscape_SRC ...@@ -403,8 +228,6 @@ set(inkscape_SRC
unclump.h unclump.h
undo-stack-observer.h undo-stack-observer.h
unicoderange.h unicoderange.h
uri-references.h
uri.h
vanishing-point.h vanishing-point.h
verbs.h verbs.h
version.h version.h
...@@ -440,10 +263,10 @@ list(APPEND inkscape_SRC ...@@ -440,10 +263,10 @@ list(APPEND inkscape_SRC
add_subdirectory(debug) add_subdirectory(debug)
add_subdirectory(display) add_subdirectory(display)
add_subdirectory(extension) add_subdirectory(extension)
add_subdirectory(filters)
add_subdirectory(helper) add_subdirectory(helper)
add_subdirectory(io) add_subdirectory(io)
add_subdirectory(live_effects) add_subdirectory(live_effects)
add_subdirectory(object)
add_subdirectory(svg) add_subdirectory(svg)
add_subdirectory(trace) add_subdirectory(trace)
add_subdirectory(ui) add_subdirectory(ui)
......
...@@ -15,11 +15,16 @@ ...@@ -15,11 +15,16 @@
#endif #endif
#include <set> #include <set>
#include <glibmm/ustring.h> #include <glibmm/ustring.h>
#include "conditions.h"