dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename initialise to initialize

Browse Source
This commit is contained in:
Jonas Kvinge
2020-10-17 17:29:09 +02:00
parent 5b21118a8c
commit b6693a71f9
43 changed files with 114 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/settings/backendsettingspage.cpp
View File

@@ -104,7 +104,7 @@ void BackendSettingsPage::Load() {
device_current_ = s.value("device", QVariant());
ui_->combobox_engine->setCurrentIndex(ui_->combobox_engine->findData(static_cast<int>(enginetype)));
if (EngineInitialised()) Load_Engine(enginetype);
if (EngineInitialized()) Load_Engine(enginetype);
ui_->checkbox_volume_control->setChecked(s.value("volume_control", true).toBool());
@@ -152,7 +152,7 @@ void BackendSettingsPage::Load() {
ui_->widget_alsa_plugin->hide();
#endif
if (!EngineInitialised()) return;
if (!EngineInitialized()) return;
if (engine()->state() == Engine::Empty) {
if (ui_->combobox_engine->count() > 1) ui_->combobox_engine->setEnabled(true);
@@ -207,7 +207,7 @@ void BackendSettingsPage::Load() {
}
bool BackendSettingsPage::EngineInitialised() {
bool BackendSettingsPage::EngineInitialized() {
if (!engine() || engine()->type() == Engine::None) {
errordialog_.ShowMessage("Engine is not initialized! Please restart.");
@@ -219,7 +219,7 @@ bool BackendSettingsPage::EngineInitialised() {
void BackendSettingsPage::Load_Engine(const Engine::EngineType enginetype) {
if (!EngineInitialised()) return;
if (!EngineInitialized()) return;
QString output = output_current_;
QVariant device = device_current_;
@@ -253,7 +253,7 @@ void BackendSettingsPage::Load_Engine(const Engine::EngineType enginetype) {
void BackendSettingsPage::Load_Output(QString output, QVariant device) {
if (!EngineInitialised()) return;
if (!EngineInitialized()) return;
if (output.isEmpty()) output = engine()->DefaultOutput();
@@ -301,7 +301,7 @@ void BackendSettingsPage::Load_Output(QString output, QVariant device) {
void BackendSettingsPage::Load_Device(const QString &output, const QVariant &device) {
if (!EngineInitialised()) return;
if (!EngineInitialized()) return;
int devices = 0;
DeviceFinder::Device df_device;
@@ -385,7 +385,7 @@ void BackendSettingsPage::Load_Device(const QString &output, const QVariant &dev
void BackendSettingsPage::Save() {
if (!EngineInitialised()) return;
if (!EngineInitialized()) return;
QVariant enginetype_v = ui_->combobox_engine->itemData(ui_->combobox_engine->currentIndex());
Engine::EngineType enginetype = enginetype_v.value<Engine::EngineType>();
@@ -447,7 +447,7 @@ void BackendSettingsPage::Cancel() {
void BackendSettingsPage::EngineChanged(const int index) {
if (!configloaded_ || !EngineInitialised()) return;
if (!configloaded_ || !EngineInitialized()) return;
QVariant v = ui_->combobox_engine->itemData(index);
Engine::EngineType enginetype = v.value<Engine::EngineType>();
@@ -467,7 +467,7 @@ void BackendSettingsPage::EngineChanged(const int index) {
void BackendSettingsPage::OutputChanged(const int index) {
if (!configloaded_ || !EngineInitialised()) return;
if (!configloaded_ || !EngineInitialized()) return;
EngineBase::OutputDetails output = ui_->combobox_output->itemData(index).value<EngineBase::OutputDetails>();
Load_Device(output.name, QVariant());
@@ -476,7 +476,7 @@ void BackendSettingsPage::OutputChanged(const int index) {
void BackendSettingsPage::DeviceSelectionChanged(int index) {
if (!configloaded_ || !EngineInitialised()) return;
if (!configloaded_ || !EngineInitialized()) return;
EngineBase::OutputDetails output = ui_->combobox_output->itemData(ui_->combobox_output->currentIndex()).value<EngineBase::OutputDetails>();
QVariant device = ui_->combobox_device->itemData(index).value<QVariant>();
@@ -499,7 +499,7 @@ void BackendSettingsPage::DeviceSelectionChanged(int index) {
void BackendSettingsPage::DeviceStringChanged() {
if (!configloaded_ || !EngineInitialised()) return;
if (!configloaded_ || !EngineInitialized()) return;
EngineBase::OutputDetails output = ui_->combobox_output->itemData(ui_->combobox_output->currentIndex()).value<EngineBase::OutputDetails>();
bool found(false);
@@ -588,7 +588,7 @@ void BackendSettingsPage::radiobutton_alsa_hw_clicked(const bool checked) {
#ifdef HAVE_ALSA
if (!configloaded_ || !EngineInitialised()) return;
if (!configloaded_ || !EngineInitialized()) return;
EngineBase::OutputDetails output = ui_->combobox_output->itemData(ui_->combobox_output->currentIndex()).value<EngineBase::OutputDetails>();
if (!engine()->ALSADeviceSupport(output.name)) return;
@@ -619,7 +619,7 @@ void BackendSettingsPage::radiobutton_alsa_plughw_clicked(const bool checked) {
#ifdef HAVE_ALSA
if (!configloaded_ || !EngineInitialised()) return;
if (!configloaded_ || !EngineInitialized()) return;
EngineBase::OutputDetails output = ui_->combobox_output->itemData(ui_->combobox_output->currentIndex()).value<EngineBase::OutputDetails>();
if (!engine()->ALSADeviceSupport(output.name)) return;
@@ -646,7 +646,7 @@ void BackendSettingsPage::radiobutton_alsa_plughw_clicked(const bool checked) {
void BackendSettingsPage::FadingOptionsChanged() {
if (!configloaded_ || !EngineInitialised()) return;
if (!configloaded_ || !EngineInitialized()) return;
EngineBase::OutputDetails output = ui_->combobox_output->itemData(ui_->combobox_output->currentIndex()).value<EngineBase::OutputDetails>();
if (engine()->type() == Engine::GStreamer && !(engine()->ALSADeviceSupport(output.name) && !ui_->lineedit_device->text().isEmpty()) && ui_->checkbox_volume_control->isChecked()) {

2
src/settings/backendsettingspage.h
View File

@@ -76,7 +76,7 @@ private:
Ui_BackendSettingsPage *ui_;
bool EngineInitialised();
bool EngineInitialized();
void EngineChanged(Engine::EngineType enginetype);

6
src/settings/collectionsettingspage.cpp
View File

@@ -64,7 +64,7 @@ const QStringList CollectionSettingsPage::cacheUnitNames = { "KB", "MB", "GB", "
CollectionSettingsPage::CollectionSettingsPage(SettingsDialog *dialog)
: SettingsPage(dialog),
ui_(new Ui_CollectionSettingsPage),
initialised_model_(false)
initialized_model_(false)
{
ui_->setupUi(this);
@@ -137,13 +137,13 @@ void CollectionSettingsPage::DiskCacheEnable(const int state) {
void CollectionSettingsPage::Load() {
if (!initialised_model_) {
if (!initialized_model_) {
if (ui_->list->selectionModel()) {
disconnect(ui_->list->selectionModel(), SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), this, SLOT(CurrentRowChanged(QModelIndex)));
}
ui_->list->setModel(dialog()->collection_directory_model());
initialised_model_ = true;
initialized_model_ = true;
connect(ui_->list->selectionModel(), SIGNAL(currentRowChanged(QModelIndex, QModelIndex)), SLOT(CurrentRowChanged(QModelIndex)));
}

2
src/settings/collectionsettingspage.h
View File

@@ -76,7 +76,7 @@ class CollectionSettingsPage : public SettingsPage {
private:
Ui_CollectionSettingsPage *ui_;
bool initialised_model_;
bool initialized_model_;
static const QStringList cacheUnitNames;
};

6
src/settings/moodbarsettingspage.cpp
View File

@@ -51,7 +51,7 @@ const int MoodbarSettingsPage::kMoodbarPreviewHeight = 18;
MoodbarSettingsPage::MoodbarSettingsPage(SettingsDialog* dialog)
: SettingsPage(dialog),
ui_(new Ui_MoodbarSettingsPage),
initialised_(false)
initialized_(false)
{
ui_->setupUi(this);
@@ -96,8 +96,8 @@ void MoodbarSettingsPage::Cancel() {}
void MoodbarSettingsPage::InitMoodbarPreviews() {
if (initialised_) return;
initialised_ = true;
if (initialized_) return;
initialized_ = true;
const QSize preview_size(kMoodbarPreviewWidth, kMoodbarPreviewHeight);
ui_->moodbar_style->setIconSize(preview_size);

2
src/settings/moodbarsettingspage.h
View File

@@ -50,7 +50,7 @@ class MoodbarSettingsPage : public SettingsPage {
Ui_MoodbarSettingsPage* ui_;
bool initialised_;
bool initialized_;
};
#endif // MOODBARSETTINGSPAGE_H

6
src/settings/shortcutssettingspage.cpp
View File

@@ -57,7 +57,7 @@ const char *GlobalShortcutsSettingsPage::kSettingsGroup = "GlobalShortcuts";
GlobalShortcutsSettingsPage::GlobalShortcutsSettingsPage(SettingsDialog *dialog)
: SettingsPage(dialog),
ui_(new Ui_GlobalShortcutsSettingsPage),
initialised_(false),
initialized_(false),
grabber_(new GlobalShortcutGrabber) {
ui_->setupUi(this);
@@ -105,8 +105,8 @@ void GlobalShortcutsSettingsPage::Load() {
GlobalShortcuts *manager = dialog()->global_shortcuts_manager();
if (!initialised_) {
initialised_ = true;
if (!initialized_) {
initialized_ = true;
de_ = Utilities::DesktopEnvironment();
ui_->widget_warning->hide();

2
src/settings/shortcutssettingspage.h
View File

@@ -78,7 +78,7 @@ class GlobalShortcutsSettingsPage : public SettingsPage {
private:
Ui_GlobalShortcutsSettingsPage *ui_;
bool initialised_;
bool initialized_;
std::unique_ptr<GlobalShortcutGrabber> grabber_;
QMap<QString, Shortcut> shortcuts_;