Merge branch 'ft9_refactor' into feat-refactor

# Conflicts:
#	CMakeLists.txt
#	lib/ft4/getcandidates4.f90
#	lib/ft4/sync4d.f90
This commit is contained in:
sirhc808
2019-07-02 12:06:14 -05:00
60 changed files with 377 additions and 341 deletions
+2 -2
View File
@@ -25,7 +25,7 @@
#include <QHash>
#include <QDebug>
#include "MessageServer.hpp"
#include "Network/MessageServer.hpp"
#include "Radio.hpp"
#include "qt_helpers.hpp"
@@ -147,7 +147,7 @@ public:
: server_ {new MessageServer {this}}
{
// connect up server
connect (server_, &MessageServer::error, [this] (QString const& message) {
connect (server_, &MessageServer::error, [] (QString const& message) {
std::cerr << tr ("Network Error: %1").arg ( message).toStdString () << std::endl;
});
connect (server_, &MessageServer::client_opened, this, &Server::add_client);