move transform related headers into transform
dir to minimize clutter
This commit is contained in:
parent
e582ca65b5
commit
de2b44712a
15 changed files with 18 additions and 17 deletions
|
@ -38,6 +38,7 @@ subdirs = [
|
|||
'text',
|
||||
'text/placements',
|
||||
'text/formatting',
|
||||
'transform',
|
||||
'markers_placements',
|
||||
'geometry',
|
||||
'value'
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
#define MAPNIK_ATTRIBUTE_COLLECTOR_HPP
|
||||
|
||||
// mapnik
|
||||
#include <mapnik/transform_processor.hpp>
|
||||
#include <mapnik/transform/transform_processor.hpp>
|
||||
#include <mapnik/util/noncopyable.hpp>
|
||||
#include <mapnik/attribute.hpp>
|
||||
#include <mapnik/symbolizer.hpp>
|
||||
|
|
|
@ -30,13 +30,13 @@
|
|||
#include <mapnik/parse_path.hpp>
|
||||
#include <mapnik/color.hpp>
|
||||
#include <mapnik/expression.hpp>
|
||||
#include <mapnik/transform_processor.hpp>
|
||||
#include <mapnik/color_factory.hpp>
|
||||
#include <mapnik/symbolizer.hpp>
|
||||
#include <mapnik/xml_tree.hpp>
|
||||
#include <mapnik/config_error.hpp>
|
||||
#include <mapnik/evaluate_global_attributes.hpp>
|
||||
#include <mapnik/parse_transform.hpp>
|
||||
#include <mapnik/transform/transform_processor.hpp>
|
||||
#include <mapnik/transform/parse_transform.hpp>
|
||||
#include <mapnik/util/dasharray_parser.hpp>
|
||||
#include <mapnik/util/variant.hpp>
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
#ifndef MAPNIK_TRANSFORM_GRAMMAR_X3_HPP
|
||||
#define MAPNIK_TRANSFORM_GRAMMAR_X3_HPP
|
||||
|
||||
#include <mapnik/transform_expression.hpp>
|
||||
#include <mapnik/transform/transform_expression.hpp>
|
||||
|
||||
#pragma GCC diagnostic push
|
||||
#include <mapnik/warning_ignore.hpp>
|
|
@ -23,8 +23,8 @@
|
|||
#ifndef MAPNIK_TRANSFORM_GRAMMAR_X3_DEF_HPP
|
||||
#define MAPNIK_TRANSFORM_GRAMMAR_X3_DEF_HPP
|
||||
|
||||
#include <mapnik/transform_expression.hpp>
|
||||
#include <mapnik/transform_expression_grammar_x3.hpp>
|
||||
#include <mapnik/transform/transform_expression.hpp>
|
||||
#include <mapnik/transform/transform_expression_grammar_x3.hpp>
|
||||
#include <mapnik/expression_grammar_x3.hpp>
|
||||
|
||||
#pragma GCC diagnostic push
|
|
@ -26,7 +26,7 @@
|
|||
// mapnik
|
||||
#include <mapnik/config.hpp>
|
||||
#include <mapnik/value.hpp>
|
||||
#include <mapnik/transform_expression.hpp>
|
||||
#include <mapnik/transform/transform_expression.hpp>
|
||||
#include <mapnik/expression_evaluator.hpp>
|
||||
#include <mapnik/util/variant.hpp>
|
||||
|
|
@ -39,7 +39,7 @@
|
|||
#include <mapnik/xml_loader.hpp>
|
||||
#include <mapnik/expression.hpp>
|
||||
#include <mapnik/parse_path.hpp>
|
||||
#include <mapnik/parse_transform.hpp>
|
||||
#include <mapnik/transform/parse_transform.hpp>
|
||||
#include <mapnik/raster_colorizer.hpp>
|
||||
#include <mapnik/svg/svg_path_parser.hpp>
|
||||
#include <mapnik/text/placements/registry.hpp>
|
||||
|
@ -55,7 +55,7 @@
|
|||
#include <mapnik/image_filter_types.hpp>
|
||||
#include <mapnik/projection.hpp>
|
||||
#include <mapnik/group/group_rule.hpp>
|
||||
#include <mapnik/transform_expression.hpp>
|
||||
#include <mapnik/transform/transform_expression.hpp>
|
||||
#include <mapnik/evaluate_global_attributes.hpp>
|
||||
#include <mapnik/boolean.hpp>
|
||||
|
||||
|
|
|
@ -20,8 +20,8 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
#include <mapnik/parse_transform.hpp>
|
||||
#include <mapnik/transform_expression_grammar_x3.hpp>
|
||||
#include <mapnik/transform/parse_transform.hpp>
|
||||
#include <mapnik/transform/transform_expression_grammar_x3.hpp>
|
||||
#include <mapnik/expression_grammar_x3_config.hpp> // transcoder_tag
|
||||
#include <mapnik/config_error.hpp>
|
||||
// stl
|
||||
|
|
|
@ -41,7 +41,7 @@
|
|||
#include <mapnik/image_filter_types.hpp>
|
||||
#include <mapnik/parse_path.hpp>
|
||||
#include <mapnik/symbolizer_utils.hpp>
|
||||
#include <mapnik/transform_processor.hpp>
|
||||
#include <mapnik/transform/transform_processor.hpp>
|
||||
#include <mapnik/group/group_rule.hpp>
|
||||
#include <mapnik/group/group_layout.hpp>
|
||||
#include <mapnik/group/group_symbolizer_properties.hpp>
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
#include <mapnik/symbolizer.hpp>
|
||||
#include <mapnik/attribute.hpp>
|
||||
#include <mapnik/feature.hpp>
|
||||
#include <mapnik/transform_processor.hpp>
|
||||
#include <mapnik/transform/transform_processor.hpp>
|
||||
|
||||
namespace mapnik {
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@
|
|||
|
||||
// mapnik
|
||||
#include <mapnik/expression_string.hpp>
|
||||
#include <mapnik/transform_expression.hpp>
|
||||
#include <mapnik/transform/transform_expression.hpp>
|
||||
|
||||
// stl
|
||||
#include <sstream>
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
*
|
||||
*****************************************************************************/
|
||||
|
||||
#include <mapnik/transform_expression_grammar_x3_def.hpp>
|
||||
#include <mapnik/transform/transform_expression_grammar_x3_def.hpp>
|
||||
#include <mapnik/expression_grammar_x3_config.hpp>
|
||||
|
||||
namespace mapnik { namespace grammar {
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#include "catch.hpp"
|
||||
|
||||
#include <mapnik/parse_transform.hpp>
|
||||
#include <mapnik/transform_expression.hpp>
|
||||
#include <mapnik/transform/parse_transform.hpp>
|
||||
#include <mapnik/transform/transform_expression.hpp>
|
||||
|
||||
namespace {
|
||||
|
||||
|
|
Loading…
Reference in a new issue