summaryrefslogtreecommitdiffstats
path: root/buildtools/pascal
diff options
context:
space:
mode:
Diffstat (limited to 'buildtools/pascal')
-rw-r--r--buildtools/pascal/CMakeLists.txt10
-rw-r--r--buildtools/pascal/Makefile.am16
-rw-r--r--buildtools/pascal/kdevpascalproject.desktop (renamed from buildtools/pascal/tdevpascalproject.desktop)2
-rw-r--r--buildtools/pascal/kdevpascalproject.rc (renamed from buildtools/pascal/tdevpascalproject.rc)0
-rw-r--r--buildtools/pascal/pascalglobaloptionsdlg.cpp4
-rw-r--r--buildtools/pascal/pascalproject_part.cpp48
-rw-r--r--buildtools/pascal/pascalproject_part.h12
-rw-r--r--buildtools/pascal/pascalproject_widget.cpp2
-rw-r--r--buildtools/pascal/pascalproject_widget.h2
-rw-r--r--buildtools/pascal/pascalprojectoptionsdlg.cpp8
-rw-r--r--buildtools/pascal/pascalprojectoptionsdlg.h2
11 files changed, 53 insertions, 53 deletions
diff --git a/buildtools/pascal/CMakeLists.txt b/buildtools/pascal/CMakeLists.txt
index f43f27b2..b10a6bec 100644
--- a/buildtools/pascal/CMakeLists.txt
+++ b/buildtools/pascal/CMakeLists.txt
@@ -30,17 +30,17 @@ link_directories(
##### other data ################################
-install( FILES tdevpascalproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES tdevpascalproject.rc DESTINATION ${DATA_INSTALL_DIR}/tdevpascalproject )
+install( FILES kdevpascalproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevpascalproject.rc DESTINATION ${DATA_INSTALL_DIR}/kdevpascalproject )
-##### libtdevpascalproject (module) #############
+##### libkdevpascalproject (module) #############
-tde_add_kpart( libtdevpascalproject AUTOMOC
+tde_add_kpart( libkdevpascalproject AUTOMOC
SOURCES
pascalproject_part.cpp pascalproject_widget.cpp
pascalproject_optionsdlgbase.ui pascalprojectoptionsdlg.cpp
pascalglobaloptionsdlg.cpp service.cpp
- LINK tdevbuildbase-shared tdevbuildtoolswidgets-shared
+ LINK kdevbuildbase-shared kdevbuildtoolswidgets-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/buildtools/pascal/Makefile.am b/buildtools/pascal/Makefile.am
index f822bd6d..9bf4fc90 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 = 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
+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
-libtdevpascalproject_la_SOURCES = pascalproject_part.cpp pascalproject_widget.cpp pascalproject_optionsdlgbase.ui pascalprojectoptionsdlg.cpp pascalglobaloptionsdlg.cpp service.cpp
+libkdevpascalproject_la_SOURCES = pascalproject_part.cpp pascalproject_widget.cpp pascalproject_optionsdlgbase.ui pascalprojectoptionsdlg.cpp pascalglobaloptionsdlg.cpp service.cpp
METASOURCES = AUTO
servicedir = $(kde_servicesdir)
-service_DATA = tdevpascalproject.desktop
+service_DATA = kdevpascalproject.desktop
-rcdir = $(kde_datadir)/tdevpascalproject
-rc_DATA = tdevpascalproject.rc
+rcdir = $(kde_datadir)/kdevpascalproject
+rc_DATA = kdevpascalproject.rc
diff --git a/buildtools/pascal/tdevpascalproject.desktop b/buildtools/pascal/kdevpascalproject.desktop
index 36143f24..cde3c21d 100644
--- a/buildtools/pascal/tdevpascalproject.desktop
+++ b/buildtools/pascal/kdevpascalproject.desktop
@@ -89,5 +89,5 @@ GenericName[uz@cyrillic]=Pascal лойиҳаси
GenericName[zh_CN]=Pascal 工程
GenericName[zh_TW]=Pascal 專案
ServiceTypes=TDevelop/Project
-X-TDE-Library=libtdevpascalproject
+X-TDE-Library=libkdevpascalproject
X-TDevelop-Version=5
diff --git a/buildtools/pascal/tdevpascalproject.rc b/buildtools/pascal/kdevpascalproject.rc
index 9e7f46fd..9e7f46fd 100644
--- a/buildtools/pascal/tdevpascalproject.rc
+++ b/buildtools/pascal/kdevpascalproject.rc
diff --git a/buildtools/pascal/pascalglobaloptionsdlg.cpp b/buildtools/pascal/pascalglobaloptionsdlg.cpp
index b55ae62f..ccbf8dc1 100644
--- a/buildtools/pascal/pascalglobaloptionsdlg.cpp
+++ b/buildtools/pascal/pascalglobaloptionsdlg.cpp
@@ -17,7 +17,7 @@
#include <kdebug.h>
#include <tdeconfig.h>
-#include "tdevcompileroptions.h"
+#include "kdevcompileroptions.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);
- 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/pascal/pascalproject_part.cpp b/buildtools/pascal/pascalproject_part.cpp
index 42864e23..01b0734a 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 <tdevgenericfactory.h>
+#include <kdevgenericfactory.h>
#include <kdebug.h>
#include <kdialogbase.h>
#include <tdemessagebox.h>
@@ -32,13 +32,13 @@
#include <kprocess.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 "kdevcore.h"
+#include "kdevmainwindow.h"
+#include "kdevmakefrontend.h"
+#include "kdevappfrontend.h"
+#include "kdevpartcontroller.h"
+#include "kdevlanguagesupport.h"
+#include "kdevcompileroptions.h"
#include "runoptionswidget.h"
#include "envvartools.h"
@@ -46,17 +46,17 @@
#include "pascalprojectoptionsdlg.h"
#include "pascalglobaloptionsdlg.h"
-#include <tdevplugininfo.h>
+#include <kdevplugininfo.h>
-typedef TDevGenericFactory<PascalProjectPart> PascalProjectFactory;
-static const TDevPluginInfo data("tdevpascalproject");
-K_EXPORT_COMPONENT_FACTORY( libtdevpascalproject, PascalProjectFactory( data ) )
+typedef KDevGenericFactory<PascalProjectPart> PascalProjectFactory;
+static const KDevPluginInfo data("kdevpascalproject");
+K_EXPORT_COMPONENT_FACTORY( libkdevpascalproject, PascalProjectFactory( data ) )
PascalProjectPart::PascalProjectPart(TQObject *parent, const char *name, const TQStringList& )
- :TDevBuildTool(&data, parent, name ? name : "PascalProjectPart" )
+ :KDevBuildTool(&data, parent, name ? name : "PascalProjectPart" )
{
setInstance(PascalProjectFactory::instance());
- setXMLFile("tdevpascalproject.rc");
+ setXMLFile("kdevpascalproject.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 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
@@ -172,7 +172,7 @@ void PascalProjectPart::openProject(const TQString &dirName, const TQString &pro
}
} while (!s.isEmpty());
- TDevProject::openProject( dirName, projectName );
+ KDevProject::openProject( dirName, projectName );
}
void PascalProjectPart::closeProject()
@@ -197,7 +197,7 @@ DomUtil::PairList PascalProjectPart::runEnvironmentVars() const
*/
TQString PascalProjectPart::runDirectory() const
{
- TQString cwd = defaultRunDirectory("tdevpascalproject");
+ TQString cwd = defaultRunDirectory("kdevpascalproject");
if (cwd.isEmpty())
cwd = buildDirectory();
return cwd;
@@ -384,12 +384,12 @@ void PascalProjectPart::slotExecute()
void PascalProjectPart::changedFiles( const TQStringList & fileList )
{
- TDevProject::changedFiles(fileList);
+ KDevProject::changedFiles(fileList);
}
void PascalProjectPart::changedFile( const TQString & fileName )
{
- TDevProject::changedFile(fileName);
+ KDevProject::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()) );
}
-TDevCompilerOptions *PascalProjectPart::createCompilerOptions(const TQString &name)
+KDevCompilerOptions *PascalProjectPart::createCompilerOptions(const TQString &name)
{
KService::Ptr service = KService::serviceByDesktopName(name);
if (!service) {
@@ -458,13 +458,13 @@ TDevCompilerOptions *PascalProjectPart::createCompilerOptions(const TQString &na
args = TQStringList::split(" ", prop.toString());
TQObject *obj = factory->create(this, service->name().latin1(),
- "TDevCompilerOptions", args);
+ "KDevCompilerOptions", args);
- if (!obj->inherits("TDevCompilerOptions")) {
- kdDebug() << "Component does not inherit TDevCompilerOptions" << endl;
+ if (!obj->inherits("KDevCompilerOptions")) {
+ kdDebug() << "Component does not inherit KDevCompilerOptions" << endl;
return 0;
}
- TDevCompilerOptions *dlg = (TDevCompilerOptions*) obj;
+ KDevCompilerOptions *dlg = (KDevCompilerOptions*) obj;
return dlg;
}
diff --git a/buildtools/pascal/pascalproject_part.h b/buildtools/pascal/pascalproject_part.h
index 8f46817b..54d09b2e 100644
--- a/buildtools/pascal/pascalproject_part.h
+++ b/buildtools/pascal/pascalproject_part.h
@@ -8,18 +8,18 @@
* (at your option) any later version. *
* *
***************************************************************************/
-#ifndef __TDEVPART_PASCALPROJECT_H__
-#define __TDEVPART_PASCALPROJECT_H__
+#ifndef __KDEVPART_PASCALPROJECT_H__
+#define __KDEVPART_PASCALPROJECT_H__
#include <tqguardedptr.h>
-#include "tdevbuildtool.h"
+#include "kdevbuildtool.h"
class PascalProjectWidget;
class KDialogBase;
-class TDevCompilerOptions;
+class KDevCompilerOptions;
-class PascalProjectPart : public TDevBuildTool
+class PascalProjectPart : public KDevBuildTool
{
Q_OBJECT
@@ -61,7 +61,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) const;
TQStringList distFiles() const;
diff --git a/buildtools/pascal/pascalproject_widget.cpp b/buildtools/pascal/pascalproject_widget.cpp
index 9ce95c47..a8671023 100644
--- a/buildtools/pascal/pascalproject_widget.cpp
+++ b/buildtools/pascal/pascalproject_widget.cpp
@@ -4,7 +4,7 @@
#include <kdebug.h>
-#include <tdevcore.h>
+#include <kdevcore.h>
#include "pascalproject_part.h"
diff --git a/buildtools/pascal/pascalproject_widget.h b/buildtools/pascal/pascalproject_widget.h
index 5e104856..252c7500 100644
--- a/buildtools/pascal/pascalproject_widget.h
+++ b/buildtools/pascal/pascalproject_widget.h
@@ -6,7 +6,7 @@
#include <tqstring.h>
-class TDevProject;
+class KDevProject;
class PascalProjectPart;
diff --git a/buildtools/pascal/pascalprojectoptionsdlg.cpp b/buildtools/pascal/pascalprojectoptionsdlg.cpp
index 1593656a..9c7c2518 100644
--- a/buildtools/pascal/pascalprojectoptionsdlg.cpp
+++ b/buildtools/pascal/pascalprojectoptionsdlg.cpp
@@ -20,7 +20,7 @@
#include <tqvalidator.h>
#include "domutil.h"
-#include "tdevcompileroptions.h"
+#include "kdevcompileroptions.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("tdevpascalproject").namedItem("configurations");
+ TQDomNode node = dom.documentElement().namedItem("kdevpascalproject").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("tdevpascalproject").namedItem("configurations");
+ TQDomNode node = dom.documentElement().namedItem("kdevpascalproject").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);
- 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/pascal/pascalprojectoptionsdlg.h b/buildtools/pascal/pascalprojectoptionsdlg.h
index c641faf3..acedb14d 100644
--- a/buildtools/pascal/pascalprojectoptionsdlg.h
+++ b/buildtools/pascal/pascalprojectoptionsdlg.h
@@ -16,7 +16,7 @@
#include "pascalproject_optionsdlgbase.h"
class PascalProjectPart;
-class TDevCompilerOptions;
+class KDevCompilerOptions;
class PascalProjectOptionsDlg : public PascalProjectOptionsDlgBase
{