From 23d0e18ff4cbb64a2449c4208ed45c8263497d8b Mon Sep 17 00:00:00 2001 From: Aviii06 Date: Thu, 7 Apr 2022 22:44:34 +0530 Subject: [PATCH] rename helper-fns.h and move it to util rename helper-fns.h and move it to util --- src/CMakeLists.txt | 1 - src/live_effects/parameter/array.cpp | 2 +- src/live_effects/parameter/bool.cpp | 2 +- src/live_effects/parameter/togglebutton.cpp | 2 +- src/object/filters/colormatrix.cpp | 2 +- src/object/filters/componenttransfer-funcnode.cpp | 2 +- src/object/filters/composite.cpp | 2 +- src/object/filters/convolvematrix.cpp | 2 +- src/object/filters/displacementmap.cpp | 2 +- src/object/filters/offset.cpp | 2 +- src/object/filters/turbulence.cpp | 2 +- src/object/sp-guide.cpp | 2 +- src/util/CMakeLists.txt | 1 + src/{helper-fns.h => util/helper-read-fns.h} | 0 testfiles/lpespaths-test.h | 2 +- 15 files changed, 13 insertions(+), 13 deletions(-) rename src/{helper-fns.h => util/helper-read-fns.h} (100%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 635c5afad3..4626999c9f 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 98b3db2a5b..53d737d7b6 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 79841b48a2..ae457254f9 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 c8a80c8577..bf406bd278 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 a42955453e..db0306ce53 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 d73fbee6fd..1c4c74b3fe 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 cfd43362f3..55cae6b925 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 69a4172658..f4358fea71 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 41ce4d1507..edd1b74eab 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 b859598b11..021b27d80c 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 d8fe979596..195b824ced 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 a82350cadf..24294b67c0 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 c357658185..d758faa28c 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 09f96b7efb..21e5f53b72 100644 --- a/testfiles/lpespaths-test.h +++ b/testfiles/lpespaths-test.h @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include #include -- GitLab