diff options
Diffstat (limited to 'buildtools')
82 files changed, 401 insertions, 401 deletions
diff --git a/buildtools/ada/CMakeLists.txt b/buildtools/ada/CMakeLists.txt index 8d0fd4ae..0cf08117 100644 --- a/buildtools/ada/CMakeLists.txt +++ b/buildtools/ada/CMakeLists.txt @@ -28,17 +28,17 @@ link_directories( ##### other data ################################ -install( FILES kdevadaproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES kdevadaproject.rc DESTINATION ${DATA_INSTALL_DIR}/kdevadaproject ) +install( FILES tdevadaproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES tdevadaproject.rc DESTINATION ${DATA_INSTALL_DIR}/tdevadaproject ) -##### libkdevadaproject (module) ################ +##### libtdevadaproject (module) ################ -tde_add_kpart( libkdevadaproject AUTOMOC +tde_add_kpart( libtdevadaproject AUTOMOC SOURCES adaproject_part.cpp adaproject_widget.cpp adaproject_optionsdlgbase.ui adaprojectoptionsdlg.cpp adaglobaloptionsdlg.cpp service.cpp - LINK kdevbuildbase-shared + LINK tdevbuildbase-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/buildtools/ada/Makefile.am b/buildtools/ada/Makefile.am index 2b2614ec..7997b18c 100644 --- a/buildtools/ada/Makefile.am +++ b/buildtools/ada/Makefile.am @@ -2,17 +2,17 @@ INCLUDES = -I$(top_srcdir)/buildtools/lib/base -I$(top_srcdir)/lib/interfaces \ -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/interfaces/external \ -I$(top_srcdir)/lib/interfaces/extras -I$(top_srcdir)/lib/util $(all_includes) -kde_module_LTLIBRARIES = libkdevadaproject.la -libkdevadaproject_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libkdevadaproject_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ - $(top_builddir)/buildtools/lib/base/libkdevbuildbase.la $(top_builddir)/lib/interfaces/extras/libkdevextras.la +kde_module_LTLIBRARIES = libtdevadaproject.la +libtdevadaproject_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libtdevadaproject_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ + $(top_builddir)/buildtools/lib/base/libtdevbuildbase.la $(top_builddir)/lib/interfaces/extras/libtdevextras.la -libkdevadaproject_la_SOURCES = adaproject_part.cpp adaproject_widget.cpp adaproject_optionsdlgbase.ui adaprojectoptionsdlg.cpp adaglobaloptionsdlg.cpp service.cpp +libtdevadaproject_la_SOURCES = adaproject_part.cpp adaproject_widget.cpp adaproject_optionsdlgbase.ui adaprojectoptionsdlg.cpp adaglobaloptionsdlg.cpp service.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = kdevadaproject.desktop +service_DATA = tdevadaproject.desktop -rcdir = $(kde_datadir)/kdevadaproject -rc_DATA = kdevadaproject.rc +rcdir = $(kde_datadir)/tdevadaproject +rc_DATA = tdevadaproject.rc diff --git a/buildtools/ada/adaglobaloptionsdlg.cpp b/buildtools/ada/adaglobaloptionsdlg.cpp index cea68bdc..791c23ae 100644 --- a/buildtools/ada/adaglobaloptionsdlg.cpp +++ b/buildtools/ada/adaglobaloptionsdlg.cpp @@ -15,7 +15,7 @@ #include <kdebug.h> #include <tdeconfig.h> -#include "kdevcompileroptions.h" +#include "tdevcompileroptions.h" #include "service.h" #include "adaproject_part.h" @@ -61,7 +61,7 @@ AdaGlobalOptionsDlg::~AdaGlobalOptionsDlg() void AdaGlobalOptionsDlg::optionsButtonClicked() { TQString name = ServiceComboBox::currentText(compiler_box, service_names); - KDevCompilerOptions *plugin = m_part->createCompilerOptions(name); + TDevCompilerOptions *plugin = m_part->createCompilerOptions(name); if (plugin) { TQString flags = plugin->exec(this, options_edit->text()); diff --git a/buildtools/ada/adaproject_part.cpp b/buildtools/ada/adaproject_part.cpp index 32833dfd..195e2889 100644 --- a/buildtools/ada/adaproject_part.cpp +++ b/buildtools/ada/adaproject_part.cpp @@ -28,29 +28,29 @@ #include <tdeconfig.h> #include "domutil.h" -#include "kdevcore.h" -#include "kdevmainwindow.h" -#include "kdevmakefrontend.h" -#include "kdevappfrontend.h" -#include "kdevpartcontroller.h" -#include "kdevlanguagesupport.h" -#include "kdevcompileroptions.h" -#include "kdevgenericfactory.h" -#include <kdevplugininfo.h> +#include "tdevcore.h" +#include "tdevmainwindow.h" +#include "tdevmakefrontend.h" +#include "tdevappfrontend.h" +#include "tdevpartcontroller.h" +#include "tdevlanguagesupport.h" +#include "tdevcompileroptions.h" +#include "tdevgenericfactory.h" +#include <tdevplugininfo.h> #include "adaproject_widget.h" #include "adaprojectoptionsdlg.h" #include "adaglobaloptionsdlg.h" -typedef KDevGenericFactory<AdaProjectPart> AdaProjectFactory; -static const KDevPluginInfo data("kdevadaproject"); -K_EXPORT_COMPONENT_FACTORY( libkdevadaproject, AdaProjectFactory( data ) ) +typedef TDevGenericFactory<AdaProjectPart> AdaProjectFactory; +static const TDevPluginInfo data("tdevadaproject"); +K_EXPORT_COMPONENT_FACTORY( libtdevadaproject, AdaProjectFactory( data ) ) AdaProjectPart::AdaProjectPart(TQObject *parent, const char *name, const TQStringList& ) - :KDevBuildTool(&data, parent, name ? name : "AdaProjectPart" ) + :TDevBuildTool(&data, parent, name ? name : "AdaProjectPart" ) { setInstance(AdaProjectFactory::instance()); - setXMLFile("kdevadaproject.rc"); + setXMLFile("tdevadaproject.rc"); TDEAction *action; action = new TDEAction( i18n("&Build Project"), "make_tdevelop", Key_F8, @@ -70,7 +70,7 @@ AdaProjectPart::AdaProjectPart(TQObject *parent, const char *name, const TQStrin // TQWhatsThis::add(m_widget, i18n("WHAT DOES THIS PART DO?")); - // now you decide what should happen to the widget. Take a look at kdevcore.h + // now you decide what should happen to the widget. Take a look at tdevcore.h // or at other plugins how to embed it. // if you want to embed your widget as an outputview, simply uncomment @@ -109,8 +109,8 @@ void AdaProjectPart::openProject(const TQString &dirName, const TQString &projec TQDomDocument &dom = *projectDom(); // Set the default directory radio to "executable" - if (DomUtil::readEntry(dom, "/kdevadaproject/run/directoryradio") == "" ) { - DomUtil::writeEntry(dom, "/kdevadaproject/run/directoryradio", "executable"); + if (DomUtil::readEntry(dom, "/tdevadaproject/run/directoryradio") == "" ) { + DomUtil::writeEntry(dom, "/tdevadaproject/run/directoryradio", "executable"); } loadProjectConfig(); @@ -165,7 +165,7 @@ void AdaProjectPart::openProject(const TQString &dirName, const TQString &projec } } while (!s.isEmpty()); - KDevProject::openProject( dirName, projectName ); + TDevProject::openProject( dirName, projectName ); } void AdaProjectPart::closeProject() @@ -175,7 +175,7 @@ void AdaProjectPart::closeProject() /** Retuns a PairList with the run environment variables */ DomUtil::PairList AdaProjectPart::runEnvironmentVars() const { - return DomUtil::readPairListEntry(*projectDom(), "/kdevadaproject/run/envvars", "envvar", "name", "value"); + return DomUtil::readPairListEntry(*projectDom(), "/tdevadaproject/run/envvars", "envvar", "name", "value"); } @@ -190,7 +190,7 @@ DomUtil::PairList AdaProjectPart::runEnvironmentVars() const */ TQString AdaProjectPart::runDirectory() const { - TQString cwd = defaultRunDirectory("kdevadaproject"); + TQString cwd = defaultRunDirectory("tdevadaproject"); if (cwd.isEmpty()) cwd = buildDirectory(); return cwd; @@ -212,7 +212,7 @@ TQString AdaProjectPart::mainProgram() const if ( !dom ) return TQString(); - TQString DomMainProgram = DomUtil::readEntry( *dom, "/kdevadaproject/run/mainprogram"); + TQString DomMainProgram = DomUtil::readEntry( *dom, "/tdevadaproject/run/mainprogram"); if ( DomMainProgram.isEmpty() ) return TQString(); @@ -231,14 +231,14 @@ TQString AdaProjectPart::mainProgram() const /** Retuns a TQString with the run command line arguments */ TQString AdaProjectPart::debugArguments() const { - return DomUtil::readEntry(*projectDom(), "/kdevadaproject/run/globaldebugarguments"); + return DomUtil::readEntry(*projectDom(), "/tdevadaproject/run/globaldebugarguments"); } /** Retuns a TQString with the run command line arguments */ TQString AdaProjectPart::runArguments() const { - return DomUtil::readEntry(*projectDom(), "/kdevadaproject/run/programargs"); + return DomUtil::readEntry(*projectDom(), "/tdevadaproject/run/programargs"); } TQString AdaProjectPart::mainSource() const @@ -361,12 +361,12 @@ void AdaProjectPart::slotExecute() void AdaProjectPart::changedFiles( const TQStringList & fileList ) { - KDevProject::changedFiles(fileList); + TDevProject::changedFiles(fileList); } void AdaProjectPart::changedFile( const TQString & fileName ) { - KDevProject::changedFile(fileName); + TDevProject::changedFile(fileName); } void AdaProjectPart::projectConfigWidget( KDialogBase * dlg ) @@ -382,10 +382,10 @@ void AdaProjectPart::loadProjectConfig( ) { TQDomDocument &dom = *(projectDom()); - TQString config = DomUtil::readEntry(dom, "/kdevadaproject/general/useconfiguration", "default"); - m_mainSource = DomUtil::readEntry(dom, TQString("/kdevadaproject/configurations/") + config + TQString("/mainsource") ); - m_compilerOpts = DomUtil::readEntry(dom, TQString("/kdevadaproject/configurations/") + config + TQString("/compileroptions")); - m_compilerExec = DomUtil::readEntry(dom, TQString("/kdevadaproject/configurations/") + config + TQString("/compilerexec")); + TQString config = DomUtil::readEntry(dom, "/tdevadaproject/general/useconfiguration", "default"); + m_mainSource = DomUtil::readEntry(dom, TQString("/tdevadaproject/configurations/") + config + TQString("/mainsource") ); + m_compilerOpts = DomUtil::readEntry(dom, TQString("/tdevadaproject/configurations/") + config + TQString("/compileroptions")); + m_compilerExec = DomUtil::readEntry(dom, TQString("/tdevadaproject/configurations/") + config + TQString("/compilerexec")); if (m_compilerExec.isEmpty()) { @@ -408,7 +408,7 @@ void AdaProjectPart::configWidget( KDialogBase * dlg ) connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); } -KDevCompilerOptions *AdaProjectPart::createCompilerOptions(const TQString &name) +TDevCompilerOptions *AdaProjectPart::createCompilerOptions(const TQString &name) { KService::Ptr service = KService::serviceByDesktopName(name); if (!service) { @@ -430,13 +430,13 @@ KDevCompilerOptions *AdaProjectPart::createCompilerOptions(const TQString &name) args = TQStringList::split(" ", prop.toString()); TQObject *obj = factory->create(this, service->name().latin1(), - "KDevCompilerOptions", args); + "TDevCompilerOptions", args); - if (!obj->inherits("KDevCompilerOptions")) { - kdDebug() << "AdaProjectPart::createCompilerOptions: component does not inherit KDevCompilerOptions" << endl; + if (!obj->inherits("TDevCompilerOptions")) { + kdDebug() << "AdaProjectPart::createCompilerOptions: component does not inherit TDevCompilerOptions" << endl; return 0; } - KDevCompilerOptions *dlg = (KDevCompilerOptions*) obj; + TDevCompilerOptions *dlg = (TDevCompilerOptions*) obj; return dlg; } diff --git a/buildtools/ada/adaproject_part.h b/buildtools/ada/adaproject_part.h index 5511da78..46b328c4 100644 --- a/buildtools/ada/adaproject_part.h +++ b/buildtools/ada/adaproject_part.h @@ -6,18 +6,18 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. */ -#ifndef __KDEVPART_ADAPROJECT_H__ -#define __KDEVPART_ADAPROJECT_H__ +#ifndef __TDEVPART_ADAPROJECT_H__ +#define __TDEVPART_ADAPROJECT_H__ #include <tqguardedptr.h> -#include "kdevbuildtool.h" +#include "tdevbuildtool.h" class AdaProjectWidget; class KDialogBase; -class KDevCompilerOptions; +class TDevCompilerOptions; -class AdaProjectPart : public KDevBuildTool +class AdaProjectPart : public TDevBuildTool { Q_OBJECT @@ -59,7 +59,7 @@ public: virtual void changedFiles( const TQStringList & fileList ); virtual void changedFile( const TQString & fileName ); - KDevCompilerOptions *createCompilerOptions(const TQString &name); + TDevCompilerOptions *createCompilerOptions(const TQString &name); virtual TQString defaultOptions(const TQString compiler); TQStringList distFiles() const; diff --git a/buildtools/ada/adaproject_widget.cpp b/buildtools/ada/adaproject_widget.cpp index f5016e8c..3eaba244 100644 --- a/buildtools/ada/adaproject_widget.cpp +++ b/buildtools/ada/adaproject_widget.cpp @@ -3,7 +3,7 @@ #include <kurl.h> #include <kdebug.h> -#include <kdevcore.h> +#include <tdevcore.h> #include "adaproject_part.h" #include "adaproject_widget.h" diff --git a/buildtools/ada/adaproject_widget.h b/buildtools/ada/adaproject_widget.h index 6bbab369..c89fc511 100644 --- a/buildtools/ada/adaproject_widget.h +++ b/buildtools/ada/adaproject_widget.h @@ -4,7 +4,7 @@ #include <tqwidget.h> #include <tqstring.h> -class KDevProject; +class TDevProject; class AdaProjectPart; class AdaProjectWidget : public TQWidget diff --git a/buildtools/ada/adaprojectoptionsdlg.cpp b/buildtools/ada/adaprojectoptionsdlg.cpp index 28549efc..6cced020 100644 --- a/buildtools/ada/adaprojectoptionsdlg.cpp +++ b/buildtools/ada/adaprojectoptionsdlg.cpp @@ -18,7 +18,7 @@ #include <tqvalidator.h> #include "domutil.h" -#include "kdevcompileroptions.h" +#include "tdevcompileroptions.h" #include "service.h" #include "adaproject_part.h" @@ -43,7 +43,7 @@ AdaProjectOptionsDlg::AdaProjectOptionsDlg(AdaProjectPart *part, TQWidget* paren TQDomDocument &dom = *(m_part->projectDom()); currentConfig = TQString(); - configChanged(DomUtil::readEntry(dom, "/kdevadaproject/general/useconfiguration", "default")); + configChanged(DomUtil::readEntry(dom, "/tdevadaproject/general/useconfiguration", "default")); } AdaProjectOptionsDlg::~AdaProjectOptionsDlg() @@ -57,7 +57,7 @@ TQStringList AdaProjectOptionsDlg::allBuildConfigs() TQStringList allConfigs; allConfigs.append("default"); - TQDomNode node = dom.documentElement().namedItem("kdevadaproject").namedItem("configurations"); + TQDomNode node = dom.documentElement().namedItem("tdevadaproject").namedItem("configurations"); TQDomElement childEl = node.firstChild().toElement(); while (!childEl.isNull()) { TQString config = childEl.tagName(); @@ -72,7 +72,7 @@ TQStringList AdaProjectOptionsDlg::allBuildConfigs() void AdaProjectOptionsDlg::accept() { - DomUtil::writeEntry(*m_part->projectDom(), "/kdevadaproject/general/useconfiguration", currentConfig); + DomUtil::writeEntry(*m_part->projectDom(), "/tdevadaproject/general/useconfiguration", currentConfig); if (dirty) { saveConfig(currentConfig); @@ -88,7 +88,7 @@ void AdaProjectOptionsDlg::compiler_box_activated( const TQString& /*s*/ ) void AdaProjectOptionsDlg::saveConfig( TQString config ) { TQDomDocument dom = *m_part->projectDom(); - TQString prefix = "/kdevadaproject/configurations/" + config + "/"; + TQString prefix = "/tdevadaproject/configurations/" + config + "/"; DomUtil::writeEntry(dom, prefix + "compiler", ServiceComboBox::currentText(compiler_box, service_names)); @@ -100,7 +100,7 @@ void AdaProjectOptionsDlg::saveConfig( TQString config ) void AdaProjectOptionsDlg::readConfig( TQString config ) { TQDomDocument dom = *m_part->projectDom(); - TQString prefix = "/kdevadaproject/configurations/" + config + "/"; + TQString prefix = "/tdevadaproject/configurations/" + config + "/"; TQString compiler = DomUtil::readEntry(dom, prefix + "compiler", ""); @@ -171,7 +171,7 @@ void AdaProjectOptionsDlg::configRemoved() TQString config = config_combo->currentText(); TQDomDocument dom = *m_part->projectDom(); - TQDomNode node = dom.documentElement().namedItem("kdevadaproject").namedItem("configurations"); + TQDomNode node = dom.documentElement().namedItem("tdevadaproject").namedItem("configurations"); node.removeChild(node.namedItem(config)); allConfigs.remove(config); @@ -185,7 +185,7 @@ void AdaProjectOptionsDlg::configRemoved() void AdaProjectOptionsDlg::optionsButtonClicked( ) { TQString name = ServiceComboBox::currentText(compiler_box, service_names); - KDevCompilerOptions *plugin = m_part->createCompilerOptions(name); + TDevCompilerOptions *plugin = m_part->createCompilerOptions(name); if (plugin) { TQString flags = plugin->exec(this, options_edit->text()); diff --git a/buildtools/ada/adaprojectoptionsdlg.h b/buildtools/ada/adaprojectoptionsdlg.h index 569f06c9..0f6c0262 100644 --- a/buildtools/ada/adaprojectoptionsdlg.h +++ b/buildtools/ada/adaprojectoptionsdlg.h @@ -14,7 +14,7 @@ #include "adaproject_optionsdlgbase.h" class AdaProjectPart; -class KDevCompilerOptions; +class TDevCompilerOptions; class AdaProjectOptionsDlg : public AdaProjectOptionsDlgBase { diff --git a/buildtools/ada/kdevadaproject.desktop b/buildtools/ada/tdevadaproject.desktop index 882b0f64..91206fd4 100644 --- a/buildtools/ada/kdevadaproject.desktop +++ b/buildtools/ada/tdevadaproject.desktop @@ -95,6 +95,6 @@ GenericName[uz@cyrillic]=Ada лойиҳаси GenericName[zh_CN]=Ada 工程 GenericName[zh_TW]=Ada 專案 ServiceTypes=TDevelop/Project -X-TDE-Library=libkdevadaproject +X-TDE-Library=libtdevadaproject X-TDevelop-Version=5 X-TDevelop-Language=Ada diff --git a/buildtools/ada/kdevadaproject.rc b/buildtools/ada/tdevadaproject.rc index d7f260e1..d7f260e1 100644 --- a/buildtools/ada/kdevadaproject.rc +++ b/buildtools/ada/tdevadaproject.rc diff --git a/buildtools/ant/CMakeLists.txt b/buildtools/ant/CMakeLists.txt index 1b7cfd98..48858d7f 100644 --- a/buildtools/ant/CMakeLists.txt +++ b/buildtools/ant/CMakeLists.txt @@ -26,15 +26,15 @@ link_directories( ##### other data ################################ -install( FILES kdevantproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES kdevantproject.rc DESTINATION ${DATA_INSTALL_DIR}/kdevantproject ) +install( FILES tdevantproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES tdevantproject.rc DESTINATION ${DATA_INSTALL_DIR}/tdevantproject ) -##### libkdevantproject (module) ################ +##### libtdevantproject (module) ################ -tde_add_kpart( libkdevantproject AUTOMOC +tde_add_kpart( libtdevantproject AUTOMOC SOURCES antprojectpart.cpp antoptionswidget.ui classpathwidget.ui - LINK kdevbuildbase-shared + LINK tdevbuildbase-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/buildtools/ant/Makefile.am b/buildtools/ant/Makefile.am index 30f314b8..6f3e23e6 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 = 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 +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 -libkdevantproject_la_SOURCES = antprojectpart.cpp antoptionswidget.ui classpathwidget.ui +libtdevantproject_la_SOURCES = antprojectpart.cpp antoptionswidget.ui classpathwidget.ui METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = kdevantproject.desktop +service_DATA = tdevantproject.desktop -rcdir = $(kde_datadir)/kdevantproject -rc_DATA = kdevantproject.rc +rcdir = $(kde_datadir)/tdevantproject +rc_DATA = tdevantproject.rc diff --git a/buildtools/ant/antprojectpart.cpp b/buildtools/ant/antprojectpart.cpp index 902055ec..fcbdd630 100644 --- a/buildtools/ant/antprojectpart.cpp +++ b/buildtools/ant/antprojectpart.cpp @@ -11,7 +11,7 @@ #include <tqdir.h> -#include <kdevgenericfactory.h> +#include <tdevgenericfactory.h> #include <kdebug.h> #include <tdeaction.h> #include <tdepopupmenu.h> @@ -21,10 +21,10 @@ #include <keditlistbox.h> #include <kurlrequester.h> -#include <kdevplugininfo.h> +#include <tdevplugininfo.h> -#include <kdevcore.h> -#include <kdevmakefrontend.h> +#include <tdevcore.h> +#include <tdevmakefrontend.h> #include <urlutil.h> @@ -34,9 +34,9 @@ -typedef KDevGenericFactory<AntProjectPart> AntProjectFactory; -static const KDevPluginInfo data("kdevantproject"); -K_EXPORT_COMPONENT_FACTORY(libkdevantproject, AntProjectFactory( data )) +typedef TDevGenericFactory<AntProjectPart> AntProjectFactory; +static const TDevPluginInfo data("tdevantproject"); +K_EXPORT_COMPONENT_FACTORY(libtdevantproject, AntProjectFactory( data )) AntOptions::AntOptions() @@ -46,11 +46,11 @@ AntOptions::AntOptions() AntProjectPart::AntProjectPart(TQObject *parent, const char *name, const TQStringList &) - : KDevBuildTool(&data, parent, name ? name : "AntProjectPart") + : TDevBuildTool(&data, parent, name ? name : "AntProjectPart") { setInstance(AntProjectFactory::instance()); - setXMLFile("kdevantproject.rc"); + setXMLFile("tdevantproject.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(); - KDevProject::openProject( dirName, projectName ); + TDevProject::openProject( dirName, projectName ); } diff --git a/buildtools/ant/antprojectpart.h b/buildtools/ant/antprojectpart.h index e3b325d2..f6203c55 100644 --- a/buildtools/ant/antprojectpart.h +++ b/buildtools/ant/antprojectpart.h @@ -16,7 +16,7 @@ class Context; class ClassPathWidget; -#include "kdevbuildtool.h" +#include "tdevbuildtool.h" class AntOptionsWidget; @@ -40,7 +40,7 @@ public: }; -class AntProjectPart : public KDevBuildTool +class AntProjectPart : public TDevBuildTool { Q_OBJECT diff --git a/buildtools/ant/kdevantproject.desktop b/buildtools/ant/tdevantproject.desktop index e2880101..bbca6555 100644 --- a/buildtools/ant/kdevantproject.desktop +++ b/buildtools/ant/tdevantproject.desktop @@ -91,6 +91,6 @@ GenericName[uz@cyrillic]=Ant лойиҳаси GenericName[zh_CN]=Ant 工程 GenericName[zh_TW]=Ant 專案 ServiceTypes=TDevelop/Project -X-TDE-Library=libkdevantproject +X-TDE-Library=libtdevantproject X-TDevelop-Version=5 X-TDevelop-Args= diff --git a/buildtools/ant/kdevantproject.rc b/buildtools/ant/tdevantproject.rc index df892b3c..df892b3c 100644 --- a/buildtools/ant/kdevantproject.rc +++ b/buildtools/ant/tdevantproject.rc diff --git a/buildtools/autotools/CMakeLists.txt b/buildtools/autotools/CMakeLists.txt index f7af5bc6..e33d897c 100644 --- a/buildtools/autotools/CMakeLists.txt +++ b/buildtools/autotools/CMakeLists.txt @@ -32,13 +32,13 @@ link_directories( ##### other data ################################ -install( FILES kdevautoproject.desktop kdevtdeautoproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES kdevautoproject.rc DESTINATION ${DATA_INSTALL_DIR}/kdevautoproject ) +install( FILES tdevautoproject.desktop tdevtdeautoproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES tdevautoproject.rc DESTINATION ${DATA_INSTALL_DIR}/tdevautoproject ) -##### libkdevautoproject (module) ############### +##### libtdevautoproject (module) ############### -tde_add_kpart( libkdevautoproject AUTOMOC +tde_add_kpart( libtdevautoproject AUTOMOC SOURCES autoprojectpart.cpp autoprojectwidget.cpp configureoptionswidget.cpp configureoptionswidgetbase.ui @@ -60,6 +60,6 @@ tde_add_kpart( libkdevautoproject AUTOMOC autolistviewitems.cpp managecustomcommandsbase.ui managecustomcommand.cpp autoprojectviewbase.ui autotoolsaction.cpp makefilehandler.cpp - LINK kdevautotoolsparser-static kdevbuildbase-shared kdevbuildtoolswidgets-shared + LINK tdevautotoolsparser-static tdevbuildbase-shared tdevbuildtoolswidgets-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/buildtools/autotools/Makefile.am b/buildtools/autotools/Makefile.am index 98f3ad51..a704eb29 100644 --- a/buildtools/autotools/Makefile.am +++ b/buildtools/autotools/Makefile.am @@ -7,14 +7,14 @@ INCLUDES = -I$(top_srcdir)/buildtools/lib -I$(top_srcdir)/buildtools/lib/base \ -I$(top_builddir)/buildtools/lib/widgets -kde_module_LTLIBRARIES = libkdevautoproject.la -libkdevautoproject_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(KDE_PLUGIN) -libkdevautoproject_la_LIBADD = \ - $(top_builddir)/buildtools/lib/base/libkdevbuildbase.la \ - $(top_builddir)/buildtools/lib/parsers/autotools/libkdevautotoolsparser.la $(top_builddir)/buildtools/lib/widgets/libkdevbuildtoolswidgets.la \ - $(top_builddir)/lib/interfaces/extras/libkdevextras.la $(top_builddir)/lib/libtdevelop.la +kde_module_LTLIBRARIES = libtdevautoproject.la +libtdevautoproject_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(KDE_PLUGIN) +libtdevautoproject_la_LIBADD = \ + $(top_builddir)/buildtools/lib/base/libtdevbuildbase.la \ + $(top_builddir)/buildtools/lib/parsers/autotools/libtdevautotoolsparser.la $(top_builddir)/buildtools/lib/widgets/libtdevbuildtoolswidgets.la \ + $(top_builddir)/lib/interfaces/extras/libtdevextras.la $(top_builddir)/lib/libtdevelop.la -libkdevautoproject_la_SOURCES = autoprojectpart.cpp autoprojectwidget.cpp \ +libtdevautoproject_la_SOURCES = autoprojectpart.cpp autoprojectwidget.cpp \ configureoptionswidget.cpp configureoptionswidgetbase.ui subprojectoptionsdlg.cpp \ subprojectoptionsdlgbase.ui targetoptionsdlg.cpp targetoptionsdlgbase.ui addservicedlg.cpp \ addservicedlgbase.ui addapplicationdlg.cpp addapplicationdlgbase.ui addtargetdlg.cpp \ @@ -30,9 +30,9 @@ libkdevautoproject_la_SOURCES = autoprojectpart.cpp autoprojectwidget.cpp \ METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = kdevautoproject.desktop kdevtdeautoproject.desktop +service_DATA = tdevautoproject.desktop tdevtdeautoproject.desktop -rcdir = $(kde_datadir)/kdevautoproject -rc_DATA = kdevautoproject.rc +rcdir = $(kde_datadir)/tdevautoproject +rc_DATA = tdevautoproject.rc noinst_HEADERS = managecustomcommand.h autotoolsaction.h makefilehandler.h diff --git a/buildtools/autotools/addfiledlg.cpp b/buildtools/autotools/addfiledlg.cpp index d3f71637..18bf87a8 100644 --- a/buildtools/autotools/addfiledlg.cpp +++ b/buildtools/autotools/addfiledlg.cpp @@ -36,7 +36,7 @@ #include "autoprojectpart.h" #include "autoprojectwidget.h" -#include "kdevpartcontroller.h" +#include "tdevpartcontroller.h" AddFileDialog::AddFileDialog(AutoProjectPart *part, AutoProjectWidget *widget, SubprojectItem *spitem, TargetItem *item, diff --git a/buildtools/autotools/addsubprojectdlg.cpp b/buildtools/autotools/addsubprojectdlg.cpp index 59cebc53..fa64c506 100644 --- a/buildtools/autotools/addsubprojectdlg.cpp +++ b/buildtools/autotools/addsubprojectdlg.cpp @@ -25,7 +25,7 @@ #include "autolistviewitems.h" -#include "kdevmakefrontend.h" +#include "tdevmakefrontend.h" #include "misc.h" #include "autoprojectpart.h" #include "autosubprojectview.h" diff --git a/buildtools/autotools/autodetailsview.cpp b/buildtools/autotools/autodetailsview.cpp index 91b6d75c..34060b61 100644 --- a/buildtools/autotools/autodetailsview.cpp +++ b/buildtools/autotools/autodetailsview.cpp @@ -32,13 +32,13 @@ #include <tdepopupmenu.h> /** KDevelop */ -#include "kdevappfrontend.h" -#include "kdevcore.h" -#include "kdevmainwindow.h" -#include "kdevpartcontroller.h" -#include "kdevcreatefile.h" -#include "kdevlanguagesupport.h" -#include "kdevmakefrontend.h" +#include "tdevappfrontend.h" +#include "tdevcore.h" +#include "tdevmainwindow.h" +#include "tdevpartcontroller.h" +#include "tdevcreatefile.h" +#include "tdevlanguagesupport.h" +#include "tdevmakefrontend.h" #include "urlutil.h" #include "domutil.h" @@ -294,13 +294,13 @@ void AutoDetailsView::slotAddNewFile() if ( !titem ) return; - KDevCreateFile * createFileSupport = m_part->extension<KDevCreateFile>("TDevelop/CreateFile"); + TDevCreateFile * createFileSupport = m_part->extension<TDevCreateFile>("TDevelop/CreateFile"); if (createFileSupport) { - KDevCreateFile::CreatedFile crFile = + TDevCreateFile::CreatedFile crFile = createFileSupport->createNewFile(TQString(), m_widget->selectedSubproject()->path); -/* if (crFile.status == KDevCreateFile::CreatedFile::STATUS_OK) +/* if (crFile.status == TDevCreateFile::CreatedFile::STATUS_OK) { FileItem *fitem = m_widget->createFileItem(crFile.filename, m_widget->selectedSubproject()); titem->sources.append(fitem); diff --git a/buildtools/autotools/autoprojectpart.cpp b/buildtools/autotools/autoprojectpart.cpp index 6b408bd0..ae5453bc 100644 --- a/buildtools/autotools/autoprojectpart.cpp +++ b/buildtools/autotools/autoprojectpart.cpp @@ -45,34 +45,34 @@ #include <kprocess.h> #include <domutil.h> -#include <kdevcore.h> -#include <kdevmakefrontend.h> -#include <kdevappfrontend.h> -#include <kdevmainwindow.h> -#include <kdevpartcontroller.h> +#include <tdevcore.h> +#include <tdevmakefrontend.h> +#include <tdevappfrontend.h> +#include <tdevmainwindow.h> +#include <tdevpartcontroller.h> #include <makeoptionswidget.h> #include <runoptionswidget.h> #include <envvartools.h> #include <configwidgetproxy.h> -#include <kdevplugininfo.h> +#include <tdevplugininfo.h> #include <urlutil.h> #define CONFIGURE_OPTIONS 1 #define RUN_OPTIONS 2 #define MAKE_OPTIONS 3 -static const KDevPluginInfo data("kdevautoproject"); +static const TDevPluginInfo data("tdevautoproject"); -K_EXPORT_COMPONENT_FACTORY( libkdevautoproject, AutoProjectFactory( data ) ) +K_EXPORT_COMPONENT_FACTORY( libtdevautoproject, AutoProjectFactory( data ) ) AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStringList &args) - : KDevBuildTool(&data, parent, name ? name : "AutoProjectPart") + : TDevBuildTool(&data, parent, name ? name : "AutoProjectPart") , m_lastCompilationFailed(false) { setInstance(AutoProjectFactory::instance()); - setXMLFile("kdevautoproject.rc"); + setXMLFile("tdevautoproject.rc"); m_executeAfterBuild = false; m_isKDE = (args[0] == "kde"); @@ -310,7 +310,7 @@ void AutoProjectPart::openProject(const TQString &dirName, const TQString &proje "Project -> Project Options -> Run Options"), i18n("No active target specified"), "tdevelop_open_project_no_active_target"); } - KDevProject::openProject( dirName, projectName ); + TDevProject::openProject( dirName, projectName ); } @@ -358,7 +358,7 @@ TQString AutoProjectPart::runDirectory() const TQString cwd; if( DomUtil::readBoolEntry(dom, "/kdevautoproject/run/useglobalprogram", false) || !m_widget->activeTarget() ) { - cwd = defaultRunDirectory("kdevautoproject"); + cwd = defaultRunDirectory("tdevautoproject"); }else { cwd = DomUtil::readEntry( dom, "/kdevautoproject/run/cwd/"+m_widget->activeTarget()->name ); @@ -585,7 +585,7 @@ TQStringList AutoProjectPart::allBuildConfigs() const TQStringList allConfigs; allConfigs.append("default"); - TQDomNode node = dom.documentElement().namedItem("kdevautoproject").namedItem("configurations"); + TQDomNode node = dom.documentElement().namedItem("tdevautoproject").namedItem("configurations"); TQDomElement childEl = node.firstChild().toElement(); while (!childEl.isNull()) { @@ -1075,7 +1075,7 @@ TQString AutoProjectPart::updateAdminDirectoryCommand() const // Find the admin tarball TDEStandardDirs dirs; - dirs.addResourceType("apptemplates", TDEStandardDirs::kde_default("data") + "kdevappwizard/template-common/"); + dirs.addResourceType("apptemplates", TDEStandardDirs::kde_default("data") + "tdevappwizard/template-common/"); source = dirs.findResource("apptemplates", "admin.tar.gz"); if (source != "") { TQString cmdline = "rm -rf admin && tar -xzvf "; @@ -1453,7 +1453,7 @@ bool AutoProjectPart::isKDE() const return m_isKDE; } -KDevProject::Options AutoProjectPart::options() const +TDevProject::Options AutoProjectPart::options() const { return UsesAutotoolsBuildSystem; } diff --git a/buildtools/autotools/autoprojectpart.h b/buildtools/autotools/autoprojectpart.h index 83066c3c..08d83719 100644 --- a/buildtools/autotools/autoprojectpart.h +++ b/buildtools/autotools/autoprojectpart.h @@ -20,8 +20,8 @@ #include <tqmap.h> #include <tqdatetime.h> #include <tqdir.h> -#include <kdevgenericfactory.h> -#include "kdevbuildtool.h" +#include <tdevgenericfactory.h> +#include "tdevbuildtool.h" class TQDomElement; class TQStringList; @@ -31,7 +31,7 @@ class TDESelectAction; class TargetItem; class ConfigWidgetProxy; -class AutoProjectPart : public KDevBuildTool +class AutoProjectPart : public TDevBuildTool { Q_OBJECT @@ -41,7 +41,7 @@ public: virtual ~AutoProjectPart(); /** - * Implementation of the KDevProject interface. + * Implementation of the TDevProject interface. */ virtual TQString projectDirectory() const; virtual TQString projectName() const; @@ -61,7 +61,7 @@ public: virtual Options options() const; /** - * Implementation of the KDevPlugin interface. + * Implementation of the TDevPlugin interface. */ virtual void restorePartialProjectSession ( const TQDomElement* el ); virtual void savePartialProjectSession ( TQDomElement* el ); @@ -85,7 +85,7 @@ public: protected: /** - * Reimplemented from KDevProject. These methods are only + * Reimplemented from TDevProject. These methods are only * for use by the application core. */ virtual void openProject( const TQString &dirName, const TQString &projectName ); @@ -151,7 +151,7 @@ private: bool queueInternalLibDependenciesBuild( TargetItem* titem, TQStringList& list ); }; -typedef KDevGenericFactory<AutoProjectPart> AutoProjectFactory; +typedef TDevGenericFactory<AutoProjectPart> AutoProjectFactory; #endif // kate: indent-mode csands; tab-width 4; diff --git a/buildtools/autotools/autoprojectwidget.cpp b/buildtools/autotools/autoprojectwidget.cpp index a558a593..c41a60dc 100644 --- a/buildtools/autotools/autoprojectwidget.cpp +++ b/buildtools/autotools/autoprojectwidget.cpp @@ -42,7 +42,7 @@ #include <kxmlguiclient.h> #include <tdeaction.h> -#include "kdevcore.h" +#include "tdevcore.h" #include "domutil.h" #include "misc.h" #include "choosetargetdialog.h" diff --git a/buildtools/autotools/autosubprojectview.cpp b/buildtools/autotools/autosubprojectview.cpp index 8353e2ea..0eecfe4b 100644 --- a/buildtools/autotools/autosubprojectview.cpp +++ b/buildtools/autotools/autosubprojectview.cpp @@ -34,10 +34,10 @@ #include <tdelistview.h> /** KDevelop */ -#include <kdevmainwindow.h> -#include <kdevmakefrontend.h> -#include <kdevappfrontend.h> -#include <kdevcore.h> +#include <tdevmainwindow.h> +#include <tdevmakefrontend.h> +#include <tdevappfrontend.h> +#include <tdevcore.h> #include <urlutil.h> /** AutoProject */ diff --git a/buildtools/autotools/choosetargetdialog.cpp b/buildtools/autotools/choosetargetdialog.cpp index 8b59545f..fad399f3 100644 --- a/buildtools/autotools/choosetargetdialog.cpp +++ b/buildtools/autotools/choosetargetdialog.cpp @@ -43,7 +43,7 @@ #include "autoprojectwidget.h" #include "autoprojectpart.h" -#include "kdevpartcontroller.h" +#include "tdevpartcontroller.h" class ChooseTargetDialog::Private { diff --git a/buildtools/autotools/configureoptionswidget.cpp b/buildtools/autotools/configureoptionswidget.cpp index cc39aa07..c991d15d 100644 --- a/buildtools/autotools/configureoptionswidget.cpp +++ b/buildtools/autotools/configureoptionswidget.cpp @@ -29,7 +29,7 @@ #include <kservice.h> #include <ktrader.h> -#include "kdevcompileroptions.h" +#include "tdevcompileroptions.h" #include "autoprojectpart.h" #include "environmentvariableswidget.h" @@ -310,7 +310,7 @@ void ConfigureOptionsWidget::configRemoved() TQString config = config_combo->currentText(); TQDomDocument dom = *m_part->projectDom(); - TQDomNode node = dom.documentElement().namedItem("kdevautoproject").namedItem("configurations"); + TQDomNode node = dom.documentElement().namedItem("tdevautoproject").namedItem("configurations"); node.removeChild(node.namedItem(config)); allConfigs.remove(config); @@ -348,7 +348,7 @@ void ConfigureOptionsWidget::f77serviceChanged() void ConfigureOptionsWidget::cflagsClicked() { TQString name = ServiceComboBox::currentText(cservice_combo, cservice_names); - KDevCompilerOptions *plugin = createCompilerOptions(name); + TDevCompilerOptions *plugin = createCompilerOptions(name); if (plugin) { TQString flags = plugin->exec(this, cflags_edit->text()); @@ -361,7 +361,7 @@ void ConfigureOptionsWidget::cflagsClicked() void ConfigureOptionsWidget::cxxflagsClicked() { TQString name = ServiceComboBox::currentText(cxxservice_combo, cxxservice_names); - KDevCompilerOptions *plugin = createCompilerOptions(name); + TDevCompilerOptions *plugin = createCompilerOptions(name); if (plugin) { TQString flags = plugin->exec(this, cxxflags_edit->text()); @@ -374,7 +374,7 @@ void ConfigureOptionsWidget::cxxflagsClicked() void ConfigureOptionsWidget::f77flagsClicked() { TQString name = ServiceComboBox::currentText(f77service_combo, f77service_names); - KDevCompilerOptions *plugin = createCompilerOptions(name); + TDevCompilerOptions *plugin = createCompilerOptions(name); if (plugin) { TQString flags = plugin->exec(this, f77flags_edit->text()); @@ -384,7 +384,7 @@ void ConfigureOptionsWidget::f77flagsClicked() } -KDevCompilerOptions *ConfigureOptionsWidget::createCompilerOptions(const TQString &name) +TDevCompilerOptions *ConfigureOptionsWidget::createCompilerOptions(const TQString &name) { KService::Ptr service = KService::serviceByDesktopName(name); if (!service) { @@ -406,13 +406,13 @@ KDevCompilerOptions *ConfigureOptionsWidget::createCompilerOptions(const TQStrin args = TQStringList::split(" ", prop.toString()); TQObject *obj = factory->create(TQT_TQOBJECT(this), service->name().latin1(), - "KDevCompilerOptions", args); + "TDevCompilerOptions", args); - if (!obj->inherits("KDevCompilerOptions")) { - kdDebug(9020) << "Component does not inherit KDevCompilerOptions" << endl; + if (!obj->inherits("TDevCompilerOptions")) { + kdDebug(9020) << "Component does not inherit TDevCompilerOptions" << endl; return 0; } - KDevCompilerOptions *dlg = (KDevCompilerOptions*) obj; + TDevCompilerOptions *dlg = (TDevCompilerOptions*) obj; return dlg; } diff --git a/buildtools/autotools/configureoptionswidget.h b/buildtools/autotools/configureoptionswidget.h index e40874de..dfab95cc 100644 --- a/buildtools/autotools/configureoptionswidget.h +++ b/buildtools/autotools/configureoptionswidget.h @@ -18,7 +18,7 @@ #include "domutil.h" -class KDevCompilerOptions; +class TDevCompilerOptions; class AutoProjectPart; class EnvironmentVariablesWidget; @@ -53,7 +53,7 @@ private: void readSettings( const TQString &config ); void saveSettings( const TQString &config ); - KDevCompilerOptions *createCompilerOptions( const TQString &lang ); + TDevCompilerOptions *createCompilerOptions( const TQString &lang ); TDETrader::OfferList coffers, cxxoffers, f77offers; TQStringList cservice_names, cservice_execs; TQStringList cxxservice_names, cxxservice_execs; diff --git a/buildtools/autotools/fileselectorwidget.cpp b/buildtools/autotools/fileselectorwidget.cpp index c10db050..afd09d4b 100644 --- a/buildtools/autotools/fileselectorwidget.cpp +++ b/buildtools/autotools/fileselectorwidget.cpp @@ -43,7 +43,7 @@ #include "autoprojectwidget.h" #include "autoprojectpart.h" -#include "kdevlanguagesupport.h" +#include "tdevlanguagesupport.h" #include "tdefilednddetailview.h" #include "tdefiledndiconview.h" @@ -140,7 +140,7 @@ FileSelectorWidget::FileSelectorWidget(AutoProjectPart* part, KFile::Mode mode, /* read the file patterns from the project DOM */ TQDomElement docEl = m_part->projectDom()->documentElement(); - TQDomElement fileviewEl = docEl.namedItem("kdevfileview").toElement(); + TQDomElement fileviewEl = docEl.namedItem("tdevfileview").toElement(); TQDomElement groupsEl = fileviewEl.namedItem("groups").toElement(); TQDomElement groupEl = groupsEl.firstChild().toElement(); diff --git a/buildtools/autotools/misc.cpp b/buildtools/autotools/misc.cpp index ec58b54c..f1174b21 100644 --- a/buildtools/autotools/misc.cpp +++ b/buildtools/autotools/misc.cpp @@ -21,10 +21,10 @@ #include "misc.h" -#include "kdevcompileroptions.h" +#include "tdevcompileroptions.h" -static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObject *parent ) +static TDevCompilerOptions *createCompilerOptions( const TQString &name, TQObject *parent ) { KService::Ptr service = KService::serviceByDesktopName( name ); if ( !service ) @@ -48,13 +48,13 @@ static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObjec args = TQStringList::split(" ", prop.toString()); TQObject *obj = factory->create(parent, service->name().latin1(), - "KDevCompilerOptions", args); + "TDevCompilerOptions", args); - if (!obj->inherits("KDevCompilerOptions")) { - kdDebug(9020) << "Component does not inherit KDevCompilerOptions" << endl; + if (!obj->inherits("TDevCompilerOptions")) { + kdDebug(9020) << "Component does not inherit TDevCompilerOptions" << endl; return 0; } - KDevCompilerOptions *dlg = (KDevCompilerOptions*) obj; + TDevCompilerOptions *dlg = (TDevCompilerOptions*) obj; return dlg; @@ -65,14 +65,14 @@ static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObjec args = TQStringList::split( " ", prop.toString() ); return KParts::ComponentFactory - ::createInstanceFromService<KDevCompilerOptions>( service, parent, + ::createInstanceFromService<TDevCompilerOptions>( service, parent, service->name().latin1(), args );*/ } TQString AutoProjectTool::execFlagsDialog( const TQString &compiler, const TQString &flags, TQWidget *parent ) { - KDevCompilerOptions * plugin = createCompilerOptions( compiler, TQT_TQOBJECT(parent) ); + TDevCompilerOptions * plugin = createCompilerOptions( compiler, TQT_TQOBJECT(parent) ); if ( plugin ) { diff --git a/buildtools/autotools/removefiledlg.cpp b/buildtools/autotools/removefiledlg.cpp index e265a969..6508d126 100644 --- a/buildtools/autotools/removefiledlg.cpp +++ b/buildtools/autotools/removefiledlg.cpp @@ -155,7 +155,7 @@ void RemoveFileDialog::accept() TQDomDocument &dom = *(m_part->projectDom()); TQDomElement el = dom.documentElement(); - TQDomNode el2 = el.namedItem("kdevautoproject"); + TQDomNode el2 = el.namedItem("tdevautoproject"); TQDomNode el3 = el2.namedItem("subclassing"); TQDomNode n = el3.firstChild(); diff --git a/buildtools/autotools/kdevautoproject.desktop b/buildtools/autotools/tdevautoproject.desktop index a149c870..ad164259 100644 --- a/buildtools/autotools/kdevautoproject.desktop +++ b/buildtools/autotools/tdevautoproject.desktop @@ -92,6 +92,6 @@ GenericName[zh_CN]=Automake 工程 GenericName[zh_TW]=Automake 專案 ServiceTypes=TDevelop/Project Icon=make -X-TDE-Library=libkdevautoproject +X-TDE-Library=libtdevautoproject X-TDevelop-Version=5 X-TDevelop-Args= diff --git a/buildtools/autotools/kdevautoproject.rc b/buildtools/autotools/tdevautoproject.rc index 5d213e3e..5d213e3e 100644 --- a/buildtools/autotools/kdevautoproject.rc +++ b/buildtools/autotools/tdevautoproject.rc diff --git a/buildtools/autotools/kdevtdeautoproject.desktop b/buildtools/autotools/tdevtdeautoproject.desktop index b9b6abd8..5ed348d1 100644 --- a/buildtools/autotools/kdevtdeautoproject.desktop +++ b/buildtools/autotools/tdevtdeautoproject.desktop @@ -87,6 +87,6 @@ GenericName[zh_CN]=TDE Automake 工程 GenericName[zh_TW]=TDE Automake 專案 ServiceTypes=TDevelop/Project Icon=make -X-TDE-Library=libkdevautoproject +X-TDE-Library=libtdevautoproject X-TDevelop-Version=5 X-TDevelop-Args=kde diff --git a/buildtools/custommakefiles/CMakeLists.txt b/buildtools/custommakefiles/CMakeLists.txt index 55036324..8327a38d 100644 --- a/buildtools/custommakefiles/CMakeLists.txt +++ b/buildtools/custommakefiles/CMakeLists.txt @@ -30,15 +30,15 @@ link_directories( ##### other data ################################ -install( FILES kdevcustomproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES kdevcustomproject.rc DESTINATION ${DATA_INSTALL_DIR}/kdevcustomproject ) +install( FILES tdevcustomproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES tdevcustomproject.rc DESTINATION ${DATA_INSTALL_DIR}/tdevcustomproject ) -##### libkdevcustomproject (module) ############# +##### libtdevcustomproject (module) ############# -tde_add_kpart( libkdevcustomproject AUTOMOC +tde_add_kpart( libtdevcustomproject AUTOMOC SOURCES selectnewfilesdialog.cpp selectnewfilesdialogbase.ui custombuildoptionswidget.cpp @@ -46,6 +46,6 @@ tde_add_kpart( libkdevcustomproject AUTOMOC custommakeconfigwidgetbase.ui custommanagerwidget.cpp custommanagerwidgetbase.ui customotherconfigwidget.cpp customotherconfigwidgetbase.ui customprojectpart.cpp - LINK kdevbuildbase-shared kdevbuildtoolswidgets-shared + LINK tdevbuildbase-shared tdevbuildtoolswidgets-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/buildtools/custommakefiles/Makefile.am b/buildtools/custommakefiles/Makefile.am index 087ab001..618f8794 100644 --- a/buildtools/custommakefiles/Makefile.am +++ b/buildtools/custommakefiles/Makefile.am @@ -5,12 +5,12 @@ INCLUDES = -I$(top_srcdir)/buildtools/lib/base \ -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util $(all_includes) \ -I$(top_builddir)/buildtools/lib/widgets -kde_module_LTLIBRARIES = libkdevcustomproject.la -libkdevcustomproject_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libkdevcustomproject_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ - $(top_builddir)/buildtools/lib/widgets/libkdevbuildtoolswidgets.la $(top_builddir)/buildtools/lib/base/libkdevbuildbase.la +kde_module_LTLIBRARIES = libtdevcustomproject.la +libtdevcustomproject_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libtdevcustomproject_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ + $(top_builddir)/buildtools/lib/widgets/libtdevbuildtoolswidgets.la $(top_builddir)/buildtools/lib/base/libtdevbuildbase.la -libkdevcustomproject_la_SOURCES = selectnewfilesdialog.cpp selectnewfilesdialogbase.ui \ +libtdevcustomproject_la_SOURCES = selectnewfilesdialog.cpp selectnewfilesdialogbase.ui \ custombuildoptionswidget.cpp custombuildoptionswidgetbase.ui custommakeconfigwidget.cpp \ custommakeconfigwidgetbase.ui custommanagerwidget.cpp custommanagerwidgetbase.ui \ customotherconfigwidget.cpp customotherconfigwidgetbase.ui customprojectpart.cpp @@ -18,9 +18,9 @@ libkdevcustomproject_la_SOURCES = selectnewfilesdialog.cpp selectnewfilesdialogb METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = kdevcustomproject.desktop +service_DATA = tdevcustomproject.desktop -rcdir = $(kde_datadir)/kdevcustomproject -rc_DATA = kdevcustomproject.rc +rcdir = $(kde_datadir)/tdevcustomproject +rc_DATA = tdevcustomproject.rc noinst_HEADERS = selectnewfilesdialog.h custommanagerwidget.h \ customotherconfigwidget.h diff --git a/buildtools/custommakefiles/customprojectpart.cpp b/buildtools/custommakefiles/customprojectpart.cpp index 5b41080e..c9cc482d 100644 --- a/buildtools/custommakefiles/customprojectpart.cpp +++ b/buildtools/custommakefiles/customprojectpart.cpp @@ -31,7 +31,7 @@ #include <kdebug.h> #include <kdialogbase.h> #include <keditlistbox.h> -#include <kdevgenericfactory.h> +#include <tdevgenericfactory.h> #include <kiconloader.h> #include <tdelocale.h> #include <tdemainwindow.h> @@ -42,11 +42,11 @@ #include <kprocess.h> #include "domutil.h" -#include "kdevcore.h" -#include "kdevmainwindow.h" -#include "kdevmakefrontend.h" -#include "kdevappfrontend.h" -#include "kdevpartcontroller.h" +#include "tdevcore.h" +#include "tdevmainwindow.h" +#include "tdevmakefrontend.h" +#include "tdevappfrontend.h" +#include "tdevpartcontroller.h" #include "runoptionswidget.h" #include "makeoptionswidget.h" #include "custombuildoptionswidget.h" @@ -59,18 +59,18 @@ #include "selectnewfilesdialog.h" -#include <kdevplugininfo.h> +#include <tdevplugininfo.h> -typedef KDevGenericFactory<CustomProjectPart> CustomProjectFactory; -static const KDevPluginInfo data( "kdevcustomproject" ); -K_EXPORT_COMPONENT_FACTORY( libkdevcustomproject, CustomProjectFactory( data ) ) +typedef TDevGenericFactory<CustomProjectPart> CustomProjectFactory; +static const TDevPluginInfo data( "tdevcustomproject" ); +K_EXPORT_COMPONENT_FACTORY( libtdevcustomproject, CustomProjectFactory( data ) ) CustomProjectPart::CustomProjectPart( TQObject *parent, const char *name, const TQStringList & ) - : KDevBuildTool( &data, parent, name ? name : "CustomProjectPart" ) + : TDevBuildTool( &data, parent, name ? name : "CustomProjectPart" ) , m_lastCompilationFailed( false ), m_recursive( false ), m_first_recursive( false ) { setInstance( CustomProjectFactory::instance() ); - setXMLFile( "kdevcustomproject.rc" ); + setXMLFile( "tdevcustomproject.rc" ); m_executeAfterBuild = false; @@ -477,7 +477,7 @@ void CustomProjectPart::openProject( const TQString &dirName, const TQString &pr el.setTagName( "default" ); envs.appendChild( el ); } - KDevProject::openProject( dirName, projectName ); + TDevProject::openProject( dirName, projectName ); } @@ -632,7 +632,7 @@ DomUtil::PairList CustomProjectPart::runEnvironmentVars() const */ TQString CustomProjectPart::runDirectory() const { - TQString cwd = defaultRunDirectory( "kdevcustomproject" ); + TQString cwd = defaultRunDirectory( "tdevcustomproject" ); if ( cwd.isEmpty() ) cwd = buildDirectory(); return cwd; diff --git a/buildtools/custommakefiles/customprojectpart.h b/buildtools/custommakefiles/customprojectpart.h index 67223e92..db46d576 100644 --- a/buildtools/custommakefiles/customprojectpart.h +++ b/buildtools/custommakefiles/customprojectpart.h @@ -20,7 +20,7 @@ #include <tqdatetime.h> #include <tqvaluestack.h> -#include <kdevbuildtool.h> +#include <tdevbuildtool.h> class TQListViewItem; class TQPopupMenu; @@ -30,7 +30,7 @@ class CustomProjectWidget; class Context; class TDESelectAction; -class CustomProjectPart : public KDevBuildTool +class CustomProjectPart : public TDevBuildTool { Q_OBJECT diff --git a/buildtools/custommakefiles/kdevcustomproject.desktop b/buildtools/custommakefiles/tdevcustomproject.desktop index 9f81a3d6..0ea2c3bc 100644 --- a/buildtools/custommakefiles/kdevcustomproject.desktop +++ b/buildtools/custommakefiles/tdevcustomproject.desktop @@ -38,7 +38,7 @@ Comment[tg]=Лоиҳаи оддӣ Comment[tr]=Özel Proje Comment[zh_CN]=自定义工程 Comment[zh_TW]=自訂專案 -Name=KDevCustomProject +Name=TDevCustomProject Name[da]=TDevelop brugerdefineret projekt Name[de]=Benutzerdefiniertes Projekt (TDevelop) Name[hi]=के-डेव-कस्टम-परियोजना @@ -86,6 +86,6 @@ GenericName[tr]=Özel Proje GenericName[zh_CN]=自定义工程 GenericName[zh_TW]=自訂專案 ServiceTypes=TDevelop/Project -X-TDE-Library=libkdevcustomproject +X-TDE-Library=libtdevcustomproject X-TDevelop-Version=5 X-TDevelop-Args= diff --git a/buildtools/custommakefiles/kdevcustomproject.rc b/buildtools/custommakefiles/tdevcustomproject.rc index c744b4be..08079774 100644 --- a/buildtools/custommakefiles/kdevcustomproject.rc +++ b/buildtools/custommakefiles/tdevcustomproject.rc @@ -1,5 +1,5 @@ <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> -<kpartgui name="KDevCustomProject" version="7"> +<kpartgui name="TDevCustomProject" version="7"> <MenuBar> <Menu name="project" > <Action name="repopulate_project" /> diff --git a/buildtools/lib/base/CMakeLists.txt b/buildtools/lib/base/CMakeLists.txt index f3585669..a429be6c 100644 --- a/buildtools/lib/base/CMakeLists.txt +++ b/buildtools/lib/base/CMakeLists.txt @@ -26,14 +26,14 @@ link_directories( ##### headers ################################### install( FILES - kdevbuildtool.h + tdevbuildtool.h DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/buildtools/base ) -##### kdevbuildbase (shared) #################### +##### tdevbuildbase (shared) #################### -tde_add_library( kdevbuildbase SHARED AUTOMOC - SOURCES kdevbuildtool.cpp +tde_add_library( tdevbuildbase SHARED AUTOMOC + SOURCES tdevbuildtool.cpp VERSION 0.0.0 LINK tdevelop-shared DESTINATION ${LIB_INSTALL_DIR} diff --git a/buildtools/lib/base/Mainpage.dox b/buildtools/lib/base/Mainpage.dox index 3e16d2d8..8a85d338 100644 --- a/buildtools/lib/base/Mainpage.dox +++ b/buildtools/lib/base/Mainpage.dox @@ -8,8 +8,8 @@ This library contains base classes for KDevelop builtool support plugins. <b>Include path</b>: -I\$(kde_includes)/tdevelop/buildtools/base \section btbaseoverview Overview -This library is created to provide KDevBuildTool compat class which can be used -as drop-in replacement of KDevProject class for buildtool support plugins +This library is created to provide TDevBuildTool compat class which can be used +as drop-in replacement of TDevProject class for buildtool support plugins written for old KDevelop architecture (before version 3.2). Nevertheless, it can be useful for new buildtool plugins as well because it provides diff --git a/buildtools/lib/base/Makefile.am b/buildtools/lib/base/Makefile.am index 7e1083ef..6532398d 100644 --- a/buildtools/lib/base/Makefile.am +++ b/buildtools/lib/base/Makefile.am @@ -2,14 +2,14 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \ -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util -I$(top_srcdir)/lib/widgets/propeditor \ $(all_includes) METASOURCES = AUTO -lib_LTLIBRARIES = libkdevbuildbase.la -libkdevbuildbase_la_LDFLAGS = $(all_libraries) -libkdevbuildbase_la_LIBADD = $(top_builddir)/lib/interfaces/libkdevinterfaces.la $(LIB_QT) $(LIB_TDEUI) -libkdevbuildbase_la_SOURCES = kdevbuildtool.cpp +lib_LTLIBRARIES = libtdevbuildbase.la +libtdevbuildbase_la_LDFLAGS = $(all_libraries) +libtdevbuildbase_la_LIBADD = $(top_builddir)/lib/interfaces/libtdevinterfaces.la $(LIB_QT) $(LIB_TDEUI) +libtdevbuildbase_la_SOURCES = tdevbuildtool.cpp tdevelopbuildtoolsincludedir = $(includedir)/tdevelop/buildtools/base -tdevelopbuildtoolsinclude_HEADERS = kdevbuildtool.h +tdevelopbuildtoolsinclude_HEADERS = tdevbuildtool.h -DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevutil kdevinterfaces kdevextensions -DOXYGEN_PROJECTNAME = KDevelop Buildtool Base Library -DOXYGEN_DOCDIRPREFIX = kdevbt +DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils tdevutil tdevinterfaces tdevextensions +DOXYGEN_PROJECTNAME = TDevelop Buildtool Base Library +DOXYGEN_DOCDIRPREFIX = tdevbt include ../../../Doxyfile.am diff --git a/buildtools/lib/base/kdevbuildtool.cpp b/buildtools/lib/base/tdevbuildtool.cpp index 618f02d9..aa901bb7 100644 --- a/buildtools/lib/base/kdevbuildtool.cpp +++ b/buildtools/lib/base/tdevbuildtool.cpp @@ -16,23 +16,23 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "kdevbuildtool.h" +#include "tdevbuildtool.h" -#include <kdevmakefrontend.h> -#include <kdevappfrontend.h> +#include <tdevmakefrontend.h> +#include <tdevappfrontend.h> -KDevBuildTool::KDevBuildTool(const KDevPluginInfo* info, TQObject* parent, const char* name) - :KDevProject(info, parent, name) +TDevBuildTool::TDevBuildTool(const TDevPluginInfo* info, TQObject* parent, const char* name) + :TDevProject(info, parent, name) { } -KDevMakeFrontend * KDevBuildTool::makeFrontend() +TDevMakeFrontend * TDevBuildTool::makeFrontend() { - return extension<KDevMakeFrontend>("TDevelop/MakeFrontend"); + return extension<TDevMakeFrontend>("TDevelop/MakeFrontend"); } -KDevAppFrontend * KDevBuildTool::appFrontend() +TDevAppFrontend * TDevBuildTool::appFrontend() { - return extension<KDevAppFrontend>("TDevelop/AppFrontend"); + return extension<TDevAppFrontend>("TDevelop/AppFrontend"); } diff --git a/buildtools/lib/base/kdevbuildtool.h b/buildtools/lib/base/tdevbuildtool.h index ff1abcc0..b6899f9b 100644 --- a/buildtools/lib/base/kdevbuildtool.h +++ b/buildtools/lib/base/tdevbuildtool.h @@ -17,24 +17,24 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef KDEVBUILDTOOL_H -#define KDEVBUILDTOOL_H +#ifndef TDEVBUILDTOOL_H +#define TDEVBUILDTOOL_H -#include <kdevproject.h> +#include <tdevproject.h> -class KDevMakeFrontend; -class KDevAppFrontend; +class TDevMakeFrontend; +class TDevAppFrontend; /**Base class for KDevelop build tool support plugins.*/ -class KDevBuildTool: public KDevProject +class TDevBuildTool: public TDevProject { public: - KDevBuildTool(const KDevPluginInfo* info, TQObject* parent, const char* name); + TDevBuildTool(const TDevPluginInfo* info, TQObject* parent, const char* name); /**@return The make frontend.*/ - KDevMakeFrontend *makeFrontend(); + TDevMakeFrontend *makeFrontend(); /**@return The application frontend.*/ - KDevAppFrontend *appFrontend(); + TDevAppFrontend *appFrontend(); }; diff --git a/buildtools/lib/parsers/autotools/CMakeLists.txt b/buildtools/lib/parsers/autotools/CMakeLists.txt index 8226e963..5bc97247 100644 --- a/buildtools/lib/parsers/autotools/CMakeLists.txt +++ b/buildtools/lib/parsers/autotools/CMakeLists.txt @@ -16,9 +16,9 @@ include_directories( ) -##### kdevautotoolsparser (static) ############## +##### tdevautotoolsparser (static) ############## -tde_add_library( kdevautotoolsparser STATIC_PIC +tde_add_library( tdevautotoolsparser STATIC_PIC SOURCES autotoolsast.cpp autotoolsdriver.cpp autotools_yacc.cpp ) diff --git a/buildtools/lib/parsers/autotools/Makefile.am b/buildtools/lib/parsers/autotools/Makefile.am index 340d0e38..47234583 100644 --- a/buildtools/lib/parsers/autotools/Makefile.am +++ b/buildtools/lib/parsers/autotools/Makefile.am @@ -6,9 +6,9 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \ -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util -I$(top_srcdir)/lib/widgets/propeditor \ $(all_includes) METASOURCES = AUTO -noinst_LTLIBRARIES = libkdevautotoolsparser.la -libkdevautotoolsparser_la_LDFLAGS = $(all_libraries) $(LIB_TDEIO) -libkdevautotoolsparser_la_SOURCES = autotoolsast.cpp autotoolsdriver.cpp autotools_yacc.cpp +noinst_LTLIBRARIES = libtdevautotoolsparser.la +libtdevautotoolsparser_la_LDFLAGS = $(all_libraries) $(LIB_TDEIO) +libtdevautotoolsparser_la_SOURCES = autotoolsast.cpp autotoolsdriver.cpp autotools_yacc.cpp parser: cd $(srcdir) ; \ @@ -19,6 +19,6 @@ parser: EXTRA_DIST = autotools.yy autotools.ll DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils -DOXYGEN_PROJECTNAME = KDevelop AutoTools Parser -DOXYGEN_DOCDIRPREFIX = kdevparser +DOXYGEN_PROJECTNAME = TDevelop AutoTools Parser +DOXYGEN_DOCDIRPREFIX = tdevparser include ../../../../Doxyfile.am diff --git a/buildtools/lib/parsers/autotools/tests/Makefile.am b/buildtools/lib/parsers/autotools/tests/Makefile.am index 30c67288..00c2baba 100644 --- a/buildtools/lib/parsers/autotools/tests/Makefile.am +++ b/buildtools/lib/parsers/autotools/tests/Makefile.am @@ -13,9 +13,9 @@ METASOURCES = AUTO check_PROGRAMS = runner viewer runner_LDFLAGS = $(all_libraries) $(LIB_TDECORE) $(KDE_RPATH) -runner_LDADD = $(top_builddir)/buildtools/lib/parsers/autotools/libkdevautotoolsparser.la +runner_LDADD = $(top_builddir)/buildtools/lib/parsers/autotools/libtdevautotoolsparser.la runner_SOURCES = runner.cpp viewer_LDFLAGS = $(all_libraries) $(LIB_TDECORE) $(KDE_RPATH) -viewer_LDADD = $(top_builddir)/buildtools/lib/parsers/autotools/libkdevautotoolsparser.la +viewer_LDADD = $(top_builddir)/buildtools/lib/parsers/autotools/libtdevautotoolsparser.la viewer_SOURCES = viewer.cpp viewer_main.cpp viewerbase.ui diff --git a/buildtools/lib/parsers/qmake/CMakeLists.txt b/buildtools/lib/parsers/qmake/CMakeLists.txt index b8328a84..6ffebfa6 100644 --- a/buildtools/lib/parsers/qmake/CMakeLists.txt +++ b/buildtools/lib/parsers/qmake/CMakeLists.txt @@ -27,9 +27,9 @@ install( FILES DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/buildtools/parsers/qmake ) -##### kdevqmakeparser (shared) ################## +##### tdevqmakeparser (shared) ################## -tde_add_library( kdevqmakeparser SHARED +tde_add_library( tdevqmakeparser SHARED SOURCES qmake_lex.cpp qmake_yacc.cpp qmakeast.cpp qmakeastvisitor.cpp qmakedriver.cpp diff --git a/buildtools/lib/parsers/qmake/Makefile.am b/buildtools/lib/parsers/qmake/Makefile.am index ff3f175b..9e14382a 100644 --- a/buildtools/lib/parsers/qmake/Makefile.am +++ b/buildtools/lib/parsers/qmake/Makefile.am @@ -8,9 +8,9 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \ -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util -I$(top_srcdir)/lib/widgets/propeditor \ $(all_includes) METASOURCES = AUTO -lib_LTLIBRARIES = libkdevqmakeparser.la -libkdevqmakeparser_la_LDFLAGS = -no-undefined $(all_libraries) $(LIB_TDEIO) -libkdevqmakeparser_la_SOURCES = qmake_lex.cpp qmake_yacc.cpp qmakeast.cpp \ +lib_LTLIBRARIES = libtdevqmakeparser.la +libtdevqmakeparser_la_LDFLAGS = -no-undefined $(all_libraries) $(LIB_TDEIO) +libtdevqmakeparser_la_SOURCES = qmake_lex.cpp qmake_yacc.cpp qmakeast.cpp \ qmakeastvisitor.cpp qmakedriver.cpp tdevelopbuildtoolsincludedir = $(includedir)/tdevelop/buildtools/parsers/qmake @@ -24,8 +24,8 @@ parser: EXTRA_DIST = qmake.yy qmake.ll DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils -DOXYGEN_PROJECTNAME = KDevelop QMake parser -DOXYGEN_DOCDIRPREFIX = kdevparser +DOXYGEN_PROJECTNAME = TDevelop QMake parser +DOXYGEN_DOCDIRPREFIX = tdevparser include ../../../../Doxyfile.am noinst_HEADERS = qmake.ll qmake.yy qmake_lex.h diff --git a/buildtools/lib/parsers/qmake/tests/Makefile.am b/buildtools/lib/parsers/qmake/tests/Makefile.am index e1932f7e..74935269 100644 --- a/buildtools/lib/parsers/qmake/tests/Makefile.am +++ b/buildtools/lib/parsers/qmake/tests/Makefile.am @@ -13,9 +13,9 @@ METASOURCES = AUTO noinst_PROGRAMS = runner viewer runner_LDFLAGS = $(all_libraries) $(LIB_TDECORE) $(KDE_RPATH) -runner_LDADD = $(top_builddir)/buildtools/lib/parsers/qmake/libkdevqmakeparser.la +runner_LDADD = $(top_builddir)/buildtools/lib/parsers/qmake/libtdevqmakeparser.la runner_SOURCES = runner.cpp viewer_LDFLAGS = --no-undefined $(all_libraries) $(LIB_TDECORE) $(KDE_RPATH) -viewer_LDADD = $(top_builddir)/buildtools/lib/parsers/qmake/libkdevqmakeparser.la +viewer_LDADD = $(top_builddir)/buildtools/lib/parsers/qmake/libtdevqmakeparser.la viewer_SOURCES = viewer.cpp viewer_main.cpp viewerbase.ui diff --git a/buildtools/lib/widgets/CMakeLists.txt b/buildtools/lib/widgets/CMakeLists.txt index d86d0c66..0349f6d3 100644 --- a/buildtools/lib/widgets/CMakeLists.txt +++ b/buildtools/lib/widgets/CMakeLists.txt @@ -36,9 +36,9 @@ install( FILES DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/buildtools/widgets ) -##### kdevbuildtoolswidgets (shared) ############ +##### tdevbuildtoolswidgets (shared) ############ -tde_add_library( kdevbuildtoolswidgets SHARED AUTOMOC +tde_add_library( tdevbuildtoolswidgets SHARED AUTOMOC SOURCES addenvvardlg.cpp addfilesdialog.cpp environmentdisplaydialog.cpp diff --git a/buildtools/lib/widgets/Makefile.am b/buildtools/lib/widgets/Makefile.am index 6042ea06..718bbb04 100644 --- a/buildtools/lib/widgets/Makefile.am +++ b/buildtools/lib/widgets/Makefile.am @@ -5,11 +5,11 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util \ -I$(top_srcdir)/lib/widgets/propeditor $(all_includes) -lib_LTLIBRARIES = libkdevbuildtoolswidgets.la -libkdevbuildtoolswidgets_la_LDFLAGS = $(all_libraries) -libkdevbuildtoolswidgets_la_LIBADD = $(top_builddir)/lib/interfaces/libkdevinterfaces.la \ +lib_LTLIBRARIES = libtdevbuildtoolswidgets.la +libtdevbuildtoolswidgets_la_LDFLAGS = $(all_libraries) +libtdevbuildtoolswidgets_la_LIBADD = $(top_builddir)/lib/interfaces/libtdevinterfaces.la \ $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) -ltdetexteditor -libkdevbuildtoolswidgets_la_SOURCES = addenvvardlg.cpp addfilesdialog.cpp \ +libtdevbuildtoolswidgets_la_SOURCES = addenvvardlg.cpp addfilesdialog.cpp \ environmentdisplaydialog.cpp environmentdisplaydialogbase.ui environmentvariableswidget.cpp \ environmentvariableswidgetbase.ui envvartools.cpp makeoptionswidget.cpp makeoptionswidgetbase.ui \ removesubprojectdialog.cpp removesubprojectdlgbase.ui runoptionswidget.cpp runoptionswidgetbase.ui \ @@ -23,8 +23,8 @@ tdevelopbuildtoolsinclude_HEADERS = addenvvardlg.h addfilesdialog.h \ makeoptionswidgetbase.h removesubprojectdialog.h removesubprojectdlgbase.h runoptionswidget.h \ runoptionswidgetbase.h subclassesdlg.h subclassesdlgbase.h -DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevutil kdevinterfaces kdevutil -DOXYGEN_PROJECTNAME = KDevelop Buildtool Widgets Library -DOXYGEN_DOCDIRPREFIX = kdevbt +DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils tdevutil tdevinterfaces tdevutil +DOXYGEN_PROJECTNAME = TDevelop Buildtool Widgets Library +DOXYGEN_DOCDIRPREFIX = tdevbt include ../../../Doxyfile.am noinst_HEADERS = environmentdisplaydialog.h diff --git a/buildtools/pascal/CMakeLists.txt b/buildtools/pascal/CMakeLists.txt index b10a6bec..f43f27b2 100644 --- a/buildtools/pascal/CMakeLists.txt +++ b/buildtools/pascal/CMakeLists.txt @@ -30,17 +30,17 @@ link_directories( ##### other data ################################ -install( FILES kdevpascalproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES kdevpascalproject.rc DESTINATION ${DATA_INSTALL_DIR}/kdevpascalproject ) +install( FILES tdevpascalproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES tdevpascalproject.rc DESTINATION ${DATA_INSTALL_DIR}/tdevpascalproject ) -##### libkdevpascalproject (module) ############# +##### libtdevpascalproject (module) ############# -tde_add_kpart( libkdevpascalproject AUTOMOC +tde_add_kpart( libtdevpascalproject AUTOMOC SOURCES pascalproject_part.cpp pascalproject_widget.cpp pascalproject_optionsdlgbase.ui pascalprojectoptionsdlg.cpp pascalglobaloptionsdlg.cpp service.cpp - LINK kdevbuildbase-shared kdevbuildtoolswidgets-shared + LINK tdevbuildbase-shared tdevbuildtoolswidgets-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/buildtools/pascal/Makefile.am b/buildtools/pascal/Makefile.am index 9bf4fc90..f822bd6d 100644 --- a/buildtools/pascal/Makefile.am +++ b/buildtools/pascal/Makefile.am @@ -4,20 +4,20 @@ INCLUDES = -I$(top_srcdir)/buildtools/lib/base \ -I$(top_srcdir)/lib/interfaces/extras -I$(top_srcdir)/lib/util -I$(top_builddir)/buildtools/lib/widgets \ $(all_includes) -kde_module_LTLIBRARIES = libkdevpascalproject.la -libkdevpascalproject_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libkdevpascalproject_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ - $(top_builddir)/buildtools/lib/widgets/libkdevbuildtoolswidgets.la $(top_builddir)/buildtools/lib/base/libkdevbuildbase.la +kde_module_LTLIBRARIES = libtdevpascalproject.la +libtdevpascalproject_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libtdevpascalproject_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ + $(top_builddir)/buildtools/lib/widgets/libtdevbuildtoolswidgets.la $(top_builddir)/buildtools/lib/base/libtdevbuildbase.la -libkdevpascalproject_la_SOURCES = pascalproject_part.cpp pascalproject_widget.cpp pascalproject_optionsdlgbase.ui pascalprojectoptionsdlg.cpp pascalglobaloptionsdlg.cpp service.cpp +libtdevpascalproject_la_SOURCES = pascalproject_part.cpp pascalproject_widget.cpp pascalproject_optionsdlgbase.ui pascalprojectoptionsdlg.cpp pascalglobaloptionsdlg.cpp service.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = kdevpascalproject.desktop +service_DATA = tdevpascalproject.desktop -rcdir = $(kde_datadir)/kdevpascalproject -rc_DATA = kdevpascalproject.rc +rcdir = $(kde_datadir)/tdevpascalproject +rc_DATA = tdevpascalproject.rc diff --git a/buildtools/pascal/pascalglobaloptionsdlg.cpp b/buildtools/pascal/pascalglobaloptionsdlg.cpp index ccbf8dc1..b55ae62f 100644 --- a/buildtools/pascal/pascalglobaloptionsdlg.cpp +++ b/buildtools/pascal/pascalglobaloptionsdlg.cpp @@ -17,7 +17,7 @@ #include <kdebug.h> #include <tdeconfig.h> -#include "kdevcompileroptions.h" +#include "tdevcompileroptions.h" #include "service.h" #include "pascalproject_part.h" @@ -64,7 +64,7 @@ PascalGlobalOptionsDlg::~PascalGlobalOptionsDlg() void PascalGlobalOptionsDlg::optionsButtonClicked() { TQString name = ServiceComboBox::currentText(compiler_box, service_names); - KDevCompilerOptions *plugin = m_part->createCompilerOptions(name); + TDevCompilerOptions *plugin = m_part->createCompilerOptions(name); if (plugin) { TQString flags = plugin->exec(this, options_edit->text()); diff --git a/buildtools/pascal/pascalproject_part.cpp b/buildtools/pascal/pascalproject_part.cpp index 01b0734a..42864e23 100644 --- a/buildtools/pascal/pascalproject_part.cpp +++ b/buildtools/pascal/pascalproject_part.cpp @@ -21,7 +21,7 @@ #include <kiconloader.h> #include <tdelocale.h> #include <tdeaction.h> -#include <kdevgenericfactory.h> +#include <tdevgenericfactory.h> #include <kdebug.h> #include <kdialogbase.h> #include <tdemessagebox.h> @@ -32,13 +32,13 @@ #include <kprocess.h> #include "domutil.h" -#include "kdevcore.h" -#include "kdevmainwindow.h" -#include "kdevmakefrontend.h" -#include "kdevappfrontend.h" -#include "kdevpartcontroller.h" -#include "kdevlanguagesupport.h" -#include "kdevcompileroptions.h" +#include "tdevcore.h" +#include "tdevmainwindow.h" +#include "tdevmakefrontend.h" +#include "tdevappfrontend.h" +#include "tdevpartcontroller.h" +#include "tdevlanguagesupport.h" +#include "tdevcompileroptions.h" #include "runoptionswidget.h" #include "envvartools.h" @@ -46,17 +46,17 @@ #include "pascalprojectoptionsdlg.h" #include "pascalglobaloptionsdlg.h" -#include <kdevplugininfo.h> +#include <tdevplugininfo.h> -typedef KDevGenericFactory<PascalProjectPart> PascalProjectFactory; -static const KDevPluginInfo data("kdevpascalproject"); -K_EXPORT_COMPONENT_FACTORY( libkdevpascalproject, PascalProjectFactory( data ) ) +typedef TDevGenericFactory<PascalProjectPart> PascalProjectFactory; +static const TDevPluginInfo data("tdevpascalproject"); +K_EXPORT_COMPONENT_FACTORY( libtdevpascalproject, PascalProjectFactory( data ) ) PascalProjectPart::PascalProjectPart(TQObject *parent, const char *name, const TQStringList& ) - :KDevBuildTool(&data, parent, name ? name : "PascalProjectPart" ) + :TDevBuildTool(&data, parent, name ? name : "PascalProjectPart" ) { setInstance(PascalProjectFactory::instance()); - setXMLFile("kdevpascalproject.rc"); + setXMLFile("tdevpascalproject.rc"); TDEAction *action; action = new TDEAction( i18n("&Build Project"), "make_tdevelop", Key_F8, @@ -82,7 +82,7 @@ PascalProjectPart::PascalProjectPart(TQObject *parent, const char *name, const T // TQWhatsThis::add(m_widget, i18n("WHAT DOES THIS PART DO?")); - // now you decide what should happen to the widget. Take a look at kdevcore.h + // now you decide what should happen to the widget. Take a look at tdevcore.h // or at other plugins how to embed it. // if you want to embed your widget as an outputview, simply uncomment @@ -172,7 +172,7 @@ void PascalProjectPart::openProject(const TQString &dirName, const TQString &pro } } while (!s.isEmpty()); - KDevProject::openProject( dirName, projectName ); + TDevProject::openProject( dirName, projectName ); } void PascalProjectPart::closeProject() @@ -197,7 +197,7 @@ DomUtil::PairList PascalProjectPart::runEnvironmentVars() const */ TQString PascalProjectPart::runDirectory() const { - TQString cwd = defaultRunDirectory("kdevpascalproject"); + TQString cwd = defaultRunDirectory("tdevpascalproject"); if (cwd.isEmpty()) cwd = buildDirectory(); return cwd; @@ -384,12 +384,12 @@ void PascalProjectPart::slotExecute() void PascalProjectPart::changedFiles( const TQStringList & fileList ) { - KDevProject::changedFiles(fileList); + TDevProject::changedFiles(fileList); } void PascalProjectPart::changedFile( const TQString & fileName ) { - KDevProject::changedFile(fileName); + TDevProject::changedFile(fileName); } void PascalProjectPart::projectConfigWidget( KDialogBase * dlg ) @@ -436,7 +436,7 @@ void PascalProjectPart::configWidget( KDialogBase * dlg ) connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); } -KDevCompilerOptions *PascalProjectPart::createCompilerOptions(const TQString &name) +TDevCompilerOptions *PascalProjectPart::createCompilerOptions(const TQString &name) { KService::Ptr service = KService::serviceByDesktopName(name); if (!service) { @@ -458,13 +458,13 @@ KDevCompilerOptions *PascalProjectPart::createCompilerOptions(const TQString &na args = TQStringList::split(" ", prop.toString()); TQObject *obj = factory->create(this, service->name().latin1(), - "KDevCompilerOptions", args); + "TDevCompilerOptions", args); - if (!obj->inherits("KDevCompilerOptions")) { - kdDebug() << "Component does not inherit KDevCompilerOptions" << endl; + if (!obj->inherits("TDevCompilerOptions")) { + kdDebug() << "Component does not inherit TDevCompilerOptions" << endl; return 0; } - KDevCompilerOptions *dlg = (KDevCompilerOptions*) obj; + TDevCompilerOptions *dlg = (TDevCompilerOptions*) obj; return dlg; } diff --git a/buildtools/pascal/pascalproject_part.h b/buildtools/pascal/pascalproject_part.h index 54d09b2e..8f46817b 100644 --- a/buildtools/pascal/pascalproject_part.h +++ b/buildtools/pascal/pascalproject_part.h @@ -8,18 +8,18 @@ * (at your option) any later version. * * * ***************************************************************************/ -#ifndef __KDEVPART_PASCALPROJECT_H__ -#define __KDEVPART_PASCALPROJECT_H__ +#ifndef __TDEVPART_PASCALPROJECT_H__ +#define __TDEVPART_PASCALPROJECT_H__ #include <tqguardedptr.h> -#include "kdevbuildtool.h" +#include "tdevbuildtool.h" class PascalProjectWidget; class KDialogBase; -class KDevCompilerOptions; +class TDevCompilerOptions; -class PascalProjectPart : public KDevBuildTool +class PascalProjectPart : public TDevBuildTool { Q_OBJECT @@ -61,7 +61,7 @@ public: virtual void changedFiles( const TQStringList & fileList ); virtual void changedFile( const TQString & fileName ); - KDevCompilerOptions *createCompilerOptions(const TQString &name); + TDevCompilerOptions *createCompilerOptions(const TQString &name); virtual TQString defaultOptions(const TQString compiler) const; TQStringList distFiles() const; diff --git a/buildtools/pascal/pascalproject_widget.cpp b/buildtools/pascal/pascalproject_widget.cpp index a8671023..9ce95c47 100644 --- a/buildtools/pascal/pascalproject_widget.cpp +++ b/buildtools/pascal/pascalproject_widget.cpp @@ -4,7 +4,7 @@ #include <kdebug.h> -#include <kdevcore.h> +#include <tdevcore.h> #include "pascalproject_part.h" diff --git a/buildtools/pascal/pascalproject_widget.h b/buildtools/pascal/pascalproject_widget.h index 252c7500..5e104856 100644 --- a/buildtools/pascal/pascalproject_widget.h +++ b/buildtools/pascal/pascalproject_widget.h @@ -6,7 +6,7 @@ #include <tqstring.h> -class KDevProject; +class TDevProject; class PascalProjectPart; diff --git a/buildtools/pascal/pascalprojectoptionsdlg.cpp b/buildtools/pascal/pascalprojectoptionsdlg.cpp index 9c7c2518..1593656a 100644 --- a/buildtools/pascal/pascalprojectoptionsdlg.cpp +++ b/buildtools/pascal/pascalprojectoptionsdlg.cpp @@ -20,7 +20,7 @@ #include <tqvalidator.h> #include "domutil.h" -#include "kdevcompileroptions.h" +#include "tdevcompileroptions.h" #include "service.h" #include "pascalproject_part.h" @@ -59,7 +59,7 @@ TQStringList PascalProjectOptionsDlg::allBuildConfigs() TQStringList allConfigs; allConfigs.append("default"); - TQDomNode node = dom.documentElement().namedItem("kdevpascalproject").namedItem("configurations"); + TQDomNode node = dom.documentElement().namedItem("tdevpascalproject").namedItem("configurations"); TQDomElement childEl = node.firstChild().toElement(); while (!childEl.isNull()) { TQString config = childEl.tagName(); @@ -173,7 +173,7 @@ void PascalProjectOptionsDlg::configRemoved() TQString config = config_combo->currentText(); TQDomDocument dom = *m_part->projectDom(); - TQDomNode node = dom.documentElement().namedItem("kdevpascalproject").namedItem("configurations"); + TQDomNode node = dom.documentElement().namedItem("tdevpascalproject").namedItem("configurations"); node.removeChild(node.namedItem(config)); allConfigs.remove(config); @@ -187,7 +187,7 @@ void PascalProjectOptionsDlg::configRemoved() void PascalProjectOptionsDlg::optionsButtonClicked( ) { TQString name = ServiceComboBox::currentText(compiler_box, service_names); - KDevCompilerOptions *plugin = m_part->createCompilerOptions(name); + TDevCompilerOptions *plugin = m_part->createCompilerOptions(name); if (plugin) { TQString flags = plugin->exec(this, options_edit->text()); diff --git a/buildtools/pascal/pascalprojectoptionsdlg.h b/buildtools/pascal/pascalprojectoptionsdlg.h index acedb14d..c641faf3 100644 --- a/buildtools/pascal/pascalprojectoptionsdlg.h +++ b/buildtools/pascal/pascalprojectoptionsdlg.h @@ -16,7 +16,7 @@ #include "pascalproject_optionsdlgbase.h" class PascalProjectPart; -class KDevCompilerOptions; +class TDevCompilerOptions; class PascalProjectOptionsDlg : public PascalProjectOptionsDlgBase { diff --git a/buildtools/pascal/kdevpascalproject.desktop b/buildtools/pascal/tdevpascalproject.desktop index cde3c21d..36143f24 100644 --- a/buildtools/pascal/kdevpascalproject.desktop +++ b/buildtools/pascal/tdevpascalproject.desktop @@ -89,5 +89,5 @@ GenericName[uz@cyrillic]=Pascal лойиҳаси GenericName[zh_CN]=Pascal 工程 GenericName[zh_TW]=Pascal 專案 ServiceTypes=TDevelop/Project -X-TDE-Library=libkdevpascalproject +X-TDE-Library=libtdevpascalproject X-TDevelop-Version=5 diff --git a/buildtools/pascal/kdevpascalproject.rc b/buildtools/pascal/tdevpascalproject.rc index 9e7f46fd..9e7f46fd 100644 --- a/buildtools/pascal/kdevpascalproject.rc +++ b/buildtools/pascal/tdevpascalproject.rc diff --git a/buildtools/qmake/CMakeLists.txt b/buildtools/qmake/CMakeLists.txt index fa281096..e2b877f5 100644 --- a/buildtools/qmake/CMakeLists.txt +++ b/buildtools/qmake/CMakeLists.txt @@ -31,13 +31,13 @@ link_directories( ##### other data ################################ -install( FILES kdevtrollproject.desktop kdevtmakeproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES kdevtrollproject.rc DESTINATION ${DATA_INSTALL_DIR}/kdevtrollproject ) +install( FILES tdevtrollproject.desktop tdevtmakeproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES tdevtrollproject.rc DESTINATION ${DATA_INSTALL_DIR}/tdevtrollproject ) -##### libkdevtrollproject (module) ############## +##### libtdevtrollproject (module) ############## -tde_add_kpart( libkdevtrollproject AUTOMOC +tde_add_kpart( libtdevtrollproject AUTOMOC SOURCES choosesubprojectdlg.cpp choosesubprojectdlgbase.ui createscopedlg.cpp createscopedlgbase.ui @@ -48,6 +48,6 @@ tde_add_kpart( libkdevtrollproject AUTOMOC qmakeoptionswidgetbase.ui qmakescopeitem.cpp scope.cpp trolllistview.cpp trollprojectpart.cpp trollprojectwidget.cpp - LINK kdevqmakeparser-shared kdevbuildbase-shared kdevbuildtoolswidgets-shared + LINK tdevqmakeparser-shared tdevbuildbase-shared tdevbuildtoolswidgets-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/buildtools/qmake/Makefile.am b/buildtools/qmake/Makefile.am index b50fc775..68adba76 100644 --- a/buildtools/qmake/Makefile.am +++ b/buildtools/qmake/Makefile.am @@ -8,14 +8,14 @@ INCLUDES = -I$(top_srcdir)/buildtools/lib/base \ -I$(top_builddir)/buildtools/lib/widgets $(all_includes) -kde_module_LTLIBRARIES = libkdevtrollproject.la -libkdevtrollproject_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libkdevtrollproject_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ - $(top_builddir)/lib/util/libkdevutil.la $(top_builddir)/buildtools/lib/widgets/libkdevbuildtoolswidgets.la \ - $(top_builddir)/buildtools/lib/base/libkdevbuildbase.la \ - $(top_builddir)/buildtools/lib/parsers/qmake/libkdevqmakeparser.la - -libkdevtrollproject_la_SOURCES = choosesubprojectdlg.cpp \ +kde_module_LTLIBRARIES = libtdevtrollproject.la +libtdevtrollproject_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libtdevtrollproject_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ + $(top_builddir)/lib/util/libtdevutil.la $(top_builddir)/buildtools/lib/widgets/libtdevbuildtoolswidgets.la \ + $(top_builddir)/buildtools/lib/base/libtdevbuildbase.la \ + $(top_builddir)/buildtools/lib/parsers/qmake/libtdevqmakeparser.la + +libtdevtrollproject_la_SOURCES = choosesubprojectdlg.cpp \ choosesubprojectdlgbase.ui createscopedlg.cpp createscopedlgbase.ui disablesubprojectdlg.cpp \ disablesubprojectdlgbase.ui newwidgetdlg.cpp newwidgetdlgbase.ui \ projectconfigurationdlg.cpp projectconfigurationdlgbase.ui qmakedefaultopts.cpp \ @@ -26,9 +26,9 @@ libkdevtrollproject_la_SOURCES = choosesubprojectdlg.cpp \ METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = kdevtrollproject.desktop kdevtmakeproject.desktop +service_DATA = tdevtrollproject.desktop tdevtmakeproject.desktop -rcdir = $(kde_datadir)/kdevtrollproject -rc_DATA = kdevtrollproject.rc +rcdir = $(kde_datadir)/tdevtrollproject +rc_DATA = tdevtrollproject.rc noinst_HEADERS = createscopedlg.h disablesubprojectdlg.h qmakedefaultopts.h \ qmakeoptionswidget.h qmakescopeitem.h trolllistview.h diff --git a/buildtools/qmake/kdevtmakeproject.desktop b/buildtools/qmake/tdevtmakeproject.desktop index 97b4b528..a5b729d5 100644 --- a/buildtools/qmake/kdevtmakeproject.desktop +++ b/buildtools/qmake/tdevtmakeproject.desktop @@ -85,7 +85,7 @@ GenericName[tr]=TMake Projesi GenericName[zh_CN]=TMake 工程 GenericName[zh_TW]=TMake 專案 ServiceTypes=TDevelop/Project -X-TDE-Library=libkdevtrollproject +X-TDE-Library=libtdevtrollproject X-TDevelop-Version=5 X-TDevelop-Args=TMake diff --git a/buildtools/qmake/kdevtrollproject.desktop b/buildtools/qmake/tdevtrollproject.desktop index bf118c56..24ef620e 100644 --- a/buildtools/qmake/kdevtrollproject.desktop +++ b/buildtools/qmake/tdevtrollproject.desktop @@ -90,6 +90,6 @@ GenericName[uz@cyrillic]=QMake лойиҳаси GenericName[zh_CN]=QMake 工程 GenericName[zh_TW]=QMake 專案 ServiceTypes=TDevelop/Project -X-TDE-Library=libkdevtrollproject +X-TDE-Library=libtdevtrollproject X-TDevelop-Version=5 X-TDevelop-Args= diff --git a/buildtools/qmake/kdevtrollproject.rc b/buildtools/qmake/tdevtrollproject.rc index 8f6e0048..8f6e0048 100644 --- a/buildtools/qmake/kdevtrollproject.rc +++ b/buildtools/qmake/tdevtrollproject.rc diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp index c71afc30..738e2534 100644 --- a/buildtools/qmake/trollprojectpart.cpp +++ b/buildtools/qmake/trollprojectpart.cpp @@ -27,7 +27,7 @@ #include <kdirwatch.h> #include <kstatusbar.h> #include <tqmessagebox.h> -#include <kdevgenericfactory.h> +#include <tdevgenericfactory.h> #include <tdeaction.h> #include <tdeparts/part.h> #include <kprocess.h> @@ -41,11 +41,11 @@ #include "domutil.h" -#include "kdevcore.h" -#include "kdevmainwindow.h" -#include "kdevmakefrontend.h" -#include "kdevappfrontend.h" -#include "kdevpartcontroller.h" +#include "tdevcore.h" +#include "tdevmainwindow.h" +#include "tdevmakefrontend.h" +#include "tdevappfrontend.h" +#include "tdevpartcontroller.h" #include "trollprojectwidget.h" #include "runoptionswidget.h" #include "config.h" @@ -53,15 +53,15 @@ #include "qmakeoptionswidget.h" #include "scope.h" -#include <kdevplugininfo.h> +#include <tdevplugininfo.h> #include <urlutil.h> -typedef KDevGenericFactory<TrollProjectPart> TrollProjectFactory; -static const KDevPluginInfo data("kdevtrollproject"); -K_EXPORT_COMPONENT_FACTORY( libkdevtrollproject, TrollProjectFactory( data ) ) +typedef TDevGenericFactory<TrollProjectPart> TrollProjectFactory; +static const TDevPluginInfo data("tdevtrollproject"); +K_EXPORT_COMPONENT_FACTORY( libtdevtrollproject, TrollProjectFactory( data ) ) TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQStringList& args ) - : KDevBuildTool(&data, parent, name ? name : "TrollProjectPart") + : TDevBuildTool(&data, parent, name ? name : "TrollProjectPart") { setInstance(TrollProjectFactory::instance()); @@ -70,7 +70,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS else m_tmakeProject = false; - setXMLFile("kdevtrollproject.rc"); + setXMLFile("tdevtrollproject.rc"); m_executeProjectAfterBuild = false; m_executeTargetAfterBuild = false; @@ -405,7 +405,7 @@ void TrollProjectPart::openProject(const TQString &dirName, const TQString &proj DomUtil::writeEntry(dom, "/kdevtrollproject/run/directoryradio", "executable"); } - KDevProject::openProject( dirName, projectName ); + TDevProject::openProject( dirName, projectName ); } @@ -475,7 +475,7 @@ TQString TrollProjectPart::runDirectory() const TQString cwd; if( DomUtil::readBoolEntry(dom, "/kdevtrollproject/run/useglobalprogram", true) ) { - cwd = defaultRunDirectory("kdevtrollproject"); + cwd = defaultRunDirectory("tdevtrollproject"); }else { TQString name = m_widget->getCurrentOutputFilename(); @@ -788,7 +788,7 @@ bool TrollProjectPart::isDirty() return false; } -KDevProject::Options TrollProjectPart::options( ) const +TDevProject::Options TrollProjectPart::options( ) const { return UsesTQMakeBuildSystem; } diff --git a/buildtools/qmake/trollprojectpart.h b/buildtools/qmake/trollprojectpart.h index e36ef202..2b673b59 100644 --- a/buildtools/qmake/trollprojectpart.h +++ b/buildtools/qmake/trollprojectpart.h @@ -21,14 +21,14 @@ #include <tqmap.h> #include <tqdatetime.h> -#include "kdevbuildtool.h" +#include "tdevbuildtool.h" class KDialogBase; class TrollProjectWidget; class KDirWatch; class TQMakeDefaultOpts; -class TrollProjectPart : public KDevBuildTool +class TrollProjectPart : public TDevBuildTool { Q_OBJECT diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp index 68dfad8e..12d814a5 100644 --- a/buildtools/qmake/trollprojectwidget.cpp +++ b/buildtools/qmake/trollprojectwidget.cpp @@ -60,14 +60,14 @@ #include <tdeio/netaccess.h> #include <kurlcompletion.h> -#include "kdevcore.h" -#include "kdevpartcontroller.h" -#include "kdevmainwindow.h" +#include "tdevcore.h" +#include "tdevpartcontroller.h" +#include "tdevmainwindow.h" #include "trollprojectpart.h" -#include "kdevappfrontend.h" -#include "kdevmakefrontend.h" -#include "kdevlanguagesupport.h" -#include "kdevcreatefile.h" +#include "tdevappfrontend.h" +#include "tdevmakefrontend.h" +#include "tdevlanguagesupport.h" +#include "tdevcreatefile.h" #include "subclassesdlg.h" #include "addfilesdialog.h" #include "urlutil.h" @@ -1403,7 +1403,7 @@ void TrollProjectWidget::slotNewFile() return ; } } - KDevCreateFile * createFileSupport = m_part->extension<KDevCreateFile>( "TDevelop/CreateFile" ); + TDevCreateFile * createFileSupport = m_part->extension<TDevCreateFile>( "TDevelop/CreateFile" ); TQString fcext; if( gitem ) { @@ -1437,7 +1437,7 @@ void TrollProjectWidget::slotNewFile() fcext = TQString(); } } - KDevCreateFile::CreatedFile crFile = + TDevCreateFile::CreatedFile crFile = createFileSupport->createNewFile( fcext, projectDirectory() + TQString(TQChar(TQDir::separator()))+ m_shownSubproject->relativePath() ); } @@ -1683,7 +1683,7 @@ void TrollProjectWidget::slotDetailsContextMenu( TDEListView *, TQListViewItem * } else if ( r == idInsNewFile ) { - KDevCreateFile * createFileSupport = m_part->extension<KDevCreateFile>( "TDevelop/CreateFile" ); + TDevCreateFile * createFileSupport = m_part->extension<TDevCreateFile>( "TDevelop/CreateFile" ); TQString fcext; switch ( titem->groupType ) { @@ -1714,7 +1714,7 @@ void TrollProjectWidget::slotDetailsContextMenu( TDEListView *, TQListViewItem * default: fcext = TQString(); } - KDevCreateFile::CreatedFile crFile = + TDevCreateFile::CreatedFile crFile = createFileSupport->createNewFile( fcext, cleanSubprojectPath ); } diff --git a/buildtools/script/CMakeLists.txt b/buildtools/script/CMakeLists.txt index d3f97540..c30a403d 100644 --- a/buildtools/script/CMakeLists.txt +++ b/buildtools/script/CMakeLists.txt @@ -27,16 +27,16 @@ link_directories( ##### other data ################################ -install( FILES kdevscriptproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES kdevscriptproject.rc DESTINATION ${DATA_INSTALL_DIR}/kdevscriptproject ) +install( FILES tdevscriptproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES tdevscriptproject.rc DESTINATION ${DATA_INSTALL_DIR}/tdevscriptproject ) -##### libkdevscriptproject (module) ############# +##### libtdevscriptproject (module) ############# -tde_add_kpart( libkdevscriptproject AUTOMOC +tde_add_kpart( libtdevscriptproject AUTOMOC SOURCES scriptprojectpart.cpp scriptoptionswidget.cpp scriptoptionswidgetbase.ui scriptnewfiledlg.cpp - LINK kdevbuildbase-shared + LINK tdevbuildbase-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/buildtools/script/Makefile.am b/buildtools/script/Makefile.am index 542b1a69..a3d7652a 100644 --- a/buildtools/script/Makefile.am +++ b/buildtools/script/Makefile.am @@ -10,17 +10,17 @@ INCLUDES = -I$(top_srcdir)/buildtools/lib/base \ -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/interfaces/external -I$(top_srcdir)/lib/util \ -I$(top_srcdir)/lib/external_interfaces $(all_includes) -kde_module_LTLIBRARIES = libkdevscriptproject.la -libkdevscriptproject_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libkdevscriptproject_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ - $(top_builddir)/buildtools/lib/widgets/libkdevbuildtoolswidgets.la $(top_builddir)/buildtools/lib/base/libkdevbuildbase.la +kde_module_LTLIBRARIES = libtdevscriptproject.la +libtdevscriptproject_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libtdevscriptproject_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ + $(top_builddir)/buildtools/lib/widgets/libtdevbuildtoolswidgets.la $(top_builddir)/buildtools/lib/base/libtdevbuildbase.la -libkdevscriptproject_la_SOURCES = scriptprojectpart.cpp scriptoptionswidget.cpp scriptoptionswidgetbase.ui scriptnewfiledlg.cpp +libtdevscriptproject_la_SOURCES = scriptprojectpart.cpp scriptoptionswidget.cpp scriptoptionswidgetbase.ui scriptnewfiledlg.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = kdevscriptproject.desktop +service_DATA = tdevscriptproject.desktop -rcdir = $(kde_datadir)/kdevscriptproject -rc_DATA = kdevscriptproject.rc +rcdir = $(kde_datadir)/tdevscriptproject +rc_DATA = tdevscriptproject.rc diff --git a/buildtools/script/scriptnewfiledlg.cpp b/buildtools/script/scriptnewfiledlg.cpp index 9308792a..f254680e 100644 --- a/buildtools/script/scriptnewfiledlg.cpp +++ b/buildtools/script/scriptnewfiledlg.cpp @@ -81,7 +81,7 @@ void ScriptNewFileDialog::accept() return; } - KDevProject *project = m_part->project(); + TDevProject *project = m_part->project(); if (!project->activeDirectory().isEmpty()) fileName.prepend(project->activeDirectory() + "/"); TQString destpath = project->projectDirectory() + "/" + fileName; diff --git a/buildtools/script/scriptoptionswidget.cpp b/buildtools/script/scriptoptionswidget.cpp index d80cd501..13049699 100644 --- a/buildtools/script/scriptoptionswidget.cpp +++ b/buildtools/script/scriptoptionswidget.cpp @@ -16,10 +16,10 @@ #include <tqradiobutton.h> #include <tqtabwidget.h> #include "domutil.h" -#include "kdevlanguagesupport.h" +#include "tdevlanguagesupport.h" -ScriptOptionsWidget::ScriptOptionsWidget(KDevPlugin *part, +ScriptOptionsWidget::ScriptOptionsWidget(TDevPlugin *part, TQWidget *parent, const char *name) : ScriptOptionsWidgetBase(parent, name) { diff --git a/buildtools/script/scriptoptionswidget.h b/buildtools/script/scriptoptionswidget.h index 8f136d75..086186cc 100644 --- a/buildtools/script/scriptoptionswidget.h +++ b/buildtools/script/scriptoptionswidget.h @@ -14,7 +14,7 @@ #include "scriptoptionswidgetbase.h" -class KDevPlugin; +class TDevPlugin; class ScriptOptionsWidget : public ScriptOptionsWidgetBase @@ -23,14 +23,14 @@ class ScriptOptionsWidget : public ScriptOptionsWidgetBase public: - ScriptOptionsWidget( KDevPlugin *part, TQWidget *parent=0, const char *name=0 ); + ScriptOptionsWidget( TDevPlugin *part, TQWidget *parent=0, const char *name=0 ); ~ScriptOptionsWidget(); public slots: void accept(); private: - KDevPlugin *m_part; + TDevPlugin *m_part; }; #endif diff --git a/buildtools/script/scriptprojectpart.cpp b/buildtools/script/scriptprojectpart.cpp index 8f6b5fb4..ef4fb16f 100644 --- a/buildtools/script/scriptprojectpart.cpp +++ b/buildtools/script/scriptprojectpart.cpp @@ -23,32 +23,32 @@ #include <kiconloader.h> #include <tdelocale.h> #include <tdemessagebox.h> -#include <kdevgenericfactory.h> -#include <kdevcreatefile.h> +#include <tdevgenericfactory.h> +#include <tdevcreatefile.h> #include <kdirwatch.h> #include "domutil.h" -#include "kdevcore.h" -#include "kdevmainwindow.h" -#include "kdevpartcontroller.h" -#include "kdevlanguagesupport.h" +#include "tdevcore.h" +#include "tdevmainwindow.h" +#include "tdevpartcontroller.h" +#include "tdevlanguagesupport.h" #include "scriptoptionswidget.h" #include "scriptnewfiledlg.h" -#include "kdevplugininfo.h" +#include "tdevplugininfo.h" -typedef KDevGenericFactory<ScriptProjectPart> ScriptProjectFactory; -static const KDevPluginInfo data("kdevscriptproject"); -K_EXPORT_COMPONENT_FACTORY( libkdevscriptproject, ScriptProjectFactory( data ) ) +typedef TDevGenericFactory<ScriptProjectPart> ScriptProjectFactory; +static const TDevPluginInfo data("tdevscriptproject"); +K_EXPORT_COMPONENT_FACTORY( libtdevscriptproject, ScriptProjectFactory( data ) ) ScriptProjectPart::ScriptProjectPart(TQObject *parent, const char *name, const TQStringList &) - : KDevBuildTool(&data, parent, name ? name : "ScriptProjectPart") + : TDevBuildTool(&data, parent, name ? name : "ScriptProjectPart") { setInstance(ScriptProjectFactory::instance()); - setXMLFile("kdevscriptproject.rc"); + setXMLFile("tdevscriptproject.rc"); // only create new file action if file creation part not available - if (!extension<KDevCreateFile>("TDevelop/CreateFile")) { + if (!extension<TDevCreateFile>("TDevelop/CreateFile")) { TDEAction *action; action = new TDEAction( i18n("New File..."), 0, this, TQT_SLOT(slotNewFile()), @@ -148,7 +148,7 @@ void ScriptProjectPart::openProject(const TQString &dirName, const TQString &pro } } while (!s.isEmpty()); - KDevProject::openProject( dirName, projectName ); + TDevProject::openProject( dirName, projectName ); } @@ -192,7 +192,7 @@ DomUtil::PairList ScriptProjectPart::runEnvironmentVars() const */ TQString ScriptProjectPart::runDirectory() const { - TQString cwd = defaultRunDirectory("kdevscriptproject"); + TQString cwd = defaultRunDirectory("tdevscriptproject"); if (cwd.isEmpty()) cwd = buildDirectory(); return cwd; diff --git a/buildtools/script/scriptprojectpart.h b/buildtools/script/scriptprojectpart.h index 92087991..2c3023ad 100644 --- a/buildtools/script/scriptprojectpart.h +++ b/buildtools/script/scriptprojectpart.h @@ -15,14 +15,14 @@ #include <tqdict.h> #include <tqguardedptr.h> -#include "kdevbuildtool.h" +#include "tdevbuildtool.h" class TQListViewItem; class TQStringList; class KDialogBase; class ScriptProjectWidget; -class ScriptProjectPart : public KDevBuildTool +class ScriptProjectPart : public TDevBuildTool { Q_OBJECT diff --git a/buildtools/script/kdevscriptproject.desktop b/buildtools/script/tdevscriptproject.desktop index 6e135c16..9ba87c9f 100644 --- a/buildtools/script/kdevscriptproject.desktop +++ b/buildtools/script/tdevscriptproject.desktop @@ -83,5 +83,5 @@ GenericName[zh_CN]=脚本语言工程 GenericName[zh_TW]=文稿語言專案 ServiceTypes=TDevelop/Project Icon=tdevelop -X-TDE-Library=libkdevscriptproject +X-TDE-Library=libtdevscriptproject X-TDevelop-Version=5 diff --git a/buildtools/script/kdevscriptproject.rc b/buildtools/script/tdevscriptproject.rc index 651b10b4..d15c3dc2 100644 --- a/buildtools/script/kdevscriptproject.rc +++ b/buildtools/script/tdevscriptproject.rc @@ -1,5 +1,5 @@ <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> -<kpartgui name="KDevCustomProject" version="2"> +<kpartgui name="TDevCustomProject" version="2"> <MenuBar> <Menu name="file" > <Action name="file_newfile" /> |