linting fix

pull/459/head
Jedi18 4 years ago
parent c2a56fc233
commit 04b920fbee
  1. 3
      src/UserSettingsPage.cpp
  2. 3
      src/UserSettingsPage.h

@ -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,7 +177,8 @@ 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");
}

Loading…
Cancel
Save