diff --git a/include/events/Event.h b/include/events/Event.h
index a7e4fb2d..e5a71c39 100644
--- a/include/events/Event.h
+++ b/include/events/Event.h
@@ -26,7 +26,7 @@ namespace matrix
{
namespace events
{
-enum EventType {
+enum class EventType {
/// m.room.aliases
RoomAliases,
/// m.room.avatar
diff --git a/include/events/HistoryVisibilityEventContent.h b/include/events/HistoryVisibilityEventContent.h
index 84738480..7b00d85e 100644
--- a/include/events/HistoryVisibilityEventContent.h
+++ b/include/events/HistoryVisibilityEventContent.h
@@ -26,7 +26,7 @@ namespace matrix
{
namespace events
{
-enum HistoryVisibility {
+enum class HistoryVisibility {
Invited,
Joined,
Shared,
diff --git a/include/events/JoinRulesEventContent.h b/include/events/JoinRulesEventContent.h
index ff03a26e..9b3d27c3 100644
--- a/include/events/JoinRulesEventContent.h
+++ b/include/events/JoinRulesEventContent.h
@@ -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,
diff --git a/include/events/MemberEventContent.h b/include/events/MemberEventContent.h
index 39ff0db1..9fd1d7d9 100644
--- a/include/events/MemberEventContent.h
+++ b/include/events/MemberEventContent.h
@@ -27,7 +27,7 @@ namespace matrix
{
namespace events
{
-enum Membership {
+enum class Membership {
// The user is banned.
BanState,
diff --git a/include/events/MessageEventContent.h b/include/events/MessageEventContent.h
index adc0f3ff..1ef730ed 100644
--- a/include/events/MessageEventContent.h
+++ b/include/events/MessageEventContent.h
@@ -26,7 +26,7 @@ namespace matrix
{
namespace events
{
-enum MessageEventType {
+enum class MessageEventType {
// m.audio
Audio,
diff --git a/include/events/PowerLevelsEventContent.h b/include/events/PowerLevelsEventContent.h
index c51755d8..bac4a42b 100644
--- a/include/events/PowerLevelsEventContent.h
+++ b/include/events/PowerLevelsEventContent.h
@@ -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_;
|
