Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Matthias Kollmann committed 2017-10-16 17:32:39 +02:00
commit d32cd85183
7 files changed
+100 -15

No files matched your search

+19 -1
View File
@@ -250,8 +250,10 @@ void QZeroConfPrivate::cleanUp(DNSServiceRef toClean)
browserSocket = NULL;
}
QMap<QString, QZeroConfService *>::iterator i;
for (i = pub->services.begin(); i != pub->services.end(); i++)
for (i = pub->services.begin(); i != pub->services.end(); i++) {
emit pub->serviceRemoved(*i);
delete *i;
}
pub->services.clear();
}
else if (toClean == dnssRef) {
@@ -318,6 +320,14 @@ void QZeroConf::stopServicePublish(void)
pri->cleanUp(pri->dnssRef);
}
bool QZeroConf::publishExists(void)
{
if (pri->dnssRef)
return true;
else
return false;
}
void QZeroConf::addServiceTxtRecord(QString nameOnly)
{
pri->txt.append((quint8) nameOnly.size());
@@ -374,3 +384,11 @@ void QZeroConf::stopBrowser(void)
{
pri->cleanUp(pri->browser);
}
bool QZeroConf::browserExists(void)
{
if (pri->browser)
return true;
else
return false;
}