From e44cc374e184396d32ec196186f2a6578fa0860e Mon Sep 17 00:00:00 2001
From: Konstantinos Sideris <sideris.konstantin@gmail.com>
Date: Mon, 8 May 2017 00:51:03 +0300
Subject: Use strongly typed enums

---
 include/ui/FlatButton.h | 10 ++++------
 include/ui/Theme.h      | 18 +++++++++---------
 2 files changed, 13 insertions(+), 15 deletions(-)

(limited to 'include/ui')

diff --git a/include/ui/FlatButton.h b/include/ui/FlatButton.h
index 8053f430..6e2eb149 100644
--- a/include/ui/FlatButton.h
+++ b/include/ui/FlatButton.h
@@ -86,9 +86,9 @@ class FlatButton : public QPushButton
 	Q_PROPERTY(qreal fontSize WRITE setFontSize READ fontSize)
 
 public:
-	explicit FlatButton(QWidget *parent = 0, ui::ButtonPreset preset = ui::FlatPreset);
-	explicit FlatButton(const QString &text, QWidget *parent = 0, ui::ButtonPreset preset = ui::FlatPreset);
-	FlatButton(const QString &text, ui::Role role, QWidget *parent = 0, ui::ButtonPreset preset = ui::FlatPreset);
+	explicit FlatButton(QWidget *parent = 0, ui::ButtonPreset preset = ui::ButtonPreset::FlatPreset);
+	explicit FlatButton(const QString &text, QWidget *parent = 0, ui::ButtonPreset preset = ui::ButtonPreset::FlatPreset);
+	FlatButton(const QString &text, ui::Role role, QWidget *parent = 0, ui::ButtonPreset preset = ui::ButtonPreset::FlatPreset);
 	~FlatButton();
 
 	void applyPreset(ui::ButtonPreset preset);
@@ -132,9 +132,7 @@ public:
 	QSize sizeHint() const override;
 
 protected:
-	enum {
-		IconPadding = 0
-	};
+	int IconPadding = 0;
 
 	void checkStateSet() override;
 	void mousePressEvent(QMouseEvent *event) override;
diff --git a/include/ui/Theme.h b/include/ui/Theme.h
index 41739a98..795425e4 100644
--- a/include/ui/Theme.h
+++ b/include/ui/Theme.h
@@ -7,7 +7,7 @@
 
 namespace ui
 {
-enum AvatarType {
+enum class AvatarType {
 	Icon,
 	Image,
 	Letter
@@ -19,40 +19,40 @@ const int FontSize = 16;
 // Default avatar size. Width and height.
 const int AvatarSize = 40;
 
-enum ButtonPreset {
+enum class ButtonPreset {
 	FlatPreset,
 	CheckablePreset
 };
 
-enum RippleStyle {
+enum class RippleStyle {
 	CenteredRipple,
 	PositionedRipple,
 	NoRipple
 };
 
-enum OverlayStyle {
+enum class OverlayStyle {
 	NoOverlay,
 	TintedOverlay,
 	GrayOverlay
 };
 
-enum Role {
+enum class Role {
 	Default,
 	Primary,
 	Secondary
 };
 
-enum ButtonIconPlacement {
+enum class ButtonIconPlacement {
 	LeftIcon,
 	RightIcon
 };
 
-enum ProgressType {
+enum class ProgressType {
 	DeterminateProgress,
 	IndeterminateProgress
 };
 
-enum Color {
+enum class Color {
 	Black,
 	BrightWhite,
 	FadedWhite,
@@ -78,7 +78,7 @@ public:
 	QColor getColor(const QString &key) const;
 
 	void setColor(const QString &key, const QColor &color);
-	void setColor(const QString &key, ui::Color &color);
+	void setColor(const QString &key, ui::Color color);
 
 private:
 	QColor rgba(int r, int g, int b, qreal a) const;
-- 
cgit 1.5.1