thek0tyara/nheko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use strongly typed enums

Browse source
This commit is contained in:
Konstantinos Sideris 2017-05-08 00:51:03 +03:00
parent 1f90c58076
commit e44cc374e1
17 changed files with 76 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/MatrixClient.h
View file

@ -82,7 +82,7 @@ private slots:
void onResponse(QNetworkReply *reply);
private:
enum Endpoint {
enum class Endpoint {
GetOwnProfile,
GetOwnAvatar,
GetProfile,

2
include/SlidingStackWidget.h
View file

@ -37,7 +37,7 @@ class SlidingStackWidget : public QStackedWidget
public:
// Defines the animation direction.
enum AnimationDirection {
enum class AnimationDirection {
LEFT_TO_RIGHT,
RIGHT_TO_LEFT,
AUTOMATIC

2
include/events/Event.h
View file

@ -26,7 +26,7 @@ namespace matrix
{
namespace events
{
enum EventType {
enum class EventType {
/// m.room.aliases
RoomAliases,
/// m.room.avatar

2
include/events/HistoryVisibilityEventContent.h
View file

@ -26,7 +26,7 @@ namespace matrix
{
namespace events
{
enum HistoryVisibility {
enum class HistoryVisibility {
Invited,
Joined,
Shared,

2
include/events/JoinRulesEventContent.h
View file

@ -26,7 +26,7 @@ namespace matrix
{
namespace events
{
enum JoinRule {
enum class JoinRule {
// A user who wishes to join the room must first receive
// an invite to the room from someone already inside of the room.
Invite,

2
include/events/MemberEventContent.h
View file

@ -27,7 +27,7 @@ namespace matrix
{
namespace events
{
enum Membership {
enum class Membership {
// The user is banned.
BanState,

2
include/events/MessageEventContent.h
View file

@ -26,7 +26,7 @@ namespace matrix
{
namespace events
{
enum MessageEventType {
enum class MessageEventType {
// m.audio
Audio,

16
include/events/PowerLevelsEventContent.h
View file

@ -27,7 +27,7 @@ namespace matrix
{
namespace events
{
enum PowerLevels {
enum class PowerLevels {
User = 0,
Moderator = 50,
Admin = 100,
@ -55,14 +55,14 @@ public:
int userLevel(QString user_id) const;
private:
int ban_ = PowerLevels::Moderator;
int invite_ = PowerLevels::Moderator;
int kick_ = PowerLevels::Moderator;
int redact_ = PowerLevels::Moderator;
int ban_ = static_cast<int>(PowerLevels::Moderator);
int invite_ = static_cast<int>(PowerLevels::Moderator);
int kick_ = static_cast<int>(PowerLevels::Moderator);
int redact_ = static_cast<int>(PowerLevels::Moderator);
int events_default_ = PowerLevels::User;
int state_default_ = PowerLevels::Moderator;
int users_default_ = PowerLevels::User;
int events_default_ = static_cast<int>(PowerLevels::User);
int state_default_ = static_cast<int>(PowerLevels::Moderator);
int users_default_ = static_cast<int>(PowerLevels::User);
QMap<QString, int> events_;
QMap<QString, int> users_;

10
include/ui/FlatButton.h
View file

@ -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;

18
include/ui/Theme.h
View file

@ -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;