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
+1 -1
View File
@@ -16,7 +16,7 @@
/// Viewer that displays a choice value
class ChoiceValueViewer : public ValueViewer {
public:
public:
DECLARE_VALUE_VIEWER(Choice) : ValueViewer(parent,style) {}
virtual bool prepare(RotatedDC& dc);
+1 -1
View File
@@ -18,7 +18,7 @@ DECLARE_POINTER_TYPE(AlphaMask);
/// Viewer that displays a color value
class ColorValueViewer : public ValueViewer {
public:
public:
DECLARE_VALUE_VIEWER(Color) : ValueViewer(parent,style) {}
virtual void draw(RotatedDC& dc);
+2 -2
View File
@@ -18,14 +18,14 @@ DECLARE_POINTER_TYPE(AlphaMask);
/// Viewer that displays an image value
class ImageValueViewer : public ValueViewer {
public:
public:
DECLARE_VALUE_VIEWER(Image) : ValueViewer(parent,style) {}
virtual void draw(RotatedDC& dc);
virtual void onValueChange();
virtual void onStyleChange(int);
private:
private:
Bitmap bitmap; ///< Cached bitmap
RealSize size; ///< Size of cached bitmap
Radians angle; ///< Angle of cached bitmap
+1 -1
View File
@@ -16,7 +16,7 @@
/// Viewer that displays a text value
class InfoValueViewer : public ValueViewer {
public:
public:
DECLARE_VALUE_VIEWER(Info) : ValueViewer(parent,style) {}
virtual void draw(RotatedDC& dc);
+3 -3
View File
@@ -16,15 +16,15 @@
/// Viewer that displays a multiple choice value
class MultipleChoiceValueViewer : public ValueViewer {
public:
public:
DECLARE_VALUE_VIEWER(MultipleChoice) : ValueViewer(parent,style), item_height(0) {}
virtual bool prepare(RotatedDC& dc);
virtual void draw(RotatedDC& dc);
virtual void onStyleChange(int);
protected:
protected:
double item_height; ///< Height of a single item, or 0 if non uniform
private:
private:
void drawChoice(RotatedDC& dc, RealPoint& pos, const String& choice, bool active = true);
};
+4 -4
View File
@@ -4,7 +4,7 @@
//| License: GNU General Public License 2 or later (see file COPYING) |
//+----------------------------------------------------------------------------+
#pragma once
#pragma once
// ----------------------------------------------------------------------------- : Includes
@@ -16,7 +16,7 @@
/// Viewer that displays a package choice value
class PackageChoiceValueViewer : public ValueViewer {
public:
public:
DECLARE_VALUE_VIEWER(PackageChoice) : ValueViewer(parent,style) { initItems(); }
virtual void draw(RotatedDC& dc);
@@ -26,9 +26,9 @@ class PackageChoiceValueViewer : public ValueViewer {
String name;
Bitmap image;
};
protected:
protected:
vector<Item> items;
private:
private:
void initItems();
struct ComparePackagePosHint;
};
+2 -2
View File
@@ -16,13 +16,13 @@
/// Viewer that displays a symbol value
class SymbolValueViewer : public ValueViewer {
public:
public:
DECLARE_VALUE_VIEWER(Symbol) : ValueViewer(parent,style) {}
virtual void draw(RotatedDC& dc);
void onValueChange();
protected:
protected:
vector<Bitmap> symbols; ///< Cached images
};
+2 -2
View File
@@ -17,7 +17,7 @@
/// Viewer that displays a text value
class TextValueViewer : public ValueViewer {
public:
public:
DECLARE_VALUE_VIEWER(Text) : ValueViewer(parent,style) {}
virtual bool prepare(RotatedDC& dc);
@@ -27,7 +27,7 @@ class TextValueViewer : public ValueViewer {
virtual void onAction(const Action&, bool undone);
virtual double getStretch() const;
protected:
protected:
TextViewer v;
};
+3 -3
View File
@@ -25,7 +25,7 @@ DECLARE_POINTER_TYPE(Value);
/// The virtual viewer control for a single field on a card (or in the set data)
/** A viewer can only display a value, not edit it, ValueEditor is used for that */
class ValueViewer : public StyleListener {
public:
public:
/// Construct a ValueViewer, set the value at a later time
ValueViewer(DataViewer& parent, const StyleP& style);
virtual ~ValueViewer() {}
@@ -71,7 +71,7 @@ class ValueViewer : public StyleListener {
virtual ValueEditor* getEditor() { return 0; }
DataViewer& viewer; ///< Our parent object
protected:
protected:
ValueP valueP; ///< The value we are currently viewing
/// Set the pen for drawing the border, returns true if a border needs to be drawn
@@ -86,7 +86,7 @@ class ValueViewer : public StyleListener {
const AlphaMask& getMask(int w = 0, int h = 0) const;
const AlphaMask& getMask(const Rotation& rot) const;
public:
public:
/// Should this viewer render using a platform native look?
bool nativeLook() const;
/// Is this the currently selected viewer?