Rename Transfer::State to Transfer::Status

Native-speaking soures told me that Status is preferred over State
for what we want to express. So let's rename this before it's too
late.

diff --git a/src/client/clienttransfer.cpp b/src/client/clienttransfer.cpp
index 4b55e93..f42e14e 100644 (file)
--- a/src/client/clienttransfer.cpp
+++ b/src/client/clienttransfer.cpp
@@ -27,7 +27,7 @@ ClientTransfer::ClientTransfer(const QUuid &uuid, QObject *parent)
     : Transfer(uuid, parent),
     _file(0)
 {
     : Transfer(uuid, parent),
     _file(0)
 {

-    connect(this, SIGNAL(stateChanged(Transfer::State)), SLOT(onStateChanged(Transfer::State)));
+    connect(this, SIGNAL(statusChanged(Transfer::Status)), SLOT(onStatusChanged(Transfer::Status)));

 }
 
 
 }
 
 


@@ -85,14 +85,14 @@ void ClientTransfer::dataReceived(PeerPtr, const QByteArray &data)
 }
 
 
 }
 
 

-void ClientTransfer::onStateChanged(Transfer::State state)
+void ClientTransfer::onStatusChanged(Transfer::Status status)

 {
 {

-    switch(state) {
-        case State::Completed:
+    switch(status) {
+        case Status::Completed:

             if (_file)
                 _file->close();
             break;
             if (_file)
                 _file->close();
             break;

-        case State::Failed:
+        case Status::Failed:

             if (_file)
                 _file->remove();
             break;
             if (_file)
                 _file->remove();
             break;

diff --git a/src/common/transfer.cpp b/src/common/transfer.cpp
index f565a0d..68ef9b4 100644 (file)
--- a/src/common/transfer.cpp
+++ b/src/common/transfer.cpp
@@ -23,7 +23,7 @@
 INIT_SYNCABLE_OBJECT(Transfer)
 Transfer::Transfer(const QUuid &uuid, QObject *parent)
     : SyncableObject(parent),
 INIT_SYNCABLE_OBJECT(Transfer)
 Transfer::Transfer(const QUuid &uuid, QObject *parent)
     : SyncableObject(parent),

-    _state(State::New),
+    _status(Status::New),

     _direction(Direction::Receive),
     _port(0),
     _fileSize(0),
     _direction(Direction::Receive),
     _port(0),
     _fileSize(0),


@@ -34,7 +34,7 @@ Transfer::Transfer(const QUuid &uuid, QObject *parent)
 
 Transfer::Transfer(Direction direction, const QString &nick, const QString &fileName, const QHostAddress &address, quint16 port, quint64 fileSize, QObject *parent)
     : SyncableObject(parent),
 
 Transfer::Transfer(Direction direction, const QString &nick, const QString &fileName, const QHostAddress &address, quint16 port, quint64 fileSize, QObject *parent)
     : SyncableObject(parent),

-    _state(State::New),
+    _status(Status::New),

     _direction(direction),
     _fileName(fileName),
     _address(address),
     _direction(direction),
     _fileName(fileName),
     _address(address),


@@ -50,9 +50,9 @@ Transfer::Transfer(Direction direction, const QString &nick, const QString &file
 void Transfer::init()
 {
     static auto regTypes = []() -> bool {
 void Transfer::init()
 {
     static auto regTypes = []() -> bool {

-        qRegisterMetaType<State>("Transfer::State");
+        qRegisterMetaType<Status>("Transfer::Status");

         qRegisterMetaType<Direction>("Transfer::Direction");
         qRegisterMetaType<Direction>("Transfer::Direction");

-        qRegisterMetaTypeStreamOperators<State>("Transfer::State");
+        qRegisterMetaTypeStreamOperators<Status>("Transfer::Status");

         qRegisterMetaTypeStreamOperators<Direction>("Transfer::Direction");
         return true;
     }();
         qRegisterMetaTypeStreamOperators<Direction>("Transfer::Direction");
         return true;
     }();


@@ -69,18 +69,18 @@ QUuid Transfer::uuid() const
 }
 
 
 }
 
 

-Transfer::State Transfer::state() const
+Transfer::Status Transfer::status() const

 {
 {

-    return _state;
+    return _status;

 }
 
 
 }
 
 

-void Transfer::setState(Transfer::State state)
+void Transfer::setStatus(Transfer::Status status)

 {
 {

-    if (_state != state) {
-        _state = state;
-        SYNC(ARG(state));
-        emit stateChanged(state);
+    if (_status != status) {
+        _status = status;
+        SYNC(ARG(status));
+        emit statusChanged(status);

     }
 }
 
     }
 }
 


@@ -186,20 +186,20 @@ void Transfer::setError(const QString &errorString)
 {
     qWarning() << Q_FUNC_INFO << errorString;
     emit error(errorString);
 {
     qWarning() << Q_FUNC_INFO << errorString;
     emit error(errorString);

-    setState(State::Failed);
+    setStatus(Status::Failed);

     cleanUp();
 }
 
 
     cleanUp();
 }
 
 

-QDataStream &operator<<(QDataStream &out, Transfer::State state) {
+QDataStream &operator<<(QDataStream &out, Transfer::Status state) {

     out << static_cast<qint8>(state);
     return out;
 }
 
     out << static_cast<qint8>(state);
     return out;
 }
 

-QDataStream &operator>>(QDataStream &in, Transfer::State &state) {
+QDataStream &operator>>(QDataStream &in, Transfer::Status &state) {

     qint8 s;
     in >> s;
     qint8 s;
     in >> s;

-    state = static_cast<Transfer::State>(s);
+    state = static_cast<Transfer::Status>(s);

     return in;
 }
 
     return in;
 }
 

diff --git a/src/common/transfer.h b/src/common/transfer.h
index 96a5cc7..cb3efb3 100644 (file)
--- a/src/common/transfer.h
+++ b/src/common/transfer.h
@@ -33,7 +33,7 @@ class Transfer : public SyncableObject
     SYNCABLE_OBJECT
 
     Q_PROPERTY(QUuid uuid READ uuid);
     SYNCABLE_OBJECT
 
     Q_PROPERTY(QUuid uuid READ uuid);

-    Q_PROPERTY(Transfer::State state READ state WRITE setState NOTIFY stateChanged);
+    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(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);


@@ -42,7 +42,7 @@ class Transfer : public SyncableObject
     Q_PROPERTY(QString nick READ nick WRITE setNick NOTIFY nickChanged);
 
 public:
     Q_PROPERTY(QString nick READ nick WRITE setNick NOTIFY nickChanged);
 
 public:

-    enum class State {
+    enum class Status {

         New,
         Pending,
         Connecting,
         New,
         Pending,
         Connecting,


@@ -65,7 +65,7 @@ public:
     inline virtual const QMetaObject *syncMetaObject() const { return &staticMetaObject; }
 
     QUuid uuid() const;
     inline virtual const QMetaObject *syncMetaObject() const { return &staticMetaObject; }
 
     QUuid uuid() const;

-    State state() const;
+    Status status() const;

     Direction direction() const;
     QString fileName() const;
     QHostAddress address() const;
     Direction direction() const;
     QString fileName() const;
     QHostAddress address() const;


@@ -83,7 +83,7 @@ public slots:
     virtual void requestRejected(PeerPtr peer) { Q_UNUSED(peer); }
 
 signals:
     virtual void requestRejected(PeerPtr peer) { Q_UNUSED(peer); }
 
 signals:

-    void stateChanged(Transfer::State state);
+    void statusChanged (Transfer::Status state);

     void directionChanged(Transfer::Direction direction);
     void addressChanged(const QHostAddress &address);
     void portChanged(quint16 port);
     void directionChanged(Transfer::Direction direction);
     void addressChanged(const QHostAddress &address);
     void portChanged(quint16 port);


@@ -97,7 +97,7 @@ signals:
     void rejected(PeerPtr peer = 0) const;
 
 protected slots:
     void rejected(PeerPtr peer = 0) const;
 
 protected slots:

-    void setState(Transfer::State state);
+    void setStatus(Transfer::Status status);

     void setError(const QString &errorString);
 
     // called on the client side through sync calls
     void setError(const QString &errorString);
 
     // called on the client side through sync calls


@@ -116,7 +116,7 @@ private:
     void setNick(const QString &nick);
 
 
     void setNick(const QString &nick);
 
 

-    State _state;
+    Status _status;

     Direction _direction;
     QString _fileName;
     QHostAddress _address;
     Direction _direction;
     QString _fileName;
     QHostAddress _address;


@@ -126,11 +126,11 @@ private:
     QUuid _uuid;
 };
 
     QUuid _uuid;
 };
 

-Q_DECLARE_METATYPE(Transfer::State)
+Q_DECLARE_METATYPE(Transfer::Status)

 Q_DECLARE_METATYPE(Transfer::Direction)
 
 Q_DECLARE_METATYPE(Transfer::Direction)
 

-QDataStream &operator<<(QDataStream &out, Transfer::State state);
-QDataStream &operator>>(QDataStream &in, Transfer::State &state);
+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);
 
 QDataStream &operator<<(QDataStream &out, Transfer::Direction direction);
 QDataStream &operator>>(QDataStream &in, Transfer::Direction &direction);
 

diff --git a/src/core/coretransfer.cpp b/src/core/coretransfer.cpp
index 766136e..aced4c6 100644 (file)
--- a/src/core/coretransfer.cpp
+++ b/src/core/coretransfer.cpp
@@ -54,7 +54,7 @@ void CoreTransfer::cleanUp()
 
 void CoreTransfer::onSocketDisconnected()
 {
 
 void CoreTransfer::onSocketDisconnected()
 {

-    if (state() == State::Connecting || state() == State::Transferring) {
+    if (status() == Status::Connecting || status() == Status::Transferring) {

         setError(tr("Socket closed while still transferring!"));
     }
     else
         setError(tr("Socket closed while still transferring!"));
     }
     else


@@ -66,7 +66,7 @@ void CoreTransfer::onSocketError(QAbstractSocket::SocketError error)
 {
     Q_UNUSED(error)
 
 {
     Q_UNUSED(error)
 

-    if (state() == State::Connecting || state() == State::Transferring) {
+    if (status() == Status::Connecting || status() == Status::Transferring) {

         setError(tr("DCC connection error: %1").arg(_socket->errorString()));
     }
 }
         setError(tr("DCC connection error: %1").arg(_socket->errorString()));
     }
 }


@@ -74,11 +74,11 @@ void CoreTransfer::onSocketError(QAbstractSocket::SocketError error)
 
 void CoreTransfer::requestAccepted(PeerPtr peer)
 {
 
 void CoreTransfer::requestAccepted(PeerPtr peer)
 {

-    if (_peer || !peer || state() != State::New)
+    if (_peer || !peer || status() != Status::New)

         return; // transfer was already accepted
 
     _peer = peer;
         return; // transfer was already accepted
 
     _peer = peer;

-    setState(State::Pending);
+    setStatus(Status::Pending);

 
     emit accepted(peer);
 
 
     emit accepted(peer);
 


@@ -89,11 +89,11 @@ void CoreTransfer::requestAccepted(PeerPtr peer)
 
 void CoreTransfer::requestRejected(PeerPtr peer)
 {
 
 void CoreTransfer::requestRejected(PeerPtr peer)
 {

-    if (_peer || state() != State::New)
+    if (_peer || status() != Status::New)

         return;
 
     _peer = peer;
         return;
 
     _peer = peer;

-    setState(State::Rejected);
+    setStatus(Status::Rejected);

 
     emit rejected(peer);
 }
 
     emit rejected(peer);
 }


@@ -101,7 +101,7 @@ void CoreTransfer::requestRejected(PeerPtr peer)
 
 void CoreTransfer::start()
 {
 
 void CoreTransfer::start()
 {

-    if (!_peer || state() != State::Pending || direction() != Direction::Receive)
+    if (!_peer || status() != Status::Pending || direction() != Direction::Receive)

         return;
 
     setupConnectionForReceive();
         return;
 
     setupConnectionForReceive();


@@ -115,7 +115,7 @@ void CoreTransfer::setupConnectionForReceive()
         return;
     }
 
         return;
     }
 

-    setState(State::Connecting);
+    setStatus(Status::Connecting);

 
     _socket = new QTcpSocket(this);
     connect(_socket, SIGNAL(connected()), SLOT(startReceiving()));
 
     _socket = new QTcpSocket(this);
     connect(_socket, SIGNAL(connected()), SLOT(startReceiving()));


@@ -129,7 +129,7 @@ void CoreTransfer::setupConnectionForReceive()
 
 void CoreTransfer::startReceiving()
 {
 
 void CoreTransfer::startReceiving()
 {

-    setState(State::Transferring);
+    setStatus(Status::Transferring);

 }
 
 
 }
 
 


@@ -162,7 +162,7 @@ void CoreTransfer::onDataReceived()
     else if (_pos == fileSize()) {
         qDebug() << "DCC Receive: Transfer finished";
         if (relayData(QByteArray(), false)) // empty buffer
     else if (_pos == fileSize()) {
         qDebug() << "DCC Receive: Transfer finished";
         if (relayData(QByteArray(), false)) // empty buffer

-            setState(State::Completed);
+            setStatus(Status::Completed);

     }
 
     _reading = false;
     }
 
     _reading = false;