Cleanup: indentation of public/protected/private keywords

This commit is contained in:
Twan van Laarhoven
2020-05-12 21:57:37 +02:00
parent 86aec577a2
commit 0c3712b61a
167 changed files with 751 additions and 752 deletions
+8 -8
View File
@@ -37,7 +37,7 @@ enum SymbolSet
/// Base class for symbol filters
class SymbolFilter : public IntrusivePtrVirtualBase {
public:
public:
virtual ~SymbolFilter() {}
/// What color should the symbol have at location (x, y)?
/** x,y are in the range [0...1) */
@@ -57,7 +57,7 @@ intrusive_ptr<SymbolFilter> read_new<SymbolFilter>(Reader& reader);
/// Symbol filter that returns solid colors
class SolidFillSymbolFilter : public SymbolFilter {
public:
public:
inline SolidFillSymbolFilter() {}
inline SolidFillSymbolFilter(const Color& fill_color, const Color& border_color)
: fill_color(fill_color), border_color(border_color)
@@ -65,20 +65,20 @@ class SolidFillSymbolFilter : public SymbolFilter {
virtual Color color(double x, double y, SymbolSet point) const;
virtual String fillType() const;
virtual bool operator == (const SymbolFilter& that) const;
private:
private:
Color fill_color, border_color;
DECLARE_REFLECTION_OVERRIDE();
};
/// Symbol filter that returns some gradient
class GradientSymbolFilter : public SymbolFilter {
public:
public:
inline GradientSymbolFilter() {}
inline GradientSymbolFilter(const Color& fill_color_1, const Color& border_color_1, const Color& fill_color_2, const Color& border_color_2)
: fill_color_1(fill_color_1), border_color_1(border_color_1)
, fill_color_2(fill_color_2), border_color_2(border_color_2)
{}
protected:
protected:
Color fill_color_1, border_color_1;
Color fill_color_2, border_color_2;
template <typename T>
@@ -90,7 +90,7 @@ class GradientSymbolFilter : public SymbolFilter {
/// Symbol filter that returns a linear gradient
class LinearGradientSymbolFilter : public GradientSymbolFilter {
public:
public:
LinearGradientSymbolFilter();
LinearGradientSymbolFilter(const Color& fill_color_1, const Color& border_color_1, const Color& fill_color_2, const Color& border_color_2
,double center_x, double center_y, double end_x, double end_y);
@@ -102,7 +102,7 @@ class LinearGradientSymbolFilter : public GradientSymbolFilter {
/// return time on the gradient, used by GradientSymbolFilter::color
inline double t(double x, double y) const;
private:
private:
double center_x, center_y;
double end_x, end_y;
mutable double len;
@@ -111,7 +111,7 @@ class LinearGradientSymbolFilter : public GradientSymbolFilter {
/// Symbol filter that returns a radial gradient
class RadialGradientSymbolFilter : public GradientSymbolFilter {
public:
public:
inline RadialGradientSymbolFilter() {}
inline RadialGradientSymbolFilter(const Color& fill_color_1, const Color& border_color_1, const Color& fill_color_2, const Color& border_color_2)
: GradientSymbolFilter(fill_color_1, border_color_1, fill_color_2, border_color_2)
+2 -2
View File
@@ -29,7 +29,7 @@ enum HighlightStyle
/// Class that knows how to draw a symbol
class SymbolViewer : public SymbolView {
public:
public:
// --------------------------------------------------- : Data
SymbolViewer(const SymbolP& symbol, bool editing_hints, double size = 500, double border_radius = 0.05);
@@ -61,7 +61,7 @@ class SymbolViewer : public SymbolView {
void onAction(const Action&, bool) {}
private:
private:
typedef shared_ptr<wxMemoryDC> MemoryDCP;
/// Inside a reflection?
int in_symmetry;