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
4545
4646 connect(ui.buttonBrowseLocation, &QPushButton::clicked, this, &PreferencesDialog::openSnapshotLocationBrowser);
4747 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);
4949
5050 connect(ui.buttonChangeAppearance, &QPushButton::clicked, this, &PreferencesDialog::openFullAvatarModelBrowser);
5151 connect(ui.appearanceDescription, &QLineEdit::textChanged, this, [this](const QString& url) {
5252 DependencyManager::get<AvatarManager>()->getMyAvatar()->useFullAvatarURL(url, "");
5353 this->fullAvatarURLChanged(url, "");
5454 });
55− connect(Application::getInstance(), &Application::fullAvatarURLChanged, this, &PreferencesDialog::fullAvatarURLChanged);
55+ connect(qApp, &Application::fullAvatarURLChanged, this, &PreferencesDialog::fullAvatarURLChanged);
5656
5757 // move dialog to left side
5858 move(parentWidget()->geometry().topLeft());
@@ -298,7 +298,7 @@ void PreferencesDialog::savePreferences() { · 239 unmodified lines
298298 audio->setOutputStarveDetectionThreshold(ui.outputStarveDetectionThresholdSpinner->value());
299299 audio->setOutputStarveDetectionPeriod(ui.outputStarveDetectionPeriodSpinner->value());
300300
301− Application::getInstance()->resizeGL();
301+ qApp->resizeGL();
302302
303303 // LOD items
304304 auto lodManager = DependencyManager::get<LODManager>();