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/clearcase/integrator/CMakeLists.txt | 4 +- vcs/clearcase/integrator/Makefile.am | 4 +- vcs/clearcase/integrator/ccintegratordlg.h | 2 +- vcs/clearcase/integrator/clearcaseintegrator.cpp | 10 ++--- vcs/clearcase/integrator/clearcaseintegrator.h | 4 +- .../integrator/kdevclearcaseintegrator.desktop | 44 ++++++++++++++++++++++ .../integrator/tdevclearcaseintegrator.desktop | 44 ---------------------- 7 files changed, 56 insertions(+), 56 deletions(-) create mode 100644 vcs/clearcase/integrator/kdevclearcaseintegrator.desktop delete mode 100644 vcs/clearcase/integrator/tdevclearcaseintegrator.desktop (limited to 'vcs/clearcase/integrator') diff --git a/vcs/clearcase/integrator/CMakeLists.txt b/vcs/clearcase/integrator/CMakeLists.txt index bd527272..ccc3348f 100644 --- a/vcs/clearcase/integrator/CMakeLists.txt +++ b/vcs/clearcase/integrator/CMakeLists.txt @@ -26,7 +26,7 @@ link_directories( ##### other data ################################ -install( FILES tdevclearcaseintegrator.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevclearcaseintegrator.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) ##### libclearcaseintegrator (module) ########### @@ -35,6 +35,6 @@ tde_add_kpart( libclearcaseintegrator AUTOMOC SOURCES clearcaseintegrator.cpp ccintegratordlgbase.ui ccintegratordlg.cpp - LINK tdevextras-shared tdevelop-shared + LINK kdevextras-shared tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/vcs/clearcase/integrator/Makefile.am b/vcs/clearcase/integrator/Makefile.am index 98e39465..a9d50a98 100644 --- a/vcs/clearcase/integrator/Makefile.am +++ b/vcs/clearcase/integrator/Makefile.am @@ -5,9 +5,9 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = libclearcaseintegrator.la libclearcaseintegrator_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) libclearcaseintegrator_la_LIBADD =\ - $(top_builddir)/lib/interfaces/extras/libtdevextras.la\ + $(top_builddir)/lib/interfaces/extras/libkdevextras.la\ $(top_builddir)/lib/libtdevelop.la -kde_services_DATA = tdevclearcaseintegrator.desktop +kde_services_DATA = kdevclearcaseintegrator.desktop noinst_HEADERS = clearcaseintegrator.h ccintegratordlg.h libclearcaseintegrator_la_SOURCES = clearcaseintegrator.cpp \ ccintegratordlgbase.ui ccintegratordlg.cpp diff --git a/vcs/clearcase/integrator/ccintegratordlg.h b/vcs/clearcase/integrator/ccintegratordlg.h index 2eb1e2e3..f427b2b3 100644 --- a/vcs/clearcase/integrator/ccintegratordlg.h +++ b/vcs/clearcase/integrator/ccintegratordlg.h @@ -21,7 +21,7 @@ #define CCINTEGRATORDLG_H #include "ccintegratordlgbase.h" -#include +#include class CCIntegratorDlg: public CCIntegratorDlgBase, public VCSDialog { Q_OBJECT diff --git a/vcs/clearcase/integrator/clearcaseintegrator.cpp b/vcs/clearcase/integrator/clearcaseintegrator.cpp index f00783b4..4e8c1a0b 100644 --- a/vcs/clearcase/integrator/clearcaseintegrator.cpp +++ b/vcs/clearcase/integrator/clearcaseintegrator.cpp @@ -19,19 +19,19 @@ ***************************************************************************/ #include "clearcaseintegrator.h" -#include -#include +#include +#include #include "ccintegratordlg.h" -static const TDevPluginInfo data("tdevclearcaseintegrator"); -typedef TDevGenericFactory ClearcaseIntegratorFactory; +static const KDevPluginInfo data("kdevclearcaseintegrator"); +typedef KDevGenericFactory ClearcaseIntegratorFactory; K_EXPORT_COMPONENT_FACTORY( libclearcaseintegrator, ClearcaseIntegratorFactory(data) ) ClearcaseIntegrator::ClearcaseIntegrator(TQObject* parent, const char* name, const TQStringList // args ) - :TDevVCSIntegrator(parent, name) + :KDevVCSIntegrator(parent, name) { } diff --git a/vcs/clearcase/integrator/clearcaseintegrator.h b/vcs/clearcase/integrator/clearcaseintegrator.h index 4e431da6..3859c1f9 100644 --- a/vcs/clearcase/integrator/clearcaseintegrator.h +++ b/vcs/clearcase/integrator/clearcaseintegrator.h @@ -20,11 +20,11 @@ #ifndef CLEARCASEINTEGRATOR_H #define CLEARCASEINTEGRATOR_H -#include +#include #include -class ClearcaseIntegrator : public TDevVCSIntegrator +class ClearcaseIntegrator : public KDevVCSIntegrator { Q_OBJECT diff --git a/vcs/clearcase/integrator/kdevclearcaseintegrator.desktop b/vcs/clearcase/integrator/kdevclearcaseintegrator.desktop new file mode 100644 index 00000000..4bc49cfc --- /dev/null +++ b/vcs/clearcase/integrator/kdevclearcaseintegrator.desktop @@ -0,0 +1,44 @@ +[Desktop Entry] +Type=Service +Name=KDevClearcaseIntegrator +Name[da]=TDevelop Clearcase-integration +Name[nds]=TDevelop-Clearcase-Integreren +Name[sk]=KDev ClearCase integrácia +Name[sv]=TDevelop Clearcase-integration +Name[zh_TW]=TDevelop Clearcase 整合器 +Comment=Clearcase Project Integration Facility +Comment[ca]=Faciliat per a la integració amb projectes Clearcase +Comment[da]=Clearcase projektintegration +Comment[de]=Clearcase-Integration +Comment[el]=Λειτουργία ενσωμάτωσης Clearcase στο έργο +Comment[es]=Facilidad para integración con proyectos Clearcase +Comment[et]=Clearcase projekti põimimisvahend +Comment[eu]=Clearcase proiektu-integraziorako tresna +Comment[fa]=تسهیلات مجتمع‌سازی پروژۀ Clearcase +Comment[fr]=Fonction d'intégration pour un projet utilisant Clearcase +Comment[gl]=Utilidade para a integración de proxectos ClearCase +Comment[hu]=Integrálás Clearcase-projektekkel +Comment[it]=Funzione di integrazione del progetto ClearCase +Comment[ja]=Clearcase プロジェクト統合ツール +Comment[ms]=Kemudahan Integrasi Projek Clearcase +Comment[nds]=Projektintegreren för Clearcase +Comment[ne]=क्लेयरकेस परियोजना एकिकरण सुविधा +Comment[nl]=Clearcase-projectintegratie +Comment[pl]=Integracja z Clearcase +Comment[pt]=Integração com Projectos Clearcase +Comment[pt_BR]=Facilidade de Integração ao Projeto de Clearcase +Comment[ru]=Интеграция Clearcase +Comment[sk]=Integrácia ClearCase projektu +Comment[sr]=Интеграција Clearcase-а у пројекат +Comment[sr@Latn]=Integracija Clearcase-a u projekat +Comment[sv]=Funktion för integrering av Clearcase i projekt +Comment[tr]=Clearcase Proje Bütünleştirilmesi Aracı +Comment[zh_CN]=Clearcase 工程集成功能 +Comment[zh_TW]=Clearcase 專案整合工具 +Exec=blubb +ServiceTypes=TDevelop/VCSIntegrator +X-TDE-Library=libclearcaseintegrator +X-TDevelop-Default=false +X-TDevelop-VCS=ClearCase +X-TDevelop-VCSPlugin=kdevclearcase +X-TDevelop-Version=5 diff --git a/vcs/clearcase/integrator/tdevclearcaseintegrator.desktop b/vcs/clearcase/integrator/tdevclearcaseintegrator.desktop deleted file mode 100644 index 4bc49cfc..00000000 --- a/vcs/clearcase/integrator/tdevclearcaseintegrator.desktop +++ /dev/null @@ -1,44 +0,0 @@ -[Desktop Entry] -Type=Service -Name=KDevClearcaseIntegrator -Name[da]=TDevelop Clearcase-integration -Name[nds]=TDevelop-Clearcase-Integreren -Name[sk]=KDev ClearCase integrácia -Name[sv]=TDevelop Clearcase-integration -Name[zh_TW]=TDevelop Clearcase 整合器 -Comment=Clearcase Project Integration Facility -Comment[ca]=Faciliat per a la integració amb projectes Clearcase -Comment[da]=Clearcase projektintegration -Comment[de]=Clearcase-Integration -Comment[el]=Λειτουργία ενσωμάτωσης Clearcase στο έργο -Comment[es]=Facilidad para integración con proyectos Clearcase -Comment[et]=Clearcase projekti põimimisvahend -Comment[eu]=Clearcase proiektu-integraziorako tresna -Comment[fa]=تسهیلات مجتمع‌سازی پروژۀ Clearcase -Comment[fr]=Fonction d'intégration pour un projet utilisant Clearcase -Comment[gl]=Utilidade para a integración de proxectos ClearCase -Comment[hu]=Integrálás Clearcase-projektekkel -Comment[it]=Funzione di integrazione del progetto ClearCase -Comment[ja]=Clearcase プロジェクト統合ツール -Comment[ms]=Kemudahan Integrasi Projek Clearcase -Comment[nds]=Projektintegreren för Clearcase -Comment[ne]=क्लेयरकेस परियोजना एकिकरण सुविधा -Comment[nl]=Clearcase-projectintegratie -Comment[pl]=Integracja z Clearcase -Comment[pt]=Integração com Projectos Clearcase -Comment[pt_BR]=Facilidade de Integração ao Projeto de Clearcase -Comment[ru]=Интеграция Clearcase -Comment[sk]=Integrácia ClearCase projektu -Comment[sr]=Интеграција Clearcase-а у пројекат -Comment[sr@Latn]=Integracija Clearcase-a u projekat -Comment[sv]=Funktion för integrering av Clearcase i projekt -Comment[tr]=Clearcase Proje Bütünleştirilmesi Aracı -Comment[zh_CN]=Clearcase 工程集成功能 -Comment[zh_TW]=Clearcase 專案整合工具 -Exec=blubb -ServiceTypes=TDevelop/VCSIntegrator -X-TDE-Library=libclearcaseintegrator -X-TDevelop-Default=false -X-TDevelop-VCS=ClearCase -X-TDevelop-VCSPlugin=kdevclearcase -X-TDevelop-Version=5 -- cgit v1.2.1