summaryrefslogtreecommitdiff
path: root/src/mbgl/style
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2016-05-25 21:14:18 +0200
committerKonstantin Käfer <mail@kkaefer.com>2016-05-25 21:35:37 +0200
commite2bcea90fce8a1e05e517c615d21d845e955f53d (patch)
tree208da7ad0db235a13b5ae6d360279a624e46fb95 /src/mbgl/style
parent6368403f433cfbfed1547d4167a9836fa2942a97 (diff)
downloadqtlocation-mapboxgl-e2bcea90fce8a1e05e517c615d21d845e955f53d.tar.gz
[core] use #pragma once instead of ifdef include guards
Diffstat (limited to 'src/mbgl/style')
-rw-r--r--src/mbgl/style/class_dictionary.hpp5
-rw-r--r--src/mbgl/style/function.hpp5
-rw-r--r--src/mbgl/style/function_evaluator.hpp5
-rw-r--r--src/mbgl/style/layout_property.hpp5
-rw-r--r--src/mbgl/style/paint_property.hpp5
-rw-r--r--src/mbgl/style/render_item.hpp5
-rw-r--r--src/mbgl/style/style.hpp5
-rw-r--r--src/mbgl/style/style_bucket_parameters.hpp5
-rw-r--r--src/mbgl/style/style_calculation_parameters.hpp5
-rw-r--r--src/mbgl/style/style_cascade_parameters.hpp5
-rw-r--r--src/mbgl/style/style_layer.hpp5
-rw-r--r--src/mbgl/style/style_observer.hpp5
-rw-r--r--src/mbgl/style/style_parser.hpp5
-rw-r--r--src/mbgl/style/style_render_parameters.hpp5
-rw-r--r--src/mbgl/style/style_update_parameters.hpp5
-rw-r--r--src/mbgl/style/zoom_history.hpp5
16 files changed, 16 insertions, 64 deletions
diff --git a/src/mbgl/style/class_dictionary.hpp b/src/mbgl/style/class_dictionary.hpp
index 8a06a77c7a..703e27b438 100644
--- a/src/mbgl/style/class_dictionary.hpp
+++ b/src/mbgl/style/class_dictionary.hpp
@@ -1,5 +1,4 @@
-#ifndef MBGL_STYLE_CLASS_DICTIONARY
-#define MBGL_STYLE_CLASS_DICTIONARY
+#pragma once
#include <cstdint>
#include <string>
@@ -33,5 +32,3 @@ private:
};
} // namespace mbgl
-
-#endif
diff --git a/src/mbgl/style/function.hpp b/src/mbgl/style/function.hpp
index c5de6b5db7..a04fc8bb4f 100644
--- a/src/mbgl/style/function.hpp
+++ b/src/mbgl/style/function.hpp
@@ -1,5 +1,4 @@
-#ifndef MBGL_STYLE_FUNCTION
-#define MBGL_STYLE_FUNCTION
+#pragma once
#include <vector>
#include <utility>
@@ -27,5 +26,3 @@ private:
};
} // namespace mbgl
-
-#endif
diff --git a/src/mbgl/style/function_evaluator.hpp b/src/mbgl/style/function_evaluator.hpp
index 7da1c299e0..43549179df 100644
--- a/src/mbgl/style/function_evaluator.hpp
+++ b/src/mbgl/style/function_evaluator.hpp
@@ -1,5 +1,4 @@
-#ifndef MBGL_STYLE_FUNCTION_EVALUATOR
-#define MBGL_STYLE_FUNCTION_EVALUATOR
+#pragma once
#include <mbgl/style/function.hpp>
#include <mbgl/util/interpolate.hpp>
@@ -41,5 +40,3 @@ struct Interpolator<Faded<T>>
}
} // namespace mbgl
-
-#endif
diff --git a/src/mbgl/style/layout_property.hpp b/src/mbgl/style/layout_property.hpp
index dd3c032152..1df780be52 100644
--- a/src/mbgl/style/layout_property.hpp
+++ b/src/mbgl/style/layout_property.hpp
@@ -1,5 +1,4 @@
-#ifndef MBGL_LAYOUT_PROPERTY
-#define MBGL_LAYOUT_PROPERTY
+#pragma once
#include <mbgl/style/property_parsing.hpp>
#include <mbgl/style/function.hpp>
@@ -36,5 +35,3 @@ public:
};
} // namespace mbgl
-
-#endif
diff --git a/src/mbgl/style/paint_property.hpp b/src/mbgl/style/paint_property.hpp
index 3c2b4ba7d7..256f045d0d 100644
--- a/src/mbgl/style/paint_property.hpp
+++ b/src/mbgl/style/paint_property.hpp
@@ -1,5 +1,4 @@
-#ifndef MBGL_PAINT_PROPERTY
-#define MBGL_PAINT_PROPERTY
+#pragma once
#include <mbgl/style/class_dictionary.hpp>
#include <mbgl/style/property_parsing.hpp>
@@ -144,5 +143,3 @@ public:
};
} // namespace mbgl
-
-#endif
diff --git a/src/mbgl/style/render_item.hpp b/src/mbgl/style/render_item.hpp
index 6f15669654..a70c92f620 100644
--- a/src/mbgl/style/render_item.hpp
+++ b/src/mbgl/style/render_item.hpp
@@ -1,5 +1,4 @@
-#ifndef MBGL_STYLE_RENDER_ITEM
-#define MBGL_STYLE_RENDER_ITEM
+#pragma once
namespace mbgl {
@@ -20,5 +19,3 @@ struct RenderItem {
};
} // namespace mbgl
-
-#endif
diff --git a/src/mbgl/style/style.hpp b/src/mbgl/style/style.hpp
index 6a1af4cc9c..5fdd6cdc8e 100644
--- a/src/mbgl/style/style.hpp
+++ b/src/mbgl/style/style.hpp
@@ -1,5 +1,4 @@
-#ifndef MBGL_STYLE_STYLE
-#define MBGL_STYLE_STYLE
+#pragma once
#include <mbgl/style/render_item.hpp>
#include <mbgl/style/zoom_history.hpp>
@@ -137,5 +136,3 @@ public:
};
} // namespace mbgl
-
-#endif
diff --git a/src/mbgl/style/style_bucket_parameters.hpp b/src/mbgl/style/style_bucket_parameters.hpp
index ce3fc6ac7e..ab63f8fe55 100644
--- a/src/mbgl/style/style_bucket_parameters.hpp
+++ b/src/mbgl/style/style_bucket_parameters.hpp
@@ -1,5 +1,4 @@
-#ifndef STYLE_BUCKET_PARAMETERS
-#define STYLE_BUCKET_PARAMETERS
+#pragma once
#include <mbgl/map/mode.hpp>
#include <mbgl/style/filter.hpp>
@@ -60,5 +59,3 @@ public:
};
} // namespace mbgl
-
-#endif
diff --git a/src/mbgl/style/style_calculation_parameters.hpp b/src/mbgl/style/style_calculation_parameters.hpp
index 00a578d4e7..1c50bd6128 100644
--- a/src/mbgl/style/style_calculation_parameters.hpp
+++ b/src/mbgl/style/style_calculation_parameters.hpp
@@ -1,5 +1,4 @@
-#ifndef STYLE_CALCULATION_PARAMETERS
-#define STYLE_CALCULATION_PARAMETERS
+#pragma once
#include <mbgl/style/zoom_history.hpp>
#include <mbgl/util/chrono.hpp>
@@ -27,5 +26,3 @@ public:
};
} // namespace mbgl
-
-#endif
diff --git a/src/mbgl/style/style_cascade_parameters.hpp b/src/mbgl/style/style_cascade_parameters.hpp
index bacf886b6f..569145bd04 100644
--- a/src/mbgl/style/style_cascade_parameters.hpp
+++ b/src/mbgl/style/style_cascade_parameters.hpp
@@ -1,5 +1,4 @@
-#ifndef STYLE_CASCADE_PARAMETERS
-#define STYLE_CASCADE_PARAMETERS
+#pragma once
#include <mbgl/map/mode.hpp>
#include <mbgl/util/chrono.hpp>
@@ -19,5 +18,3 @@ public:
};
} // namespace mbgl
-
-#endif
diff --git a/src/mbgl/style/style_layer.hpp b/src/mbgl/style/style_layer.hpp
index a568126e51..1388cbcb5a 100644
--- a/src/mbgl/style/style_layer.hpp
+++ b/src/mbgl/style/style_layer.hpp
@@ -1,5 +1,4 @@
-#ifndef MBGL_STYLE_STYLE_LAYER
-#define MBGL_STYLE_STYLE_LAYER
+#pragma once
#include <mbgl/style/types.hpp>
#include <mbgl/style/filter.hpp>
@@ -101,5 +100,3 @@ protected:
};
} // namespace mbgl
-
-#endif
diff --git a/src/mbgl/style/style_observer.hpp b/src/mbgl/style/style_observer.hpp
index c725334c10..9e2c946f7d 100644
--- a/src/mbgl/style/style_observer.hpp
+++ b/src/mbgl/style/style_observer.hpp
@@ -1,5 +1,4 @@
-#ifndef MBGL_STYLE_STYLE_OBSERVER
-#define MBGL_STYLE_STYLE_OBSERVER
+#pragma once
#include <mbgl/text/glyph_store_observer.hpp>
#include <mbgl/sprite/sprite_store_observer.hpp>
@@ -22,5 +21,3 @@ public:
};
} // namespace mbgl
-
-#endif
diff --git a/src/mbgl/style/style_parser.hpp b/src/mbgl/style/style_parser.hpp
index 2c1feac15a..98481aec51 100644
--- a/src/mbgl/style/style_parser.hpp
+++ b/src/mbgl/style/style_parser.hpp
@@ -1,5 +1,4 @@
-#ifndef MBGL_STYLE_STYLE_PARSER
-#define MBGL_STYLE_STYLE_PARSER
+#pragma once
#include <mbgl/style/types.hpp>
#include <mbgl/style/style_layer.hpp>
@@ -54,5 +53,3 @@ private:
};
} // namespace mbgl
-
-#endif
diff --git a/src/mbgl/style/style_render_parameters.hpp b/src/mbgl/style/style_render_parameters.hpp
index 16ce99177a..7347717a1d 100644
--- a/src/mbgl/style/style_render_parameters.hpp
+++ b/src/mbgl/style/style_render_parameters.hpp
@@ -1,5 +1,4 @@
-#ifndef STYLE_RENDER_PARAMETERS
-#define STYLE_RENDER_PARAMETERS
+#pragma once
namespace mbgl {
@@ -14,5 +13,3 @@ public:
};
}
-
-#endif
diff --git a/src/mbgl/style/style_update_parameters.hpp b/src/mbgl/style/style_update_parameters.hpp
index e620f249f8..73ed500e8e 100644
--- a/src/mbgl/style/style_update_parameters.hpp
+++ b/src/mbgl/style/style_update_parameters.hpp
@@ -1,5 +1,4 @@
-#ifndef STYLE_UPDATE_PARAMETERS
-#define STYLE_UPDATE_PARAMETERS
+#pragma once
#include <mbgl/map/mode.hpp>
@@ -53,5 +52,3 @@ public:
};
}
-
-#endif
diff --git a/src/mbgl/style/zoom_history.hpp b/src/mbgl/style/zoom_history.hpp
index 4e01af1fdd..8c88ea6507 100644
--- a/src/mbgl/style/zoom_history.hpp
+++ b/src/mbgl/style/zoom_history.hpp
@@ -1,5 +1,4 @@
-#ifndef MBGL_STYLE_ZOOM_HISTORY
-#define MBGL_STYLE_ZOOM_HISTORY
+#pragma once
#include <mbgl/util/chrono.hpp>
@@ -35,5 +34,3 @@ struct ZoomHistory {
}
};
} // namespace mbgl
-
-#endif