linting fix
This commit is contained in:
parent
c2a56fc233
commit
04b920fbee
@ -741,8 +741,7 @@ UserSettingsPage::UserSettingsPage(QSharedPointer<UserSettings> settings, QWidge
|
||||
fontSelectionCombo_->setCurrentIndex(
|
||||
fontSelectionCombo_->findText(tr(currentFont.toStdString().c_str())));
|
||||
} else {
|
||||
fontSelectionCombo_->setCurrentIndex(
|
||||
fontSelectionCombo_->findText(currentFont));
|
||||
fontSelectionCombo_->setCurrentIndex(fontSelectionCombo_->findText(currentFont));
|
||||
}
|
||||
|
||||
emojiFontSelectionCombo_->setCurrentIndex(
|
||||
|
@ -177,12 +177,13 @@ public:
|
||||
int timelineMaxWidth() const { return timelineMaxWidth_; }
|
||||
double fontSize() const { return baseFontSize_; }
|
||||
QString font() const { return font_; }
|
||||
QString emojiFont() const {
|
||||
QString emojiFont() const
|
||||
{
|
||||
if (emojiFont_ == "Default") {
|
||||
return tr("Default");
|
||||
}
|
||||
|
||||
return emojiFont_;
|
||||
return emojiFont_;
|
||||
}
|
||||
Presence presence() const { return presence_; }
|
||||
QString ringtone() const { return ringtone_; }
|
||||
|
Loading…
Reference in New Issue
Block a user