flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-23 07:15:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #787, MS review items + discussion on slack

Browse Source 
https://dev.vatsim-germany.org/issues/787#note-4
This commit is contained in:
Klaus Basan
2016-11-29 18:36:27 +01:00
parent df2073e5e6
commit fc3ac8b323
7 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/blackcore/application.cpp
View File

@@ -515,12 +515,9 @@ namespace BlackCore
void CApplication::processEventsFor(int milliseconds)
{
const QTime end = QTime::currentTime().addMSecs(milliseconds);
while (QTime::currentTime() <= end)
{
QCoreApplication::processEvents();
QThread::msleep(100);
}
QEventLoop eventLoop;
QTimer::singleShot(milliseconds, &eventLoop, &QEventLoop::quit);
eventLoop.exec();
}
bool CApplication::useContexts(const CCoreFacadeConfig &coreConfig)

2
src/blackcore/db/databasereader.cpp
View File

@@ -148,7 +148,7 @@ namespace BlackCore
// Using timer to first finish this function, then the resulting signal
if (validInCacheEntities != CEntityFlags::NoEntity)
{
QTimer::singleShot(10, this, [ = ]
QTimer::singleShot(0, this, [ = ]
{
emit this->dataRead(validInCacheEntities, CEntityFlags::ReadFinished, 0);
});

4
src/blackcore/webdataservices.h
View File

@@ -291,11 +291,11 @@ namespace BlackCore
BlackMisc::CCountry getCountryForName(const QString &name) const;
//! Get airports
//! \\threadsafe
//! \threadsafe
BlackMisc::Aviation::CAirportList getAirports() const;
//! Get airports count
//! \\threadsafe
//! \threadsafe
int getAirportsCount() const;
//! Get METARs

3
src/blackgui/components/textmessagecomponent.cpp
View File

@@ -18,6 +18,7 @@
#include "blackgui/textmessagetextedit.h"
#include "blackgui/views/textmessageview.h"
#include "blackgui/views/viewbase.h"
#include "blackmisc/verify.h"
#include "blackmisc/audio/notificationsounds.h"
#include "blackmisc/aviation/atcstation.h"
#include "blackmisc/aviation/callsign.h"
@@ -287,7 +288,7 @@ namespace BlackGui
if (!tab) { tab = this->addNewTextMessageTab(cs); }
Q_ASSERT_X(tab, Q_FUNC_INFO, "Missing tab");
CTextMessageTextEdit *textEdit = tab->findChild<CTextMessageTextEdit *>();
Q_ASSERT_X(textEdit, Q_FUNC_INFO, "Missing text edit");
BLACK_VERIFY_X(textEdit, Q_FUNC_INFO, "Missing text edit");
if (!textEdit) { return; } // do not crash, though this situation could not happen
textEdit->insertTextMessage(textMessage);

2
src/blackmisc/applicationinfolist.cpp
View File

@@ -7,8 +7,6 @@
* contained in the LICENSE file.
*/
//! \file
#include "blackmisc/applicationinfolist.h"
namespace BlackMisc

1
src/blackmisc/aviation/airport.cpp
View File

@@ -42,7 +42,6 @@ namespace BlackMisc
{
if (!this->m_country.hasIsoCode() && airport.getCountry().hasIsoCode()) { this->m_country = airport.getCountry(); }
if (this->m_descriptiveName.isEmpty()) { this->m_descriptiveName = airport.getDescriptiveName(); }
if (this->m_descriptiveName.isEmpty()) { this->m_descriptiveName = airport.getDescriptiveName(); }
}
QString CAirport::convertToQString(bool i18n) const

2
src/swiftguistandard/swiftguistd.cpp
View File

@@ -412,7 +412,7 @@ void SwiftGuiStd::ps_sharedFilesHeadersLoaded()
sm = CStatusMessage(this).info("Load data for '%1'?") << CEntityFlags::flagToString(newSingleEntity);
sms.push_back(sm);
}
auto lambda = [this, newEntities]()
auto lambda = [newEntities]()
{
sGui->getWebDataServices()->triggerLoadingDirectlyFromSharedFiles(newEntities, false);
};