Formatting

This commit is contained in:
Jonas Kvinge
2021-07-11 09:49:38 +02:00
parent a6742d401c
commit e48b7d83a3
161 changed files with 370 additions and 369 deletions

View File

@@ -74,7 +74,7 @@ const char *AppearanceSettingsPage::kOpacityLevel = "opacity_level";
const int AppearanceSettingsPage::kDefaultBlurRadius = 0;
const int AppearanceSettingsPage::kDefaultOpacityLevel = 40;
const char *AppearanceSettingsPage::kTabBarSystemColor= "tab_system_color";
const char *AppearanceSettingsPage::kTabBarSystemColor = "tab_system_color";
const char *AppearanceSettingsPage::kTabBarGradient = "tab_gradient";
const char *AppearanceSettingsPage::kTabBarColor = "tab_color";
@@ -164,9 +164,9 @@ void AppearanceSettingsPage::Load() {
// Keep in mind originals colors, in case the user clicks on Cancel, to be able to restore colors
original_use_a_custom_color_set_ = s.value(kUseCustomColorSet, false).toBool();
original_foreground_color_ = s.value(kForegroundColor, p.color(QPalette::WindowText)).value<QColor>();
original_foreground_color_ = s.value(kForegroundColor, p.color(QPalette::WindowText)).value<QColor>();
current_foreground_color_ = original_foreground_color_;
original_background_color_ = s.value(kBackgroundColor, p.color(QPalette::Window)).value<QColor>();
original_background_color_ = s.value(kBackgroundColor, p.color(QPalette::Window)).value<QColor>();
current_background_color_ = original_background_color_;
InitColorSelectorsColors();
@@ -289,7 +289,7 @@ void AppearanceSettingsPage::Save() {
s.setValue(kBackgroundImageType, background_image_type_);
if (background_image_type_ == BackgroundImageType_Custom)
s.setValue(kBackgroundImageFilename, background_image_filename_);
s.setValue(kBackgroundImageFilename, background_image_filename_);
else
s.remove(kBackgroundImageFilename);

View File

@@ -133,4 +133,4 @@ class AppearanceSettingsPage : public SettingsPage {
};
#endif // APPEARANCESETTINGSPAGE_H
#endif // APPEARANCESETTINGSPAGE_H

View File

@@ -294,7 +294,7 @@ void BackendSettingsPage::Load_Output(QString output, QVariant device) {
break;
}
}
if (!found) { // Output is invalid for this engine, reset to default output.
if (!found) { // Output is invalid for this engine, reset to default output.
output = engine()->DefaultOutput();
device = (engine()->CustomDeviceSupport(output) ? QString() : QVariant());
for (int i = 0; i < ui_->combobox_output->count(); ++i) {
@@ -492,7 +492,7 @@ void BackendSettingsPage::Save() {
void BackendSettingsPage::Cancel() {
if (engine() && engine()->type() != enginetype_current_) { // Reset engine back to the original because user cancelled.
if (engine() && engine()->type() != enginetype_current_) { // Reset engine back to the original because user cancelled.
dialog()->app()->player()->CreateEngine(enginetype_current_);
dialog()->app()->player()->Init();
}

View File

@@ -40,7 +40,7 @@ class Ui_BackendSettingsPage;
class BackendSettingsPage : public SettingsPage {
Q_OBJECT
public:
public:
explicit BackendSettingsPage(SettingsDialog *dialog, QWidget *parent = nullptr);
~BackendSettingsPage() override;

View File

@@ -36,7 +36,7 @@ class Ui_BehaviourSettingsPage;
class BehaviourSettingsPage : public SettingsPage {
Q_OBJECT
public:
public:
explicit BehaviourSettingsPage(SettingsDialog *dialog, QWidget *parent = nullptr);
~BehaviourSettingsPage() override;

View File

@@ -38,7 +38,7 @@ class Ui_ContextSettingsPage;
class ContextSettingsPage : public SettingsPage {
Q_OBJECT
public:
public:
explicit ContextSettingsPage(SettingsDialog *dialog, QWidget *parent = nullptr);
~ContextSettingsPage() override;

View File

@@ -153,7 +153,7 @@ void NotificationsSettingsPage::Load() {
ui_->notifications_native->setChecked(true);
break;
}
// Fallthrough
// Fallthrough
case OSDBase::Pretty:
ui_->notifications_pretty->setChecked(true);
@@ -164,7 +164,7 @@ void NotificationsSettingsPage::Load() {
ui_->notifications_tray->setChecked(true);
break;
}
// Fallthrough
// Fallthrough
case OSDBase::Disabled:
default: