#pragma once
+#include "common-export.h"
+
#include <QString>
#include <QStringList>
#include <QList>
#include <QPointer>
#include <QMutex>
#include <QByteArray>
+#include <utility>
#include "types.h"
#include "util.h"
// TODO: ConnectionInfo to propagate and sync the current state of NetworkConnection, encodings etcpp
-class Network : public SyncableObject
+class COMMON_EXPORT Network : public SyncableObject
{
Q_OBJECT
SYNCABLE_OBJECT
Server() : port(6667), useSsl(false), sslVerify(true), sslVersion(0), useProxy(false),
proxyType(QNetworkProxy::Socks5Proxy), proxyHost("localhost"), proxyPort(8080) {}
- Server(const QString &host, uint port, const QString &password, bool useSsl,
+ Server(QString host, uint port, QString password, bool useSsl,
bool sslVerify)
- : host(host), port(port), password(password), useSsl(useSsl), sslVerify(sslVerify),
+ : host(std::move(host)), port(port), password(std::move(password)), useSsl(useSsl), sslVerify(sslVerify),
sslVersion(0), useProxy(false), proxyType(QNetworkProxy::Socks5Proxy),
proxyHost("localhost"), proxyPort(8080) {}
bool operator==(const Server &other) const;
bool operator!=(const Server &other) const;
};
- typedef QList<Server> ServerList;
+ using ServerList = QList<Server>;
- Network(const NetworkId &networkid, QObject *parent = 0);
- ~Network();
+ Network(const NetworkId &networkid, QObject *parent = nullptr);
+ ~Network() override;
inline NetworkId networkId() const { return _networkId; }
//! Stores all editable information about a network (as opposed to runtime state).
-struct NetworkInfo
+struct COMMON_EXPORT NetworkInfo
{
QString networkName;
bool operator!=(const NetworkInfo &other) const;
};
-QDataStream &operator<<(QDataStream &out, const NetworkInfo &info);
-QDataStream &operator>>(QDataStream &in, NetworkInfo &info);
-QDebug operator<<(QDebug dbg, const NetworkInfo &i);
+COMMON_EXPORT QDataStream &operator<<(QDataStream &out, const NetworkInfo &info);
+COMMON_EXPORT QDataStream &operator>>(QDataStream &in, NetworkInfo &info);
+COMMON_EXPORT QDebug operator<<(QDebug dbg, const NetworkInfo &i);
Q_DECLARE_METATYPE(NetworkInfo)
-QDataStream &operator<<(QDataStream &out, const Network::Server &server);
-QDataStream &operator>>(QDataStream &in, Network::Server &server);
-QDebug operator<<(QDebug dbg, const Network::Server &server);
+COMMON_EXPORT QDataStream &operator<<(QDataStream &out, const Network::Server &server);
+COMMON_EXPORT QDataStream &operator>>(QDataStream &in, Network::Server &server);
+COMMON_EXPORT QDebug operator<<(QDebug dbg, const Network::Server &server);
Q_DECLARE_METATYPE(Network::Server)