feedc0de/QtZeroConf
1
0
Fork 0
forked from jbagg/QtZeroConf
Code Pull Requests Activity

Finnish thread safe stuff

Browse Source
This commit is contained in:
Jonathan Bagg
2018-04-15 12:33:50 -04:00
parent 339b5c83eb
commit f464b49e44
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
README.md
View File

@ -84,9 +84,9 @@ QZeroConf zeroConf;
``` ```
It is recommend, but not required, that you connect a slot to QZeroConf's error() signal. It is recommend, but not required, that you connect a slot to QZeroConf's error() signal.
3) Connect a slot to QZeroConf's serviceAdded() signal. When serviceAdded() is emitted, it passes a pointer to the QZeroConfService recently discovered. 3) Connect a slot to QZeroConf's serviceAdded() signal. When serviceAdded() is emitted, it passes the QZeroConfService recently discovered. QZeroConfServices are [shared objects](http://doc.qt.io/qt-5/implicit-sharing.html). They are safe to use between threads.
4) Optionally connect a slot to QZeroConf's serviceRemoved() signal to received status when the service is unpublished. ServiceRemoved() passes a pointer to the service being removed. **Do not make delayed connections with ServiceRemoved() signal.** 4) Optionally connect a slot to QZeroConf's serviceRemoved() signal to received status when the service is unpublished. ServiceRemoved() passes the QZeroConfService being removed.
5) Call startBrowser() with the type of the service to browse for and optionally the protocol to use. 5) Call startBrowser() with the type of the service to browse for and optionally the protocol to use.
@ -102,6 +102,10 @@ Only one browser can be in use per instance of QzeroConf.
```c++ ```c++
qDebug() << zcs->txt["Qt"]; qDebug() << zcs->txt["Qt"];
``` ```
**QML**
QZeroConf can be used in QML applications
### Build Dependencies ### Build Dependencies

6
qzeroconfservice.cpp
View File

@ -1,3 +1,4 @@
#include <QMutexLocker>
#include "qzeroconfservice.h" #include "qzeroconfservice.h"
@ -13,6 +14,7 @@ public:
quint32 interfaceIndex; quint32 interfaceIndex;
quint16 port = 0; quint16 port = 0;
QMap <QByteArray, QByteArray> txt; QMap <QByteArray, QByteArray> txt;
QMutex lock;
}; };
@ -80,21 +82,25 @@ void QZeroConfService::setHost(const QString &host)
QHostAddress QZeroConfService::ip() const QHostAddress QZeroConfService::ip() const
{ {
QMutexLocker locker(&data->lock);
return data->ip; return data->ip;
} }
void QZeroConfService::setIp(QHostAddress &ip) void QZeroConfService::setIp(QHostAddress &ip)
{ {
QMutexLocker locker(&data->lock);
data->ip = ip; data->ip = ip;
} }
QHostAddress QZeroConfService::ipv6() const QHostAddress QZeroConfService::ipv6() const
{ {
QMutexLocker locker(&data->lock);
return data->ipv6; return data->ipv6;
} }
void QZeroConfService::setIpv6(const QHostAddress &ipv6) void QZeroConfService::setIpv6(const QHostAddress &ipv6)
{ {
QMutexLocker locker(&data->lock);
data->ipv6 = ipv6; data->ipv6 = ipv6;
} }