diff options
Diffstat (limited to 'dnssd')
| -rw-r--r-- | dnssd/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | dnssd/Makefile.am | 10 | ||||
| -rw-r--r-- | dnssd/README | 2 | ||||
| -rw-r--r-- | dnssd/domainbrowser.cpp | 4 | ||||
| -rw-r--r-- | dnssd/kcm_tdednssd.kcfg (renamed from dnssd/kcm_kdnssd.kcfg) | 2 | ||||
| -rw-r--r-- | dnssd/remoteservice.h | 2 | ||||
| -rw-r--r-- | dnssd/servicebase.h | 4 | ||||
| -rw-r--r-- | dnssd/settings.kcfgc | 4 |
8 files changed, 17 insertions, 17 deletions
diff --git a/dnssd/CMakeLists.txt b/dnssd/CMakeLists.txt index 3df24100b..01be9831c 100644 --- a/dnssd/CMakeLists.txt +++ b/dnssd/CMakeLists.txt @@ -31,9 +31,9 @@ install( FILES DESTINATION ${INCLUDE_INSTALL_DIR}/dnssd ) -##### kdnssd #################################### +##### tdednssd #################################### -set( target kdnssd ) +set( target tdednssd ) set( ${target}_SRCS remoteservice.cpp responder.cpp servicebase.cpp @@ -45,6 +45,6 @@ tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} VERSION 1.0.0 LINK tdecore-shared - DEPENDENCIES kconfig_compiler + DEPENDENCIES tdeconfig_compiler DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/dnssd/Makefile.am b/dnssd/Makefile.am index c24bdd6ba..25e749d72 100644 --- a/dnssd/Makefile.am +++ b/dnssd/Makefile.am @@ -7,16 +7,16 @@ noinst_HEADERS = sdevent.h # let automoc handle all of the meta source files (moc) METASOURCES = AUTO -lib_LTLIBRARIES = libkdnssd.la +lib_LTLIBRARIES = libtdednssd.la -libkdnssd_la_SOURCES = remoteservice.cpp responder.cpp servicebase.cpp \ +libtdednssd_la_SOURCES = remoteservice.cpp responder.cpp servicebase.cpp \ settings.kcfgc publicservice.cpp query.cpp domainbrowser.cpp servicebrowser.cpp dnssdincludedir = $(includedir)/dnssd dnssdinclude_HEADERS = domainbrowser.h query.h remoteservice.h \ publicservice.h servicebase.h servicebrowser.h settings.h -libkdnssd_la_LIBADD = ../tdecore/libtdecore.la $(AVAHI_LIBS) $(LIB_QT) -libkdnssd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0 +libtdednssd_la_LIBADD = ../tdecore/libtdecore.la $(AVAHI_LIBS) $(LIB_QT) +libtdednssd_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0 -#kde_kcfg_DATA = kcm_kdnssd.kcfg +#kde_kcfg_DATA = kcm_tdednssd.kcfg include ../admin/Doxyfile.am diff --git a/dnssd/README b/dnssd/README index ffceb8ce9..304a7babb 100644 --- a/dnssd/README +++ b/dnssd/README @@ -1,7 +1,7 @@ Checklist to ensure that zeroconf will work: 1) Install Avahi, at least version 0.3 -2) compile kdnssd-avahi and install it to replace 'stub' libkdnssd.so provided by tdelibs +2) compile tdednssd-avahi and install it to replace 'stub' libtdednssd.so provided by tdelibs 3) check /etc/nsswitch.conf and ensure that there is 'mdns' before 'dns' in line starting with 'host:'. It should be something like: host: files mdns dns diff --git a/dnssd/domainbrowser.cpp b/dnssd/domainbrowser.cpp index 8a24f11b6..229d56f7f 100644 --- a/dnssd/domainbrowser.cpp +++ b/dnssd/domainbrowser.cpp @@ -26,7 +26,7 @@ #include "remoteservice.h" #include "query.h" #include "servicebrowser.h" -#include <kapplication.h> +#include <tdeapplication.h> #ifdef HAVE_DNSSD #ifdef AVAHI_API_0_6 #include <avahi-client/lookup.h> @@ -86,7 +86,7 @@ DomainBrowser::DomainBrowser(TQObject *parent) : TQObject(parent) d->m_domains+="local."; d->m_browseLAN=true; } - connect(KApplication::kApplication(),TQT_SIGNAL(kipcMessage(int,int)),this, + connect(TDEApplication::kApplication(),TQT_SIGNAL(kipcMessage(int,int)),this, TQT_SLOT(domainListChanged(int,int))); } diff --git a/dnssd/kcm_kdnssd.kcfg b/dnssd/kcm_tdednssd.kcfg index 207ab608c..19cefaafa 100644 --- a/dnssd/kcm_kdnssd.kcfg +++ b/dnssd/kcm_tdednssd.kcfg @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0 http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" > - <kcfgfile name="kdnssdrc" /> + <kcfgfile name="tdednssdrc" /> <group name="browsing" > <entry key="DomainList" type="StringList" > <label>Additional domains for browsing</label> diff --git a/dnssd/remoteservice.h b/dnssd/remoteservice.h index 8f529f791..485fd64d2 100644 --- a/dnssd/remoteservice.h +++ b/dnssd/remoteservice.h @@ -43,7 +43,7 @@ class KDNSSD_EXPORT RemoteService : public TQObject, public ServiceBase { Q_OBJECT public: - typedef KSharedPtr<RemoteService> Ptr; + typedef TDESharedPtr<RemoteService> Ptr; /** Creates unresolved service from given DNS label diff --git a/dnssd/servicebase.h b/dnssd/servicebase.h index debb987cf..b3a6cab9d 100644 --- a/dnssd/servicebase.h +++ b/dnssd/servicebase.h @@ -37,10 +37,10 @@ services of given type are present in given domain. @short Describes any type of service. @author Jakub Stachowski */ -class KDNSSD_EXPORT ServiceBase : public KShared +class KDNSSD_EXPORT ServiceBase : public TDEShared { public: - typedef KSharedPtr<ServiceBase> Ptr; + typedef TDESharedPtr<ServiceBase> Ptr; /** @param name Service name - empty for metaservices diff --git a/dnssd/settings.kcfgc b/dnssd/settings.kcfgc index df47ad3a5..b8454f94b 100644 --- a/dnssd/settings.kcfgc +++ b/dnssd/settings.kcfgc @@ -1,7 +1,7 @@ ClassName=Configuration -File=kcm_kdnssd.kcfg +File=kcm_tdednssd.kcfg GlobalEnums=false -Inherits=KConfigSkeleton +Inherits=TDEConfigSkeleton ItemAccessors=false MemberVariables=private Mutators=true |