modernize: Use 'using' instead of 'typedef'

[quassel.git] / src / common / network.h

diff --git a/src/common/network.h b/src/common/network.h
index eaa427c..4fe30f1 100644 (file)
--- a/src/common/network.h
+++ b/src/common/network.h
@@ -18,8 +18,9 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef NETWORK_H
-#define NETWORK_H
+#pragma once
+
+#include "common-export.h"
 
 #include <QString>
 #include <QStringList>
@@ -47,10 +48,11 @@ 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
 {
-    SYNCABLE_OBJECT
     Q_OBJECT
+    SYNCABLE_OBJECT
+
     Q_ENUMS(ConnectionState)
 
     Q_PROPERTY(QString networkName READ networkName WRITE setNetworkName)
@@ -141,10 +143,10 @@ public :
         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; }
 
@@ -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,14 +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)
-
-#endif