From 6392f5a9dfce2bf83617d49bb7f332181ec6004e Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 25 May 2014 15:37:31 +0900 Subject: Revert "Finish renaming tdevelop components" This reverts commit 722ce1efbac31c61b1d4b13f7e075c9f311e3e73. --- buildtools/script/CMakeLists.txt | 10 ++-- buildtools/script/Makefile.am | 16 +++--- buildtools/script/kdevscriptproject.desktop | 87 +++++++++++++++++++++++++++++ buildtools/script/kdevscriptproject.rc | 12 ++++ buildtools/script/scriptnewfiledlg.cpp | 2 +- buildtools/script/scriptoptionswidget.cpp | 4 +- buildtools/script/scriptoptionswidget.h | 6 +- buildtools/script/scriptprojectpart.cpp | 30 +++++----- buildtools/script/scriptprojectpart.h | 4 +- buildtools/script/tdevscriptproject.desktop | 87 ----------------------------- buildtools/script/tdevscriptproject.rc | 12 ---- 11 files changed, 135 insertions(+), 135 deletions(-) create mode 100644 buildtools/script/kdevscriptproject.desktop create mode 100644 buildtools/script/kdevscriptproject.rc delete mode 100644 buildtools/script/tdevscriptproject.desktop delete mode 100644 buildtools/script/tdevscriptproject.rc (limited to 'buildtools/script') 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/kdevscriptproject.desktop b/buildtools/script/kdevscriptproject.desktop new file mode 100644 index 00000000..6e135c16 --- /dev/null +++ b/buildtools/script/kdevscriptproject.desktop @@ -0,0 +1,87 @@ +[Desktop Entry] +Type=Service +Exec=blubb +Comment=Scripting Language Project +Comment[ca]=Projecte de llenguatge escrivint scripts +Comment[da]=Scriptsprog-projekt +Comment[de]=Skriptsprachen-Projekt für TDevelop +Comment[el]=Έργο γλώσσας γραφής σεναρίων +Comment[es]=Proyecto de lenguaje de guiones +Comment[et]=Skriptikeele projekt +Comment[eu]=Script lengoai proiektua +Comment[fa]=پروژۀ زبان دست‌نوشته‌ای +Comment[fr]=Projet avec les langages de scripts +Comment[ga]=Tionscadal i dTeanga Scriptithe +Comment[gl]=Proxecto de linguaxe de scripting +Comment[hi]=स्क्रिप्टिंग भाषा परियोजना +Comment[hu]=Szkript-projekt +Comment[is]=Skriftumálsverkefni +Comment[it]=Progetto con linguaggio di scripting +Comment[ja]=スクリプト言語プロジェクト +Comment[ms]=Projek Bahasa Penskrip +Comment[nds]=Skriptspraak-Projekt +Comment[ne]=स्क्रिप्टिङ भाषा परियोजना +Comment[nl]=Scripttaal-project +Comment[pl]=Projekt w języku skryptowym +Comment[pt]=Projecto de uma Linguagem de 'Scripting' +Comment[pt_BR]=Projeto de Linguagem de Script +Comment[ru]=Проект скриптового языка +Comment[sk]=Skriptovací jazyk projekt +Comment[sl]=Projekt skriptnega jezika +Comment[sr]=Пројекат скриптног језика +Comment[sr@Latn]=Projekat skriptnog jezika +Comment[sv]=Projekt för skriptspråk +Comment[ta]=ஸ்கிரிப்டிங் மொழி பிராஜக்ட் +Comment[tg]=Лоиҳа бо забони ғарчкунӣ +Comment[tr]=Betik Dili Projesi +Comment[zh_CN]=脚本语言工程 +Comment[zh_TW]=文稿語言專案 +Name=KDevScriptProject +Name[da]=TDevelop script-projekt +Name[de]=Skriptsprachen-Projekt (TDevelop) +Name[hi]=के-डेव-स्क्रिप्ट-परियोजना +Name[nds]=Skriptspraak-Projekt (TDevelop) +Name[ne]=केडीई विकास स्क्रिप्ट परियोजना +Name[pl]=KDevProjektSkrypt +Name[sk]=KDevSkriptProjekt +Name[sv]=TDevelop skriptprojekt +Name[ta]=கெடெவ் ஸ்கிரிப்ட் பிராஜக்ட் +Name[tg]=KDevЛоиҳаи скрипт +Name[zh_TW]=TDevelop 文稿專案 +GenericName=Scripting Language Project +GenericName[ca]=Projecte de llenguatge escrivint scripts +GenericName[da]=Scriptsprog-projekt +GenericName[de]=Skriptsprachen-Projekt +GenericName[el]=Έργο γλώσσας γραφής σεναρίων +GenericName[es]=Proyecto de lenguaje de guiones +GenericName[et]=Skriptikeele projekt +GenericName[eu]=Script lengoaia proiektua +GenericName[fa]=پروژۀ زبان دست‌نوشته‌ای +GenericName[fr]=Projet avec les langages de scripts +GenericName[ga]=Tionscadal i dTeanga Scriptithe +GenericName[gl]=Proxecto de linguaxe de scripting +GenericName[hi]=स्क्रिप्टिंग भाषा परियोजना +GenericName[hu]=Szkript-projekt +GenericName[it]=Progetto con linguaggio di scripting +GenericName[ja]=スクリプト言語プロジェクト +GenericName[nds]=Skriptspraak-Projekt +GenericName[ne]=स्क्रिप्टिङ भाषा परियोजना +GenericName[nl]=Scripttaal-project +GenericName[pl]=Projekt w języku skryptowym +GenericName[pt]=Projecto de uma Linguagem de 'Scripting' +GenericName[pt_BR]=Projeto de Linguagem de Script +GenericName[ru]=Проект скриптового языка +GenericName[sk]=Skriptovací jazyk projekt +GenericName[sl]=Projekt skriptnega jezika +GenericName[sr]=Пројекат скриптног језика +GenericName[sr@Latn]=Projekat skriptnog jezika +GenericName[sv]=Projekt för skriptspråk +GenericName[ta]=ஸ்கிரிப்டிங் மொழி பிராஜக்ட் +GenericName[tg]=Лоиҳа бо забони ғарчкунӣ +GenericName[tr]=Betik Dili Projesi +GenericName[zh_CN]=脚本语言工程 +GenericName[zh_TW]=文稿語言專案 +ServiceTypes=TDevelop/Project +Icon=tdevelop +X-TDE-Library=libkdevscriptproject +X-TDevelop-Version=5 diff --git a/buildtools/script/kdevscriptproject.rc b/buildtools/script/kdevscriptproject.rc new file mode 100644 index 00000000..651b10b4 --- /dev/null +++ b/buildtools/script/kdevscriptproject.rc @@ -0,0 +1,12 @@ + + + + + + + + + + + + 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 #include #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 #include #include -#include -#include +#include +#include #include #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 ScriptProjectFactory; -static const TDevPluginInfo data("tdevscriptproject"); -K_EXPORT_COMPONENT_FACTORY( libtdevscriptproject, ScriptProjectFactory( data ) ) +typedef KDevGenericFactory 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("TDevelop/CreateFile")) { + if (!extension("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 #include -#include "tdevbuildtool.h" +#include "kdevbuildtool.h" class TQListViewItem; class TQStringList; class KDialogBase; class ScriptProjectWidget; -class ScriptProjectPart : public TDevBuildTool +class ScriptProjectPart : public KDevBuildTool { Q_OBJECT diff --git a/buildtools/script/tdevscriptproject.desktop b/buildtools/script/tdevscriptproject.desktop deleted file mode 100644 index 9ba87c9f..00000000 --- a/buildtools/script/tdevscriptproject.desktop +++ /dev/null @@ -1,87 +0,0 @@ -[Desktop Entry] -Type=Service -Exec=blubb -Comment=Scripting Language Project -Comment[ca]=Projecte de llenguatge escrivint scripts -Comment[da]=Scriptsprog-projekt -Comment[de]=Skriptsprachen-Projekt für TDevelop -Comment[el]=Έργο γλώσσας γραφής σεναρίων -Comment[es]=Proyecto de lenguaje de guiones -Comment[et]=Skriptikeele projekt -Comment[eu]=Script lengoai proiektua -Comment[fa]=پروژۀ زبان دست‌نوشته‌ای -Comment[fr]=Projet avec les langages de scripts -Comment[ga]=Tionscadal i dTeanga Scriptithe -Comment[gl]=Proxecto de linguaxe de scripting -Comment[hi]=स्क्रिप्टिंग भाषा परियोजना -Comment[hu]=Szkript-projekt -Comment[is]=Skriftumálsverkefni -Comment[it]=Progetto con linguaggio di scripting -Comment[ja]=スクリプト言語プロジェクト -Comment[ms]=Projek Bahasa Penskrip -Comment[nds]=Skriptspraak-Projekt -Comment[ne]=स्क्रिप्टिङ भाषा परियोजना -Comment[nl]=Scripttaal-project -Comment[pl]=Projekt w języku skryptowym -Comment[pt]=Projecto de uma Linguagem de 'Scripting' -Comment[pt_BR]=Projeto de Linguagem de Script -Comment[ru]=Проект скриптового языка -Comment[sk]=Skriptovací jazyk projekt -Comment[sl]=Projekt skriptnega jezika -Comment[sr]=Пројекат скриптног језика -Comment[sr@Latn]=Projekat skriptnog jezika -Comment[sv]=Projekt för skriptspråk -Comment[ta]=ஸ்கிரிப்டிங் மொழி பிராஜக்ட் -Comment[tg]=Лоиҳа бо забони ғарчкунӣ -Comment[tr]=Betik Dili Projesi -Comment[zh_CN]=脚本语言工程 -Comment[zh_TW]=文稿語言專案 -Name=KDevScriptProject -Name[da]=TDevelop script-projekt -Name[de]=Skriptsprachen-Projekt (TDevelop) -Name[hi]=के-डेव-स्क्रिप्ट-परियोजना -Name[nds]=Skriptspraak-Projekt (TDevelop) -Name[ne]=केडीई विकास स्क्रिप्ट परियोजना -Name[pl]=KDevProjektSkrypt -Name[sk]=KDevSkriptProjekt -Name[sv]=TDevelop skriptprojekt -Name[ta]=கெடெவ் ஸ்கிரிப்ட் பிராஜக்ட் -Name[tg]=KDevЛоиҳаи скрипт -Name[zh_TW]=TDevelop 文稿專案 -GenericName=Scripting Language Project -GenericName[ca]=Projecte de llenguatge escrivint scripts -GenericName[da]=Scriptsprog-projekt -GenericName[de]=Skriptsprachen-Projekt -GenericName[el]=Έργο γλώσσας γραφής σεναρίων -GenericName[es]=Proyecto de lenguaje de guiones -GenericName[et]=Skriptikeele projekt -GenericName[eu]=Script lengoaia proiektua -GenericName[fa]=پروژۀ زبان دست‌نوشته‌ای -GenericName[fr]=Projet avec les langages de scripts -GenericName[ga]=Tionscadal i dTeanga Scriptithe -GenericName[gl]=Proxecto de linguaxe de scripting -GenericName[hi]=स्क्रिप्टिंग भाषा परियोजना -GenericName[hu]=Szkript-projekt -GenericName[it]=Progetto con linguaggio di scripting -GenericName[ja]=スクリプト言語プロジェクト -GenericName[nds]=Skriptspraak-Projekt -GenericName[ne]=स्क्रिप्टिङ भाषा परियोजना -GenericName[nl]=Scripttaal-project -GenericName[pl]=Projekt w języku skryptowym -GenericName[pt]=Projecto de uma Linguagem de 'Scripting' -GenericName[pt_BR]=Projeto de Linguagem de Script -GenericName[ru]=Проект скриптового языка -GenericName[sk]=Skriptovací jazyk projekt -GenericName[sl]=Projekt skriptnega jezika -GenericName[sr]=Пројекат скриптног језика -GenericName[sr@Latn]=Projekat skriptnog jezika -GenericName[sv]=Projekt för skriptspråk -GenericName[ta]=ஸ்கிரிப்டிங் மொழி பிராஜக்ட் -GenericName[tg]=Лоиҳа бо забони ғарчкунӣ -GenericName[tr]=Betik Dili Projesi -GenericName[zh_CN]=脚本语言工程 -GenericName[zh_TW]=文稿語言專案 -ServiceTypes=TDevelop/Project -Icon=tdevelop -X-TDE-Library=libtdevscriptproject -X-TDevelop-Version=5 diff --git a/buildtools/script/tdevscriptproject.rc b/buildtools/script/tdevscriptproject.rc deleted file mode 100644 index d15c3dc2..00000000 --- a/buildtools/script/tdevscriptproject.rc +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - -- cgit v1.2.1