d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 19:08:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

linting fix

Browse source
This commit is contained in:
Jedi18 2021-02-07 22:18:04 +05:30
parent c2a56fc233
commit 04b920fbee
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/UserSettingsPage.cpp
View file

@ -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(

5
src/UserSettingsPage.h
View file

@ -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_; }