make lint
4 files changed, 17 insertions, 11 deletions
diff --git a/resources/qml/MessageView.qml b/resources/qml/MessageView.qml
index 29115b00..dafca0f6 100644
--- a/resources/qml/MessageView.qml
+++ b/resources/qml/MessageView.qml
@@ -102,6 +102,7 @@ ListView {
Avatar {
id: messageUserAvatar
+
width: avatarSize
height: avatarSize
url: modelData ? chat.model.avatarUrl(modelData.userId).replace("mxc://", "image://MxcImage/") : ""
@@ -112,8 +113,8 @@ ListView {
Connections {
target: chat.model
- onRoomAvatarUrlChanged: {
- messageUserAvatar.url = modelData ? chat.model.avatarUrl(modelData.userId).replace("mxc://", "image://MxcImage/") : ""
+ onRoomAvatarUrlChanged: {
+ messageUserAvatar.url = modelData ? chat.model.avatarUrl(modelData.userId).replace("mxc://", "image://MxcImage/") : "";
}
}
diff --git a/resources/qml/UserProfile.qml b/resources/qml/UserProfile.qml
index 37ae6de8..4797a38e 100644
--- a/resources/qml/UserProfile.qml
+++ b/resources/qml/UserProfile.qml
@@ -49,6 +49,7 @@ ApplicationWindow {
Text {
id: errorText
+
text: "Error Text"
color: "red"
visible: opacity > 0
@@ -58,24 +59,28 @@ ApplicationWindow {
SequentialAnimation {
id: hideErrorAnimation
+
running: false
+
PauseAnimation {
duration: 4000
}
+
NumberAnimation {
target: errorText
property: 'opacity'
to: 0
duration: 1000
}
+
}
- Connections{
+ Connections {
target: profile
onDisplayError: {
- errorText.text = errorMessage
- errorText.opacity = 1
- hideErrorAnimation.restart()
+ errorText.text = errorMessage;
+ errorText.opacity = 1;
+ hideErrorAnimation.restart();
}
}
diff --git a/src/ChatPage.cpp b/src/ChatPage.cpp
index d8907740..6d67e6f2 100644
--- a/src/ChatPage.cpp
+++ b/src/ChatPage.cpp
@@ -449,10 +449,9 @@ ChatPage::deleteConfigs()
{
QSettings settings;
- if (UserSettings::instance()->profile() != "")
- {
- settings.beginGroup("profile");
- settings.beginGroup(UserSettings::instance()->profile());
+ if (UserSettings::instance()->profile() != "") {
+ settings.beginGroup("profile");
+ settings.beginGroup(UserSettings::instance()->profile());
}
settings.beginGroup("auth");
settings.remove("");
diff --git a/src/Utils.cpp b/src/Utils.cpp
index 1b2808b3..f90e5049 100644
--- a/src/Utils.cpp
+++ b/src/Utils.cpp
@@ -70,7 +70,8 @@ utils::replaceEmoji(const QString &body)
for (auto &code : utf32_string) {
if (utils::codepointIsEmoji(code)) {
if (!insideFontBlock) {
- fmtBody += QString("<font face=\"" + UserSettings::instance()->font() + "\">");
+ fmtBody += QString("<font face=\"" +
+ UserSettings::instance()->font() + "\">");
insideFontBlock = true;
}
|