Skip to content

Commit

Permalink
Merge pull request #29 from wuming123057/master
Browse files Browse the repository at this point in the history 
I have modified the global.h file, and the export message class
  • Loading branch information
@wuming123057
wuming123057 committed Oct 14, 2015
2 parents d88915e + 4a28dd2 commit 453c9b5
Show file tree
Hide file tree
Showing 7 changed files with 107 additions and 65 deletions.
111 changes: 75 additions & 36 deletions qmqtt_client.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,117 +36,145 @@
namespace QMQTT {

Client::Client(const QString & host, quint32 port, QObject * parent /* =0 */)
:pd_ptr(new ClientPrivate(this))
:d_ptr(new ClientPrivate(this))

{
pd_func()->init(host, port, parent);
Q_D(Client);
d->init(host, port, parent);
}

Client::~Client()
{
//?
Q_D(Client);
delete d;
}

/*----------------------------------------------------------------
* Get/Set Property
----------------------------------------------------------------*/
QString Client::host() const
{
return pd_func()->host;
Q_D(const Client);
// QString* str = d->host;
// return const_cast<QString *const>(d->host);
// return d->host;
return d->host;
}

void Client::setHost(const QString & host)
{
pd_func()->host = host;
// d->host = host;
Q_D(Client);
d->host = host;
}

quint32 Client::port() const
{
return pd_func()->port;
Q_D(const Client);
return d->port;
}

void Client::setPort(quint32 port)
{
pd_func()->port = port;
Q_D(Client);
d->port = port;
}

QString Client::clientId() const
{
return pd_func()->clientId;
Q_D(const Client);
return d->clientId;
}

void Client::setClientId(const QString &clientId)
{
pd_func()->clientId = clientId;
Q_D(Client);
d->clientId = clientId;
}

QString Client::username() const
{
return pd_func()->username;
Q_D(const Client);
return d->username;
}

void Client::setUsername(const QString & username)
{
pd_func()->username = username;
Q_D(Client);
d->username = username;
}

QString Client::password() const
{
return pd_func()->password;
Q_D(const Client);
return d->password;
}

void Client::setPassword(const QString & password)
{
pd_func()->password = password;
Q_D(Client);
d->password = password;
}

int Client::keepalive()
{
return pd_func()->keepalive;
Q_D( Client);
return d->keepalive;
}

void Client::setKeepAlive(int keepalive)
{
pd_func()->keepalive = keepalive;
Q_D(Client);
d->keepalive = keepalive;
}

bool Client::cleansess()
{
return pd_func()->cleansess;
Q_D(Client);
return d->cleansess;
}

void Client::setCleansess(bool cleansess)
{
pd_func()->cleansess = cleansess;
Q_D(Client);
d->cleansess = cleansess;
}

bool Client::autoReconnect() const
{
return pd_func()->network->autoReconnect();
Q_D(const Client);
return d->network->autoReconnect();
}

void Client::setAutoReconnect(bool value)
{
pd_func()->network->setAutoReconnect(value);
Q_D(Client);
d->network->setAutoReconnect(value);
}

Will *Client::will()
{
return pd_func()->will;
Q_D(Client);
return d->will;
}

void Client::setWill(Will *will)
{
pd_func()->will = will;
Q_D(Client);
d->will = will;
}

State Client::state() const
{
return pd_func()->state;
Q_D(const Client);
return d->state;
}

bool Client::isConnected()
{
return pd_func()->network->isConnected();
Q_D(Client);
return d->network->isConnected();
}


Expand All @@ -155,56 +183,65 @@ bool Client::isConnected()
----------------------------------------------------------------*/
void Client::connect()
{
pd_func()->sockConnect();
Q_D(Client);
d->sockConnect();
}

void Client::onConnected()
{
Q_D(Client);
qCDebug(client) << "Sock Connected....";
pd_func()->sendConnect();
pd_func()->startKeepalive();
d->sendConnect();
d->startKeepalive();
emit connected();
}

quint16 Client::publish(Message &message)
{
quint16 msgid = pd_func()->sendPublish(message);
Q_D(Client);
quint16 msgid = d->sendPublish(message);
emit published(message);
return msgid;
}

void Client::puback(quint8 type, quint16 msgid)
{
pd_func()->sendPuback(type, msgid);
Q_D(Client);
d->sendPuback(type, msgid);
emit pubacked(type, msgid);
}

quint16 Client::subscribe(const QString &topic, quint8 qos)
{
quint16 msgid = pd_func()->sendSubscribe(topic, qos);
Q_D(Client);
quint16 msgid = d->sendSubscribe(topic, qos);
emit subscribed(topic);
return msgid;
}

void Client::unsubscribe(const QString &topic)
{
pd_func()->sendUnsubscribe(topic);
Q_D(Client);
d->sendUnsubscribe(topic);
emit unsubscribed(topic);
}

void Client::ping()
{
pd_func()->sendPing();
Q_D(Client);
d->sendPing();
}

void Client::disconnect()
{
pd_func()->disconnect();
Q_D(Client);
d->disconnect();
}

void Client::onDisconnected()
{
pd_func()->stopKeepalive();
Q_D(Client);
d->stopKeepalive();
emit disconnected();
}

Expand Down Expand Up @@ -274,20 +311,22 @@ void Client::handleConnack(quint8 ack)

void Client::handlePublish(Message & message)
{
Q_D(Client);
if(message.qos() == MQTT_QOS1) {
pd_func()->sendPuback(PUBACK, message.id());
d->sendPuback(PUBACK, message.id());
} else if(message.qos() == MQTT_QOS2) {
pd_func()->sendPuback(PUBREC, message.id());
d->sendPuback(PUBREC, message.id());
}
emit received(message);
}

void Client::handlePuback(quint8 type, quint16 msgid)
{
Q_D(Client);
if(type == PUBREC) {
pd_func()->sendPuback(PUBREL, msgid);
d->sendPuback(PUBREL, msgid);
} else if (type == PUBREL) {
pd_func()->sendPuback(PUBCOMP, msgid);
d->sendPuback(PUBCOMP, msgid);
}
emit pubacked(type, msgid);
}
Expand Down
12 changes: 6 additions & 6 deletions qmqtt_client.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,8 @@ class QMQTTSHARED_EXPORT Client : public QObject
Q_PROPERTY(int keepalive READ keepalive WRITE setKeepAlive)
Q_PROPERTY(bool autoReconnect READ autoReconnect WRITE setAutoReconnect)

Q_DISABLE_COPY(Client)

P_DECLARE_PRIVATE(QMQTT::Client)

//friend class ClientPrivate;
// friend class ClientPrivate;

public:
Client(const QString &host = "localhost", quint32 port = 1883, QObject * parent = 0);
Expand Down Expand Up @@ -169,8 +166,11 @@ private slots:
void handleConnack(quint8 ack);
void handlePuback(quint8 type, quint16 msgid);

protected:
ClientPrivate * const pd_ptr;
private:
ClientPrivate *const d_ptr;

Q_DISABLE_COPY(Client)
Q_DECLARE_PRIVATE(Client)

};

Expand Down
21 changes: 11 additions & 10 deletions qmqtt_client_p.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ namespace QMQTT {

Q_LOGGING_CATEGORY(client, "qmqtt.client")

ClientPrivate::ClientPrivate(Client *q) :
ClientPrivate::ClientPrivate(Client *qt) :
host("localhost"),
port(1883),
keepalive(300),
pq_ptr(q)
q_ptr(qt)
{
gmid= 1;
}
Expand All @@ -53,19 +53,20 @@ ClientPrivate::~ClientPrivate()

void ClientPrivate::init(QObject * parent)
{
pq_func()->setParent(parent);
Q_Q(Client);
q->setParent(parent);
if(!timer) {
timer = new QTimer(pq_func());
timer = new QTimer(q);
}
QObject::connect(timer, SIGNAL(timeout()), pq_func(), SLOT(ping()));
QObject::connect(timer, SIGNAL(timeout()), q, SLOT(ping()));
if(!network){
network = new Network(pq_func());
network = new Network(q);
}
//TODO: FIXME LATER, how to handle socket error?
QObject::connect(network, SIGNAL(connected()), pq_func(), SLOT(onConnected()));
QObject::connect(network, SIGNAL(error(QAbstractSocket::SocketError)), pq_func(), SIGNAL(error(QAbstractSocket::SocketError)));
QObject::connect(network, SIGNAL(disconnected()), pq_func(), SLOT(onDisconnected()));
QObject::connect(network, SIGNAL(received(Frame &)), pq_func(), SLOT(onReceived(Frame &)));
QObject::connect(network, SIGNAL(connected()), q, SLOT(onConnected()));
QObject::connect(network, SIGNAL(error(QAbstractSocket::SocketError)), q, SIGNAL(error(QAbstractSocket::SocketError)));
QObject::connect(network, SIGNAL(disconnected()), q, SLOT(onDisconnected()));
QObject::connect(network, SIGNAL(received(Frame &)), q, SLOT(onReceived(Frame &)));
}

void ClientPrivate::init(const QString &host, int port, QObject * parent)
Expand Down
13 changes: 7 additions & 6 deletions qmqtt_client_p.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,18 +42,16 @@
#include "qmqtt_global.h"
#include "qmqtt_message.h"
#include "qmqtt_will.h"

#include "qmqtt_network.h"
namespace QMQTT {

Q_DECLARE_LOGGING_CATEGORY(client)

class ClientPrivate
{

P_DECLARE_PUBLIC(QMQTT::Client)

Q_DECLARE_PUBLIC(Client)
public:
explicit ClientPrivate(Client * q);
ClientPrivate(Client * qt);
~ClientPrivate();
void init(QObject * parent = 0);
void init(const QString & host, int port, QObject *parent = 0);
Expand All @@ -74,7 +72,7 @@ class ClientPrivate
QPointer<QMQTT::Network> network;
QPointer<QTimer> timer;

Client * const pq_ptr;


public slots:
void sockConnect();
Expand All @@ -92,6 +90,9 @@ public slots:
private:
QString randomClientId();
quint16 nextmid();
Client * const q_ptr;



};

Expand Down
Loading

0 comments on commit 453c9b5

Please sign in to comment.