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

Minor formatting/tweaks

Browse Source
This commit is contained in:
Klaus Basan
2016-12-02 02:58:40 +01:00
parent 34b2a792aa
commit add3aa5a74
5 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackcore/vatsim/networkvatlib.cpp
View File

@@ -93,7 +93,7 @@ namespace BlackCore
connect(&m_processingTimer, &QTimer::timeout, this, &CNetworkVatlib::process); connect(&m_processingTimer, &QTimer::timeout, this, &CNetworkVatlib::process);
connect(&m_positionUpdateTimer, &QTimer::timeout, this, &CNetworkVatlib::sendPositionUpdate); connect(&m_positionUpdateTimer, &QTimer::timeout, this, &CNetworkVatlib::sendPositionUpdate);
connect(&m_interimPositionUpdateTimer, &QTimer::timeout, this, &CNetworkVatlib::sendInterimPositions); connect(&m_interimPositionUpdateTimer, &QTimer::timeout, this, &CNetworkVatlib::sendInterimPositions);
connect(&this->m_scheduledConfigUpdate, &QTimer::timeout, this, &CNetworkVatlib::sendIncrementalAircraftConfig); connect(&m_scheduledConfigUpdate, &QTimer::timeout, this, &CNetworkVatlib::sendIncrementalAircraftConfig);
m_scheduledConfigUpdate.setSingleShot(true); m_scheduledConfigUpdate.setSingleShot(true);
m_processingTimer.start(c_processingIntervalMsec); m_processingTimer.start(c_processingIntervalMsec);

17
src/blackgui/components/maininfoareacomponent.ui
View File

@@ -14,7 +14,7 @@
<string>Main info area</string> <string>Main info area</string>
</property> </property>
<property name="windowIcon"> <property name="windowIcon">
<iconset resource="../../blackmisc/blackmisc.qrc"> <iconset>
<normaloff>:/own/icons/own/swift/swift24.png</normaloff>:/own/icons/own/swift/swift24.png</iconset> <normaloff>:/own/icons/own/swift/swift24.png</normaloff>:/own/icons/own/swift/swift24.png</iconset>
</property> </property>
<property name="styleSheet"> <property name="styleSheet">
@@ -612,7 +612,7 @@
<property name="lineWidth"> <property name="lineWidth">
<number>0</number> <number>0</number>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="vl_WeatherInner">
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
</property> </property>
@@ -679,15 +679,6 @@
</property> </property>
<item> <item>
<widget class="QFrame" name="fr_RenderingInner"> <widget class="QFrame" name="fr_RenderingInner">
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
<property name="lineWidth">
<number>0</number>
</property>
<layout class="QVBoxLayout" name="vl_RenderingInner"> <layout class="QVBoxLayout" name="vl_RenderingInner">
<property name="spacing"> <property name="spacing">
<number>0</number> <number>0</number>
@@ -950,8 +941,6 @@
<container>1</container> <container>1</container>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<resources> <resources/>
<include location="../../blackmisc/blackmisc.qrc"/>
</resources>
<connections/> <connections/>
</ui> </ui>

2
src/blackmisc/audio/voiceroom.cpp
View File

@@ -77,7 +77,7 @@ namespace BlackMisc
{ {
if (!this->isValid()) return "Invalid"; if (!this->isValid()) return "Invalid";
QString s = this->getVoiceRoomUrl(false); QString s = this->getVoiceRoomUrl(false);
s.append(this ->isConnected() ? " connected" : " unconnected"); s.append(this->isConnected() ? " connected" : " unconnected");
if (this->m_audioPlaying) s.append(" playing"); if (this->m_audioPlaying) s.append(" playing");
return s; return s;
} }

2
src/plugins/simulator/fsx/simulatorfsxsimconnectproc.cpp
View File

@@ -136,7 +136,7 @@ namespace BlackSimPlugin
} }
case SIMCONNECT_RECV_ID_EVENT_FRAME: case SIMCONNECT_RECV_ID_EVENT_FRAME:
{ {
SIMCONNECT_RECV_EVENT_FRAME *event = (SIMCONNECT_RECV_EVENT_FRAME *) pData; SIMCONNECT_RECV_EVENT_FRAME *event = (SIMCONNECT_RECV_EVENT_FRAME *) pData;
switch (event->uEventID) switch (event->uEventID)
{ {
case SystemEventFrame: case SystemEventFrame:

1
src/swiftdata/swiftdata.cpp
View File

@@ -70,6 +70,7 @@ void CSwiftData::closeEvent(QCloseEvent *event)
void CSwiftData::ps_appendLogMessage(const CStatusMessage &message) void CSwiftData::ps_appendLogMessage(const CStatusMessage &message)
{ {
if (!ui->comp_MainInfoArea) { return; } // not initialized yet
CLogComponent *logComponent = ui->comp_MainInfoArea->getLogComponent(); CLogComponent *logComponent = ui->comp_MainInfoArea->getLogComponent();
Q_ASSERT_X(logComponent, Q_FUNC_INFO, "missing log component"); Q_ASSERT_X(logComponent, Q_FUNC_INFO, "missing log component");
logComponent->appendStatusMessageToList(message); logComponent->appendStatusMessageToList(message);