Cleanup: indentation of public/protected/private keywords

src/data/field/boolean.hpp

@@ -19,7 +19,7 @@ DECLARE_POINTER_TYPE(BooleanValue);
 
 /// A field whos value is either true or false
 class BooleanField : public ChoiceField {
-  public:
+public:
   BooleanField();
   DECLARE_FIELD_TYPE(Boolean);
   
@@ -30,14 +30,14 @@ class BooleanField : public ChoiceField {
 
 /// The Style for a BooleanField
 class BooleanStyle : public ChoiceStyle {
-  public:
+public:
   BooleanStyle(const ChoiceFieldP& field);
   DECLARE_HAS_FIELD(Boolean); // not DECLARE_STYLE_TYPE, because we use a normal ChoiceValueViewer/Editor
   virtual StyleP clone() const;
   
   // no extra data
   
-  private:
+private:
   DECLARE_REFLECTION();
 };
 
@@ -45,14 +45,14 @@ class BooleanStyle : public ChoiceStyle {
 
 /// The Value in a BooleanField
 class BooleanValue : public ChoiceValue {
-  public:
+public:
   inline BooleanValue(const ChoiceFieldP& field) : ChoiceValue(field) {}
   DECLARE_HAS_FIELD(Boolean);
   virtual ValueP clone() const;
   
   // no extra data
   
-  private:
+private:
   DECLARE_REFLECTION();
 };
 

src/data/field/choice.hpp

@@ -26,7 +26,7 @@ DECLARE_POINTER_TYPE(ChoiceValue);
 
 /// A field that contains a list of choices
 class ChoiceField : public Field {
-  public:
+public:
   ChoiceField();
   DECLARE_FIELD_TYPE(Choice);
   
@@ -53,7 +53,7 @@ enum ChoiceChoiceType {
 
 /// An item that can be chosen for this field
 class ChoiceField::Choice : public IntrusivePtrBase<ChoiceField::Choice> {
-  public:
+public:
   Choice();
   Choice(const String& name);
   
@@ -184,7 +184,7 @@ public:
 
 /// The Value in a ChoiceField
 class ChoiceValue : public Value {
-  public:
+public:
   /// Create a value for the given field
   /** If initial_first_choice then the first choice should be used in the absence of
       an explicit initial value

src/data/field/color.hpp

@@ -22,7 +22,7 @@ DECLARE_POINTER_TYPE(ColorValue);
 
 /// A field for color values, it contains a list of choices for colors
 class ColorField : public Field {
-  public:
+public:
   ColorField();
   DECLARE_FIELD_TYPE(Color);
   
@@ -41,7 +41,7 @@ class ColorField : public Field {
 
 /// A color that can be chosen for this field
 class ColorField::Choice : public IntrusivePtrBase<ColorField::Choice> {
-  public:
+public:
   String name;    ///< Name of the color
   Color  color;    ///< The actual color
   
@@ -52,7 +52,7 @@ class ColorField::Choice : public IntrusivePtrBase<ColorField::Choice> {
 
 /// The Style for a ColorField
 class ColorStyle : public Style {
-  public:
+public:
   ColorStyle(const ColorFieldP& field);
   DECLARE_STYLE_TYPE(Color);
   
@@ -70,7 +70,7 @@ class ColorStyle : public Style {
 
 /// The Value in a ColorField
 class ColorValue : public Value {
-  public:
+public:
   ColorValue(const ColorFieldP& field);
   DECLARE_VALUE_TYPE(Color, Defaultable<Color>);
   

src/data/field/image.hpp

@@ -22,7 +22,7 @@ DECLARE_POINTER_TYPE(ImageValue);
 
 /// A field for image values
 class ImageField : public Field {
-  public:
+public:
   // no extra data
   DECLARE_FIELD_TYPE(Image);
 };
@@ -31,7 +31,7 @@ class ImageField : public Field {
 
 /// The Style for a ImageField
 class ImageStyle : public Style {
-  public:
+public:
   inline ImageStyle(const ImageFieldP& field) : Style(field) {}
   DECLARE_STYLE_TYPE(Image);
   
@@ -44,7 +44,7 @@ class ImageStyle : public Style {
 
 /// The Value in a ImageField, i.e. an image
 class ImageValue : public Value {
-  public:
+public:
   inline ImageValue(const ImageFieldP& field) : Value(field) {}
   DECLARE_VALUE_TYPE(Image, LocalFileName);
   

src/data/field/information.hpp

@@ -24,7 +24,7 @@ DECLARE_POINTER_TYPE(InfoValue);
 /** These values are not editable, they are just headers, icons, labels, etc.
  */
 class InfoField : public Field {
-  public:
+public:
   InfoField() { editable = false; }
   DECLARE_FIELD_TYPE(Text);
   
@@ -37,7 +37,7 @@ class InfoField : public Field {
 
 /// The Style for a InfoField
 class InfoStyle : public Style {
-  public:
+public:
   InfoStyle(const InfoFieldP&);
   DECLARE_STYLE_TYPE(Info);
   
@@ -55,7 +55,7 @@ class InfoStyle : public Style {
 
 /// The Value in a InfoField
 class InfoValue : public Value {
-  public:
+public:
   inline InfoValue(const InfoFieldP& field) : Value(field) {}
   DECLARE_VALUE_TYPE(Info, String);
   

src/data/field/multiple_choice.hpp

@@ -19,7 +19,7 @@ DECLARE_POINTER_TYPE(MultipleChoiceValue);
 
 /// A ChoiceField where multiple choices can be selected simultaniously
 class MultipleChoiceField : public ChoiceField {
-  public:
+public:
   MultipleChoiceField();
   DECLARE_FIELD_TYPE(MultipleChoiceField);
   
@@ -31,7 +31,7 @@ class MultipleChoiceField : public ChoiceField {
 
 /// The Style for a MultipleChoiceField
 class MultipleChoiceStyle : public ChoiceStyle {
-  public:
+public:
   MultipleChoiceStyle(const MultipleChoiceFieldP& field);
   DECLARE_STYLE_TYPE(MultipleChoice);
   
@@ -48,7 +48,7 @@ class MultipleChoiceStyle : public ChoiceStyle {
  *  The choices must be ordered by id
  */
 class MultipleChoiceValue : public ChoiceValue {
-  public:
+public:
   inline MultipleChoiceValue(const MultipleChoiceFieldP& field) : ChoiceValue(field, false) {}
   DECLARE_HAS_FIELD(MultipleChoice);
   virtual ValueP clone() const;
@@ -66,7 +66,7 @@ class MultipleChoiceValue : public ChoiceValue {
   
   virtual bool update(Context&);
   
-  private:
+private:
   DECLARE_REFLECTION();
   
   /// Put the value in normal form (all choices ordered, empty_name

src/data/field/package_choice.hpp

@@ -4,7 +4,7 @@
 //| License:      GNU General Public License 2 or later (see file COPYING)     |
 //+----------------------------------------------------------------------------+
 
-#pragma once
+#pragma once
 
 // ----------------------------------------------------------------------------- : Includes
 
@@ -23,7 +23,7 @@ DECLARE_POINTER_TYPE(PackageChoiceValue);
 
 /// A field for PackageChoice values, it contains a list of choices for PackageChoices
 class PackageChoiceField : public Field {
-  public:
+public:
   PackageChoiceField() : required(true), empty_name(_("none")) {}
   DECLARE_FIELD_TYPE(PackageChoice);
   
@@ -40,7 +40,7 @@ class PackageChoiceField : public Field {
 
 /// The Style for a PackageChoiceField
 class PackageChoiceStyle : public Style {
-  public:
+public:
   PackageChoiceStyle(const PackageChoiceFieldP& field);
   DECLARE_STYLE_TYPE(PackageChoice);
   
@@ -53,7 +53,7 @@ class PackageChoiceStyle : public Style {
 
 /// The Value in a PackageChoiceField
 class PackageChoiceValue : public Value {
-  public:
+public:
   PackageChoiceValue(const PackageChoiceFieldP& field) : Value(field), package_name(field->initial) {}
   DECLARE_VALUE_TYPE(PackageChoice, String);
   

src/data/field/symbol.hpp

@@ -24,7 +24,7 @@ DECLARE_POINTER_TYPE(SymbolValue);
 
 /// A field for image values
 class SymbolField : public Field {
-  public:
+public:
   DECLARE_FIELD_TYPE(Symbol);
   
   // no extra data
@@ -34,7 +34,7 @@ class SymbolField : public Field {
 
 /// The Style for a SymbolField
 class SymbolStyle : public Style {
-  public:
+public:
   inline SymbolStyle(const SymbolFieldP& field)
     : Style(field)
     , min_aspect_ratio(1), max_aspect_ratio(1)
@@ -48,7 +48,7 @@ class SymbolStyle : public Style {
 
 /// Styling for a symbol variation, defines color, border, etc.
 class SymbolVariation : public IntrusivePtrBase<SymbolVariation> {
-  public:
+public:
   SymbolVariation();
   ~SymbolVariation();
   String        name;        ///< Name of this variation
@@ -64,7 +64,7 @@ class SymbolVariation : public IntrusivePtrBase<SymbolVariation> {
 
 /// The Value in a SymbolField, i.e. a symbol
 class SymbolValue : public Value {
-  public:
+public:
   inline SymbolValue(const SymbolFieldP& field) : Value(field) {}
   DECLARE_VALUE_TYPE(Symbol, LocalFileName);
   

src/data/field/text.hpp

@@ -30,7 +30,7 @@ DECLARE_POINTER_TYPE(LineLayout);
 
 /// A field for values containing tagged text
 class TextField : public Field {
-  public:
+public:
   TextField();
   DECLARE_FIELD_TYPE(Text);
   
@@ -68,7 +68,7 @@ public:
 
 /// The Style for a TextField
 class TextStyle : public Style {
-  public:
+public:
   TextStyle(const TextFieldP&);
   DECLARE_STYLE_TYPE(Text);
   
@@ -107,7 +107,7 @@ class TextStyle : public Style {
 
 /// The Value in a TextField
 class TextValue : public Value {
-  public:
+public:
   inline TextValue(const TextFieldP& field) : Value(field), last_update(1) {}
   DECLARE_VALUE_TYPE(Text, Defaultable<String>);
   
@@ -122,7 +122,7 @@ class TextValue : public Value {
 /// A 'fake' TextValue that is used to edit some other string
 /** Used by TextCtrl */
 class FakeTextValue : public TextValue {
-  public:
+public:
   /// Initialize the fake text value
   /** underlying can be nullptr, in that case there is no underlying value */
   FakeTextValue(const TextFieldP& field, String* underlying, bool editable, bool untagged);