mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-26 18:55:38 +08:00
suppress/fix a few more GCC and MSVC warnings and errors
This commit is contained in:
@@ -5,7 +5,9 @@
|
|||||||
#include <QProcess>
|
#include <QProcess>
|
||||||
#ifdef Q_OS_WIN
|
#ifdef Q_OS_WIN
|
||||||
// for qdatetime, see here http://qt-project.org/forums/viewthread/22133
|
// for qdatetime, see here http://qt-project.org/forums/viewthread/22133
|
||||||
|
#ifndef NOMINMAX
|
||||||
#define NOMINMAX
|
#define NOMINMAX
|
||||||
|
#endif
|
||||||
#include <windows.h> // for Sleep
|
#include <windows.h> // for Sleep
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ Client::~Client()
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
void Client::onError(QAbstractSocket::SocketError error, QString message)
|
void Client::onError(QAbstractSocket::SocketError /* error */, QString message)
|
||||||
{
|
{
|
||||||
bAppWarning << "Socket error!";
|
bAppWarning << "Socket error!";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,8 +13,10 @@
|
|||||||
using namespace BlackMisc;
|
using namespace BlackMisc;
|
||||||
|
|
||||||
CDialogConnect::CDialogConnect(QWidget *parent) :
|
CDialogConnect::CDialogConnect(QWidget *parent) :
|
||||||
QDialog(parent), m_hasComConnection(false),
|
QDialog(parent),
|
||||||
ui(new Ui::CDialogConnect), comclient(IContext::getInstance())
|
ui(new Ui::CDialogConnect),
|
||||||
|
comclient(IContext::getInstance()),
|
||||||
|
m_hasComConnection(false)
|
||||||
{
|
{
|
||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
|
||||||
|
|||||||
@@ -7,6 +7,7 @@
|
|||||||
#define BLACKMISC_AVIOADFSYSTEM_H
|
#define BLACKMISC_AVIOADFSYSTEM_H
|
||||||
|
|
||||||
#include "blackmisc/aviomodulator.h"
|
#include "blackmisc/aviomodulator.h"
|
||||||
|
#include <stdexcept>
|
||||||
|
|
||||||
namespace BlackMisc
|
namespace BlackMisc
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -111,8 +111,8 @@ public:
|
|||||||
bool isMagneticTrack() const
|
bool isMagneticTrack() const
|
||||||
{
|
{
|
||||||
return this->m_magnetic;
|
return this->m_magnetic;
|
||||||
QT_TRANSLATE_NOOP("Aviation", "magnetic");
|
(void)QT_TRANSLATE_NOOP("Aviation", "magnetic");
|
||||||
QT_TRANSLATE_NOOP("Aviation", "true");
|
(void)QT_TRANSLATE_NOOP("Aviation", "true");
|
||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
|
|||||||
@@ -5,6 +5,7 @@
|
|||||||
|
|
||||||
#include "blackmisc/mathmatrix3x3.h"
|
#include "blackmisc/mathmatrix3x3.h"
|
||||||
#include "blackmisc/mathmatrix3x1.h"
|
#include "blackmisc/mathmatrix3x1.h"
|
||||||
|
#include <typeinfo>
|
||||||
|
|
||||||
namespace BlackMisc
|
namespace BlackMisc
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -14,6 +14,7 @@
|
|||||||
#include <QtGlobal>
|
#include <QtGlobal>
|
||||||
#include <QString>
|
#include <QString>
|
||||||
#include <QLocale>
|
#include <QLocale>
|
||||||
|
#include <typeinfo>
|
||||||
|
|
||||||
namespace BlackMisc
|
namespace BlackMisc
|
||||||
{
|
{
|
||||||
@@ -459,10 +460,10 @@ public:
|
|||||||
{
|
{
|
||||||
qRegisterMetaType<MU>(typeid(MU).name());
|
qRegisterMetaType<MU>(typeid(MU).name());
|
||||||
qDBusRegisterMetaType<MU>();
|
qDBusRegisterMetaType<MU>();
|
||||||
qDBusRegisterMetaType<QList<MU>>();
|
qDBusRegisterMetaType<QList<MU> >();
|
||||||
qRegisterMetaType<PQ>(typeid(PQ).name());
|
qRegisterMetaType<PQ>(typeid(PQ).name());
|
||||||
qDBusRegisterMetaType<PQ>();
|
qDBusRegisterMetaType<PQ>();
|
||||||
qDBusRegisterMetaType<QList<PQ>>();
|
qDBusRegisterMetaType<QList<PQ> >();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user