summaryrefslogtreecommitdiffstats
path: root/buildtools/custommakefiles
diff options
context:
space:
mode:
authorMichele Calgaro <[email protected]>2014-05-25 15:37:31 +0900
committerMichele Calgaro <[email protected]>2014-05-25 15:37:31 +0900
commit6392f5a9dfce2bf83617d49bb7f332181ec6004e (patch)
treeab69e390f7962b7e7dda1a3a64f035c61c751cf4 /buildtools/custommakefiles
parentaba2788b428dc53243407902e9ccbb20b97a69fd (diff)
downloadtdevelop-6392f5a9dfce2bf83617d49bb7f332181ec6004e.tar.gz
tdevelop-6392f5a9dfce2bf83617d49bb7f332181ec6004e.zip
Revert "Finish renaming tdevelop components"
This reverts commit 722ce1efbac31c61b1d4b13f7e075c9f311e3e73.
Diffstat (limited to 'buildtools/custommakefiles')
-rw-r--r--buildtools/custommakefiles/CMakeLists.txt10
-rw-r--r--buildtools/custommakefiles/Makefile.am16
-rw-r--r--buildtools/custommakefiles/customprojectpart.cpp28
-rw-r--r--buildtools/custommakefiles/customprojectpart.h4
-rw-r--r--buildtools/custommakefiles/kdevcustomproject.desktop (renamed from buildtools/custommakefiles/tdevcustomproject.desktop)4
-rw-r--r--buildtools/custommakefiles/kdevcustomproject.rc (renamed from buildtools/custommakefiles/tdevcustomproject.rc)2
6 files changed, 32 insertions, 32 deletions
diff --git a/buildtools/custommakefiles/CMakeLists.txt b/buildtools/custommakefiles/CMakeLists.txt
index 8327a38d..55036324 100644
--- a/buildtools/custommakefiles/CMakeLists.txt
+++ b/buildtools/custommakefiles/CMakeLists.txt
@@ -30,15 +30,15 @@ link_directories(
##### other data ################################
-install( FILES tdevcustomproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
-install( FILES tdevcustomproject.rc DESTINATION ${DATA_INSTALL_DIR}/tdevcustomproject )
+install( FILES kdevcustomproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
+install( FILES kdevcustomproject.rc DESTINATION ${DATA_INSTALL_DIR}/kdevcustomproject )
-##### libtdevcustomproject (module) #############
+##### libkdevcustomproject (module) #############
-tde_add_kpart( libtdevcustomproject AUTOMOC
+tde_add_kpart( libkdevcustomproject AUTOMOC
SOURCES
selectnewfilesdialog.cpp
selectnewfilesdialogbase.ui custombuildoptionswidget.cpp
@@ -46,6 +46,6 @@ tde_add_kpart( libtdevcustomproject AUTOMOC
custommakeconfigwidgetbase.ui custommanagerwidget.cpp
custommanagerwidgetbase.ui customotherconfigwidget.cpp
customotherconfigwidgetbase.ui customprojectpart.cpp
- LINK tdevbuildbase-shared tdevbuildtoolswidgets-shared
+ LINK kdevbuildbase-shared kdevbuildtoolswidgets-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/buildtools/custommakefiles/Makefile.am b/buildtools/custommakefiles/Makefile.am
index 618f8794..087ab001 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 = 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
+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
-libtdevcustomproject_la_SOURCES = selectnewfilesdialog.cpp selectnewfilesdialogbase.ui \
+libkdevcustomproject_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 @@ libtdevcustomproject_la_SOURCES = selectnewfilesdialog.cpp selectnewfilesdialogb
METASOURCES = AUTO
servicedir = $(kde_servicesdir)
-service_DATA = tdevcustomproject.desktop
+service_DATA = kdevcustomproject.desktop
-rcdir = $(kde_datadir)/tdevcustomproject
-rc_DATA = tdevcustomproject.rc
+rcdir = $(kde_datadir)/kdevcustomproject
+rc_DATA = kdevcustomproject.rc
noinst_HEADERS = selectnewfilesdialog.h custommanagerwidget.h \
customotherconfigwidget.h
diff --git a/buildtools/custommakefiles/customprojectpart.cpp b/buildtools/custommakefiles/customprojectpart.cpp
index c9cc482d..5b41080e 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 <tdevgenericfactory.h>
+#include <kdevgenericfactory.h>
#include <kiconloader.h>
#include <tdelocale.h>
#include <tdemainwindow.h>
@@ -42,11 +42,11 @@
#include <kprocess.h>
#include "domutil.h"
-#include "tdevcore.h"
-#include "tdevmainwindow.h"
-#include "tdevmakefrontend.h"
-#include "tdevappfrontend.h"
-#include "tdevpartcontroller.h"
+#include "kdevcore.h"
+#include "kdevmainwindow.h"
+#include "kdevmakefrontend.h"
+#include "kdevappfrontend.h"
+#include "kdevpartcontroller.h"
#include "runoptionswidget.h"
#include "makeoptionswidget.h"
#include "custombuildoptionswidget.h"
@@ -59,18 +59,18 @@
#include "selectnewfilesdialog.h"
-#include <tdevplugininfo.h>
+#include <kdevplugininfo.h>
-typedef TDevGenericFactory<CustomProjectPart> CustomProjectFactory;
-static const TDevPluginInfo data( "tdevcustomproject" );
-K_EXPORT_COMPONENT_FACTORY( libtdevcustomproject, CustomProjectFactory( data ) )
+typedef KDevGenericFactory<CustomProjectPart> CustomProjectFactory;
+static const KDevPluginInfo data( "kdevcustomproject" );
+K_EXPORT_COMPONENT_FACTORY( libkdevcustomproject, CustomProjectFactory( data ) )
CustomProjectPart::CustomProjectPart( TQObject *parent, const char *name, const TQStringList & )
- : TDevBuildTool( &data, parent, name ? name : "CustomProjectPart" )
+ : KDevBuildTool( &data, parent, name ? name : "CustomProjectPart" )
, m_lastCompilationFailed( false ), m_recursive( false ), m_first_recursive( false )
{
setInstance( CustomProjectFactory::instance() );
- setXMLFile( "tdevcustomproject.rc" );
+ setXMLFile( "kdevcustomproject.rc" );
m_executeAfterBuild = false;
@@ -477,7 +477,7 @@ void CustomProjectPart::openProject( const TQString &dirName, const TQString &pr
el.setTagName( "default" );
envs.appendChild( el );
}
- TDevProject::openProject( dirName, projectName );
+ KDevProject::openProject( dirName, projectName );
}
@@ -632,7 +632,7 @@ DomUtil::PairList CustomProjectPart::runEnvironmentVars() const
*/
TQString CustomProjectPart::runDirectory() const
{
- TQString cwd = defaultRunDirectory( "tdevcustomproject" );
+ TQString cwd = defaultRunDirectory( "kdevcustomproject" );
if ( cwd.isEmpty() )
cwd = buildDirectory();
return cwd;
diff --git a/buildtools/custommakefiles/customprojectpart.h b/buildtools/custommakefiles/customprojectpart.h
index db46d576..67223e92 100644
--- a/buildtools/custommakefiles/customprojectpart.h
+++ b/buildtools/custommakefiles/customprojectpart.h
@@ -20,7 +20,7 @@
#include <tqdatetime.h>
#include <tqvaluestack.h>
-#include <tdevbuildtool.h>
+#include <kdevbuildtool.h>
class TQListViewItem;
class TQPopupMenu;
@@ -30,7 +30,7 @@ class CustomProjectWidget;
class Context;
class TDESelectAction;
-class CustomProjectPart : public TDevBuildTool
+class CustomProjectPart : public KDevBuildTool
{
Q_OBJECT
diff --git a/buildtools/custommakefiles/tdevcustomproject.desktop b/buildtools/custommakefiles/kdevcustomproject.desktop
index 0ea2c3bc..9f81a3d6 100644
--- a/buildtools/custommakefiles/tdevcustomproject.desktop
+++ b/buildtools/custommakefiles/kdevcustomproject.desktop
@@ -38,7 +38,7 @@ Comment[tg]=Лоиҳаи оддӣ
Comment[tr]=Özel Proje
Comment[zh_CN]=自定义工程
Comment[zh_TW]=自訂專案
-Name=TDevCustomProject
+Name=KDevCustomProject
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=libtdevcustomproject
+X-TDE-Library=libkdevcustomproject
X-TDevelop-Version=5
X-TDevelop-Args=
diff --git a/buildtools/custommakefiles/tdevcustomproject.rc b/buildtools/custommakefiles/kdevcustomproject.rc
index 08079774..c744b4be 100644
--- a/buildtools/custommakefiles/tdevcustomproject.rc
+++ b/buildtools/custommakefiles/kdevcustomproject.rc
@@ -1,5 +1,5 @@
<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="TDevCustomProject" version="7">
+<kpartgui name="KDevCustomProject" version="7">
<MenuBar>
<Menu name="project" >
<Action name="repopulate_project" />