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/subversion/integrator/CMakeLists.txt | 4 +- vcs/subversion/integrator/Makefile.am | 4 +- .../integrator/kdevsubversionintegrator.desktop | 45 ++++++++++++++++++++++ vcs/subversion/integrator/subversionintegrator.cpp | 10 ++--- vcs/subversion/integrator/subversionintegrator.h | 4 +- vcs/subversion/integrator/svnintegratordlg.cpp | 2 +- vcs/subversion/integrator/svnintegratordlg.h | 2 +- .../integrator/tdevsubversionintegrator.desktop | 45 ---------------------- 8 files changed, 58 insertions(+), 58 deletions(-) create mode 100644 vcs/subversion/integrator/kdevsubversionintegrator.desktop delete mode 100644 vcs/subversion/integrator/tdevsubversionintegrator.desktop (limited to 'vcs/subversion/integrator') diff --git a/vcs/subversion/integrator/CMakeLists.txt b/vcs/subversion/integrator/CMakeLists.txt index 3d6c7ad3..2256b8e3 100644 --- a/vcs/subversion/integrator/CMakeLists.txt +++ b/vcs/subversion/integrator/CMakeLists.txt @@ -26,7 +26,7 @@ link_directories( ##### other data ################################ -install( FILES tdevsubversionintegrator.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevsubversionintegrator.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) ##### libsubversionintegrator (module) ########## @@ -35,6 +35,6 @@ tde_add_kpart( libsubversionintegrator AUTOMOC SOURCES subversionintegrator.cpp svnintegratordlgbase.ui svnintegratordlg.cpp - LINK tdevextras-shared tdevelop-shared + LINK kdevextras-shared tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/vcs/subversion/integrator/Makefile.am b/vcs/subversion/integrator/Makefile.am index aded8465..231dc3c7 100644 --- a/vcs/subversion/integrator/Makefile.am +++ b/vcs/subversion/integrator/Makefile.am @@ -6,9 +6,9 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = libsubversionintegrator.la libsubversionintegrator_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) libsubversionintegrator_la_LIBADD =\ - $(top_builddir)/lib/interfaces/extras/libtdevextras.la\ + $(top_builddir)/lib/interfaces/extras/libkdevextras.la\ $(top_builddir)/lib/libtdevelop.la -kde_services_DATA = tdevsubversionintegrator.desktop +kde_services_DATA = kdevsubversionintegrator.desktop noinst_HEADERS = subversionintegrator.h svnintegratordlg.h libsubversionintegrator_la_SOURCES = subversionintegrator.cpp \ svnintegratordlgbase.ui svnintegratordlg.cpp diff --git a/vcs/subversion/integrator/kdevsubversionintegrator.desktop b/vcs/subversion/integrator/kdevsubversionintegrator.desktop new file mode 100644 index 00000000..6e666667 --- /dev/null +++ b/vcs/subversion/integrator/kdevsubversionintegrator.desktop @@ -0,0 +1,45 @@ +[Desktop Entry] +Type=Service +Name=KDevSubversionIntegrator +Name[da]=TDevelop Subversion-integration +Name[nds]=TDevelop-Subversion-Integreren +Name[sk]=KDev Subversion integrácia +Name[sv]=TDevelop Subversion-integration +Name[zh_TW]=TDevelop Subversion 整合器 +Comment=Subversion Project Integration Facility +Comment[ca]=Facilitat per a la integració amb Subversion +Comment[da]=Subversion projektintegration +Comment[de]=Subversion-Projektintegration +Comment[el]=Λειτουργία ενσωμάτωσης Subversion στο έργο +Comment[es]=Facilidad para integración con proyectos que utilicen Subversion +Comment[et]=Subversion projekti põimimisvahend +Comment[eu]=Subversion proiektuen integrazio-tesna +Comment[fa]=تسهیلات مجتمع‌سازی پروژۀ زیرنسخه +Comment[fr]=Fonction d'intégration pour un projet utilisant Subversion +Comment[gl]=Utilidade para a integración de proxectos Subversión +Comment[hu]=Projektintegrálást tesz lehetővé a Subversion-nel +Comment[it]=Funzione di integrazione del progetto Subversion +Comment[ja]=Subversion プロジェクト統合ツール +Comment[ms]=Kemudahan Integrasi Projek Subversion +Comment[nds]=Subversion-Projektintegreren +Comment[ne]=सबभर्सन परियोजना एकिकरण सुविधा +Comment[nl]=Subversion project-integratie +Comment[pl]=Integracja z Subversion +Comment[pt]=Integração com Projectos Subversion +Comment[pt_BR]=Facilidade de Integração ao Projeto de Subversão +Comment[ru]=Интеграция Subversion +Comment[sk]=Subversion projektová integrácia +Comment[sr]=Интеграција Subversion-а у пројекат +Comment[sr@Latn]=Integracija Subversion-a u projekat +Comment[sv]=Funktion för integrering av Subversion i projekt +Comment[tr]=Subversion Proje Bütünleştirme Aracı +Comment[zh_CN]=Subversion 工程集成功能 +Comment[zh_TW]=Subversion 專案整合工具 +Icon=misc +Exec=blubb +ServiceTypes=TDevelop/VCSIntegrator +X-TDE-Library=libsubversionintegrator +X-TDevelop-Default=false +X-TDevelop-VCS=Subversion +X-TDevelop-VCSPlugin=kdevsubversion +X-TDevelop-Version=5 diff --git a/vcs/subversion/integrator/subversionintegrator.cpp b/vcs/subversion/integrator/subversionintegrator.cpp index da8fed8c..32d28d27 100644 --- a/vcs/subversion/integrator/subversionintegrator.cpp +++ b/vcs/subversion/integrator/subversionintegrator.cpp @@ -19,19 +19,19 @@ ***************************************************************************/ #include "subversionintegrator.h" -#include -#include +#include +#include #include "svnintegratordlg.h" -static const TDevPluginInfo data("tdevsubversionintegrator"); -typedef TDevGenericFactory SubversionIntegratorFactory; +static const KDevPluginInfo data("kdevsubversionintegrator"); +typedef KDevGenericFactory SubversionIntegratorFactory; K_EXPORT_COMPONENT_FACTORY( libsubversionintegrator, SubversionIntegratorFactory(data) ) SubversionIntegrator::SubversionIntegrator(TQObject* parent, const char* name, const TQStringList // args ) - :TDevVCSIntegrator(parent, name) + :KDevVCSIntegrator(parent, name) { } diff --git a/vcs/subversion/integrator/subversionintegrator.h b/vcs/subversion/integrator/subversionintegrator.h index 6c7d16ac..01c43516 100644 --- a/vcs/subversion/integrator/subversionintegrator.h +++ b/vcs/subversion/integrator/subversionintegrator.h @@ -20,11 +20,11 @@ #ifndef SUBVERSIONINTEGRATOR_H #define SUBVERSIONINTEGRATOR_H -#include +#include #include -class SubversionIntegrator : public TDevVCSIntegrator +class SubversionIntegrator : public KDevVCSIntegrator { Q_OBJECT diff --git a/vcs/subversion/integrator/svnintegratordlg.cpp b/vcs/subversion/integrator/svnintegratordlg.cpp index 35e4216b..87ccf488 100644 --- a/vcs/subversion/integrator/svnintegratordlg.cpp +++ b/vcs/subversion/integrator/svnintegratordlg.cpp @@ -47,7 +47,7 @@ SvnIntegratorDlg::SvnIntegratorDlg( TQWidget *parent, const char *name ) void SvnIntegratorDlg::accept() { // to let ioslave know which protocol it should start. - KURL protocolUrl = KURL("tdevsvn+svn://blah/"); + KURL protocolUrl = KURL("kdevsvn+svn://blah/"); KURL servURL( repos1->url() ); if ( servURL.isEmpty() ) return; diff --git a/vcs/subversion/integrator/svnintegratordlg.h b/vcs/subversion/integrator/svnintegratordlg.h index bc8e8407..ccf1686f 100644 --- a/vcs/subversion/integrator/svnintegratordlg.h +++ b/vcs/subversion/integrator/svnintegratordlg.h @@ -21,7 +21,7 @@ #define SVNINTEGRATORDLG_H #include "svnintegratordlgbase.h" -#include +#include class SvnIntegratorDlg: public SvnIntegratorDlgBase, public VCSDialog { Q_OBJECT diff --git a/vcs/subversion/integrator/tdevsubversionintegrator.desktop b/vcs/subversion/integrator/tdevsubversionintegrator.desktop deleted file mode 100644 index 6e666667..00000000 --- a/vcs/subversion/integrator/tdevsubversionintegrator.desktop +++ /dev/null @@ -1,45 +0,0 @@ -[Desktop Entry] -Type=Service -Name=KDevSubversionIntegrator -Name[da]=TDevelop Subversion-integration -Name[nds]=TDevelop-Subversion-Integreren -Name[sk]=KDev Subversion integrácia -Name[sv]=TDevelop Subversion-integration -Name[zh_TW]=TDevelop Subversion 整合器 -Comment=Subversion Project Integration Facility -Comment[ca]=Facilitat per a la integració amb Subversion -Comment[da]=Subversion projektintegration -Comment[de]=Subversion-Projektintegration -Comment[el]=Λειτουργία ενσωμάτωσης Subversion στο έργο -Comment[es]=Facilidad para integración con proyectos que utilicen Subversion -Comment[et]=Subversion projekti põimimisvahend -Comment[eu]=Subversion proiektuen integrazio-tesna -Comment[fa]=تسهیلات مجتمع‌سازی پروژۀ زیرنسخه -Comment[fr]=Fonction d'intégration pour un projet utilisant Subversion -Comment[gl]=Utilidade para a integración de proxectos Subversión -Comment[hu]=Projektintegrálást tesz lehetővé a Subversion-nel -Comment[it]=Funzione di integrazione del progetto Subversion -Comment[ja]=Subversion プロジェクト統合ツール -Comment[ms]=Kemudahan Integrasi Projek Subversion -Comment[nds]=Subversion-Projektintegreren -Comment[ne]=सबभर्सन परियोजना एकिकरण सुविधा -Comment[nl]=Subversion project-integratie -Comment[pl]=Integracja z Subversion -Comment[pt]=Integração com Projectos Subversion -Comment[pt_BR]=Facilidade de Integração ao Projeto de Subversão -Comment[ru]=Интеграция Subversion -Comment[sk]=Subversion projektová integrácia -Comment[sr]=Интеграција Subversion-а у пројекат -Comment[sr@Latn]=Integracija Subversion-a u projekat -Comment[sv]=Funktion för integrering av Subversion i projekt -Comment[tr]=Subversion Proje Bütünleştirme Aracı -Comment[zh_CN]=Subversion 工程集成功能 -Comment[zh_TW]=Subversion 專案整合工具 -Icon=misc -Exec=blubb -ServiceTypes=TDevelop/VCSIntegrator -X-TDE-Library=libsubversionintegrator -X-TDevelop-Default=false -X-TDevelop-VCS=Subversion -X-TDevelop-VCSPlugin=kdevsubversion -X-TDevelop-Version=5 -- cgit v1.2.1