X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fnetwork.h;h=4fe30f1cfaf7e8563b0916425772f35d6b0deda8;hp=80e46863790e534ba342dc11a0be44b153475ccb;hb=80950b87640acfb2a75902f8aabf3419da094bf4;hpb=3e63cb8a6e83765069a45101b86ae9e21dcc57ad diff --git a/src/common/network.h b/src/common/network.h index 80e46863..4fe30f1c 100644 --- a/src/common/network.h +++ b/src/common/network.h @@ -20,6 +20,8 @@ #pragma once +#include "common-export.h" + #include #include #include @@ -46,7 +48,7 @@ struct NetworkInfo; // 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 @@ -141,10 +143,10 @@ public : bool operator==(const Server &other) const; bool operator!=(const Server &other) const; }; - typedef QList ServerList; + using ServerList = QList; - Network(const NetworkId &networkid, QObject *parent = 0); - ~Network(); + Network(const NetworkId &networkid, QObject *parent = nullptr); + ~Network() override; inline NetworkId networkId() const { return _networkId; } @@ -758,7 +760,7 @@ private: //! Stores all editable information about a network (as opposed to runtime state). -struct NetworkInfo +struct COMMON_EXPORT NetworkInfo { QString networkName; @@ -798,12 +800,12 @@ public: 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)