Katana_mirror/kdelibs
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kdelibs.git synced 2025-02-23 18:32:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of ssh://github.com/fluxer/kdelibs

Browse source
This commit is contained in:
Ivailo Monev 2022-05-06 11:58:45 +03:00
commit b3a715bc2b
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
kutils/kdnssd/CMakeLists.txt
View file

@ -14,7 +14,6 @@ add_library(kdnssd ${LIBRARY_TYPE} ${kdnssd_LIB_SRCS})
target_link_libraries(kdnssd PUBLIC
${KDE4_KDECORE_LIBS}
${QT_QTCORE_LIBRARY}
${QT_QTNETWORK_LIBRARY}
)
if(AVAHI_FOUND)

7
kutils/kdnssd/kdnssd.cpp
View file

@ -42,7 +42,7 @@ public:
bool unpublishService();
void startBrowse(const QByteArray &servicetype);
QList<KDNSSDService> services();
QList<KDNSSDService> services() const;
#if defined(HAVE_AVAHI)
static void clientCallback(AvahiClient *avahiclient, AvahiClientState avahistate, void *userdata);
@ -232,7 +232,7 @@ void KDNSSDPrivate::startBrowse(const QByteArray &servicetype)
#endif // HAVE_AVAHI
}
QList<KDNSSDService> KDNSSDPrivate::services()
QList<KDNSSDService> KDNSSDPrivate::services() const
{
#if defined(HAVE_AVAHI)
return m_services;
@ -258,7 +258,6 @@ void KDNSSDPrivate::clientCallback(AvahiClient *avahiclient, AvahiClientState av
if (avahistate == AVAHI_CLIENT_FAILURE) {
kWarning() << avahi_strerror(avahi_client_errno(avahiclient));
// avahi_simple_poll_quit(m_avahiclient);
}
}
@ -406,7 +405,7 @@ bool KDNSSD::unpublishService()
return d->unpublishService();
}
QList<KDNSSDService> KDNSSD::services()
QList<KDNSSDService> KDNSSD::services() const
{
return d->services();
}

2
kutils/kdnssd/kdnssd.h
View file

@ -60,7 +60,7 @@ public:
include services for all service types. This will block until all services are resolved
*/
void startBrowse(const QByteArray &servicetype = QByteArray());
QList<KDNSSDService> services();
QList<KDNSSDService> services() const;
Q_SIGNALS:
void finished();