flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 06:45:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed compile errors caused by inconsistencies between merged branches

Browse Source
This commit is contained in:
Mathew Sutcliffe
2013-08-29 00:02:47 +01:00
parent 20c33bf77c
commit a011bb18e6
6 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/cli_client/sample_cli_client.pro
View File

@@ -1,10 +1,10 @@
QT += core QT += core dbus
QT -= gui QT -= gui
TARGET = sample_cli_client TARGET = sample_cli_client
TEMPLATE = app TEMPLATE = app
CONFIG += console CONFIG += console c++11
CONFIG -= app_bundle CONFIG -= app_bundle
DEPENDPATH += . ../../src DEPENDPATH += . ../../src

5
src/blackcore/network_vatlib.cpp
View File

@@ -300,10 +300,7 @@ namespace BlackCore
{ {
try try
{ {
CFrequency freqCopy = freq; m_net->ReplyToInfoQuery(Cvatlib_Network::infoQuery_Freq, toFSD(callsign), toFSD(QString::number(freq.value(CFrequencyUnit::MHz()), 'f', 3)));
freqCopy.switchUnit(CFrequencyUnit::MHz());
m_net->ReplyToInfoQuery(Cvatlib_Network::infoQuery_Freq, toFSD(callsign), toFSD(freqCopy.unitValueToQStringRounded(6)));
} }
catch (...) { exceptionDispatcher(Q_FUNC_INFO); } catch (...) { exceptionDispatcher(Q_FUNC_INFO); }
} }

2
src/blackmisc/pqbase.h
View File

@@ -10,7 +10,7 @@
#include "blackmisc/debug.h" #include "blackmisc/debug.h"
#include "blackmisc/mathematics.h" #include "blackmisc/mathematics.h"
#include <QCoreApplication> #include <QCoreApplication>
#include <QDBusArgument> #include <QtDBus/QDBusArgument>
#include <QString> #include <QString>
#include <QtGlobal> #include <QtGlobal>
#include <QDebug> #include <QDebug>

2
src/blackmisc/pqphysicalquantity.h
View File

@@ -10,7 +10,7 @@
#include "blackmisc/pqbase.h" #include "blackmisc/pqbase.h"
#include "blackmisc/pqunits.h" #include "blackmisc/pqunits.h"
#include "blackmisc/debug.h" #include "blackmisc/debug.h"
#include <QDBusMetaType> #include <QtDBus/QDBusMetaType>
#include <QtGlobal> #include <QtGlobal>
#include <QString> #include <QString>
#include <QLocale> #include <QLocale>

2
src/blackmisc/pqunits.h
View File

@@ -7,7 +7,7 @@
#define BLACKMISC_PQUNITS_H #define BLACKMISC_PQUNITS_H
#include "blackmisc/pqbase.h" #include "blackmisc/pqbase.h"
#include <QDBusArgument> #include <QtDBus/QDBusArgument>
#include <QList> #include <QList>
#include <QtCore/qmath.h> #include <QtCore/qmath.h>
#include <QTranslator> #include <QTranslator>

2
src/blackmisc/streamable.h
View File

@@ -2,7 +2,7 @@
#define BLACKMISC_STREAMABLE_H #define BLACKMISC_STREAMABLE_H
#include "blackmisc/debug.h" #include "blackmisc/debug.h"
#include <QDBusMetaType> #include <QtDBus/QDBusMetaType>
#include <QString> #include <QString>
#include <QtGlobal> #include <QtGlobal>
#include <QDataStream> #include <QDataStream>