X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Ftransfer.h;h=aa9da69be538dda31a4fdb6d43beb6de2de34d77;hb=92fc8c5b119111a35ab8423c3cbde5b2a022badf;hp=5091b3f1dcbc041a9fd0f9c686e1281d73bc671f;hpb=46fba5edfabcb55103cd3fdbfc5ce85c9b592dd6;p=quassel.git diff --git a/src/common/transfer.h b/src/common/transfer.h index 5091b3f1..aa9da69b 100644 --- a/src/common/transfer.h +++ b/src/common/transfer.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2015 by the Quassel Project * + * Copyright (C) 2005-2018 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -18,8 +18,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef TRANSFER_H -#define TRANSFER_H +#pragma once + +#include "common-export.h" #include #include @@ -27,19 +28,19 @@ #include "peer.h" #include "syncableobject.h" -class Transfer : public SyncableObject +class COMMON_EXPORT Transfer : public SyncableObject { Q_OBJECT SYNCABLE_OBJECT - Q_PROPERTY(QUuid uuid READ uuid); - Q_PROPERTY(Transfer::Status status READ status WRITE setStatus NOTIFY statusChanged); - Q_PROPERTY(Transfer::Direction direction READ direction WRITE setDirection NOTIFY directionChanged); - Q_PROPERTY(QHostAddress address READ address WRITE setAddress NOTIFY addressChanged); - Q_PROPERTY(quint16 port READ port WRITE setPort NOTIFY portChanged); - Q_PROPERTY(QString fileName READ fileName WRITE setFileName NOTIFY fileNameChanged); - Q_PROPERTY(quint64 fileSize READ fileSize WRITE setFileSize NOTIFY fileSizeChanged); - Q_PROPERTY(QString nick READ nick WRITE setNick NOTIFY nickChanged); + Q_PROPERTY(QUuid uuid READ uuid) + Q_PROPERTY(Transfer::Status status READ status WRITE setStatus NOTIFY statusChanged) + Q_PROPERTY(Transfer::Direction direction READ direction WRITE setDirection NOTIFY directionChanged) + Q_PROPERTY(QHostAddress address READ address WRITE setAddress NOTIFY addressChanged) + Q_PROPERTY(quint16 port READ port WRITE setPort NOTIFY portChanged) + Q_PROPERTY(QString fileName READ fileName WRITE setFileName NOTIFY fileNameChanged) + Q_PROPERTY(quint64 fileSize READ fileSize WRITE setFileSize NOTIFY fileSizeChanged) + Q_PROPERTY(QString nick READ nick WRITE setNick NOTIFY nickChanged) public: enum class Status { @@ -62,7 +63,6 @@ public: Transfer(const QUuid &uuid, QObject *parent = 0); // for creating a syncable object client-side Transfer(Direction direction, const QString &nick, const QString &fileName, const QHostAddress &address, quint16 port, quint64 size = 0, QObject *parent = 0); - inline const QMetaObject *syncMetaObject() const override { return &staticMetaObject; } QUuid uuid() const; Status status() const; @@ -137,5 +137,3 @@ QDataStream &operator<<(QDataStream &out, Transfer::Status state); QDataStream &operator>>(QDataStream &in, Transfer::Status &state); QDataStream &operator<<(QDataStream &out, Transfer::Direction direction); QDataStream &operator>>(QDataStream &in, Transfer::Direction &direction); - -#endif