Skip to content
Snippets Groups Projects
Commit 04b920fb authored by Jedi18's avatar Jedi18
Browse files

linting fix

parent c2a56fc2
No related branches found
No related tags found
No related merge requests found
Pipeline #590 failed
...@@ -741,8 +741,7 @@ UserSettingsPage::UserSettingsPage(QSharedPointer<UserSettings> settings, QWidge ...@@ -741,8 +741,7 @@ UserSettingsPage::UserSettingsPage(QSharedPointer<UserSettings> settings, QWidge
fontSelectionCombo_->setCurrentIndex( fontSelectionCombo_->setCurrentIndex(
fontSelectionCombo_->findText(tr(currentFont.toStdString().c_str()))); fontSelectionCombo_->findText(tr(currentFont.toStdString().c_str())));
} else { } else {
fontSelectionCombo_->setCurrentIndex( fontSelectionCombo_->setCurrentIndex(fontSelectionCombo_->findText(currentFont));
fontSelectionCombo_->findText(currentFont));
} }
emojiFontSelectionCombo_->setCurrentIndex( emojiFontSelectionCombo_->setCurrentIndex(
......
...@@ -177,12 +177,13 @@ public: ...@@ -177,12 +177,13 @@ public:
int timelineMaxWidth() const { return timelineMaxWidth_; } int timelineMaxWidth() const { return timelineMaxWidth_; }
double fontSize() const { return baseFontSize_; } double fontSize() const { return baseFontSize_; }
QString font() const { return font_; } QString font() const { return font_; }
QString emojiFont() const { QString emojiFont() const
{
if (emojiFont_ == "Default") { if (emojiFont_ == "Default") {
return tr("Default"); return tr("Default");
} }
return emojiFont_; return emojiFont_;
} }
Presence presence() const { return presence_; } Presence presence() const { return presence_; }
QString ringtone() const { return ringtone_; } QString ringtone() const { return ringtone_; }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment