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. --- buildtools/ant/CMakeLists.txt | 10 ++-- buildtools/ant/Makefile.am | 16 +++--- buildtools/ant/antprojectpart.cpp | 20 ++++---- buildtools/ant/antprojectpart.h | 4 +- buildtools/ant/kdevantproject.desktop | 96 +++++++++++++++++++++++++++++++++++ buildtools/ant/kdevantproject.rc | 14 +++++ buildtools/ant/tdevantproject.desktop | 96 ----------------------------------- buildtools/ant/tdevantproject.rc | 14 ----- 8 files changed, 135 insertions(+), 135 deletions(-) create mode 100644 buildtools/ant/kdevantproject.desktop create mode 100644 buildtools/ant/kdevantproject.rc delete mode 100644 buildtools/ant/tdevantproject.desktop delete mode 100644 buildtools/ant/tdevantproject.rc (limited to 'buildtools/ant') diff --git a/buildtools/ant/CMakeLists.txt b/buildtools/ant/CMakeLists.txt index 48858d7f..1b7cfd98 100644 --- a/buildtools/ant/CMakeLists.txt +++ b/buildtools/ant/CMakeLists.txt @@ -26,15 +26,15 @@ link_directories( ##### other data ################################ -install( FILES tdevantproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevantproject.rc DESTINATION ${DATA_INSTALL_DIR}/tdevantproject ) +install( FILES kdevantproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevantproject.rc DESTINATION ${DATA_INSTALL_DIR}/kdevantproject ) -##### libtdevantproject (module) ################ +##### libkdevantproject (module) ################ -tde_add_kpart( libtdevantproject AUTOMOC +tde_add_kpart( libkdevantproject AUTOMOC SOURCES antprojectpart.cpp antoptionswidget.ui classpathwidget.ui - LINK tdevbuildbase-shared + LINK kdevbuildbase-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/buildtools/ant/Makefile.am b/buildtools/ant/Makefile.am index 6f3e23e6..30f314b8 100644 --- a/buildtools/ant/Makefile.am +++ b/buildtools/ant/Makefile.am @@ -5,17 +5,17 @@ INCLUDES = -I$(top_srcdir)/buildtools/lib/base \ -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util -I$(top_builddir)/buildtools/lib/widgets \ $(all_includes) -kde_module_LTLIBRARIES = libtdevantproject.la -libtdevantproject_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevantproject_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ - $(top_builddir)/buildtools/lib/widgets/libtdevbuildtoolswidgets.la $(top_builddir)/buildtools/lib/base/libtdevbuildbase.la +kde_module_LTLIBRARIES = libkdevantproject.la +libkdevantproject_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevantproject_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ + $(top_builddir)/buildtools/lib/widgets/libkdevbuildtoolswidgets.la $(top_builddir)/buildtools/lib/base/libkdevbuildbase.la -libtdevantproject_la_SOURCES = antprojectpart.cpp antoptionswidget.ui classpathwidget.ui +libkdevantproject_la_SOURCES = antprojectpart.cpp antoptionswidget.ui classpathwidget.ui METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevantproject.desktop +service_DATA = kdevantproject.desktop -rcdir = $(kde_datadir)/tdevantproject -rc_DATA = tdevantproject.rc +rcdir = $(kde_datadir)/kdevantproject +rc_DATA = kdevantproject.rc diff --git a/buildtools/ant/antprojectpart.cpp b/buildtools/ant/antprojectpart.cpp index fcbdd630..902055ec 100644 --- a/buildtools/ant/antprojectpart.cpp +++ b/buildtools/ant/antprojectpart.cpp @@ -11,7 +11,7 @@ #include -#include +#include #include #include #include @@ -21,10 +21,10 @@ #include #include -#include +#include -#include -#include +#include +#include #include @@ -34,9 +34,9 @@ -typedef TDevGenericFactory AntProjectFactory; -static const TDevPluginInfo data("tdevantproject"); -K_EXPORT_COMPONENT_FACTORY(libtdevantproject, AntProjectFactory( data )) +typedef KDevGenericFactory AntProjectFactory; +static const KDevPluginInfo data("kdevantproject"); +K_EXPORT_COMPONENT_FACTORY(libkdevantproject, AntProjectFactory( data )) AntOptions::AntOptions() @@ -46,11 +46,11 @@ AntOptions::AntOptions() AntProjectPart::AntProjectPart(TQObject *parent, const char *name, const TQStringList &) - : TDevBuildTool(&data, parent, name ? name : "AntProjectPart") + : KDevBuildTool(&data, parent, name ? name : "AntProjectPart") { setInstance(AntProjectFactory::instance()); - setXMLFile("tdevantproject.rc"); + setXMLFile("kdevantproject.rc"); m_buildProjectAction = new TDEAction(i18n("&Build Project"), "make_tdevelop", Key_F8, this, TQT_SLOT(slotBuild()), @@ -111,7 +111,7 @@ void AntProjectPart::openProject(const TQString &dirName, const TQString &projec else populateProject(); - TDevProject::openProject( dirName, projectName ); + KDevProject::openProject( dirName, projectName ); } diff --git a/buildtools/ant/antprojectpart.h b/buildtools/ant/antprojectpart.h index f6203c55..e3b325d2 100644 --- a/buildtools/ant/antprojectpart.h +++ b/buildtools/ant/antprojectpart.h @@ -16,7 +16,7 @@ class Context; class ClassPathWidget; -#include "tdevbuildtool.h" +#include "kdevbuildtool.h" class AntOptionsWidget; @@ -40,7 +40,7 @@ public: }; -class AntProjectPart : public TDevBuildTool +class AntProjectPart : public KDevBuildTool { Q_OBJECT diff --git a/buildtools/ant/kdevantproject.desktop b/buildtools/ant/kdevantproject.desktop new file mode 100644 index 00000000..e2880101 --- /dev/null +++ b/buildtools/ant/kdevantproject.desktop @@ -0,0 +1,96 @@ +[Desktop Entry] +Type=Service +Exec=blubb +Comment=Ant Project +Comment[br]=Raktres Ant +Comment[ca]=Projecte Ant +Comment[cs]=Ant projekt +Comment[da]=Ant-projekt +Comment[de]=Ant-Projekt für TDevelop +Comment[el]=Έργο Ant +Comment[es]=Proyecto Ant +Comment[et]=Ant projekt +Comment[eu]=Ant proiektua +Comment[fa]=پروژۀ Ant +Comment[fr]=Projet avec Ant +Comment[ga]=Comhad tionscadail Ant +Comment[gl]=Proxecto Ant +Comment[hi]=एएनटी परियोजना +Comment[hu]=Ant-projekt +Comment[is]=Ant verkefni +Comment[it]=Progetto Ant +Comment[ja]=Ant プロジェクト +Comment[ms]=Projek Ant +Comment[nds]=Ant-Projekt +Comment[ne]=एन्ट परियोजना +Comment[nl]=Ant-project +Comment[pa]=Ant ਪ੍ਰੋਜੈਕਟ +Comment[pl]=Projekt: Ant +Comment[pt]=Projecto Ant +Comment[pt_BR]=Projeto Ant +Comment[ru]=Проект Ant +Comment[sk]=Ant projekt +Comment[sl]=Projekt Ant +Comment[sr]=Ant пројекат +Comment[sr@Latn]=Ant projekat +Comment[sv]=Ant-projekt +Comment[ta]=ஆன்ட்பிராஜக்ட் +Comment[tg]=Лоиҳаи Ant +Comment[tr]=Ant Projesi +Comment[uz]=Ant loyihasi +Comment[uz@cyrillic]=Ant лойиҳаси +Comment[zh_CN]=Ant 工程 +Comment[zh_TW]=Ant 專案 +Name=KDevAntProject +Name[da]=TDevelop Ant-projekt +Name[de]=Ant-Projekt (TDevelop) +Name[hi]=के-डेव-एएनटी-परियोजना +Name[nds]=Ant-Projekt (TDevelop) +Name[ne]=केडीई विकास एन्ट परियोजना +Name[pl]=KDevProjektAnt +Name[sk]=KDevAntProjekt +Name[sv]=TDevelop Ant-projekt +Name[ta]=கெடெவ்ஆன்ட் பிராஜக்ட் +Name[tg]=Лоиҳаи KDevAnt +Name[zh_TW]=TDevelop Ant 專案 +GenericName=Ant Project +GenericName[br]=Raktres Ant +GenericName[ca]=Projecte Ant +GenericName[da]=Ant-projekt +GenericName[de]=Ant-Projekt +GenericName[el]=Έργο Ant +GenericName[es]=Proyecto Ant +GenericName[et]=Ant projekt +GenericName[eu]=Ant proiektua +GenericName[fa]=پروژۀ Ant +GenericName[fr]=Projet avec Ant +GenericName[ga]=Comhad tionscadail Ant +GenericName[gl]=Proxecto Ant +GenericName[hi]=एएनटी परियोजना +GenericName[hu]=Ant-projekt +GenericName[it]=Project con Ant +GenericName[ja]=Ant プロジェクト +GenericName[ms]=Projek Ant +GenericName[nds]=Ant-Projekt +GenericName[ne]=एन्ट परियोजना +GenericName[nl]=Ant-project +GenericName[pl]=Projekt: Ant +GenericName[pt]=Projecto Ant +GenericName[pt_BR]=Projeto Ant +GenericName[ru]=Проект Ant +GenericName[sk]=Ant projekt +GenericName[sl]=Projekt Ant +GenericName[sr]=Ant пројекат +GenericName[sr@Latn]=Ant projekat +GenericName[sv]=Ant-projekt +GenericName[ta]=ஆன்ட்பிராஜக்ட் +GenericName[tg]=Лоиҳаи Ant +GenericName[tr]=Ant Projesi +GenericName[uz]=Ant loyihasi +GenericName[uz@cyrillic]=Ant лойиҳаси +GenericName[zh_CN]=Ant 工程 +GenericName[zh_TW]=Ant 專案 +ServiceTypes=TDevelop/Project +X-TDE-Library=libkdevantproject +X-TDevelop-Version=5 +X-TDevelop-Args= diff --git a/buildtools/ant/kdevantproject.rc b/buildtools/ant/kdevantproject.rc new file mode 100644 index 00000000..df892b3c --- /dev/null +++ b/buildtools/ant/kdevantproject.rc @@ -0,0 +1,14 @@ + + + + + + + + + + + + diff --git a/buildtools/ant/tdevantproject.desktop b/buildtools/ant/tdevantproject.desktop deleted file mode 100644 index bbca6555..00000000 --- a/buildtools/ant/tdevantproject.desktop +++ /dev/null @@ -1,96 +0,0 @@ -[Desktop Entry] -Type=Service -Exec=blubb -Comment=Ant Project -Comment[br]=Raktres Ant -Comment[ca]=Projecte Ant -Comment[cs]=Ant projekt -Comment[da]=Ant-projekt -Comment[de]=Ant-Projekt für TDevelop -Comment[el]=Έργο Ant -Comment[es]=Proyecto Ant -Comment[et]=Ant projekt -Comment[eu]=Ant proiektua -Comment[fa]=پروژۀ Ant -Comment[fr]=Projet avec Ant -Comment[ga]=Comhad tionscadail Ant -Comment[gl]=Proxecto Ant -Comment[hi]=एएनटी परियोजना -Comment[hu]=Ant-projekt -Comment[is]=Ant verkefni -Comment[it]=Progetto Ant -Comment[ja]=Ant プロジェクト -Comment[ms]=Projek Ant -Comment[nds]=Ant-Projekt -Comment[ne]=एन्ट परियोजना -Comment[nl]=Ant-project -Comment[pa]=Ant ਪ੍ਰੋਜੈਕਟ -Comment[pl]=Projekt: Ant -Comment[pt]=Projecto Ant -Comment[pt_BR]=Projeto Ant -Comment[ru]=Проект Ant -Comment[sk]=Ant projekt -Comment[sl]=Projekt Ant -Comment[sr]=Ant пројекат -Comment[sr@Latn]=Ant projekat -Comment[sv]=Ant-projekt -Comment[ta]=ஆன்ட்பிராஜக்ட் -Comment[tg]=Лоиҳаи Ant -Comment[tr]=Ant Projesi -Comment[uz]=Ant loyihasi -Comment[uz@cyrillic]=Ant лойиҳаси -Comment[zh_CN]=Ant 工程 -Comment[zh_TW]=Ant 專案 -Name=KDevAntProject -Name[da]=TDevelop Ant-projekt -Name[de]=Ant-Projekt (TDevelop) -Name[hi]=के-डेव-एएनटी-परियोजना -Name[nds]=Ant-Projekt (TDevelop) -Name[ne]=केडीई विकास एन्ट परियोजना -Name[pl]=KDevProjektAnt -Name[sk]=KDevAntProjekt -Name[sv]=TDevelop Ant-projekt -Name[ta]=கெடெவ்ஆன்ட் பிராஜக்ட் -Name[tg]=Лоиҳаи KDevAnt -Name[zh_TW]=TDevelop Ant 專案 -GenericName=Ant Project -GenericName[br]=Raktres Ant -GenericName[ca]=Projecte Ant -GenericName[da]=Ant-projekt -GenericName[de]=Ant-Projekt -GenericName[el]=Έργο Ant -GenericName[es]=Proyecto Ant -GenericName[et]=Ant projekt -GenericName[eu]=Ant proiektua -GenericName[fa]=پروژۀ Ant -GenericName[fr]=Projet avec Ant -GenericName[ga]=Comhad tionscadail Ant -GenericName[gl]=Proxecto Ant -GenericName[hi]=एएनटी परियोजना -GenericName[hu]=Ant-projekt -GenericName[it]=Project con Ant -GenericName[ja]=Ant プロジェクト -GenericName[ms]=Projek Ant -GenericName[nds]=Ant-Projekt -GenericName[ne]=एन्ट परियोजना -GenericName[nl]=Ant-project -GenericName[pl]=Projekt: Ant -GenericName[pt]=Projecto Ant -GenericName[pt_BR]=Projeto Ant -GenericName[ru]=Проект Ant -GenericName[sk]=Ant projekt -GenericName[sl]=Projekt Ant -GenericName[sr]=Ant пројекат -GenericName[sr@Latn]=Ant projekat -GenericName[sv]=Ant-projekt -GenericName[ta]=ஆன்ட்பிராஜக்ட் -GenericName[tg]=Лоиҳаи Ant -GenericName[tr]=Ant Projesi -GenericName[uz]=Ant loyihasi -GenericName[uz@cyrillic]=Ant лойиҳаси -GenericName[zh_CN]=Ant 工程 -GenericName[zh_TW]=Ant 專案 -ServiceTypes=TDevelop/Project -X-TDE-Library=libtdevantproject -X-TDevelop-Version=5 -X-TDevelop-Args= diff --git a/buildtools/ant/tdevantproject.rc b/buildtools/ant/tdevantproject.rc deleted file mode 100644 index df892b3c..00000000 --- a/buildtools/ant/tdevantproject.rc +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - -- cgit v1.2.3