diff options
author | Michele Calgaro <[email protected]> | 2014-05-25 15:37:31 +0900 |
---|---|---|
committer | Michele Calgaro <[email protected]> | 2014-05-25 15:37:31 +0900 |
commit | 6392f5a9dfce2bf83617d49bb7f332181ec6004e (patch) | |
tree | ab69e390f7962b7e7dda1a3a64f035c61c751cf4 /buildtools/script | |
parent | aba2788b428dc53243407902e9ccbb20b97a69fd (diff) | |
download | tdevelop-6392f5a9dfce2bf83617d49bb7f332181ec6004e.tar.gz tdevelop-6392f5a9dfce2bf83617d49bb7f332181ec6004e.zip |
Revert "Finish renaming tdevelop components"
This reverts commit 722ce1efbac31c61b1d4b13f7e075c9f311e3e73.
Diffstat (limited to 'buildtools/script')
-rw-r--r-- | buildtools/script/CMakeLists.txt | 10 | ||||
-rw-r--r-- | buildtools/script/Makefile.am | 16 | ||||
-rw-r--r-- | buildtools/script/kdevscriptproject.desktop (renamed from buildtools/script/tdevscriptproject.desktop) | 2 | ||||
-rw-r--r-- | buildtools/script/kdevscriptproject.rc (renamed from buildtools/script/tdevscriptproject.rc) | 2 | ||||
-rw-r--r-- | buildtools/script/scriptnewfiledlg.cpp | 2 | ||||
-rw-r--r-- | buildtools/script/scriptoptionswidget.cpp | 4 | ||||
-rw-r--r-- | buildtools/script/scriptoptionswidget.h | 6 | ||||
-rw-r--r-- | buildtools/script/scriptprojectpart.cpp | 30 | ||||
-rw-r--r-- | buildtools/script/scriptprojectpart.h | 4 |
9 files changed, 38 insertions, 38 deletions
diff --git a/buildtools/script/CMakeLists.txt b/buildtools/script/CMakeLists.txt index c30a403d..d3f97540 100644 --- a/buildtools/script/CMakeLists.txt +++ b/buildtools/script/CMakeLists.txt @@ -27,16 +27,16 @@ link_directories( ##### other data ################################ -install( FILES tdevscriptproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevscriptproject.rc DESTINATION ${DATA_INSTALL_DIR}/tdevscriptproject ) +install( FILES kdevscriptproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevscriptproject.rc DESTINATION ${DATA_INSTALL_DIR}/kdevscriptproject ) -##### libtdevscriptproject (module) ############# +##### libkdevscriptproject (module) ############# -tde_add_kpart( libtdevscriptproject AUTOMOC +tde_add_kpart( libkdevscriptproject AUTOMOC SOURCES scriptprojectpart.cpp scriptoptionswidget.cpp scriptoptionswidgetbase.ui scriptnewfiledlg.cpp - LINK tdevbuildbase-shared + LINK kdevbuildbase-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/buildtools/script/Makefile.am b/buildtools/script/Makefile.am index a3d7652a..542b1a69 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 = 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 +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 -libtdevscriptproject_la_SOURCES = scriptprojectpart.cpp scriptoptionswidget.cpp scriptoptionswidgetbase.ui scriptnewfiledlg.cpp +libkdevscriptproject_la_SOURCES = scriptprojectpart.cpp scriptoptionswidget.cpp scriptoptionswidgetbase.ui scriptnewfiledlg.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevscriptproject.desktop +service_DATA = kdevscriptproject.desktop -rcdir = $(kde_datadir)/tdevscriptproject -rc_DATA = tdevscriptproject.rc +rcdir = $(kde_datadir)/kdevscriptproject +rc_DATA = kdevscriptproject.rc diff --git a/buildtools/script/tdevscriptproject.desktop b/buildtools/script/kdevscriptproject.desktop index 9ba87c9f..6e135c16 100644 --- a/buildtools/script/tdevscriptproject.desktop +++ b/buildtools/script/kdevscriptproject.desktop @@ -83,5 +83,5 @@ GenericName[zh_CN]=脚本语言工程 GenericName[zh_TW]=文稿語言專案 ServiceTypes=TDevelop/Project Icon=tdevelop -X-TDE-Library=libtdevscriptproject +X-TDE-Library=libkdevscriptproject X-TDevelop-Version=5 diff --git a/buildtools/script/tdevscriptproject.rc b/buildtools/script/kdevscriptproject.rc index d15c3dc2..651b10b4 100644 --- a/buildtools/script/tdevscriptproject.rc +++ b/buildtools/script/kdevscriptproject.rc @@ -1,5 +1,5 @@ <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> -<kpartgui name="TDevCustomProject" version="2"> +<kpartgui name="KDevCustomProject" version="2"> <MenuBar> <Menu name="file" > <Action name="file_newfile" /> diff --git a/buildtools/script/scriptnewfiledlg.cpp b/buildtools/script/scriptnewfiledlg.cpp index f254680e..9308792a 100644 --- a/buildtools/script/scriptnewfiledlg.cpp +++ b/buildtools/script/scriptnewfiledlg.cpp @@ -81,7 +81,7 @@ void ScriptNewFileDialog::accept() return; } - TDevProject *project = m_part->project(); + KDevProject *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 13049699..d80cd501 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 "tdevlanguagesupport.h" +#include "kdevlanguagesupport.h" -ScriptOptionsWidget::ScriptOptionsWidget(TDevPlugin *part, +ScriptOptionsWidget::ScriptOptionsWidget(KDevPlugin *part, TQWidget *parent, const char *name) : ScriptOptionsWidgetBase(parent, name) { diff --git a/buildtools/script/scriptoptionswidget.h b/buildtools/script/scriptoptionswidget.h index 086186cc..8f136d75 100644 --- a/buildtools/script/scriptoptionswidget.h +++ b/buildtools/script/scriptoptionswidget.h @@ -14,7 +14,7 @@ #include "scriptoptionswidgetbase.h" -class TDevPlugin; +class KDevPlugin; class ScriptOptionsWidget : public ScriptOptionsWidgetBase @@ -23,14 +23,14 @@ class ScriptOptionsWidget : public ScriptOptionsWidgetBase public: - ScriptOptionsWidget( TDevPlugin *part, TQWidget *parent=0, const char *name=0 ); + ScriptOptionsWidget( KDevPlugin *part, TQWidget *parent=0, const char *name=0 ); ~ScriptOptionsWidget(); public slots: void accept(); private: - TDevPlugin *m_part; + KDevPlugin *m_part; }; #endif diff --git a/buildtools/script/scriptprojectpart.cpp b/buildtools/script/scriptprojectpart.cpp index ef4fb16f..8f6b5fb4 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 <tdevgenericfactory.h> -#include <tdevcreatefile.h> +#include <kdevgenericfactory.h> +#include <kdevcreatefile.h> #include <kdirwatch.h> #include "domutil.h" -#include "tdevcore.h" -#include "tdevmainwindow.h" -#include "tdevpartcontroller.h" -#include "tdevlanguagesupport.h" +#include "kdevcore.h" +#include "kdevmainwindow.h" +#include "kdevpartcontroller.h" +#include "kdevlanguagesupport.h" #include "scriptoptionswidget.h" #include "scriptnewfiledlg.h" -#include "tdevplugininfo.h" +#include "kdevplugininfo.h" -typedef TDevGenericFactory<ScriptProjectPart> ScriptProjectFactory; -static const TDevPluginInfo data("tdevscriptproject"); -K_EXPORT_COMPONENT_FACTORY( libtdevscriptproject, ScriptProjectFactory( data ) ) +typedef KDevGenericFactory<ScriptProjectPart> ScriptProjectFactory; +static const KDevPluginInfo data("kdevscriptproject"); +K_EXPORT_COMPONENT_FACTORY( libkdevscriptproject, ScriptProjectFactory( data ) ) ScriptProjectPart::ScriptProjectPart(TQObject *parent, const char *name, const TQStringList &) - : TDevBuildTool(&data, parent, name ? name : "ScriptProjectPart") + : KDevBuildTool(&data, parent, name ? name : "ScriptProjectPart") { setInstance(ScriptProjectFactory::instance()); - setXMLFile("tdevscriptproject.rc"); + setXMLFile("kdevscriptproject.rc"); // only create new file action if file creation part not available - if (!extension<TDevCreateFile>("TDevelop/CreateFile")) { + if (!extension<KDevCreateFile>("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()); - TDevProject::openProject( dirName, projectName ); + KDevProject::openProject( dirName, projectName ); } @@ -192,7 +192,7 @@ DomUtil::PairList ScriptProjectPart::runEnvironmentVars() const */ TQString ScriptProjectPart::runDirectory() const { - TQString cwd = defaultRunDirectory("tdevscriptproject"); + TQString cwd = defaultRunDirectory("kdevscriptproject"); if (cwd.isEmpty()) cwd = buildDirectory(); return cwd; diff --git a/buildtools/script/scriptprojectpart.h b/buildtools/script/scriptprojectpart.h index 2c3023ad..92087991 100644 --- a/buildtools/script/scriptprojectpart.h +++ b/buildtools/script/scriptprojectpart.h @@ -15,14 +15,14 @@ #include <tqdict.h> #include <tqguardedptr.h> -#include "tdevbuildtool.h" +#include "kdevbuildtool.h" class TQListViewItem; class TQStringList; class KDialogBase; class ScriptProjectWidget; -class ScriptProjectPart : public TDevBuildTool +class ScriptProjectPart : public KDevBuildTool { Q_OBJECT |