summaryrefslogtreecommitdiffstats
path: root/buildtools/ada
diff options
context:
space:
mode:
Diffstat (limited to 'buildtools/ada')
-rw-r--r--buildtools/ada/CMakeLists.txt10
-rw-r--r--buildtools/ada/Makefile.am16
-rw-r--r--buildtools/ada/adaglobaloptionsdlg.cpp4
-rw-r--r--buildtools/ada/adaproject_part.cpp68
-rw-r--r--buildtools/ada/adaproject_part.h12
-rw-r--r--buildtools/ada/adaproject_widget.cpp2
-rw-r--r--buildtools/ada/adaproject_widget.h2
-rw-r--r--buildtools/ada/adaprojectoptionsdlg.cpp16
-rw-r--r--buildtools/ada/adaprojectoptionsdlg.h2
-rw-r--r--buildtools/ada/kdevadaproject.desktop (renamed from buildtools/ada/tdevadaproject.desktop)2
-rw-r--r--buildtools/ada/kdevadaproject.rc (renamed from buildtools/ada/tdevadaproject.rc)0
11 files changed, 67 insertions, 67 deletions
diff --git a/buildtools/ada/CMakeLists.txt b/buildtools/ada/CMakeLists.txt
index 0cf08117..8d0fd4ae 100644
--- a/buildtools/ada/CMakeLists.txt
+++ b/buildtools/ada/CMakeLists.txt
@@ -28,17 +28,17 @@ link_directories(
##### other data ################################
-install( FILES tdevadaproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES tdevadaproject.rc DESTINATION ${DATA_INSTALL_DIR}/tdevadaproject )
+install( FILES kdevadaproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevadaproject.rc DESTINATION ${DATA_INSTALL_DIR}/kdevadaproject )
-##### libtdevadaproject (module) ################
+##### libkdevadaproject (module) ################
-tde_add_kpart( libtdevadaproject AUTOMOC
+tde_add_kpart( libkdevadaproject AUTOMOC
SOURCES
adaproject_part.cpp adaproject_widget.cpp
adaproject_optionsdlgbase.ui adaprojectoptionsdlg.cpp
adaglobaloptionsdlg.cpp service.cpp
- LINK tdevbuildbase-shared
+ LINK kdevbuildbase-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/buildtools/ada/Makefile.am b/buildtools/ada/Makefile.am
index 7997b18c..2b2614ec 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 = 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
+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
-libtdevadaproject_la_SOURCES = adaproject_part.cpp adaproject_widget.cpp adaproject_optionsdlgbase.ui adaprojectoptionsdlg.cpp adaglobaloptionsdlg.cpp service.cpp
+libkdevadaproject_la_SOURCES = adaproject_part.cpp adaproject_widget.cpp adaproject_optionsdlgbase.ui adaprojectoptionsdlg.cpp adaglobaloptionsdlg.cpp service.cpp
METASOURCES = AUTO
servicedir = $(kde_servicesdir)
-service_DATA = tdevadaproject.desktop
+service_DATA = kdevadaproject.desktop
-rcdir = $(kde_datadir)/tdevadaproject
-rc_DATA = tdevadaproject.rc
+rcdir = $(kde_datadir)/kdevadaproject
+rc_DATA = kdevadaproject.rc
diff --git a/buildtools/ada/adaglobaloptionsdlg.cpp b/buildtools/ada/adaglobaloptionsdlg.cpp
index 791c23ae..cea68bdc 100644
--- a/buildtools/ada/adaglobaloptionsdlg.cpp
+++ b/buildtools/ada/adaglobaloptionsdlg.cpp
@@ -15,7 +15,7 @@
#include <kdebug.h>
#include <tdeconfig.h>
-#include "tdevcompileroptions.h"
+#include "kdevcompileroptions.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);
- TDevCompilerOptions *plugin = m_part->createCompilerOptions(name);
+ KDevCompilerOptions *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 195e2889..32833dfd 100644
--- a/buildtools/ada/adaproject_part.cpp
+++ b/buildtools/ada/adaproject_part.cpp
@@ -28,29 +28,29 @@
#include <tdeconfig.h>
#include "domutil.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 "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 "adaproject_widget.h"
#include "adaprojectoptionsdlg.h"
#include "adaglobaloptionsdlg.h"
-typedef TDevGenericFactory<AdaProjectPart> AdaProjectFactory;
-static const TDevPluginInfo data("tdevadaproject");
-K_EXPORT_COMPONENT_FACTORY( libtdevadaproject, AdaProjectFactory( data ) )
+typedef KDevGenericFactory<AdaProjectPart> AdaProjectFactory;
+static const KDevPluginInfo data("kdevadaproject");
+K_EXPORT_COMPONENT_FACTORY( libkdevadaproject, AdaProjectFactory( data ) )
AdaProjectPart::AdaProjectPart(TQObject *parent, const char *name, const TQStringList& )
- :TDevBuildTool(&data, parent, name ? name : "AdaProjectPart" )
+ :KDevBuildTool(&data, parent, name ? name : "AdaProjectPart" )
{
setInstance(AdaProjectFactory::instance());
- setXMLFile("tdevadaproject.rc");
+ setXMLFile("kdevadaproject.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 tdevcore.h
+ // now you decide what should happen to the widget. Take a look at kdevcore.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, "/tdevadaproject/run/directoryradio") == "" ) {
- DomUtil::writeEntry(dom, "/tdevadaproject/run/directoryradio", "executable");
+ if (DomUtil::readEntry(dom, "/kdevadaproject/run/directoryradio") == "" ) {
+ DomUtil::writeEntry(dom, "/kdevadaproject/run/directoryradio", "executable");
}
loadProjectConfig();
@@ -165,7 +165,7 @@ void AdaProjectPart::openProject(const TQString &dirName, const TQString &projec
}
} while (!s.isEmpty());
- TDevProject::openProject( dirName, projectName );
+ KDevProject::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(), "/tdevadaproject/run/envvars", "envvar", "name", "value");
+ return DomUtil::readPairListEntry(*projectDom(), "/kdevadaproject/run/envvars", "envvar", "name", "value");
}
@@ -190,7 +190,7 @@ DomUtil::PairList AdaProjectPart::runEnvironmentVars() const
*/
TQString AdaProjectPart::runDirectory() const
{
- TQString cwd = defaultRunDirectory("tdevadaproject");
+ TQString cwd = defaultRunDirectory("kdevadaproject");
if (cwd.isEmpty())
cwd = buildDirectory();
return cwd;
@@ -212,7 +212,7 @@ TQString AdaProjectPart::mainProgram() const
if ( !dom ) return TQString();
- TQString DomMainProgram = DomUtil::readEntry( *dom, "/tdevadaproject/run/mainprogram");
+ TQString DomMainProgram = DomUtil::readEntry( *dom, "/kdevadaproject/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(), "/tdevadaproject/run/globaldebugarguments");
+ return DomUtil::readEntry(*projectDom(), "/kdevadaproject/run/globaldebugarguments");
}
/** Retuns a TQString with the run command line arguments */
TQString AdaProjectPart::runArguments() const
{
- return DomUtil::readEntry(*projectDom(), "/tdevadaproject/run/programargs");
+ return DomUtil::readEntry(*projectDom(), "/kdevadaproject/run/programargs");
}
TQString AdaProjectPart::mainSource() const
@@ -361,12 +361,12 @@ void AdaProjectPart::slotExecute()
void AdaProjectPart::changedFiles( const TQStringList & fileList )
{
- TDevProject::changedFiles(fileList);
+ KDevProject::changedFiles(fileList);
}
void AdaProjectPart::changedFile( const TQString & fileName )
{
- TDevProject::changedFile(fileName);
+ KDevProject::changedFile(fileName);
}
void AdaProjectPart::projectConfigWidget( KDialogBase * dlg )
@@ -382,10 +382,10 @@ void AdaProjectPart::loadProjectConfig( )
{
TQDomDocument &dom = *(projectDom());
- 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"));
+ 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"));
if (m_compilerExec.isEmpty())
{
@@ -408,7 +408,7 @@ void AdaProjectPart::configWidget( KDialogBase * dlg )
connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) );
}
-TDevCompilerOptions *AdaProjectPart::createCompilerOptions(const TQString &name)
+KDevCompilerOptions *AdaProjectPart::createCompilerOptions(const TQString &name)
{
KService::Ptr service = KService::serviceByDesktopName(name);
if (!service) {
@@ -430,13 +430,13 @@ TDevCompilerOptions *AdaProjectPart::createCompilerOptions(const TQString &name)
args = TQStringList::split(" ", prop.toString());
TQObject *obj = factory->create(this, service->name().latin1(),
- "TDevCompilerOptions", args);
+ "KDevCompilerOptions", args);
- if (!obj->inherits("TDevCompilerOptions")) {
- kdDebug() << "AdaProjectPart::createCompilerOptions: component does not inherit TDevCompilerOptions" << endl;
+ if (!obj->inherits("KDevCompilerOptions")) {
+ kdDebug() << "AdaProjectPart::createCompilerOptions: component does not inherit KDevCompilerOptions" << endl;
return 0;
}
- TDevCompilerOptions *dlg = (TDevCompilerOptions*) obj;
+ KDevCompilerOptions *dlg = (KDevCompilerOptions*) obj;
return dlg;
}
diff --git a/buildtools/ada/adaproject_part.h b/buildtools/ada/adaproject_part.h
index 46b328c4..5511da78 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 __TDEVPART_ADAPROJECT_H__
-#define __TDEVPART_ADAPROJECT_H__
+#ifndef __KDEVPART_ADAPROJECT_H__
+#define __KDEVPART_ADAPROJECT_H__
#include <tqguardedptr.h>
-#include "tdevbuildtool.h"
+#include "kdevbuildtool.h"
class AdaProjectWidget;
class KDialogBase;
-class TDevCompilerOptions;
+class KDevCompilerOptions;
-class AdaProjectPart : public TDevBuildTool
+class AdaProjectPart : public KDevBuildTool
{
Q_OBJECT
@@ -59,7 +59,7 @@ public:
virtual void changedFiles( const TQStringList & fileList );
virtual void changedFile( const TQString & fileName );
- TDevCompilerOptions *createCompilerOptions(const TQString &name);
+ KDevCompilerOptions *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 3eaba244..f5016e8c 100644
--- a/buildtools/ada/adaproject_widget.cpp
+++ b/buildtools/ada/adaproject_widget.cpp
@@ -3,7 +3,7 @@
#include <kurl.h>
#include <kdebug.h>
-#include <tdevcore.h>
+#include <kdevcore.h>
#include "adaproject_part.h"
#include "adaproject_widget.h"
diff --git a/buildtools/ada/adaproject_widget.h b/buildtools/ada/adaproject_widget.h
index c89fc511..6bbab369 100644
--- a/buildtools/ada/adaproject_widget.h
+++ b/buildtools/ada/adaproject_widget.h
@@ -4,7 +4,7 @@
#include <tqwidget.h>
#include <tqstring.h>
-class TDevProject;
+class KDevProject;
class AdaProjectPart;
class AdaProjectWidget : public TQWidget
diff --git a/buildtools/ada/adaprojectoptionsdlg.cpp b/buildtools/ada/adaprojectoptionsdlg.cpp
index 6cced020..28549efc 100644
--- a/buildtools/ada/adaprojectoptionsdlg.cpp
+++ b/buildtools/ada/adaprojectoptionsdlg.cpp
@@ -18,7 +18,7 @@
#include <tqvalidator.h>
#include "domutil.h"
-#include "tdevcompileroptions.h"
+#include "kdevcompileroptions.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, "/tdevadaproject/general/useconfiguration", "default"));
+ configChanged(DomUtil::readEntry(dom, "/kdevadaproject/general/useconfiguration", "default"));
}
AdaProjectOptionsDlg::~AdaProjectOptionsDlg()
@@ -57,7 +57,7 @@ TQStringList AdaProjectOptionsDlg::allBuildConfigs()
TQStringList allConfigs;
allConfigs.append("default");
- TQDomNode node = dom.documentElement().namedItem("tdevadaproject").namedItem("configurations");
+ TQDomNode node = dom.documentElement().namedItem("kdevadaproject").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(), "/tdevadaproject/general/useconfiguration", currentConfig);
+ DomUtil::writeEntry(*m_part->projectDom(), "/kdevadaproject/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 = "/tdevadaproject/configurations/" + config + "/";
+ TQString prefix = "/kdevadaproject/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 = "/tdevadaproject/configurations/" + config + "/";
+ TQString prefix = "/kdevadaproject/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("tdevadaproject").namedItem("configurations");
+ TQDomNode node = dom.documentElement().namedItem("kdevadaproject").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);
- TDevCompilerOptions *plugin = m_part->createCompilerOptions(name);
+ KDevCompilerOptions *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 0f6c0262..569f06c9 100644
--- a/buildtools/ada/adaprojectoptionsdlg.h
+++ b/buildtools/ada/adaprojectoptionsdlg.h
@@ -14,7 +14,7 @@
#include "adaproject_optionsdlgbase.h"
class AdaProjectPart;
-class TDevCompilerOptions;
+class KDevCompilerOptions;
class AdaProjectOptionsDlg : public AdaProjectOptionsDlgBase
{
diff --git a/buildtools/ada/tdevadaproject.desktop b/buildtools/ada/kdevadaproject.desktop
index 91206fd4..882b0f64 100644
--- a/buildtools/ada/tdevadaproject.desktop
+++ b/buildtools/ada/kdevadaproject.desktop
@@ -95,6 +95,6 @@ GenericName[uz@cyrillic]=Ada лойиҳаси
GenericName[zh_CN]=Ada 工程
GenericName[zh_TW]=Ada 專案
ServiceTypes=TDevelop/Project
-X-TDE-Library=libtdevadaproject
+X-TDE-Library=libkdevadaproject
X-TDevelop-Version=5
X-TDevelop-Language=Ada
diff --git a/buildtools/ada/tdevadaproject.rc b/buildtools/ada/kdevadaproject.rc
index d7f260e1..d7f260e1 100644
--- a/buildtools/ada/tdevadaproject.rc
+++ b/buildtools/ada/kdevadaproject.rc