Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Matthias Kollmann
2017-10-16 17:32:39 +02:00
7 changed files with 100 additions and 15 deletions

View File

@@ -208,8 +208,10 @@ public:
browser = 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();
QMap<QString, AvahiServiceResolver *>::iterator r;
@@ -269,6 +271,14 @@ void QZeroConf::stopServicePublish(void)
}
}
bool QZeroConf::publishExists(void)
{
if (pri->group)
return true;
else
return false;
}
// http://www.zeroconf.org/rendezvous/txtrecords.html
void QZeroConf::addServiceTxtRecord(QString nameOnly)
@@ -312,3 +322,11 @@ void QZeroConf::stopBrowser(void)
{
pri->broswerCleanUp();
}
bool QZeroConf::browserExists(void)
{
if (pri->browser)
return true;
else
return false;
}