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

Fixed 4 gcc warnings (2x order, 1x explicit constructor, 1x GUI / from related)

Browse Source
This commit is contained in:
Klaus Basan
2014-01-17 20:05:00 +01:00
parent 222756e7ac
commit 16dc959662
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/blackgui/mainwindow.cpp
View File

@@ -22,7 +22,7 @@ MainWindow::MainWindow(GuiModes::WindowMode windowMode, QWidget *parent) :
QMainWindow(parent, windowMode == GuiModes::WindowFrameless ? (Qt::Window | Qt::FramelessWindowHint) : Qt::Tool), QMainWindow(parent, windowMode == GuiModes::WindowFrameless ? (Qt::Window | Qt::FramelessWindowHint) : Qt::Tool),
ui(new Ui::MainWindow), ui(new Ui::MainWindow),
m_infoWindow(nullptr), 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_coreAvailable(false), m_contextNetworkAvailable(false), m_contextVoiceAvailable(false),
m_dBusConnection("dummy"), m_coreRuntime(nullptr), m_dBusConnection("dummy"), m_coreRuntime(nullptr),
m_atcListOnline(nullptr), m_atcListBooked(nullptr), m_atcListOnline(nullptr), m_atcListBooked(nullptr),

12
samples/blackgui/mainwindow.ui
View File

@@ -1538,7 +1538,7 @@ QSizeGrip {
<item> <item>
<widget class="QTabWidget" name="tb_Settings"> <widget class="QTabWidget" name="tb_Settings">
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>1</number>
</property> </property>
<widget class="QWidget" name="tb_SettingsTrafficNetwork"> <widget class="QWidget" name="tb_SettingsTrafficNetwork">
<attribute name="title"> <attribute name="title">
@@ -1736,14 +1736,14 @@ QSizeGrip {
</widget> </widget>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="lbl_SettingsAircraftType"> <widget class="QLabel" name="lbl_SettingsIcaoTypeDesignator">
<property name="text"> <property name="text">
<string>ICAO type (e.g. A320)</string> <string>ICAO type (e.g. A320)</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QLineEdit" name="lbl_SettingsAircraftType"/> <widget class="QLineEdit" name="le_SettingsIcaoTypeDesignator"/>
</item> </item>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QLabel" name="lbl_SettingsIcaoAirline"> <widget class="QLabel" name="lbl_SettingsIcaoAirline">
@@ -1756,14 +1756,14 @@ QSizeGrip {
<widget class="QLineEdit" name="le_SettingsIcaoAirline"/> <widget class="QLineEdit" name="le_SettingsIcaoAirline"/>
</item> </item>
<item row="3" column="0"> <item row="3" column="0">
<widget class="QLabel" name="lbl_SettingsPlaneType"> <widget class="QLabel" name="lbl_SettingsIcaoType">
<property name="text"> <property name="text">
<string>Plane type</string> <string>Aircraft type (e.g. L2J)</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1"> <item row="3" column="1">
<widget class="QLineEdit" name="le_SettingsPlaneType"/> <widget class="QLineEdit" name="le_SettingsIcaoType"/>
</item> </item>
<item row="4" column="0"> <item row="4" column="0">
<widget class="QLabel" name="lbl_SettingsModes"> <widget class="QLabel" name="lbl_SettingsModes">

2
src/blackcore/network_vatlib.cpp
View File

@@ -31,8 +31,8 @@ namespace BlackCore
CNetworkVatlib::CNetworkVatlib(CNetworkVatlib::LoginMode loginMode, QObject *parent) CNetworkVatlib::CNetworkVatlib(CNetworkVatlib::LoginMode loginMode, QObject *parent)
: INetwork(parent), : INetwork(parent),
m_net(Cvatlib_Network::Create()), m_net(Cvatlib_Network::Create()),
m_status(Cvatlib_Network::connStatus_Idle),
m_loginMode(loginMode), m_loginMode(loginMode),
m_status(Cvatlib_Network::connStatus_Idle),
m_fsdTextCodec(QTextCodec::codecForName("latin1")) m_fsdTextCodec(QTextCodec::codecForName("latin1"))
{ {
try try

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) * (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) : 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 // void
} }