mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-05-03 16:25:54 +08:00
Fixed 4 gcc warnings (2x order, 1x explicit constructor, 1x GUI / from related)
This commit is contained in:
@@ -22,7 +22,7 @@ MainWindow::MainWindow(GuiModes::WindowMode windowMode, QWidget *parent) :
|
||||
QMainWindow(parent, windowMode == GuiModes::WindowFrameless ? (Qt::Window | Qt::FramelessWindowHint) : Qt::Tool),
|
||||
ui(new Ui::MainWindow),
|
||||
m_infoWindow(nullptr),
|
||||
m_windowMode(windowMode), m_init(false), m_coreMode(GuiModes::CoreExternal),
|
||||
m_init(false), m_windowMode(windowMode), m_coreMode(GuiModes::CoreExternal),
|
||||
m_coreAvailable(false), m_contextNetworkAvailable(false), m_contextVoiceAvailable(false),
|
||||
m_dBusConnection("dummy"), m_coreRuntime(nullptr),
|
||||
m_atcListOnline(nullptr), m_atcListBooked(nullptr),
|
||||
|
||||
@@ -1538,7 +1538,7 @@ QSizeGrip {
|
||||
<item>
|
||||
<widget class="QTabWidget" name="tb_Settings">
|
||||
<property name="currentIndex">
|
||||
<number>0</number>
|
||||
<number>1</number>
|
||||
</property>
|
||||
<widget class="QWidget" name="tb_SettingsTrafficNetwork">
|
||||
<attribute name="title">
|
||||
@@ -1736,14 +1736,14 @@ QSizeGrip {
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QLabel" name="lbl_SettingsAircraftType">
|
||||
<widget class="QLabel" name="lbl_SettingsIcaoTypeDesignator">
|
||||
<property name="text">
|
||||
<string>ICAO type (e.g. A320)</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="QLineEdit" name="lbl_SettingsAircraftType"/>
|
||||
<widget class="QLineEdit" name="le_SettingsIcaoTypeDesignator"/>
|
||||
</item>
|
||||
<item row="2" column="0">
|
||||
<widget class="QLabel" name="lbl_SettingsIcaoAirline">
|
||||
@@ -1756,14 +1756,14 @@ QSizeGrip {
|
||||
<widget class="QLineEdit" name="le_SettingsIcaoAirline"/>
|
||||
</item>
|
||||
<item row="3" column="0">
|
||||
<widget class="QLabel" name="lbl_SettingsPlaneType">
|
||||
<widget class="QLabel" name="lbl_SettingsIcaoType">
|
||||
<property name="text">
|
||||
<string>Plane type</string>
|
||||
<string>Aircraft type (e.g. L2J)</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="1">
|
||||
<widget class="QLineEdit" name="le_SettingsPlaneType"/>
|
||||
<widget class="QLineEdit" name="le_SettingsIcaoType"/>
|
||||
</item>
|
||||
<item row="4" column="0">
|
||||
<widget class="QLabel" name="lbl_SettingsModes">
|
||||
|
||||
@@ -31,8 +31,8 @@ namespace BlackCore
|
||||
CNetworkVatlib::CNetworkVatlib(CNetworkVatlib::LoginMode loginMode, QObject *parent)
|
||||
: INetwork(parent),
|
||||
m_net(Cvatlib_Network::Create()),
|
||||
m_status(Cvatlib_Network::connStatus_Idle),
|
||||
m_loginMode(loginMode),
|
||||
m_status(Cvatlib_Network::connStatus_Idle),
|
||||
m_fsdTextCodec(QTextCodec::codecForName("latin1"))
|
||||
{
|
||||
try
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user