From a011bb18e65eef236e78ab1ae0ec5b270fee26a6 Mon Sep 17 00:00:00 2001
From: Mathew Sutcliffe <oktal3700@gmail.com>
Date: Thu, 29 Aug 2013 00:02:47 +0100
Subject: [PATCH] fixed compile errors caused by inconsistencies between merged
 branches

---
 samples/cli_client/sample_cli_client.pro | 4 ++--
 src/blackcore/network_vatlib.cpp         | 5 +----
 src/blackmisc/pqbase.h                   | 2 +-
 src/blackmisc/pqphysicalquantity.h       | 2 +-
 src/blackmisc/pqunits.h                  | 2 +-
 src/blackmisc/streamable.h               | 2 +-
 6 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/samples/cli_client/sample_cli_client.pro b/samples/cli_client/sample_cli_client.pro
index e58e01d85..a5a5aaeb1 100644
--- a/samples/cli_client/sample_cli_client.pro
+++ b/samples/cli_client/sample_cli_client.pro
@@ -1,10 +1,10 @@
-QT       += core
+QT       += core dbus
 QT       -= gui
 
 TARGET = sample_cli_client
 TEMPLATE = app
 
-CONFIG   += console
+CONFIG   += console c++11
 CONFIG   -= app_bundle
 
 DEPENDPATH += . ../../src
diff --git a/src/blackcore/network_vatlib.cpp b/src/blackcore/network_vatlib.cpp
index 45714544c..ff0d09a58 100644
--- a/src/blackcore/network_vatlib.cpp
+++ b/src/blackcore/network_vatlib.cpp
@@ -300,10 +300,7 @@ namespace BlackCore
     {
         try
         {
-            CFrequency freqCopy = freq;
-            freqCopy.switchUnit(CFrequencyUnit::MHz());
-
-            m_net->ReplyToInfoQuery(Cvatlib_Network::infoQuery_Freq, toFSD(callsign), toFSD(freqCopy.unitValueToQStringRounded(6)));
+            m_net->ReplyToInfoQuery(Cvatlib_Network::infoQuery_Freq, toFSD(callsign), toFSD(QString::number(freq.value(CFrequencyUnit::MHz()), 'f', 3)));
         }
         catch (...) { exceptionDispatcher(Q_FUNC_INFO); }
     }
diff --git a/src/blackmisc/pqbase.h b/src/blackmisc/pqbase.h
index c66127013..e450f90c1 100644
--- a/src/blackmisc/pqbase.h
+++ b/src/blackmisc/pqbase.h
@@ -10,7 +10,7 @@
 #include "blackmisc/debug.h"
 #include "blackmisc/mathematics.h"
 #include <QCoreApplication>
-#include <QDBusArgument>
+#include <QtDBus/QDBusArgument>
 #include <QString>
 #include <QtGlobal>
 #include <QDebug>
diff --git a/src/blackmisc/pqphysicalquantity.h b/src/blackmisc/pqphysicalquantity.h
index ce3c80786..bd157deca 100644
--- a/src/blackmisc/pqphysicalquantity.h
+++ b/src/blackmisc/pqphysicalquantity.h
@@ -10,7 +10,7 @@
 #include "blackmisc/pqbase.h"
 #include "blackmisc/pqunits.h"
 #include "blackmisc/debug.h"
-#include <QDBusMetaType>
+#include <QtDBus/QDBusMetaType>
 #include <QtGlobal>
 #include <QString>
 #include <QLocale>
diff --git a/src/blackmisc/pqunits.h b/src/blackmisc/pqunits.h
index d94f8db96..14b7d8f66 100644
--- a/src/blackmisc/pqunits.h
+++ b/src/blackmisc/pqunits.h
@@ -7,7 +7,7 @@
 #define BLACKMISC_PQUNITS_H
 
 #include "blackmisc/pqbase.h"
-#include <QDBusArgument>
+#include <QtDBus/QDBusArgument>
 #include <QList>
 #include <QtCore/qmath.h>
 #include <QTranslator>
diff --git a/src/blackmisc/streamable.h b/src/blackmisc/streamable.h
index 76f3881d6..142bf20b5 100644
--- a/src/blackmisc/streamable.h
+++ b/src/blackmisc/streamable.h
@@ -2,7 +2,7 @@
 #define BLACKMISC_STREAMABLE_H
 
 #include "blackmisc/debug.h"
-#include <QDBusMetaType>
+#include <QtDBus/QDBusMetaType>
 #include <QString>
 #include <QtGlobal>
 #include <QDataStream>