diff --git a/samples/blackgui/mainwindow.cpp b/samples/blackgui/mainwindow.cpp index 2787ee2ac..2ffcf337e 100644 --- a/samples/blackgui/mainwindow.cpp +++ b/samples/blackgui/mainwindow.cpp @@ -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), diff --git a/samples/blackgui/mainwindow.ui b/samples/blackgui/mainwindow.ui index 70751a761..464694af9 100644 --- a/samples/blackgui/mainwindow.ui +++ b/samples/blackgui/mainwindow.ui @@ -1538,7 +1538,7 @@ QSizeGrip { - 0 + 1 @@ -1736,14 +1736,14 @@ QSizeGrip { - + ICAO type (e.g. A320) - + @@ -1756,14 +1756,14 @@ QSizeGrip { - + - Plane type + Aircraft type (e.g. L2J) - + diff --git a/src/blackcore/network_vatlib.cpp b/src/blackcore/network_vatlib.cpp index ad02f9bc8..9f9940934 100644 --- a/src/blackcore/network_vatlib.cpp +++ b/src/blackcore/network_vatlib.cpp @@ -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 diff --git a/src/blackmisc/pqphysicalquantity.cpp b/src/blackmisc/pqphysicalquantity.cpp index 27fcb2769..ee91eb860 100644 --- a/src/blackmisc/pqphysicalquantity.cpp +++ b/src/blackmisc/pqphysicalquantity.cpp @@ -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 CPhysicalQuantity::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 }