History

Replace Application::getInstance() with qApp

Atlante45 committed 11 years ago

Commit cf3b33a1 parent 2c276bb37 files · +197 −181Browse files

Showing the changes to interface/src/ui/PreferencesDialog.cpp (1 of 37 files). Show all

Unified · Split

interface/src/ui/PreferencesDialog.cpp+3−3
@@ -45,14 +45,14 @@ PreferencesDialog::PreferencesDialog(QWidget* parent) : · 44 unmodified lines
45 45
46 connect(ui.buttonBrowseLocation, &QPushButton::clicked, this, &PreferencesDialog::openSnapshotLocationBrowser);46 connect(ui.buttonBrowseLocation, &QPushButton::clicked, this, &PreferencesDialog::openSnapshotLocationBrowser);
47 connect(ui.buttonBrowseScriptsLocation, &QPushButton::clicked, this, &PreferencesDialog::openScriptsLocationBrowser);47 connect(ui.buttonBrowseScriptsLocation, &QPushButton::clicked, this, &PreferencesDialog::openScriptsLocationBrowser);
48 connect(ui.buttonReloadDefaultScripts, &QPushButton::clicked, Application::getInstance(), &Application::loadDefaultScripts);48 connect(ui.buttonReloadDefaultScripts, &QPushButton::clicked, qApp, &Application::loadDefaultScripts);
49 49
50 connect(ui.buttonChangeAppearance, &QPushButton::clicked, this, &PreferencesDialog::openFullAvatarModelBrowser);50 connect(ui.buttonChangeAppearance, &QPushButton::clicked, this, &PreferencesDialog::openFullAvatarModelBrowser);
51 connect(ui.appearanceDescription, &QLineEdit::textChanged, this, [this](const QString& url) {51 connect(ui.appearanceDescription, &QLineEdit::textChanged, this, [this](const QString& url) {
52 DependencyManager::get<AvatarManager>()->getMyAvatar()->useFullAvatarURL(url, "");52 DependencyManager::get<AvatarManager>()->getMyAvatar()->useFullAvatarURL(url, "");
53 this->fullAvatarURLChanged(url, "");53 this->fullAvatarURLChanged(url, "");
54 });54 });
55 connect(Application::getInstance(), &Application::fullAvatarURLChanged, this, &PreferencesDialog::fullAvatarURLChanged);55 connect(qApp, &Application::fullAvatarURLChanged, this, &PreferencesDialog::fullAvatarURLChanged);
56 56
57 // move dialog to left side57 // move dialog to left side
58 move(parentWidget()->geometry().topLeft());58 move(parentWidget()->geometry().topLeft());
@@ -298,7 +298,7 @@ void PreferencesDialog::savePreferences() { · 239 unmodified lines
298 audio->setOutputStarveDetectionThreshold(ui.outputStarveDetectionThresholdSpinner->value());298 audio->setOutputStarveDetectionThreshold(ui.outputStarveDetectionThresholdSpinner->value());
299 audio->setOutputStarveDetectionPeriod(ui.outputStarveDetectionPeriodSpinner->value());299 audio->setOutputStarveDetectionPeriod(ui.outputStarveDetectionPeriodSpinner->value());
300 300
301 Application::getInstance()->resizeGL();301 qApp->resizeGL();
302 302
303 // LOD items303 // LOD items
304 auto lodManager = DependencyManager::get<LODManager>();304 auto lodManager = DependencyManager::get<LODManager>();