flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-26 02:35:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #485, further removed global setup traits from classes with read only

Browse Source 
Use global setup from sGui/sApp
This commit is contained in:
Klaus Basan
2016-03-01 01:49:59 +01:00
committed by Mathew Sutcliffe
parent 30b5e5dade
commit aa96731143
20 changed files with 22 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/swiftlauncher/swiftlauncher.cpp
View File

@@ -134,7 +134,7 @@ void CSwiftLauncher::initStyleSheet()
void CSwiftLauncher::displayLatestNews()
{
#ifndef Q_CC_MINGW
CFailoverUrlList newsUrls(this->m_setup.get().swiftLatestNewsUrls());
CFailoverUrlList newsUrls(sGui->getGlobalSetup().swiftLatestNewsUrls());
QUrl newUrl(newsUrls.obtainNextWorkingUrl());
Q_UNUSED(newUrl);
@@ -343,7 +343,7 @@ void CSwiftLauncher::ps_startButtonPressed()
}
else if (sender == this->ui->tb_Database)
{
CUrl homePage(this->m_setup.get().dbHomePageUrl());
const CUrl homePage(sApp->getGlobalSetup().dbHomePageUrl());
QDesktopServices::openUrl(homePage);
}
}

1
src/swiftlauncher/swiftlauncher.h
View File

@@ -60,7 +60,6 @@ protected:
private:
QScopedPointer<Ui::CSwiftLauncher> ui;
BlackMisc::CData<BlackCore::Data::GlobalSetup> m_setup { this, &CSwiftLauncher::ps_changedCache }; //!< setup cache
BlackMisc::CData<BlackCore::Data::UpdateInfo> m_updateInfo { this, &CSwiftLauncher::ps_changedCache }; //!< version cache
QString m_executable;
QStringList m_executableArgs;