6 files changed, 0 insertions, 295 deletions
diff --git a/src/net/netconnection.cpp b/src/net/netconnection.cpp
deleted file mode 100644
index 63ca706..0000000
--- a/src/net/netconnection.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "netconnection.h"
-
-NetConnection::NetConnection(QObject *parent)
-    : QObject(parent)
-{}
diff --git a/src/net/netconnection.h b/src/net/netconnection.h
deleted file mode 100644
index 0b5d6be..0000000
--- a/src/net/netconnection.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#pragma once
-
-#include "aopacket.h"
-#include "datatypes.h"
-
-#include <QObject>
-
-class NetConnection : public QObject
-{
-  Q_OBJECT
-
-public:
-  explicit NetConnection(QObject *parent = nullptr);
-
-  virtual bool isConnected() = 0;
-
-  virtual void connectToServer(ServerInfo &server) = 0;
-  virtual void disconnectFromServer() = 0;
-
-  virtual void sendPacket(AOPacket packet) = 0;
-
-Q_SIGNALS:
-  void connectedToServer();
-  void disconnectedFromServer();
-  void errorOccurred(QString error);
-
-  void receivedPacket(AOPacket packet);
-};
diff --git a/src/net/nettcpconnection.cpp b/src/net/nettcpconnection.cpp
deleted file mode 100644
index 2bc52b7..0000000
--- a/src/net/nettcpconnection.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-#include "nettcpconnection.h"
-
-NetTcpConnection::NetTcpConnection(QObject *parent)
-    : NetConnection(parent)
-    , m_socket(new QTcpSocket(this))
-    , m_last_state(QAbstractSocket::UnconnectedState)
-{
-#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
-  connect(m_socket, QOverload<QAbstractSocket::SocketError>::of(&QAbstractSocket::error), this, &NetTcpConnection::onErrorOccurred);
-#else
-  connect(m_socket, &QTcpSocket::errorOccurred, this, &NetTcpConnection::onErrorOccurred);
-#endif
-  connect(m_socket, &QTcpSocket::stateChanged, this, &NetTcpConnection::onStateChanged);
-  connect(m_socket, &QTcpSocket::readyRead, this, &NetTcpConnection::onReadyRead);
-}
-
-NetTcpConnection::~NetTcpConnection()
-{
-  m_socket->disconnect(this);
-  disconnectFromServer();
-}
-
-bool NetTcpConnection::isConnected()
-{
-  return m_last_state == QAbstractSocket::ConnectedState;
-}
-
-void NetTcpConnection::connectToServer(ServerInfo &server)
-{
-  disconnectedFromServer();
-  m_socket->connectToHost(server.ip, server.port);
-}
-
-void NetTcpConnection::disconnectFromServer()
-{
-  m_socket->abort();
-}
-
-void NetTcpConnection::sendPacket(AOPacket packet)
-{
-  if (!isConnected())
-  {
-    qWarning().noquote() << QObject::tr("Cannot send packet, not connected to server");
-    return;
-  }
-  m_socket->write(packet.toString(true).toUtf8());
-}
-
-void NetTcpConnection::onErrorOccurred()
-{
-  Q_EMIT errorOccurred(m_socket->errorString());
-}
-
-void NetTcpConnection::onStateChanged(QAbstractSocket::SocketState state)
-{
-  m_last_state = state;
-  switch (state)
-  {
-  default:
-    break;
-
-  case QAbstractSocket::ConnectedState:
-    m_cached_data.clear();
-    Q_EMIT connectedToServer();
-    break;
-
-  case QAbstractSocket::UnconnectedState:
-    Q_EMIT disconnectFromServer();
-    break;
-  }
-}
-
-void NetTcpConnection::onReadyRead()
-{
-  m_cached_data += QString::fromUtf8(m_socket->readAll());
-  if (!m_cached_data.endsWith('%'))
-  {
-    return;
-  }
-
-  QStringList raw_packet_list = m_cached_data.split('%', Qt::SkipEmptyParts);
-  m_cached_data.clear();
-  for (QString raw_packet : raw_packet_list)
-  {
-    if (!raw_packet.endsWith('#'))
-    {
-      Q_EMIT errorOccurred(QObject::tr("Malformed packet received %1").arg(raw_packet));
-      continue;
-    }
-    raw_packet.chop(1);
-
-    QStringList raw_content = raw_packet.split('#');
-
-    const QString header = raw_content.takeFirst();
-    for (QString &data : raw_content)
-    {
-      data = AOPacket::decode(data);
-    }
-
-    Q_EMIT receivedPacket(AOPacket(header, raw_content));
-  }
-}
diff --git a/src/net/nettcpconnection.h b/src/net/nettcpconnection.h
deleted file mode 100644
index 40dae19..0000000
--- a/src/net/nettcpconnection.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#pragma once
-
-#include "aopacket.h"
-#include "datatypes.h"
-#include "netconnection.h"
-
-#include <QTcpSocket>
-
-class NetTcpConnection : public NetConnection
-{
-public:
-  NetTcpConnection(QObject *parent = nullptr);
-  virtual ~NetTcpConnection();
-
-  bool isConnected() override;
-
-  void connectToServer(ServerInfo &server) override;
-  void disconnectFromServer() override;
-
-  void sendPacket(AOPacket packet) override;
-
-private:
-  QTcpSocket *m_socket;
-  QAbstractSocket::SocketState m_last_state;
-  QString m_cached_data;
-
-private Q_SLOTS:
-  void onErrorOccurred();
-  void onStateChanged(QAbstractSocket::SocketState state);
-  void onReadyRead();
-};
diff --git a/src/net/netwebsocketconnection.cpp b/src/net/netwebsocketconnection.cpp
deleted file mode 100644
index 91fc526..0000000
--- a/src/net/netwebsocketconnection.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-#include "netwebsocketconnection.h"
-
-#include "networkmanager.h"
-
-#include <QNetworkRequest>
-#include <QUrl>
-
-NetWebSocketConnection::NetWebSocketConnection(NetworkManager *networkManager)
-    : NetConnection(networkManager)
-    , m_network_manager(networkManager)
-    , m_socket(new QWebSocket(QString(), QWebSocketProtocol::VersionLatest, this))
-    , m_last_state(QAbstractSocket::UnconnectedState)
-{
-  connect(m_socket, QOverload<QAbstractSocket::SocketError>::of(&QWebSocket::error), this, &NetWebSocketConnection::onError);
-  connect(m_socket, &QWebSocket::stateChanged, this, &NetWebSocketConnection::onStateChanged);
-  connect(m_socket, &QWebSocket::textMessageReceived, this, &NetWebSocketConnection::onTextMessageReceived);
-}
-
-NetWebSocketConnection::~NetWebSocketConnection()
-{
-  m_socket->disconnect(this);
-  disconnectFromServer();
-}
-
-bool NetWebSocketConnection::isConnected()
-{
-  return m_last_state == QAbstractSocket::ConnectedState;
-}
-
-void NetWebSocketConnection::connectToServer(ServerInfo &server)
-{
-  disconnectFromServer();
-
-  QUrl url;
-  url.setScheme("ws");
-  url.setHost(server.ip);
-  url.setPort(server.port);
-
-  QNetworkRequest req(url);
-  req.setHeader(QNetworkRequest::UserAgentHeader, m_network_manager->get_user_agent());
-
-  m_socket->open(req);
-}
-
-void NetWebSocketConnection::disconnectFromServer()
-{
-  if (isConnected())
-  {
-    m_socket->close(QWebSocketProtocol::CloseCodeGoingAway);
-  }
-}
-
-void NetWebSocketConnection::sendPacket(AOPacket packet)
-{
-  m_socket->sendTextMessage(packet.toString(true));
-}
-
-void NetWebSocketConnection::onError()
-{
-  Q_EMIT errorOccurred(m_socket->errorString());
-}
-
-void NetWebSocketConnection::onStateChanged(QAbstractSocket::SocketState state)
-{
-  m_last_state = state;
-  switch (state)
-  {
-  default:
-    break;
-
-  case QAbstractSocket::ConnectedState:
-    Q_EMIT connectedToServer();
-    break;
-
-  case QAbstractSocket::UnconnectedState:
-    Q_EMIT disconnectedFromServer();
-    break;
-  }
-}
-
-void NetWebSocketConnection::onTextMessageReceived(QString message)
-{
-  if (!message.endsWith("#%"))
-  {
-    return;
-  }
-  message.chop(2);
-
-  QStringList raw_content = message.split('#');
-  const QString header = raw_content.takeFirst();
-  for (QString &data : raw_content)
-  {
-    data = AOPacket::decode(data);
-  }
-
-  Q_EMIT receivedPacket(AOPacket(header, raw_content));
-}
diff --git a/src/net/netwebsocketconnection.h b/src/net/netwebsocketconnection.h
deleted file mode 100644
index 26f41a6..0000000
--- a/src/net/netwebsocketconnection.h
+++ /dev/null
@@ -1,32 +0,0 @@
-#pragma once
-
-#include "netconnection.h"
-
-class NetworkManager;
-
-#include <QWebSocket>
-
-class NetWebSocketConnection : public NetConnection
-{
-public:
-  NetWebSocketConnection(NetworkManager *networkManager);
-  virtual ~NetWebSocketConnection();
-
-  bool isConnected() override;
-
-  void connectToServer(ServerInfo &server) override;
-  void disconnectFromServer() override;
-
-  void sendPacket(AOPacket packet) override;
-
-private:
-  NetworkManager *m_network_manager;
-
-  QWebSocket *m_socket;
-  QAbstractSocket::SocketState m_last_state;
-
-private Q_SLOTS:
-  void onError();
-  void onStateChanged(QAbstractSocket::SocketState state);
-  void onTextMessageReceived(QString message);
-};