From 6392f5a9dfce2bf83617d49bb7f332181ec6004e Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 25 May 2014 15:37:31 +0900 Subject: Revert "Finish renaming tdevelop components" This reverts commit 722ce1efbac31c61b1d4b13f7e075c9f311e3e73. --- vcs/perforce/integrator/CMakeLists.txt | 4 +- vcs/perforce/integrator/Makefile.am | 4 +- .../integrator/kdevperforceintegrator.desktop | 44 ++++++++++++++++++++++ vcs/perforce/integrator/perforceintegrator.cpp | 10 ++--- vcs/perforce/integrator/perforceintegrator.h | 4 +- vcs/perforce/integrator/pfintegratordlg.h | 2 +- .../integrator/tdevperforceintegrator.desktop | 44 ---------------------- 7 files changed, 56 insertions(+), 56 deletions(-) create mode 100644 vcs/perforce/integrator/kdevperforceintegrator.desktop delete mode 100644 vcs/perforce/integrator/tdevperforceintegrator.desktop (limited to 'vcs/perforce/integrator') diff --git a/vcs/perforce/integrator/CMakeLists.txt b/vcs/perforce/integrator/CMakeLists.txt index 95985418..e939e3ba 100644 --- a/vcs/perforce/integrator/CMakeLists.txt +++ b/vcs/perforce/integrator/CMakeLists.txt @@ -26,7 +26,7 @@ link_directories( ##### other data ################################ -install( FILES tdevperforceintegrator.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevperforceintegrator.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) ##### libperforceintegrator (module) ############ @@ -35,6 +35,6 @@ tde_add_kpart( libperforceintegrator AUTOMOC SOURCES perforceintegrator.cpp pfintegratordlgbase.ui pfintegratordlg.cpp - LINK tdevextras-shared tdevelop-shared + LINK kdevextras-shared tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/vcs/perforce/integrator/Makefile.am b/vcs/perforce/integrator/Makefile.am index e400e241..38e80bcd 100644 --- a/vcs/perforce/integrator/Makefile.am +++ b/vcs/perforce/integrator/Makefile.am @@ -5,9 +5,9 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = libperforceintegrator.la libperforceintegrator_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) libperforceintegrator_la_LIBADD =\ - $(top_builddir)/lib/interfaces/extras/libtdevextras.la\ + $(top_builddir)/lib/interfaces/extras/libkdevextras.la\ $(top_builddir)/lib/libtdevelop.la -kde_services_DATA = tdevperforceintegrator.desktop +kde_services_DATA = kdevperforceintegrator.desktop noinst_HEADERS = perforceintegrator.h pfintegratordlg.h libperforceintegrator_la_SOURCES = perforceintegrator.cpp \ pfintegratordlgbase.ui pfintegratordlg.cpp diff --git a/vcs/perforce/integrator/kdevperforceintegrator.desktop b/vcs/perforce/integrator/kdevperforceintegrator.desktop new file mode 100644 index 00000000..78ad9bf2 --- /dev/null +++ b/vcs/perforce/integrator/kdevperforceintegrator.desktop @@ -0,0 +1,44 @@ +[Desktop Entry] +Type=Service +Name=KDevPerforceIntegrator +Name[da]=TDevelop Perforce-integration +Name[nds]=TDevelop-Perforce-Integreren +Name[sk]=KDev Perforce integrácia +Name[sv]=TDevelop Perforce-integration +Name[zh_TW]=TDevelop Perforce 整合器 +Comment=Perforce Project Integration Facility +Comment[ca]=Facilitat per a la integració amb projectes Perforce +Comment[da]=Perforce projektintegration +Comment[de]=Perforce-Projektintegration +Comment[el]=Λειτουργία ενσωμάτωσης Perforce στο έργο +Comment[es]=Entorno para integración con proyectos Perforce +Comment[et]=Perforce projekti põimimisvahend +Comment[eu]=Perforce proiektuen integrazio-tresna +Comment[fa]=تسهیلات مجتمع‌سازی پروژۀ Perforce +Comment[fr]=Fonction d'intégration pour un projet utilisant Perforce +Comment[gl]=Utilidade para a integración de proxectos Perforce +Comment[hu]=Integrálás a Perforce-szal +Comment[it]=Funzione di integrazione del progetto Perforce +Comment[ja]=Perforce プロジェクト統合ツール +Comment[ms]=Kemudahan Integrasi Projek Perforce +Comment[nds]=Perforce-Projektintegreren +Comment[ne]=परफोर्स परियोजना एकिकरण सुविधा +Comment[nl]=Perforce project-integratie +Comment[pl]=Integracja z Perforce +Comment[pt]=Integração com Projectos Perforce +Comment[pt_BR]=Facilidade de Integração ao Projeto de Perforce +Comment[ru]=Интеграция Perforce +Comment[sk]=Perforce projektová integrácia +Comment[sr]=Интеграција Perforce-а у пројекат +Comment[sr@Latn]=Integracija Perforce-a u projekat +Comment[sv]=Funktion för integrering av Perforce i projekt +Comment[tr]=Perforce Proje Bütünleştirme Aracı +Comment[zh_CN]=Perforce 工程集成功能 +Comment[zh_TW]=Perforce 專案整合工具 +Exec=blubb +ServiceTypes=TDevelop/VCSIntegrator +X-TDE-Library=libperforceintegrator +X-TDevelop-Default=false +X-TDevelop-VCS=Perforce +X-TDevelop-VCSPlugin=kdevperforce +X-TDevelop-Version=5 diff --git a/vcs/perforce/integrator/perforceintegrator.cpp b/vcs/perforce/integrator/perforceintegrator.cpp index 74fdf54f..bc7c0988 100644 --- a/vcs/perforce/integrator/perforceintegrator.cpp +++ b/vcs/perforce/integrator/perforceintegrator.cpp @@ -19,19 +19,19 @@ ***************************************************************************/ #include "perforceintegrator.h" -#include -#include +#include +#include #include "pfintegratordlg.h" -static const TDevPluginInfo data("tdevperforceintegrator"); -typedef TDevGenericFactory PerforceIntegratorFactory; +static const KDevPluginInfo data("kdevperforceintegrator"); +typedef KDevGenericFactory PerforceIntegratorFactory; K_EXPORT_COMPONENT_FACTORY( libperforceintegrator, PerforceIntegratorFactory(data) ) PerforceIntegrator::PerforceIntegrator(TQObject* parent, const char* name, const TQStringList // args ) - :TDevVCSIntegrator(parent, name) + :KDevVCSIntegrator(parent, name) { } diff --git a/vcs/perforce/integrator/perforceintegrator.h b/vcs/perforce/integrator/perforceintegrator.h index c97ff82f..2b82046f 100644 --- a/vcs/perforce/integrator/perforceintegrator.h +++ b/vcs/perforce/integrator/perforceintegrator.h @@ -20,11 +20,11 @@ #ifndef PERFORCEINTEGRATOR_H #define PERFORCEINTEGRATOR_H -#include +#include #include -class PerforceIntegrator : public TDevVCSIntegrator +class PerforceIntegrator : public KDevVCSIntegrator { Q_OBJECT diff --git a/vcs/perforce/integrator/pfintegratordlg.h b/vcs/perforce/integrator/pfintegratordlg.h index 5398475b..3e7bf4de 100644 --- a/vcs/perforce/integrator/pfintegratordlg.h +++ b/vcs/perforce/integrator/pfintegratordlg.h @@ -21,7 +21,7 @@ #define PFINTEGRATORDLG_H #include "pfintegratordlgbase.h" -#include +#include class PFIntegratorDlg: public PFIntegratorDlgBase, public VCSDialog { Q_OBJECT diff --git a/vcs/perforce/integrator/tdevperforceintegrator.desktop b/vcs/perforce/integrator/tdevperforceintegrator.desktop deleted file mode 100644 index 78ad9bf2..00000000 --- a/vcs/perforce/integrator/tdevperforceintegrator.desktop +++ /dev/null @@ -1,44 +0,0 @@ -[Desktop Entry] -Type=Service -Name=KDevPerforceIntegrator -Name[da]=TDevelop Perforce-integration -Name[nds]=TDevelop-Perforce-Integreren -Name[sk]=KDev Perforce integrácia -Name[sv]=TDevelop Perforce-integration -Name[zh_TW]=TDevelop Perforce 整合器 -Comment=Perforce Project Integration Facility -Comment[ca]=Facilitat per a la integració amb projectes Perforce -Comment[da]=Perforce projektintegration -Comment[de]=Perforce-Projektintegration -Comment[el]=Λειτουργία ενσωμάτωσης Perforce στο έργο -Comment[es]=Entorno para integración con proyectos Perforce -Comment[et]=Perforce projekti põimimisvahend -Comment[eu]=Perforce proiektuen integrazio-tresna -Comment[fa]=تسهیلات مجتمع‌سازی پروژۀ Perforce -Comment[fr]=Fonction d'intégration pour un projet utilisant Perforce -Comment[gl]=Utilidade para a integración de proxectos Perforce -Comment[hu]=Integrálás a Perforce-szal -Comment[it]=Funzione di integrazione del progetto Perforce -Comment[ja]=Perforce プロジェクト統合ツール -Comment[ms]=Kemudahan Integrasi Projek Perforce -Comment[nds]=Perforce-Projektintegreren -Comment[ne]=परफोर्स परियोजना एकिकरण सुविधा -Comment[nl]=Perforce project-integratie -Comment[pl]=Integracja z Perforce -Comment[pt]=Integração com Projectos Perforce -Comment[pt_BR]=Facilidade de Integração ao Projeto de Perforce -Comment[ru]=Интеграция Perforce -Comment[sk]=Perforce projektová integrácia -Comment[sr]=Интеграција Perforce-а у пројекат -Comment[sr@Latn]=Integracija Perforce-a u projekat -Comment[sv]=Funktion för integrering av Perforce i projekt -Comment[tr]=Perforce Proje Bütünleştirme Aracı -Comment[zh_CN]=Perforce 工程集成功能 -Comment[zh_TW]=Perforce 專案整合工具 -Exec=blubb -ServiceTypes=TDevelop/VCSIntegrator -X-TDE-Library=libperforceintegrator -X-TDevelop-Default=false -X-TDevelop-VCS=Perforce -X-TDevelop-VCSPlugin=kdevperforce -X-TDevelop-Version=5 -- cgit v1.2.3