diff --git a/src/MatrixClient.cc b/src/MatrixClient.cc
index f9d81f27..f3b5a8ac 100644
--- a/src/MatrixClient.cc
+++ b/src/MatrixClient.cc
@@ -337,7 +337,7 @@ void MatrixClient::onImageResponse(QNetworkReply *reply)
void MatrixClient::onResponse(QNetworkReply *reply)
{
- switch (reply->property("endpoint").toInt()) {
+ switch (static_cast<Endpoint>(reply->property("endpoint").toInt())) {
case Endpoint::Versions:
onVersionsResponse(reply);
break;
@@ -387,7 +387,7 @@ void MatrixClient::login(const QString &username, const QString &password) noexc
LoginRequest body(username, password);
QNetworkReply *reply = post(request, body.serialize());
- reply->setProperty("endpoint", Endpoint::Login);
+ reply->setProperty("endpoint", static_cast<int>(Endpoint::Login));
}
void MatrixClient::logout() noexcept
@@ -404,7 +404,7 @@ void MatrixClient::logout() noexcept
QJsonObject body{};
QNetworkReply *reply = post(request, QJsonDocument(body).toJson(QJsonDocument::Compact));
- reply->setProperty("endpoint", Endpoint::Logout);
+ reply->setProperty("endpoint", static_cast<int>(Endpoint::Logout));
}
void MatrixClient::registerUser(const QString &user, const QString &pass, const QString &server) noexcept
@@ -424,7 +424,7 @@ void MatrixClient::registerUser(const QString &user, const QString &pass, const
RegisterRequest body(user, pass);
QNetworkReply *reply = post(request, body.serialize());
- reply->setProperty("endpoint", Endpoint::Register);
+ reply->setProperty("endpoint", static_cast<int>(Endpoint::Register));
}
void MatrixClient::sync() noexcept
@@ -452,7 +452,7 @@ void MatrixClient::sync() noexcept
QNetworkRequest request(QString(endpoint.toEncoded()));
QNetworkReply *reply = get(request);
- reply->setProperty("endpoint", Endpoint::Sync);
+ reply->setProperty("endpoint", static_cast<int>(Endpoint::Sync));
}
void MatrixClient::sendTextMessage(const QString &roomid, const QString &msg) noexcept
@@ -473,7 +473,7 @@ void MatrixClient::sendTextMessage(const QString &roomid, const QString &msg) no
QNetworkReply *reply = put(request, QJsonDocument(body).toJson(QJsonDocument::Compact));
- reply->setProperty("endpoint", Endpoint::SendTextMessage);
+ reply->setProperty("endpoint", static_cast<int>(Endpoint::SendTextMessage));
reply->setProperty("txn_id", txn_id_);
reply->setProperty("roomid", roomid);
@@ -505,7 +505,7 @@ void MatrixClient::initialSync() noexcept
QNetworkRequest request(QString(endpoint.toEncoded()));
QNetworkReply *reply = get(request);
- reply->setProperty("endpoint", Endpoint::InitialSync);
+ reply->setProperty("endpoint", static_cast<int>(Endpoint::InitialSync));
}
void MatrixClient::versions() noexcept
@@ -516,7 +516,7 @@ void MatrixClient::versions() noexcept
QNetworkRequest request(endpoint);
QNetworkReply *reply = get(request);
- reply->setProperty("endpoint", Endpoint::Versions);
+ reply->setProperty("endpoint", static_cast<int>(Endpoint::Versions));
}
void MatrixClient::getOwnProfile() noexcept
@@ -535,7 +535,7 @@ void MatrixClient::getOwnProfile() noexcept
QNetworkRequest request(QString(endpoint.toEncoded()));
QNetworkReply *reply = get(request);
- reply->setProperty("endpoint", Endpoint::GetOwnProfile);
+ reply->setProperty("endpoint", static_cast<int>(Endpoint::GetOwnProfile));
}
void MatrixClient::fetchRoomAvatar(const QString &roomid, const QUrl &avatar_url)
@@ -554,7 +554,7 @@ void MatrixClient::fetchRoomAvatar(const QString &roomid, const QUrl &avatar_url
QNetworkReply *reply = get(avatar_request);
reply->setProperty("roomid", roomid);
- reply->setProperty("endpoint", Endpoint::RoomAvatar);
+ reply->setProperty("endpoint", static_cast<int>(Endpoint::RoomAvatar));
}
void MatrixClient::downloadImage(const QString &event_id, const QUrl &url)
@@ -563,7 +563,7 @@ void MatrixClient::downloadImage(const QString &event_id, const QUrl &url)
QNetworkReply *reply = get(image_request);
reply->setProperty("event_id", event_id);
- reply->setProperty("endpoint", Endpoint::Image);
+ reply->setProperty("endpoint", static_cast<int>(Endpoint::Image));
}
void MatrixClient::fetchOwnAvatar(const QUrl &avatar_url)
@@ -581,5 +581,5 @@ void MatrixClient::fetchOwnAvatar(const QUrl &avatar_url)
QNetworkRequest avatar_request(media_url);
QNetworkReply *reply = get(avatar_request);
- reply->setProperty("endpoint", Endpoint::GetOwnAvatar);
+ reply->setProperty("endpoint", static_cast<int>(Endpoint::GetOwnAvatar));
}
diff --git a/src/TimelineView.cc b/src/TimelineView.cc
index 686fd602..c57d8f7b 100644
--- a/src/TimelineView.cc
+++ b/src/TimelineView.cc
@@ -72,7 +72,7 @@ int TimelineView::addEvents(const QJsonArray &events)
for (const auto &event : events) {
ty = events::extractEventType(event.toObject());
- if (ty == events::RoomMessage) {
+ if (ty == events::EventType::RoomMessage) {
events::MessageEventType msg_type = events::extractMessageEventType(event.toObject());
if (msg_type == events::MessageEventType::Text) {
diff --git a/src/ui/CircularProgress.cc b/src/ui/CircularProgress.cc
index fa74b64c..edf06d4b 100644
--- a/src/ui/CircularProgress.cc
+++ b/src/ui/CircularProgress.cc
@@ -145,7 +145,7 @@ void CircularProgress::paintEvent(QPaintEvent *event)
pen.setWidthF(width_);
pen.setColor(color());
- if (ui::IndeterminateProgress == progress_type_) {
+ if (ui::ProgressType::IndeterminateProgress == progress_type_) {
QVector<qreal> pattern;
pattern << delegate_->dashLength() * size_ / 50 << 30 * size_ / 50;
diff --git a/src/ui/FlatButton.cc b/src/ui/FlatButton.cc
index e860e7d7..a4f42a5d 100644
--- a/src/ui/FlatButton.cc
+++ b/src/ui/FlatButton.cc
@@ -15,10 +15,10 @@ void FlatButton::init()
{
ripple_overlay_ = new RippleOverlay(this);
state_machine_ = new FlatButtonStateMachine(this);
- role_ = ui::Default;
- ripple_style_ = ui::PositionedRipple;
- icon_placement_ = ui::LeftIcon;
- overlay_style_ = ui::GrayOverlay;
+ role_ = ui::Role::Default;
+ ripple_style_ = ui::RippleStyle::PositionedRipple;
+ icon_placement_ = ui::ButtonIconPlacement::LeftIcon;
+ overlay_style_ = ui::OverlayStyle::GrayOverlay;
bg_mode_ = Qt::TransparentMode;
fixed_ripple_radius_ = 64;
corner_radius_ = 3;
@@ -69,11 +69,11 @@ FlatButton::~FlatButton()
void FlatButton::applyPreset(ui::ButtonPreset preset)
{
switch (preset) {
- case ui::FlatPreset:
- setOverlayStyle(ui::NoOverlay);
+ case ui::ButtonPreset::FlatPreset:
+ setOverlayStyle(ui::OverlayStyle::NoOverlay);
break;
- case ui::CheckablePreset:
- setOverlayStyle(ui::NoOverlay);
+ case ui::ButtonPreset::CheckablePreset:
+ setOverlayStyle(ui::OverlayStyle::NoOverlay);
setCheckable(true);
break;
default:
@@ -105,11 +105,11 @@ QColor FlatButton::foregroundColor() const
}
switch (role_) {
- case ui::Primary:
+ case ui::Role::Primary:
return ThemeManager::instance().themeColor("Blue");
- case ui::Secondary:
+ case ui::Role::Secondary:
return ThemeManager::instance().themeColor("Gray");
- case ui::Default:
+ case ui::Role::Default:
default:
return ThemeManager::instance().themeColor("Black");
}
@@ -127,11 +127,11 @@ QColor FlatButton::backgroundColor() const
{
if (!background_color_.isValid()) {
switch (role_) {
- case ui::Primary:
+ case ui::Role::Primary:
return ThemeManager::instance().themeColor("Blue");
- case ui::Secondary:
+ case ui::Role::Secondary:
return ThemeManager::instance().themeColor("Gray");
- case ui::Default:
+ case ui::Role::Default:
default:
return ThemeManager::instance().themeColor("Black");
}
@@ -143,7 +143,7 @@ QColor FlatButton::backgroundColor() const
void FlatButton::setOverlayColor(const QColor &color)
{
overlay_color_ = color;
- setOverlayStyle(ui::TintedOverlay);
+ setOverlayStyle(ui::OverlayStyle::TintedOverlay);
}
QColor FlatButton::overlayColor() const
@@ -314,11 +314,11 @@ void FlatButton::checkStateSet()
void FlatButton::mousePressEvent(QMouseEvent *event)
{
- if (ui::NoRipple != ripple_style_) {
+ if (ui::RippleStyle::NoRipple != ripple_style_) {
QPoint pos;
qreal radiusEndValue;
- if (ui::CenteredRipple == ripple_style_) {
+ if (ui::RippleStyle::CenteredRipple == ripple_style_) {
pos = rect().center();
} else {
pos = event->pos();
@@ -410,8 +410,8 @@ void FlatButton::paintBackground(QPainter *painter)
return;
}
- if ((ui::NoOverlay != overlay_style_) && (overlayOpacity > 0)) {
- if (ui::TintedOverlay == overlay_style_) {
+ if ((ui::OverlayStyle::NoOverlay != overlay_style_) && (overlayOpacity > 0)) {
+ if (ui::OverlayStyle::TintedOverlay == overlay_style_) {
brush.setColor(overlayColor());
} else {
brush.setColor(Qt::gray);
diff --git a/src/ui/Theme.cc b/src/ui/Theme.cc
index 4c5c19de..ff32c92d 100644
--- a/src/ui/Theme.cc
+++ b/src/ui/Theme.cc
@@ -49,7 +49,7 @@ void Theme::setColor(const QString &key, const QColor &color)
colors_.insert(key, color);
}
-void Theme::setColor(const QString &key, ui::Color &color)
+void Theme::setColor(const QString &key, ui::Color color)
{
static const QColor palette[] = {
QColor("#171919"),
@@ -69,5 +69,5 @@ void Theme::setColor(const QString &key, ui::Color &color)
rgba(0, 0, 0, 0),
};
- colors_.insert(key, palette[color]);
+ colors_.insert(key, palette[static_cast<int>(color)]);
}
|
