w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2026-06-18 13:48:43 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ft9_refactor' into feat-refactor

Browse Source 
# 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
parent 857afbe500 af64533363
commit 27d4471cde
60 changed files with 377 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UDPExamples/BeaconsModel.hpp
+1 -1
View File
@@ -3,7 +3,7 @@
#include <QStandardItemModel>
#include "MessageServer.hpp"
#include "Network/MessageServer.hpp"
using Frequency = MessageServer::Frequency;
UDPExamples/ClientWidget.hpp
+1 -1
View File
@@ -7,7 +7,7 @@
#include <QString>
#include <QRegularExpression>
#include "MessageServer.hpp"
#include "Network/MessageServer.hpp"
class QAbstractItemModel;
class QModelIndex;
UDPExamples/DecodesModel.hpp
+1 -1
View File
@@ -3,7 +3,7 @@
#include <QStandardItemModel>
#include "MessageServer.hpp"
#include "Network/MessageServer.hpp"
using Frequency = MessageServer::Frequency;
UDPExamples/MessageAggregatorMainWindow.hpp
+1 -1
View File
@@ -5,7 +5,7 @@
#include <QHash>
#include <QString>
#include "MessageServer.hpp"
#include "Network/MessageServer.hpp"
class QDateTime;
class QStandardItemModel;
UDPExamples/UDPDaemon.cpp
+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);