diff options
author | Michele Calgaro <[email protected]> | 2014-05-25 15:37:31 +0900 |
---|---|---|
committer | Michele Calgaro <[email protected]> | 2014-05-25 15:37:31 +0900 |
commit | 6392f5a9dfce2bf83617d49bb7f332181ec6004e (patch) | |
tree | ab69e390f7962b7e7dda1a3a64f035c61c751cf4 /buildtools/ant | |
parent | aba2788b428dc53243407902e9ccbb20b97a69fd (diff) | |
download | tdevelop-6392f5a9dfce2bf83617d49bb7f332181ec6004e.tar.gz tdevelop-6392f5a9dfce2bf83617d49bb7f332181ec6004e.zip |
Revert "Finish renaming tdevelop components"
This reverts commit 722ce1efbac31c61b1d4b13f7e075c9f311e3e73.
Diffstat (limited to 'buildtools/ant')
-rw-r--r-- | buildtools/ant/CMakeLists.txt | 10 | ||||
-rw-r--r-- | buildtools/ant/Makefile.am | 16 | ||||
-rw-r--r-- | buildtools/ant/antprojectpart.cpp | 20 | ||||
-rw-r--r-- | buildtools/ant/antprojectpart.h | 4 | ||||
-rw-r--r-- | buildtools/ant/kdevantproject.desktop (renamed from buildtools/ant/tdevantproject.desktop) | 2 | ||||
-rw-r--r-- | buildtools/ant/kdevantproject.rc (renamed from buildtools/ant/tdevantproject.rc) | 0 |
6 files changed, 26 insertions, 26 deletions
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 <tqdir.h> -#include <tdevgenericfactory.h> +#include <kdevgenericfactory.h> #include <kdebug.h> #include <tdeaction.h> #include <tdepopupmenu.h> @@ -21,10 +21,10 @@ #include <keditlistbox.h> #include <kurlrequester.h> -#include <tdevplugininfo.h> +#include <kdevplugininfo.h> -#include <tdevcore.h> -#include <tdevmakefrontend.h> +#include <kdevcore.h> +#include <kdevmakefrontend.h> #include <urlutil.h> @@ -34,9 +34,9 @@ -typedef TDevGenericFactory<AntProjectPart> AntProjectFactory; -static const TDevPluginInfo data("tdevantproject"); -K_EXPORT_COMPONENT_FACTORY(libtdevantproject, AntProjectFactory( data )) +typedef KDevGenericFactory<AntProjectPart> 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/tdevantproject.desktop b/buildtools/ant/kdevantproject.desktop index bbca6555..e2880101 100644 --- a/buildtools/ant/tdevantproject.desktop +++ b/buildtools/ant/kdevantproject.desktop @@ -91,6 +91,6 @@ GenericName[uz@cyrillic]=Ant лойиҳаси GenericName[zh_CN]=Ant 工程 GenericName[zh_TW]=Ant 專案 ServiceTypes=TDevelop/Project -X-TDE-Library=libtdevantproject +X-TDE-Library=libkdevantproject X-TDevelop-Version=5 X-TDevelop-Args= diff --git a/buildtools/ant/tdevantproject.rc b/buildtools/ant/kdevantproject.rc index df892b3c..df892b3c 100644 --- a/buildtools/ant/tdevantproject.rc +++ b/buildtools/ant/kdevantproject.rc |