diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 635c5afad302d3c2234b251e979f9087b6be90ba..4626999c9f264d8ca8536998f713ddbd45b85be2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -128,7 +128,6 @@ set(inkscape_SRC gradient-chemistry.h gradient-drag.h guide-snapper.h - helper-fns.h id-clash.h inkscape-version.h inkscape-version-info.h diff --git a/src/live_effects/parameter/array.cpp b/src/live_effects/parameter/array.cpp index 98b3db2a5b05ba4aa6a5143d40e19bfeea6297b8..53d737d7b6c259fb394db28fed28a00efd07a08b 100644 --- a/src/live_effects/parameter/array.cpp +++ b/src/live_effects/parameter/array.cpp @@ -9,7 +9,7 @@ #include <2geom/coord.h> #include <2geom/point.h> -#include "helper-fns.h" +#include "util/helper-read-fns.h" #include "live_effects/effect.h" #include "live_effects/lpeobject.h" diff --git a/src/live_effects/parameter/bool.cpp b/src/live_effects/parameter/bool.cpp index 79841b48a2af1c2777febb1bb54944f8197bb8b9..ae457254f9c7a3ef73f0d0c0bb3911a402894818 100644 --- a/src/live_effects/parameter/bool.cpp +++ b/src/live_effects/parameter/bool.cpp @@ -9,7 +9,7 @@ #include -#include "helper-fns.h" +#include "util/helper-read-fns.h" #include "inkscape.h" #include "live_effects/effect.h" diff --git a/src/live_effects/parameter/togglebutton.cpp b/src/live_effects/parameter/togglebutton.cpp index c8a80c857799b842a148e4d195719699819c2df0..bf406bd2785d55dd5a61765eafd4a5fffcaf5c43 100644 --- a/src/live_effects/parameter/togglebutton.cpp +++ b/src/live_effects/parameter/togglebutton.cpp @@ -12,7 +12,7 @@ #include -#include "helper-fns.h" +#include "util/helper-read-fns.h" #include "inkscape.h" #include "selection.h" diff --git a/src/object/filters/colormatrix.cpp b/src/object/filters/colormatrix.cpp index a42955453eec86722f5feed22d092cb9aaf3e3b9..db0306ce5376da647a1cc5fb374ad0a081eb052c 100644 --- a/src/object/filters/colormatrix.cpp +++ b/src/object/filters/colormatrix.cpp @@ -21,7 +21,7 @@ #include "svg/svg.h" #include "colormatrix.h" #include "xml/repr.h" -#include "helper-fns.h" +#include "util/helper-read-fns.h" #include "display/nr-filter.h" diff --git a/src/object/filters/componenttransfer-funcnode.cpp b/src/object/filters/componenttransfer-funcnode.cpp index d73fbee6fd3e1fcdbcbe6b28ddb40a1579aaeb90..1c4c74b3fed3901753ea42050ba65f4d2ef83636 100644 --- a/src/object/filters/componenttransfer-funcnode.cpp +++ b/src/object/filters/componenttransfer-funcnode.cpp @@ -21,7 +21,7 @@ #include "componenttransfer.h" #include "componenttransfer-funcnode.h" #include "xml/repr.h" -#include "helper-fns.h" +#include "util/helper-read-fns.h" /* FeFuncNode class */ SPFeFuncNode::SPFeFuncNode(SPFeFuncNode::Channel channel) diff --git a/src/object/filters/composite.cpp b/src/object/filters/composite.cpp index cfd43362f38b730a41a1b693e0f3c11b48b6c5c3..55cae6b9253b8e7d47c2ee966f63ccb630a639ba 100644 --- a/src/object/filters/composite.cpp +++ b/src/object/filters/composite.cpp @@ -16,7 +16,7 @@ #include "composite.h" #include "attributes.h" -#include "helper-fns.h" +#include "util/helper-read-fns.h" #include "display/nr-filter.h" #include "display/nr-filter-composite.h" diff --git a/src/object/filters/convolvematrix.cpp b/src/object/filters/convolvematrix.cpp index 69a41726585e7004ca4972d843564380d9364066..f4358fea71e57841cc8024e44b4e59bf4796fc21 100644 --- a/src/object/filters/convolvematrix.cpp +++ b/src/object/filters/convolvematrix.cpp @@ -21,7 +21,7 @@ #include "convolvematrix.h" #include "attributes.h" -#include "helper-fns.h" +#include "util/helper-read-fns.h" #include "display/nr-filter.h" diff --git a/src/object/filters/displacementmap.cpp b/src/object/filters/displacementmap.cpp index 41ce4d1507cdef964202d874c055fbd85e4a57dc..edd1b74eabf55bd07a63aefb3316f0c1706325bb 100644 --- a/src/object/filters/displacementmap.cpp +++ b/src/object/filters/displacementmap.cpp @@ -16,7 +16,7 @@ #include "displacementmap.h" #include "attributes.h" -#include "helper-fns.h" +#include "util/helper-read-fns.h" #include "display/nr-filter-displacement-map.h" #include "display/nr-filter.h" diff --git a/src/object/filters/offset.cpp b/src/object/filters/offset.cpp index b859598b1195f48d4881c390a625a14701750dd6..021b27d80c3ab6011f5c613367063d228f6ca870 100644 --- a/src/object/filters/offset.cpp +++ b/src/object/filters/offset.cpp @@ -19,7 +19,7 @@ #include "offset.h" #include "attributes.h" -#include "helper-fns.h" +#include "util/helper-read-fns.h" #include "display/nr-filter.h" #include "display/nr-filter-offset.h" diff --git a/src/object/filters/turbulence.cpp b/src/object/filters/turbulence.cpp index d8fe979596bf8bd537834982f741b35df46f0d97..195b824ced14783ff28b2d0cad1fde39785533fd 100644 --- a/src/object/filters/turbulence.cpp +++ b/src/object/filters/turbulence.cpp @@ -18,7 +18,7 @@ #include "attributes.h" #include "svg/svg.h" #include "turbulence.h" -#include "helper-fns.h" +#include "util/helper-read-fns.h" #include "xml/repr.h" #include "display/nr-filter.h" diff --git a/src/object/sp-guide.cpp b/src/object/sp-guide.cpp index a82350cadfc7f7805ee450275a54d5db84ed3279..24294b67c0751c03efbf0417754feb4aa97a2beb 100644 --- a/src/object/sp-guide.cpp +++ b/src/object/sp-guide.cpp @@ -24,7 +24,7 @@ #include "desktop.h" #include "desktop-events.h" #include "document-undo.h" -#include "helper-fns.h" +#include "util/helper-read-fns.h" #include "inkscape.h" #include "sp-guide.h" diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt index c357658185936f5f90788117b73000601c120001..d758faa28cf50ea308e90f52e5987c42f7122439 100644 --- a/src/util/CMakeLists.txt +++ b/src/util/CMakeLists.txt @@ -17,6 +17,7 @@ set(util_SRC fixed_point.h format.h forward-pointer-iterator.h + helper-read-fns.h longest-common-suffix.h pages-skeleton.h paper.h diff --git a/src/helper-fns.h b/src/util/helper-read-fns.h similarity index 100% rename from src/helper-fns.h rename to src/util/helper-read-fns.h diff --git a/testfiles/lpespaths-test.h b/testfiles/lpespaths-test.h index 09f96b7efba0f90ad1197cc3b938e60341cb4a4d..21e5f53b7222b1f5292104d535eede4b0787a7e2 100644 --- a/testfiles/lpespaths-test.h +++ b/testfiles/lpespaths-test.h @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include #include