From dc6b76cac424bdf8b3cffb4ae82f3954d8acdba5 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 26 Jan 2013 13:16:20 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- kcontrol/dnssd/CMakeLists.txt | 8 +- kcontrol/dnssd/Makefile.am | 12 +-- kcontrol/dnssd/kcm_kdnssd.desktop | 155 ------------------------------------ kcontrol/dnssd/kcm_tdednssd.desktop | 155 ++++++++++++++++++++++++++++++++++++ kcontrol/dnssd/kcmdnssd.cpp | 8 +- 5 files changed, 169 insertions(+), 169 deletions(-) delete mode 100644 kcontrol/dnssd/kcm_kdnssd.desktop create mode 100644 kcontrol/dnssd/kcm_tdednssd.desktop (limited to 'kcontrol/dnssd') 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_kdnssd.desktop deleted file mode 100644 index e62c4ce01..000000000 --- a/kcontrol/dnssd/kcm_kdnssd.desktop +++ /dev/null @@ -1,155 +0,0 @@ -[Desktop Entry] -Comment=Configure service discovery -Comment[af]=Stel dienste ontdekker op -Comment[ar]=إعداد إكتشاف الخدمات -Comment[be]=Настаўленні пошуку сервісаў -Comment[bg]=Настройване откриването на услуги -Comment[bn]=সার্ভিস উদ্ঘাটন কনফিগার করুন -Comment[bs]=Podesite otkrivanje servisa -Comment[ca]=Configura el descobriment de serveis -Comment[cs]=Nastavení hledání služeb -Comment[csb]=Kòfigùracëjô wëkrëwaniô ùsłëżnotów -Comment[da]=Indstil opdagelse af tjeneste -Comment[de]=Diensteerkennung einrichten -Comment[el]=Ρύθμιση εύρεσης υπηρεσιών -Comment[eo]=Agordu servo-seĉadon -Comment[es]=Configura el buscador de servicios -Comment[et]=Teenuste tuvastamise seadistamine -Comment[eu]=Konfiguratu igartze zerbitzua -Comment[fa]=پیکربندی کشف خدمت -Comment[fi]=Asetuspalvelimen löytäminen -Comment[fr]=Configuration de la découverte de service -Comment[fy]=Tsjinst waarnimming ynstellen -Comment[ga]=Cumraigh fionnachtain seirbhísí -Comment[gl]=Configurar o descubremento de servizos -Comment[he]=הגדרת זיהוי השירותים -Comment[hi]=सेवा डिस्कवरी कॉन्फ़िगर करें -Comment[hr]=Konfiguriranje usluge discovery -Comment[hu]=A szolgáltatásdetektálás beállításai -Comment[is]=Stilla uppgötvun þjónustna -Comment[it]=Configura scoperta servizi -Comment[ja]=サービスディスカバリの設定 -Comment[ka]=სერვისის არმოჩენის კონფიგურირება -Comment[kk]=Қызыметтерді байқауды баптау -Comment[km]=កំណត់​រចនាសម្ព័ន្ធ​ការ​រកឃើញ​សេវា -Comment[ko]=서비스 발견 설정 -Comment[lt]=Konfigūruoti tarnybų radimą -Comment[lv]=Konfigurē servisu atrašanu -Comment[mk]=Конфигурирајте го откривањето сервиси -Comment[ms]=Konfigur penemuan servis -Comment[nb]=Sett opp oppdagingstjenesten -Comment[nds]=Dat Finnen vun Deensten inrichten -Comment[ne]=पत्ता लगाउने कार्य कन्फिगर गर्नुहोस् -Comment[nl]=Dienstwaarneming instellen -Comment[nn]=Set opp oppdagingstenesta -Comment[pa]=ਸੇਵਾ ਖੋਜ ਸੰਰਚਨਾ -Comment[pl]=Konfiguracja wykrywania usług -Comment[pt]=Configurar a descoberta de serviços -Comment[pt_BR]=Configurar o serviço discovery -Comment[ro]=Configurează serviciul de descoperire -Comment[ru]=Настройка обнаружения сервисов -Comment[rw]=Kuboneza ivumbura serivisi -Comment[se]=Heivet bálvalusáicama -Comment[sk]=Nastavenie služby Discovery -Comment[sl]=Nastavi odkrivanje storitev -Comment[sr]=Подешавање откривања сервиса -Comment[sr@Latn]=Podešavanje otkrivanja servisa -Comment[sv]=Anpassa tjänstupptäckt -Comment[ta]=சர்வீஸ் டிஸ்கவரியை வடிவமை -Comment[tg]=Танзими хизмати ихтироъ -Comment[th]=ปรับแต่งการค้นพบบริการ -Comment[tr]=Hizmet araştırmasını yapılandır -Comment[tt]=Xezmätlär tabu caylawı -Comment[uk]=Налаштування знаходження служб -Comment[uz]=Tarmoqdagi xizmatlarni qidirishni moslash -Comment[uz@cyrillic]=Тармоқдаги хизматларни қидиришни мослаш -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 -GenericName= -GenericName[ko]=일반 -Icon=network_local -MimeType= -Name=Zeroconf Service Discovery -Name[af]=Dienste ontdekker -Name[ar]=إكتشاف الخدمات -Name[be]=Пошук сервісаў -Name[bg]=Откриване на услуги -Name[bn]=সার্ভিস উদ্ঘাটন -Name[bs]=Otkrivanje servisa -Name[ca]=Descobriment de serveis -Name[cs]=Hledání služeb -Name[csb]=Wëkrëwanié ùsłëżnotów -Name[da]=Opdagelse af tjenester -Name[de]=Dienste-Suche -Name[el]=Εύρεση υπηρεσιών -Name[eo]=Servo-Serĉado -Name[es]=Buscador de servicios -Name[et]=Teenuste tuvastamine -Name[eu]=Igartze zerbitzua -Name[fa]=کشف خدمت -Name[fi]=Palvelut -Name[fr]=Découverte de service -Name[fy]=Tsjinst warskôging -Name[ga]=Fionnachtain Seirbhísí -Name[gl]=Descubremento de Servizos -Name[he]=זיהוי שירותים -Name[hi]=सेवा डिस्कवरी -Name[hr]=Usluga Discovery -Name[hu]=Zeroconf-beállítások -Name[is]=Uppgötvun þjónustu -Name[it]=Scoperta servizi -Name[ja]=サービスディスカバリ -Name[ka]=სერვისის აღმოჩენა -Name[kk]=Қызметтерді байқау -Name[km]=ការ​រកឃើញ​សេវា -Name[ko]=서비스 발견 -Name[lt]=Tarnybų radimas -Name[lv]=Servisu atklāšana -Name[mk]=Откривање сервиси -Name[ms]=Penemuan Servis -Name[nb]=Oppdaging av tjenester -Name[nds]=Deensten finnen -Name[ne]=पत्ता लगाउने कार्य -Name[nl]=Dienstwaarneming -Name[nn]=Oppdaging av tenester -Name[pa]=ਸੇਵਾ ਖੋਜ -Name[pl]=Wykrywanie usług -Name[pt]=Descoberta de Serviços -Name[pt_BR]=Serviço Discovery -Name[ro]=Descoperire servicii -Name[ru]=Обнаружение служб -Name[rw]=Ivumbura rya Serivisi -Name[se]=Bálvalusáican -Name[sk]=Služba Discovery -Name[sl]=Odkrivanje storitev -Name[sr]=Откривање сервиса -Name[sr@Latn]=Otkrivanje servisa -Name[sv]=Tjänstupptäckt -Name[ta]=சர்வீஸ் டிஸ்கவரி -Name[tg]=Хизмати ихтироъ -Name[th]=การค้นพบบริการ -Name[tr]=Hizmet Araştırması -Name[tt]=Xezmätlär Tabu -Name[uk]=Знаходження служб -Name[uz]=Tarmoqdagi xizmatlarni qidirish -Name[uz@cyrillic]=Тармоқдаги хизматларни қидириш -Name[vi]=Dịch vụ Khám phá -Name[wa]=Discovraedje di siervices -Name[zh_CN]=服务探索 -Name[zh_TW]=服務偵測 -Path= -StartupNotify=true -Terminal=false -Type=Application -X-DCOP-ServiceType= -X-TDE-HasReadOnlyMode=false -X-TDE-Library=kdnssd -X-TDE-ModuleType=Library -X-TDE-ParentApp=kcontrol -#root parts unused with Avahi -#X-TDE-SubstituteUID=false -#X-TDE-RootOnly=true -Categories=Qt;TDE;X-TDE-settings-network; diff --git a/kcontrol/dnssd/kcm_tdednssd.desktop b/kcontrol/dnssd/kcm_tdednssd.desktop new file mode 100644 index 000000000..ffa16d753 --- /dev/null +++ b/kcontrol/dnssd/kcm_tdednssd.desktop @@ -0,0 +1,155 @@ +[Desktop Entry] +Comment=Configure service discovery +Comment[af]=Stel dienste ontdekker op +Comment[ar]=إعداد إكتشاف الخدمات +Comment[be]=Настаўленні пошуку сервісаў +Comment[bg]=Настройване откриването на услуги +Comment[bn]=সার্ভিস উদ্ঘাটন কনফিগার করুন +Comment[bs]=Podesite otkrivanje servisa +Comment[ca]=Configura el descobriment de serveis +Comment[cs]=Nastavení hledání služeb +Comment[csb]=Kòfigùracëjô wëkrëwaniô ùsłëżnotów +Comment[da]=Indstil opdagelse af tjeneste +Comment[de]=Diensteerkennung einrichten +Comment[el]=Ρύθμιση εύρεσης υπηρεσιών +Comment[eo]=Agordu servo-seĉadon +Comment[es]=Configura el buscador de servicios +Comment[et]=Teenuste tuvastamise seadistamine +Comment[eu]=Konfiguratu igartze zerbitzua +Comment[fa]=پیکربندی کشف خدمت +Comment[fi]=Asetuspalvelimen löytäminen +Comment[fr]=Configuration de la découverte de service +Comment[fy]=Tsjinst waarnimming ynstellen +Comment[ga]=Cumraigh fionnachtain seirbhísí +Comment[gl]=Configurar o descubremento de servizos +Comment[he]=הגדרת זיהוי השירותים +Comment[hi]=सेवा डिस्कवरी कॉन्फ़िगर करें +Comment[hr]=Konfiguriranje usluge discovery +Comment[hu]=A szolgáltatásdetektálás beállításai +Comment[is]=Stilla uppgötvun þjónustna +Comment[it]=Configura scoperta servizi +Comment[ja]=サービスディスカバリの設定 +Comment[ka]=სერვისის არმოჩენის კონფიგურირება +Comment[kk]=Қызыметтерді байқауды баптау +Comment[km]=កំណត់​រចនាសម្ព័ន្ធ​ការ​រកឃើញ​សេវា +Comment[ko]=서비스 발견 설정 +Comment[lt]=Konfigūruoti tarnybų radimą +Comment[lv]=Konfigurē servisu atrašanu +Comment[mk]=Конфигурирајте го откривањето сервиси +Comment[ms]=Konfigur penemuan servis +Comment[nb]=Sett opp oppdagingstjenesten +Comment[nds]=Dat Finnen vun Deensten inrichten +Comment[ne]=पत्ता लगाउने कार्य कन्फिगर गर्नुहोस् +Comment[nl]=Dienstwaarneming instellen +Comment[nn]=Set opp oppdagingstenesta +Comment[pa]=ਸੇਵਾ ਖੋਜ ਸੰਰਚਨਾ +Comment[pl]=Konfiguracja wykrywania usług +Comment[pt]=Configurar a descoberta de serviços +Comment[pt_BR]=Configurar o serviço discovery +Comment[ro]=Configurează serviciul de descoperire +Comment[ru]=Настройка обнаружения сервисов +Comment[rw]=Kuboneza ivumbura serivisi +Comment[se]=Heivet bálvalusáicama +Comment[sk]=Nastavenie služby Discovery +Comment[sl]=Nastavi odkrivanje storitev +Comment[sr]=Подешавање откривања сервиса +Comment[sr@Latn]=Podešavanje otkrivanja servisa +Comment[sv]=Anpassa tjänstupptäckt +Comment[ta]=சர்வீஸ் டிஸ்கவரியை வடிவமை +Comment[tg]=Танзими хизмати ихтироъ +Comment[th]=ปรับแต่งการค้นพบบริการ +Comment[tr]=Hizmet araştırmasını yapılandır +Comment[tt]=Xezmätlär tabu caylawı +Comment[uk]=Налаштування знаходження служб +Comment[uz]=Tarmoqdagi xizmatlarni qidirishni moslash +Comment[uz@cyrillic]=Тармоқдаги хизматларни қидиришни мослаш +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_tdednssd +GenericName= +GenericName[ko]=일반 +Icon=network_local +MimeType= +Name=Zeroconf Service Discovery +Name[af]=Dienste ontdekker +Name[ar]=إكتشاف الخدمات +Name[be]=Пошук сервісаў +Name[bg]=Откриване на услуги +Name[bn]=সার্ভিস উদ্ঘাটন +Name[bs]=Otkrivanje servisa +Name[ca]=Descobriment de serveis +Name[cs]=Hledání služeb +Name[csb]=Wëkrëwanié ùsłëżnotów +Name[da]=Opdagelse af tjenester +Name[de]=Dienste-Suche +Name[el]=Εύρεση υπηρεσιών +Name[eo]=Servo-Serĉado +Name[es]=Buscador de servicios +Name[et]=Teenuste tuvastamine +Name[eu]=Igartze zerbitzua +Name[fa]=کشف خدمت +Name[fi]=Palvelut +Name[fr]=Découverte de service +Name[fy]=Tsjinst warskôging +Name[ga]=Fionnachtain Seirbhísí +Name[gl]=Descubremento de Servizos +Name[he]=זיהוי שירותים +Name[hi]=सेवा डिस्कवरी +Name[hr]=Usluga Discovery +Name[hu]=Zeroconf-beállítások +Name[is]=Uppgötvun þjónustu +Name[it]=Scoperta servizi +Name[ja]=サービスディスカバリ +Name[ka]=სერვისის აღმოჩენა +Name[kk]=Қызметтерді байқау +Name[km]=ការ​រកឃើញ​សេវា +Name[ko]=서비스 발견 +Name[lt]=Tarnybų radimas +Name[lv]=Servisu atklāšana +Name[mk]=Откривање сервиси +Name[ms]=Penemuan Servis +Name[nb]=Oppdaging av tjenester +Name[nds]=Deensten finnen +Name[ne]=पत्ता लगाउने कार्य +Name[nl]=Dienstwaarneming +Name[nn]=Oppdaging av tenester +Name[pa]=ਸੇਵਾ ਖੋਜ +Name[pl]=Wykrywanie usług +Name[pt]=Descoberta de Serviços +Name[pt_BR]=Serviço Discovery +Name[ro]=Descoperire servicii +Name[ru]=Обнаружение служб +Name[rw]=Ivumbura rya Serivisi +Name[se]=Bálvalusáican +Name[sk]=Služba Discovery +Name[sl]=Odkrivanje storitev +Name[sr]=Откривање сервиса +Name[sr@Latn]=Otkrivanje servisa +Name[sv]=Tjänstupptäckt +Name[ta]=சர்வீஸ் டிஸ்கவரி +Name[tg]=Хизмати ихтироъ +Name[th]=การค้นพบบริการ +Name[tr]=Hizmet Araştırması +Name[tt]=Xezmätlär Tabu +Name[uk]=Знаходження служб +Name[uz]=Tarmoqdagi xizmatlarni qidirish +Name[uz@cyrillic]=Тармоқдаги хизматларни қидириш +Name[vi]=Dịch vụ Khám phá +Name[wa]=Discovraedje di siervices +Name[zh_CN]=服务探索 +Name[zh_TW]=服務偵測 +Path= +StartupNotify=true +Terminal=false +Type=Application +X-DCOP-ServiceType= +X-TDE-HasReadOnlyMode=false +X-TDE-Library=tdednssd +X-TDE-ModuleType=Library +X-TDE-ParentApp=kcontrol +#root parts unused with Avahi +#X-TDE-SubstituteUID=false +#X-TDE-RootOnly=true +Categories=Qt;TDE;X-TDE-settings-network; 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 #include -#include +#include #include #include #include @@ -51,12 +51,12 @@ #define MDNSD_PID "/var/run/mdnsd.pid" typedef KGenericFactory 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())); -- cgit v1.2.1