Rename a number of libraries and executables to avoid conflicts with KDE4

4 files changed, 16 insertions, 16 deletions

diff --git a/kcontrol/dnssd/CMakeLists.txt b/kcontrol/dnssd/CMakeLists.txt
index bb9050274..e0036ba24 100644
--- a/kcontrol/dnssd/CMakeLists.txt
+++ b/kcontrol/dnssd/CMakeLists.txt
@@ -22,15 +22,15 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES kcm_kdnssd.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install( FILES kcm_tdednssd.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 
 
-##### kcm_kdnssd (module) #######################
+##### kcm_tdednssd (module) #######################
 
 set_source_files_properties( kcmdnssd.cpp PROPERTIES COMPILE_FLAGS -DKDE_CONFDIR=\\"${TDE_CONFIG_DIR}\\" )
 
-tde_add_kpart( kcm_kdnssd AUTOMOC
+tde_add_kpart( kcm_tdednssd AUTOMOC
   SOURCES configdialog.ui kcmdnssd.cpp
-  LINK kdnssd-shared tdeui-shared
+  LINK tdednssd-shared tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/dnssd/Makefile.am b/kcontrol/dnssd/Makefile.am
index ef6292a94..da4ffdb5d 100644
--- a/kcontrol/dnssd/Makefile.am
+++ b/kcontrol/dnssd/Makefile.am
@@ -1,12 +1,12 @@
 INCLUDES = $(all_includes)
 METASOURCES = AUTO
-kde_module_LTLIBRARIES =  kcm_kdnssd.la
-kcm_kdnssd_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
-kcm_kdnssd_la_SOURCES = configdialog.ui kcmdnssd.cpp kcmdnssd.h
+kde_module_LTLIBRARIES =  kcm_tdednssd.la
+kcm_tdednssd_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)
+kcm_tdednssd_la_SOURCES = configdialog.ui kcmdnssd.cpp kcmdnssd.h
 
-xdg_apps_DATA = kcm_kdnssd.desktop
-kcm_kdnssd_la_LIBADD = $(LIB_KDNSSD) $(LIB_TDEUI)
+xdg_apps_DATA = kcm_tdednssd.desktop
+kcm_tdednssd_la_LIBADD = $(LIB_KDNSSD) $(LIB_TDEUI)
 
 messages: rc.cpp
 	$(EXTRACTRC) *.ui *.rc >> rc.cpp
-	$(XGETTEXT) $(kcm_kdnssd_la_SOURCES) rc.cpp -o $(podir)/kcmkdnssd.pot
+	$(XGETTEXT) $(kcm_tdednssd_la_SOURCES) rc.cpp -o $(podir)/kcmtdednssd.pot
diff --git a/kcontrol/dnssd/kcm_kdnssd.desktop b/kcontrol/dnssd/kcm_tdednssd.desktop
index e62c4ce01..ffa16d753 100644
--- a/kcontrol/dnssd/kcm_kdnssd.desktop
+++ b/kcontrol/dnssd/kcm_tdednssd.desktop
@@ -67,7 +67,7 @@ Comment[vi]=Cấu hình dịch vụ khám phá
 Comment[wa]=Apontiaedjes do discovraedje do siervice
 Comment[zh_CN]=配置探索服务
 Comment[zh_TW]=設定服務偵測
-Exec=kcmshell kcm_kdnssd
+Exec=kcmshell kcm_tdednssd
 GenericName=
 GenericName[ko]=일반
 Icon=network_local
@@ -146,7 +146,7 @@ Terminal=false
 Type=Application
 X-DCOP-ServiceType=
 X-TDE-HasReadOnlyMode=false
-X-TDE-Library=kdnssd
+X-TDE-Library=tdednssd
 X-TDE-ModuleType=Library
 X-TDE-ParentApp=kcontrol
 #root parts unused with Avahi
diff --git a/kcontrol/dnssd/kcmdnssd.cpp b/kcontrol/dnssd/kcmdnssd.cpp
index 37940be95..6ef87a6c0 100644
--- a/kcontrol/dnssd/kcmdnssd.cpp
+++ b/kcontrol/dnssd/kcmdnssd.cpp
@@ -34,7 +34,7 @@
 
 #include <klocale.h>
 #include <kglobal.h>
-#include <kparts/genericfactory.h>
+#include <tdeparts/genericfactory.h>
 #include <kprocess.h>
 #include <klineedit.h>
 #include <kpassdlg.h>
@@ -51,12 +51,12 @@
 #define MDNSD_PID "/var/run/mdnsd.pid"
 
 typedef KGenericFactory<KCMDnssd, TQWidget> KCMDnssdFactory;
-K_EXPORT_COMPONENT_FACTORY( kcm_kdnssd, KCMDnssdFactory("kcmkdnssd"))
+K_EXPORT_COMPONENT_FACTORY( kcm_tdednssd, KCMDnssdFactory("kcmtdednssd"))
 
 KCMDnssd::KCMDnssd(TQWidget *parent, const char *name, const TQStringList&)
 		: ConfigDialog(parent, name), m_wdchanged(false)
 {
-	setAboutData(new TDEAboutData(I18N_NOOP("kcm_kdnssd"),
+	setAboutData(new TDEAboutData(I18N_NOOP("kcm_tdednssd"),
 	                            I18N_NOOP("ZeroConf configuration"),0,0,TDEAboutData::License_GPL,
 	                            I18N_NOOP("(C) 2004,2005 Jakub Stachowski")));
 	setQuickHelp(i18n("Setup services browsing with ZeroConf"));
@@ -65,7 +65,7 @@ KCMDnssd::KCMDnssd(TQWidget *parent, const char *name, const TQStringList&)
 		else if (getenv("TDESU_USER")!=0) tabs->removePage(tab); 
 	addConfig(DNSSD::Configuration::self(),this);
 	// it is host-wide setting so it has to be in global config file
-	domain = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/kdnssdrc" ));
+	domain = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdednssdrc" ));
 	domain->setGroup("publishing");
 	load();
 	connect(hostedit,TQT_SIGNAL(textChanged(const TQString&)),this,TQT_SLOT(wdchanged()));