Cleanup: indentation of public/protected/private keywords

src/gui/symbol/basic_shape_editor.hpp

@@ -17,7 +17,7 @@ class wxSpinCtrl;
 
 /// Editor for drawing basic shapes such as rectangles and polygons
 class SymbolBasicShapeEditor : public SymbolEditorBase {
-  public:
+public:
   SymbolBasicShapeEditor(SymbolControl* control);
   
   // --------------------------------------------------- : Drawing
@@ -45,7 +45,7 @@ class SymbolBasicShapeEditor : public SymbolEditorBase {
   virtual bool isEditing();
   
   // --------------------------------------------------- : Data
-  private:
+private:
   int mode;
   SymbolShapeP shape;
   Vector2D start;

src/gui/symbol/control.hpp

@@ -23,7 +23,7 @@ DECLARE_POINTER_TYPE(SymbolEditorBase);
  *  That object handles all events and the drawing. This class is mostly just a proxy.
  */
 class SymbolControl : public wxControl, public SymbolViewer {
-  public:
+public:
   SymbolControl(SymbolWindow* parent, int id, const SymbolP& symbol);
   
   virtual void onChangeSymbol();
@@ -57,14 +57,14 @@ class SymbolControl : public wxControl, public SymbolViewer {
   /// Are we editing?
   bool isEditing();
   
-  private:
+private:
   /// Switch the a different editor object
   void switchEditor(const SymbolEditorBaseP& e);
     
   /// Draw the editor
   void draw(DC& dc);
   
-  private:
+private:
   DECLARE_EVENT_TABLE();
 
   // --------------------------------------------------- : Data
@@ -79,7 +79,7 @@ class SymbolControl : public wxControl, public SymbolViewer {
   /// Parent window 
   SymbolWindow* parent;
   
-  private:
+private:
   /// The current editor
   SymbolEditorBaseP editor;
   

src/gui/symbol/editor.hpp

@@ -22,7 +22,7 @@ class SymbolControl;
  *  NOTE : Do not confuse with SymbolEditor (a FieldEditor)
  */
 class SymbolEditorBase : public IntrusivePtrVirtualBase {
-  protected:
+protected:
   /// The control for which we are editing
   SymbolControl& control;
   
@@ -33,7 +33,7 @@ class SymbolEditorBase : public IntrusivePtrVirtualBase {
   
   void SetStatusText(const String& text);
   
-  public:
+public:
   SymbolEditorBase(SymbolControl* control)
     : control(*control)
   {}

src/gui/symbol/part_list.hpp

@@ -27,7 +27,7 @@ DECLARE_LOCAL_EVENT_TYPE(EVENT_PART_ACTIVATE, <not used>)
 // ----------------------------------------------------------------------------- : SymbolPartList
 
 class SymbolPartList : public wxScrolledWindow, public SymbolView {
-  public:
+public:
   SymbolPartList(Window* parent, int id, SymbolPartsSelection& selection, SymbolP symbol = SymbolP());
   
   /// Another symbol is being viewed
@@ -40,9 +40,9 @@ class SymbolPartList : public wxScrolledWindow, public SymbolView {
   /// Update only a subset of the parts
   void updateParts(const set<SymbolPartP>& parts);
   
-  protected:
+protected:
   virtual wxSize DoGetBestSize() const;
-  private:
+private:
   SymbolPartsSelection& selection; ///< Store selection here
   int number_of_items;
   

src/gui/symbol/point_editor.hpp

@@ -20,14 +20,14 @@ class CurveDragAction;
 
 // Symbol editor for editing control points and handles
 class SymbolPointEditor : public SymbolEditorBase {
-  public:
+public:
   SymbolPointEditor(SymbolControl* control, const SymbolShapeP& part);
   
   // --------------------------------------------------- : Drawing
   
   virtual void draw(DC& dc);
   
-  private:
+private:
   /// Draws a gradient on the selected line to indicate curve dragging
   void drawHoveredLine(DC& dc);
   /// Draw all handles belonging to selected points
@@ -53,7 +53,7 @@ class SymbolPointEditor : public SymbolEditorBase {
   /// Retrieve a pen for the drawing of other things
   wxPen otherPen(WhichPen p);
   
-  public:
+public:
   // --------------------------------------------------- : UI
   
   virtual void initUI   (wxToolBar* tb, wxMenuBar* mb);
@@ -76,7 +76,7 @@ class SymbolPointEditor : public SymbolEditorBase {
   virtual void onChar(wxKeyEvent& ev);
   virtual bool isEditing();
   
-  private:
+private:
   // --------------------------------------------------- : Data
   
   // The symbol part we are editing

src/gui/symbol/select_editor.hpp

@@ -20,14 +20,14 @@ DECLARE_POINTER_TYPE(SymbolPartShearAction);
 
 /// Editor that allows the user to select symbol parts
 class SymbolSelectEditor : public SymbolEditorBase {
-  public:
+public:
   SymbolSelectEditor(SymbolControl* control, bool rotate);
   
   // --------------------------------------------------- : Drawing
   
   virtual void draw(DC& dc);
   
-  private:
+private:
   /// Draw handles on all sides
   void drawHandles(DC& dc);
   /// Draw a handle, dx and dy indicate the side, can be {-1,0,1}
@@ -36,7 +36,7 @@ class SymbolSelectEditor : public SymbolEditorBase {
   /// Draw the rotation center
   void drawRotationCenter(DC& dc, const Vector2D& pos);
   
-  public:
+public:
   // --------------------------------------------------- : UI
   
   virtual void initUI   (wxToolBar* tb, wxMenuBar* mb);
@@ -60,7 +60,7 @@ class SymbolSelectEditor : public SymbolEditorBase {
   
   virtual bool isEditing();
   
-  private:
+private:
   // The part under the mouse cursor
   SymbolPartP highlightPart;
   // Actions

src/gui/symbol/selection.hpp

@@ -27,7 +27,7 @@ enum SelectMode
 
 /// The selected parts of a symbol, enforcing constraints
 class SymbolPartsSelection {
-  public:
+public:
   inline SymbolPartsSelection() : root(nullptr) {}
   
   void setSymbol(const SymbolP& symbol);
@@ -69,7 +69,7 @@ class SymbolPartsSelection {
     return *selection.begin();
   }
   
-  private:
+private:
   Symbol* root;
   set<SymbolPartP> selection;
   

src/gui/symbol/symmetry_editor.hpp

@@ -18,7 +18,7 @@ class SymmetryMoveAction;
 
 /// Editor for adding symmetries
 class SymbolSymmetryEditor : public SymbolEditorBase {
-  public:
+public:
   /** The symmetry parameter is optional, if it is not set, then only new ones can be created */
   SymbolSymmetryEditor(SymbolControl* control, const SymbolSymmetryP& symmetry);
   
@@ -48,7 +48,7 @@ class SymbolSymmetryEditor : public SymbolEditorBase {
   virtual bool isEditing();
   
   // --------------------------------------------------- : Data
-  private:
+private:
   SymbolSymmetryP& symmetry;
   // controls
   wxSpinCtrl* copies;

src/gui/symbol/window.hpp

@@ -20,7 +20,7 @@ DECLARE_POINTER_TYPE(ValueActionPerformer);
 
 /// The window for editing symbols
 class SymbolWindow : public wxFrame {
-  public:
+public:
   /// Construct a SymbolWindow
   SymbolWindow(Window* parent);
   /// Construct a SymbolWindow showing a symbol from a file
@@ -29,7 +29,7 @@ class SymbolWindow : public wxFrame {
   SymbolWindow(Window* parent, ValueActionPerformer* performer);
   ~SymbolWindow();
   
-  private:
+private:
   // --------------------------------------------------- : Children
   
   /// Actual initialisation
@@ -66,7 +66,7 @@ class SymbolWindow : public wxFrame {
   
   bool inSelectionEvent; ///< Prevent recursion in onSelect...
   
-  public:
+public:
   void onSelectFromControl();
 };