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

Merge branch 'master' of dev.vatsim-germany.org:vatpilotclient/client

Browse Source
This commit is contained in:
Roland Winklmeier
2014-01-17 20:14:37 +01:00
parent c384e3d12e 16dc959662
commit ba638b8e40
17 changed files with 142 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackmisc/aviomodulator.h
View File

@@ -37,7 +37,7 @@ namespace BlackMisc
* \brief Default constructor
*/
CModulator() :
CAvionicsBase("default"), m_volumeInput(0), m_volumeOutput(0), m_digits(2) {}
CAvionicsBase("default"), m_volumeInput(0), m_volumeOutput(0), m_enabled(true), m_digits(2) {}
/*!
* \brief Constructor
@@ -47,7 +47,7 @@ namespace BlackMisc
* \param digits
*/
CModulator(const QString &name, const BlackMisc::PhysicalQuantities::CFrequency &activeFrequency, const BlackMisc::PhysicalQuantities::CFrequency &standbyFrequency, int digits) :
CAvionicsBase(name), m_frequencyActive(activeFrequency), m_frequencyStandby(standbyFrequency), m_volumeInput(0), m_volumeOutput(0), m_digits(digits), m_enabled(true) {}
CAvionicsBase(name), m_frequencyActive(activeFrequency), m_frequencyStandby(standbyFrequency), m_volumeInput(0), m_volumeOutput(0), m_enabled(true), m_digits(digits) {}
/*!
* \brief String for converter

2
src/blackmisc/pqphysicalquantity.cpp
View File

@@ -25,7 +25,7 @@ namespace BlackMisc
* (The implicitly generated copy constructor would suffice, but for what seems to be a bug in MSVC2010 template instantiation)
*/
template <class MU, class PQ> CPhysicalQuantity<MU, PQ>::CPhysicalQuantity(const CPhysicalQuantity &other) :
m_value(other.m_value), m_unit(other.m_unit)
CValueObject(), m_value(other.m_value), m_unit(other.m_unit)
{
// void
}