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/custommakefiles/CMakeLists.txt | 10 +-- buildtools/custommakefiles/Makefile.am | 16 ++-- buildtools/custommakefiles/customprojectpart.cpp | 28 +++---- buildtools/custommakefiles/customprojectpart.h | 4 +- .../custommakefiles/kdevcustomproject.desktop | 91 ++++++++++++++++++++++ buildtools/custommakefiles/kdevcustomproject.rc | 30 +++++++ .../custommakefiles/tdevcustomproject.desktop | 91 ---------------------- buildtools/custommakefiles/tdevcustomproject.rc | 30 ------- 8 files changed, 150 insertions(+), 150 deletions(-) create mode 100644 buildtools/custommakefiles/kdevcustomproject.desktop create mode 100644 buildtools/custommakefiles/kdevcustomproject.rc delete mode 100644 buildtools/custommakefiles/tdevcustomproject.desktop delete mode 100644 buildtools/custommakefiles/tdevcustomproject.rc (limited to 'buildtools/custommakefiles') 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 #include #include -#include +#include #include #include #include @@ -42,11 +42,11 @@ #include #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 +#include -typedef TDevGenericFactory CustomProjectFactory; -static const TDevPluginInfo data( "tdevcustomproject" ); -K_EXPORT_COMPONENT_FACTORY( libtdevcustomproject, CustomProjectFactory( data ) ) +typedef KDevGenericFactory 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 #include -#include +#include 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/kdevcustomproject.desktop b/buildtools/custommakefiles/kdevcustomproject.desktop new file mode 100644 index 00000000..9f81a3d6 --- /dev/null +++ b/buildtools/custommakefiles/kdevcustomproject.desktop @@ -0,0 +1,91 @@ +[Desktop Entry] +Type=Service +Exec=blubb +Comment=Custom Project +Comment[br]=Raktres diouzhoc'h +Comment[ca]=Projecte a mida +Comment[cs]=Vlastní projekt +Comment[da]=Brugerdefineret projekt +Comment[de]=Benutzerdefiniertes Projekt für TDevelop +Comment[el]=Προσαρμοσμένo έργο +Comment[es]=Proyecto personalizado +Comment[et]=Kohandatav projekt +Comment[eu]=Proiektu pertsonalizatua +Comment[fa]=پروژۀ سفارشی +Comment[fr]=Projet personnalisé +Comment[ga]=Tionscadal Saincheaptha +Comment[gl]=Proxecto persoalizado +Comment[hi]=कस्टम परियोजना +Comment[hu]=Egyedi projekt +Comment[is]=Sérsniðið verkefni +Comment[it]=Progetto personalizzato +Comment[ja]=カスタムプロジェクト +Comment[ms]=Projek Tersendiri +Comment[nds]=Egen Projekt +Comment[ne]=अनुकूल परियोजना +Comment[nl]=Aangepast project +Comment[pl]=Własny projekt +Comment[pt]=Projecto Personalizado +Comment[pt_BR]=Projeto Personalizado +Comment[ru]=Особый проект +Comment[sk]=Vlastný projekt +Comment[sl]=Poljuben projekt +Comment[sr]=Произвољан пројекат +Comment[sr@Latn]=Proizvoljan projekat +Comment[sv]=Eget projekt +Comment[ta]=தனிப்பயன் பிராஜக்ட் +Comment[tg]=Лоиҳаи оддӣ +Comment[tr]=Özel Proje +Comment[zh_CN]=自定义工程 +Comment[zh_TW]=自訂專案 +Name=KDevCustomProject +Name[da]=TDevelop brugerdefineret projekt +Name[de]=Benutzerdefiniertes Projekt (TDevelop) +Name[hi]=के-डेव-कस्टम-परियोजना +Name[nds]=Egen Projekt (TDevelop) +Name[ne]=केडीई विकास अनुकूल परियोजना +Name[pl]=KDevWłasnyProjekt +Name[sk]=KDevVlastnýProjekt +Name[sv]=TDevelop eget projekt +Name[ta]=கெடெவ் தனிப்பயன் பிராஜக்ட் +Name[tg]=Лоиҳаи оддӣKDev +Name[zh_TW]=TDevelop 自訂專案 +GenericName=Custom Project +GenericName[br]=Raktres diouzhoc'h +GenericName[ca]=Projecte a mida +GenericName[da]=Brugerdefineret projekt +GenericName[de]=Benutzerdefiniertes Projekt +GenericName[el]=Προσαρμοσμένο έργο +GenericName[es]=Proyecto personalizado +GenericName[et]=Kohandatav projekt +GenericName[eu]=Proiektu pertsonalizatua +GenericName[fa]=پروژۀ سفارشی +GenericName[fr]=Projet personnalisé +GenericName[ga]=Tionscadal Saincheaptha +GenericName[gl]=Proxecto persoalizado +GenericName[hi]=कस्टम परियोजना +GenericName[hu]=Egyedi projekt +GenericName[it]=Progetto personalizzato +GenericName[ja]=カスタムプロジェクト +GenericName[ms]=Projek Tersendiri +GenericName[nds]=Egen Projekt +GenericName[ne]=अनुकूल परियोजना +GenericName[nl]=Aangepast project +GenericName[pl]=Projekt: własny +GenericName[pt]=Projecto Personalizado +GenericName[pt_BR]=Projeto Personalizado +GenericName[ru]=Особый проект +GenericName[sk]=Vlastný projekt +GenericName[sl]=Poljuben projekt +GenericName[sr]=Произвољан пројекат +GenericName[sr@Latn]=Proizvoljan projekat +GenericName[sv]=Eget projekt +GenericName[ta]=தனிப்பயன் பிராஜக்ட் +GenericName[tg]=Лоиҳаи оддӣ +GenericName[tr]=Özel Proje +GenericName[zh_CN]=自定义工程 +GenericName[zh_TW]=自訂專案 +ServiceTypes=TDevelop/Project +X-TDE-Library=libkdevcustomproject +X-TDevelop-Version=5 +X-TDevelop-Args= diff --git a/buildtools/custommakefiles/kdevcustomproject.rc b/buildtools/custommakefiles/kdevcustomproject.rc new file mode 100644 index 00000000..c744b4be --- /dev/null +++ b/buildtools/custommakefiles/kdevcustomproject.rc @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/buildtools/custommakefiles/tdevcustomproject.desktop b/buildtools/custommakefiles/tdevcustomproject.desktop deleted file mode 100644 index 0ea2c3bc..00000000 --- a/buildtools/custommakefiles/tdevcustomproject.desktop +++ /dev/null @@ -1,91 +0,0 @@ -[Desktop Entry] -Type=Service -Exec=blubb -Comment=Custom Project -Comment[br]=Raktres diouzhoc'h -Comment[ca]=Projecte a mida -Comment[cs]=Vlastní projekt -Comment[da]=Brugerdefineret projekt -Comment[de]=Benutzerdefiniertes Projekt für TDevelop -Comment[el]=Προσαρμοσμένo έργο -Comment[es]=Proyecto personalizado -Comment[et]=Kohandatav projekt -Comment[eu]=Proiektu pertsonalizatua -Comment[fa]=پروژۀ سفارشی -Comment[fr]=Projet personnalisé -Comment[ga]=Tionscadal Saincheaptha -Comment[gl]=Proxecto persoalizado -Comment[hi]=कस्टम परियोजना -Comment[hu]=Egyedi projekt -Comment[is]=Sérsniðið verkefni -Comment[it]=Progetto personalizzato -Comment[ja]=カスタムプロジェクト -Comment[ms]=Projek Tersendiri -Comment[nds]=Egen Projekt -Comment[ne]=अनुकूल परियोजना -Comment[nl]=Aangepast project -Comment[pl]=Własny projekt -Comment[pt]=Projecto Personalizado -Comment[pt_BR]=Projeto Personalizado -Comment[ru]=Особый проект -Comment[sk]=Vlastný projekt -Comment[sl]=Poljuben projekt -Comment[sr]=Произвољан пројекат -Comment[sr@Latn]=Proizvoljan projekat -Comment[sv]=Eget projekt -Comment[ta]=தனிப்பயன் பிராஜக்ட் -Comment[tg]=Лоиҳаи оддӣ -Comment[tr]=Özel Proje -Comment[zh_CN]=自定义工程 -Comment[zh_TW]=自訂專案 -Name=TDevCustomProject -Name[da]=TDevelop brugerdefineret projekt -Name[de]=Benutzerdefiniertes Projekt (TDevelop) -Name[hi]=के-डेव-कस्टम-परियोजना -Name[nds]=Egen Projekt (TDevelop) -Name[ne]=केडीई विकास अनुकूल परियोजना -Name[pl]=KDevWłasnyProjekt -Name[sk]=KDevVlastnýProjekt -Name[sv]=TDevelop eget projekt -Name[ta]=கெடெவ் தனிப்பயன் பிராஜக்ட் -Name[tg]=Лоиҳаи оддӣKDev -Name[zh_TW]=TDevelop 自訂專案 -GenericName=Custom Project -GenericName[br]=Raktres diouzhoc'h -GenericName[ca]=Projecte a mida -GenericName[da]=Brugerdefineret projekt -GenericName[de]=Benutzerdefiniertes Projekt -GenericName[el]=Προσαρμοσμένο έργο -GenericName[es]=Proyecto personalizado -GenericName[et]=Kohandatav projekt -GenericName[eu]=Proiektu pertsonalizatua -GenericName[fa]=پروژۀ سفارشی -GenericName[fr]=Projet personnalisé -GenericName[ga]=Tionscadal Saincheaptha -GenericName[gl]=Proxecto persoalizado -GenericName[hi]=कस्टम परियोजना -GenericName[hu]=Egyedi projekt -GenericName[it]=Progetto personalizzato -GenericName[ja]=カスタムプロジェクト -GenericName[ms]=Projek Tersendiri -GenericName[nds]=Egen Projekt -GenericName[ne]=अनुकूल परियोजना -GenericName[nl]=Aangepast project -GenericName[pl]=Projekt: własny -GenericName[pt]=Projecto Personalizado -GenericName[pt_BR]=Projeto Personalizado -GenericName[ru]=Особый проект -GenericName[sk]=Vlastný projekt -GenericName[sl]=Poljuben projekt -GenericName[sr]=Произвољан пројекат -GenericName[sr@Latn]=Proizvoljan projekat -GenericName[sv]=Eget projekt -GenericName[ta]=தனிப்பயன் பிராஜக்ட் -GenericName[tg]=Лоиҳаи оддӣ -GenericName[tr]=Özel Proje -GenericName[zh_CN]=自定义工程 -GenericName[zh_TW]=自訂專案 -ServiceTypes=TDevelop/Project -X-TDE-Library=libtdevcustomproject -X-TDevelop-Version=5 -X-TDevelop-Args= diff --git a/buildtools/custommakefiles/tdevcustomproject.rc b/buildtools/custommakefiles/tdevcustomproject.rc deleted file mode 100644 index 08079774..00000000 --- a/buildtools/custommakefiles/tdevcustomproject.rc +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.1