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/qmake/CMakeLists.txt | 10 ++-- buildtools/qmake/Makefile.am | 22 +++---- buildtools/qmake/kdevtmakeproject.desktop | 91 +++++++++++++++++++++++++++++ buildtools/qmake/kdevtrollproject.desktop | 95 +++++++++++++++++++++++++++++++ buildtools/qmake/kdevtrollproject.rc | 33 +++++++++++ buildtools/qmake/tdevtmakeproject.desktop | 91 ----------------------------- buildtools/qmake/tdevtrollproject.desktop | 95 ------------------------------- buildtools/qmake/tdevtrollproject.rc | 33 ----------- buildtools/qmake/trollprojectpart.cpp | 30 +++++----- buildtools/qmake/trollprojectpart.h | 4 +- buildtools/qmake/trollprojectwidget.cpp | 22 +++---- 11 files changed, 263 insertions(+), 263 deletions(-) create mode 100644 buildtools/qmake/kdevtmakeproject.desktop create mode 100644 buildtools/qmake/kdevtrollproject.desktop create mode 100644 buildtools/qmake/kdevtrollproject.rc delete mode 100644 buildtools/qmake/tdevtmakeproject.desktop delete mode 100644 buildtools/qmake/tdevtrollproject.desktop delete mode 100644 buildtools/qmake/tdevtrollproject.rc (limited to 'buildtools/qmake') diff --git a/buildtools/qmake/CMakeLists.txt b/buildtools/qmake/CMakeLists.txt index e2b877f5..fa281096 100644 --- a/buildtools/qmake/CMakeLists.txt +++ b/buildtools/qmake/CMakeLists.txt @@ -31,13 +31,13 @@ link_directories( ##### other data ################################ -install( FILES tdevtrollproject.desktop tdevtmakeproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevtrollproject.rc DESTINATION ${DATA_INSTALL_DIR}/tdevtrollproject ) +install( FILES kdevtrollproject.desktop kdevtmakeproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevtrollproject.rc DESTINATION ${DATA_INSTALL_DIR}/kdevtrollproject ) -##### libtdevtrollproject (module) ############## +##### libkdevtrollproject (module) ############## -tde_add_kpart( libtdevtrollproject AUTOMOC +tde_add_kpart( libkdevtrollproject AUTOMOC SOURCES choosesubprojectdlg.cpp choosesubprojectdlgbase.ui createscopedlg.cpp createscopedlgbase.ui @@ -48,6 +48,6 @@ tde_add_kpart( libtdevtrollproject AUTOMOC qmakeoptionswidgetbase.ui qmakescopeitem.cpp scope.cpp trolllistview.cpp trollprojectpart.cpp trollprojectwidget.cpp - LINK tdevqmakeparser-shared tdevbuildbase-shared tdevbuildtoolswidgets-shared + LINK kdevqmakeparser-shared kdevbuildbase-shared kdevbuildtoolswidgets-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/buildtools/qmake/Makefile.am b/buildtools/qmake/Makefile.am index 68adba76..b50fc775 100644 --- a/buildtools/qmake/Makefile.am +++ b/buildtools/qmake/Makefile.am @@ -8,14 +8,14 @@ INCLUDES = -I$(top_srcdir)/buildtools/lib/base \ -I$(top_builddir)/buildtools/lib/widgets $(all_includes) -kde_module_LTLIBRARIES = libtdevtrollproject.la -libtdevtrollproject_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevtrollproject_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ - $(top_builddir)/lib/util/libtdevutil.la $(top_builddir)/buildtools/lib/widgets/libtdevbuildtoolswidgets.la \ - $(top_builddir)/buildtools/lib/base/libtdevbuildbase.la \ - $(top_builddir)/buildtools/lib/parsers/qmake/libtdevqmakeparser.la - -libtdevtrollproject_la_SOURCES = choosesubprojectdlg.cpp \ +kde_module_LTLIBRARIES = libkdevtrollproject.la +libkdevtrollproject_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevtrollproject_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ + $(top_builddir)/lib/util/libkdevutil.la $(top_builddir)/buildtools/lib/widgets/libkdevbuildtoolswidgets.la \ + $(top_builddir)/buildtools/lib/base/libkdevbuildbase.la \ + $(top_builddir)/buildtools/lib/parsers/qmake/libkdevqmakeparser.la + +libkdevtrollproject_la_SOURCES = choosesubprojectdlg.cpp \ choosesubprojectdlgbase.ui createscopedlg.cpp createscopedlgbase.ui disablesubprojectdlg.cpp \ disablesubprojectdlgbase.ui newwidgetdlg.cpp newwidgetdlgbase.ui \ projectconfigurationdlg.cpp projectconfigurationdlgbase.ui qmakedefaultopts.cpp \ @@ -26,9 +26,9 @@ libtdevtrollproject_la_SOURCES = choosesubprojectdlg.cpp \ METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevtrollproject.desktop tdevtmakeproject.desktop +service_DATA = kdevtrollproject.desktop kdevtmakeproject.desktop -rcdir = $(kde_datadir)/tdevtrollproject -rc_DATA = tdevtrollproject.rc +rcdir = $(kde_datadir)/kdevtrollproject +rc_DATA = kdevtrollproject.rc noinst_HEADERS = createscopedlg.h disablesubprojectdlg.h qmakedefaultopts.h \ qmakeoptionswidget.h qmakescopeitem.h trolllistview.h diff --git a/buildtools/qmake/kdevtmakeproject.desktop b/buildtools/qmake/kdevtmakeproject.desktop new file mode 100644 index 00000000..97b4b528 --- /dev/null +++ b/buildtools/qmake/kdevtmakeproject.desktop @@ -0,0 +1,91 @@ +[Desktop Entry] +Type=Service +Exec=blubb +Comment=TMake Project +Comment[br]=Rektras TMake +Comment[ca]=Projecte TMake +Comment[da]=TMake-projekt +Comment[de]=TMake-Projekt für TDevelop +Comment[el]=Έργο TMake +Comment[es]=Proyecto TMake +Comment[et]=TMake projekt +Comment[eu]=TMake proiektua +Comment[fa]=پروژۀ TMake +Comment[fr]=Projet avec TMake +Comment[ga]=Comhad tionscadail TMake +Comment[gl]=Proxecto TMake +Comment[hi]=टी-मेक परियोजना +Comment[hu]=TMake-projekt +Comment[is]=TMake verkefni +Comment[it]=Progetto per TMake +Comment[ja]=TMake プロジェクト +Comment[ms]=Projek TMake +Comment[nds]=TMake-Projekt +Comment[ne]=TMake परियोजना +Comment[nl]=TMake-project +Comment[pl]=Projekt: TMake +Comment[pt]=Projecto TMake +Comment[pt_BR]=Projeto TMake +Comment[ru]=Проект TMake +Comment[sk]=TMake projekt +Comment[sl]=Projekt TMake +Comment[sr]=TMake пројекат +Comment[sr@Latn]=TMake projekat +Comment[sv]=Tmake-projekt +Comment[ta]=டிமேக் பிராஜக்ட் +Comment[tg]=Лоиҳаи TMake +Comment[tr]=TMake Projesi +Comment[zh_CN]=TMake 工程 +Comment[zh_TW]=TMake 專案 +Name=KDevTMakeProject +Name[da]=TDevelop TMake-projekt +Name[de]=TMake-Projekt (TDevelop) +Name[hi]=के-डेव-टी-मेक-परियोजना +Name[nds]=TMake-Projekt (TDevelop) +Name[ne]=KDevTMake परियोजना +Name[pl]=KDevProjektTMake +Name[sk]=KDevTMakeProjekt +Name[sv]=TDevelop Tmake-projekt +Name[ta]=கெடெவ் டிமேக் பிராஜக்ட் +Name[tg]=KDevTСохтани лоиҳа +Name[zh_TW]=TDevelop TMake 專案 +GenericName=TMake Project +GenericName[br]=Raktres TMake +GenericName[ca]=Projecte TMake +GenericName[da]=TMake-projekt +GenericName[de]=TMake-Projekt +GenericName[el]=Έργο TMake +GenericName[es]=Proyecto TMake +GenericName[et]=TMake projekt +GenericName[eu]=TMake proiektua +GenericName[fa]=پروژۀ TMake +GenericName[fr]=Projet avec TMake +GenericName[ga]=Tionscadal TMake +GenericName[gl]=Proxecto TMake +GenericName[hi]=टी-मेक परियोजना +GenericName[hu]=TMake-projekt +GenericName[it]=Progetto per TMake +GenericName[ja]=TMake プロジェクト +GenericName[ms]=Projek TMake +GenericName[nds]=TMake-Projekt +GenericName[ne]=TMake परियोजना +GenericName[nl]=TMake-project +GenericName[pl]=Projekt: TMake +GenericName[pt]=Projecto TMake +GenericName[pt_BR]=Projeto TMake +GenericName[ru]=Проект TMake +GenericName[sk]=TMake projekt +GenericName[sl]=Projekt TMake +GenericName[sr]=TMake пројекат +GenericName[sr@Latn]=TMake projekat +GenericName[sv]=Tmake-projekt +GenericName[ta]=டிமேக் பிராஜக்ட் +GenericName[tg]=Лоиҳаи TMake +GenericName[tr]=TMake Projesi +GenericName[zh_CN]=TMake 工程 +GenericName[zh_TW]=TMake 專案 +ServiceTypes=TDevelop/Project +X-TDE-Library=libkdevtrollproject +X-TDevelop-Version=5 +X-TDevelop-Args=TMake + diff --git a/buildtools/qmake/kdevtrollproject.desktop b/buildtools/qmake/kdevtrollproject.desktop new file mode 100644 index 00000000..bf118c56 --- /dev/null +++ b/buildtools/qmake/kdevtrollproject.desktop @@ -0,0 +1,95 @@ +[Desktop Entry] +Type=Service +Exec=blubb +Comment=QMake Project +Comment[br]=Raktres QMake +Comment[ca]=Projecte QMake +Comment[da]=QMake-projekt +Comment[de]=QMake-Projekt für TDevelop +Comment[el]=Έργο QMake +Comment[es]=Proyecto QMake +Comment[et]=QMake projekt +Comment[eu]=QMake proiektua +Comment[fa]=پروژۀ QMake +Comment[fr]=Projet avec QMake +Comment[ga]=Tionscadal QMake +Comment[gl]=Proxecto QMake +Comment[hi]=क्यू-मेक परियोजना +Comment[hu]=QMake-projekt +Comment[is]=QMake verkefni +Comment[it]=Progetto per QMake +Comment[ja]=QMake プロジェクト +Comment[ms]=Projek QMake +Comment[nds]=QMake-Projekt +Comment[ne]=QMake परियोजना +Comment[nl]=QMake-project +Comment[pa]=QMake ਪ੍ਰੋਜੈਕਟ +Comment[pl]=Projekt: QMake +Comment[pt]=Projecto QMake +Comment[pt_BR]=Projeto QMake +Comment[ru]=Проект QMake +Comment[sk]=QMake projekt +Comment[sl]=Projekt QMake +Comment[sr]=QMake пројекат +Comment[sr@Latn]=QMake projekat +Comment[sv]=Qmake-projekt +Comment[ta]=க்யுமேக் பிராஜக்ட் +Comment[tg]=Лоиҳаи QMake +Comment[tr]=QMake Projesi +Comment[uz]=QMake loyihasi +Comment[uz@cyrillic]=QMake лойиҳаси +Comment[zh_CN]=QMake 工程 +Comment[zh_TW]=QMake 專案 +Name=KDevTrollProject +Name[da]=TDevelop Troll-projekt +Name[de]=QMake-Projekt (TDevelop) +Name[hi]=के-डेव-ट्रॉल-परियोजना +Name[nds]=QMake-Projekt (TDevelop) +Name[ne]=KDevTroll परियोजना +Name[pl]=KDevProjektTroll +Name[sk]=KDevTrollProjekt +Name[sv]=TDevelop Troll-projekt +Name[ta]=கெடெவ் டிரால் பிராஜக்ட் +Name[zh_TW]=TDevelop Troll 專案 +GenericName=QMake Project +GenericName[br]=Raktres QMake +GenericName[ca]=Projecte QMake +GenericName[da]=QMake-projekt +GenericName[de]=QMake-Projekt +GenericName[el]=Έργο QMake +GenericName[es]=Proyecto QMake +GenericName[et]=QMake projekt +GenericName[eu]=QMake proiektua +GenericName[fa]=پروژۀ QMake +GenericName[fr]=Projet avec QMake +GenericName[ga]=Tionscadal QMake +GenericName[gl]=Proxecto QMake +GenericName[hi]=क्यू-मेक परियोजना +GenericName[hu]=QMake-projekt +GenericName[it]=Progetto per QMake +GenericName[ja]=QMake プロジェクト +GenericName[ms]=Projek QMake +GenericName[nds]=QMake-Projekt +GenericName[ne]=QMake परियोजना +GenericName[nl]=QMake-project +GenericName[pa]=QMake ਪ੍ਰੋਜੈਕਟ +GenericName[pl]=Projekt: QMake +GenericName[pt]=Projecto QMake +GenericName[pt_BR]=Projeto QMake +GenericName[ru]=Проект QMake +GenericName[sk]=QMake projekt +GenericName[sl]=Projekt QMake +GenericName[sr]=QMake пројекат +GenericName[sr@Latn]=QMake projekat +GenericName[sv]=Qmake-projekt +GenericName[ta]=க்யுமேக் பிராஜக்ட் +GenericName[tg]=Лоиҳаи QMake +GenericName[tr]=QMake Projesi +GenericName[uz]=QMake loyihasi +GenericName[uz@cyrillic]=QMake лойиҳаси +GenericName[zh_CN]=QMake 工程 +GenericName[zh_TW]=QMake 專案 +ServiceTypes=TDevelop/Project +X-TDE-Library=libkdevtrollproject +X-TDevelop-Version=5 +X-TDevelop-Args= diff --git a/buildtools/qmake/kdevtrollproject.rc b/buildtools/qmake/kdevtrollproject.rc new file mode 100644 index 00000000..8f6e0048 --- /dev/null +++ b/buildtools/qmake/kdevtrollproject.rc @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/buildtools/qmake/tdevtmakeproject.desktop b/buildtools/qmake/tdevtmakeproject.desktop deleted file mode 100644 index a5b729d5..00000000 --- a/buildtools/qmake/tdevtmakeproject.desktop +++ /dev/null @@ -1,91 +0,0 @@ -[Desktop Entry] -Type=Service -Exec=blubb -Comment=TMake Project -Comment[br]=Rektras TMake -Comment[ca]=Projecte TMake -Comment[da]=TMake-projekt -Comment[de]=TMake-Projekt für TDevelop -Comment[el]=Έργο TMake -Comment[es]=Proyecto TMake -Comment[et]=TMake projekt -Comment[eu]=TMake proiektua -Comment[fa]=پروژۀ TMake -Comment[fr]=Projet avec TMake -Comment[ga]=Comhad tionscadail TMake -Comment[gl]=Proxecto TMake -Comment[hi]=टी-मेक परियोजना -Comment[hu]=TMake-projekt -Comment[is]=TMake verkefni -Comment[it]=Progetto per TMake -Comment[ja]=TMake プロジェクト -Comment[ms]=Projek TMake -Comment[nds]=TMake-Projekt -Comment[ne]=TMake परियोजना -Comment[nl]=TMake-project -Comment[pl]=Projekt: TMake -Comment[pt]=Projecto TMake -Comment[pt_BR]=Projeto TMake -Comment[ru]=Проект TMake -Comment[sk]=TMake projekt -Comment[sl]=Projekt TMake -Comment[sr]=TMake пројекат -Comment[sr@Latn]=TMake projekat -Comment[sv]=Tmake-projekt -Comment[ta]=டிமேக் பிராஜக்ட் -Comment[tg]=Лоиҳаи TMake -Comment[tr]=TMake Projesi -Comment[zh_CN]=TMake 工程 -Comment[zh_TW]=TMake 專案 -Name=KDevTMakeProject -Name[da]=TDevelop TMake-projekt -Name[de]=TMake-Projekt (TDevelop) -Name[hi]=के-डेव-टी-मेक-परियोजना -Name[nds]=TMake-Projekt (TDevelop) -Name[ne]=KDevTMake परियोजना -Name[pl]=KDevProjektTMake -Name[sk]=KDevTMakeProjekt -Name[sv]=TDevelop Tmake-projekt -Name[ta]=கெடெவ் டிமேக் பிராஜக்ட் -Name[tg]=KDevTСохтани лоиҳа -Name[zh_TW]=TDevelop TMake 專案 -GenericName=TMake Project -GenericName[br]=Raktres TMake -GenericName[ca]=Projecte TMake -GenericName[da]=TMake-projekt -GenericName[de]=TMake-Projekt -GenericName[el]=Έργο TMake -GenericName[es]=Proyecto TMake -GenericName[et]=TMake projekt -GenericName[eu]=TMake proiektua -GenericName[fa]=پروژۀ TMake -GenericName[fr]=Projet avec TMake -GenericName[ga]=Tionscadal TMake -GenericName[gl]=Proxecto TMake -GenericName[hi]=टी-मेक परियोजना -GenericName[hu]=TMake-projekt -GenericName[it]=Progetto per TMake -GenericName[ja]=TMake プロジェクト -GenericName[ms]=Projek TMake -GenericName[nds]=TMake-Projekt -GenericName[ne]=TMake परियोजना -GenericName[nl]=TMake-project -GenericName[pl]=Projekt: TMake -GenericName[pt]=Projecto TMake -GenericName[pt_BR]=Projeto TMake -GenericName[ru]=Проект TMake -GenericName[sk]=TMake projekt -GenericName[sl]=Projekt TMake -GenericName[sr]=TMake пројекат -GenericName[sr@Latn]=TMake projekat -GenericName[sv]=Tmake-projekt -GenericName[ta]=டிமேக் பிராஜக்ட் -GenericName[tg]=Лоиҳаи TMake -GenericName[tr]=TMake Projesi -GenericName[zh_CN]=TMake 工程 -GenericName[zh_TW]=TMake 專案 -ServiceTypes=TDevelop/Project -X-TDE-Library=libtdevtrollproject -X-TDevelop-Version=5 -X-TDevelop-Args=TMake - diff --git a/buildtools/qmake/tdevtrollproject.desktop b/buildtools/qmake/tdevtrollproject.desktop deleted file mode 100644 index 24ef620e..00000000 --- a/buildtools/qmake/tdevtrollproject.desktop +++ /dev/null @@ -1,95 +0,0 @@ -[Desktop Entry] -Type=Service -Exec=blubb -Comment=QMake Project -Comment[br]=Raktres QMake -Comment[ca]=Projecte QMake -Comment[da]=QMake-projekt -Comment[de]=QMake-Projekt für TDevelop -Comment[el]=Έργο QMake -Comment[es]=Proyecto QMake -Comment[et]=QMake projekt -Comment[eu]=QMake proiektua -Comment[fa]=پروژۀ QMake -Comment[fr]=Projet avec QMake -Comment[ga]=Tionscadal QMake -Comment[gl]=Proxecto QMake -Comment[hi]=क्यू-मेक परियोजना -Comment[hu]=QMake-projekt -Comment[is]=QMake verkefni -Comment[it]=Progetto per QMake -Comment[ja]=QMake プロジェクト -Comment[ms]=Projek QMake -Comment[nds]=QMake-Projekt -Comment[ne]=QMake परियोजना -Comment[nl]=QMake-project -Comment[pa]=QMake ਪ੍ਰੋਜੈਕਟ -Comment[pl]=Projekt: QMake -Comment[pt]=Projecto QMake -Comment[pt_BR]=Projeto QMake -Comment[ru]=Проект QMake -Comment[sk]=QMake projekt -Comment[sl]=Projekt QMake -Comment[sr]=QMake пројекат -Comment[sr@Latn]=QMake projekat -Comment[sv]=Qmake-projekt -Comment[ta]=க்யுமேக் பிராஜக்ட் -Comment[tg]=Лоиҳаи QMake -Comment[tr]=QMake Projesi -Comment[uz]=QMake loyihasi -Comment[uz@cyrillic]=QMake лойиҳаси -Comment[zh_CN]=QMake 工程 -Comment[zh_TW]=QMake 專案 -Name=KDevTrollProject -Name[da]=TDevelop Troll-projekt -Name[de]=QMake-Projekt (TDevelop) -Name[hi]=के-डेव-ट्रॉल-परियोजना -Name[nds]=QMake-Projekt (TDevelop) -Name[ne]=KDevTroll परियोजना -Name[pl]=KDevProjektTroll -Name[sk]=KDevTrollProjekt -Name[sv]=TDevelop Troll-projekt -Name[ta]=கெடெவ் டிரால் பிராஜக்ட் -Name[zh_TW]=TDevelop Troll 專案 -GenericName=QMake Project -GenericName[br]=Raktres QMake -GenericName[ca]=Projecte QMake -GenericName[da]=QMake-projekt -GenericName[de]=QMake-Projekt -GenericName[el]=Έργο QMake -GenericName[es]=Proyecto QMake -GenericName[et]=QMake projekt -GenericName[eu]=QMake proiektua -GenericName[fa]=پروژۀ QMake -GenericName[fr]=Projet avec QMake -GenericName[ga]=Tionscadal QMake -GenericName[gl]=Proxecto QMake -GenericName[hi]=क्यू-मेक परियोजना -GenericName[hu]=QMake-projekt -GenericName[it]=Progetto per QMake -GenericName[ja]=QMake プロジェクト -GenericName[ms]=Projek QMake -GenericName[nds]=QMake-Projekt -GenericName[ne]=QMake परियोजना -GenericName[nl]=QMake-project -GenericName[pa]=QMake ਪ੍ਰੋਜੈਕਟ -GenericName[pl]=Projekt: QMake -GenericName[pt]=Projecto QMake -GenericName[pt_BR]=Projeto QMake -GenericName[ru]=Проект QMake -GenericName[sk]=QMake projekt -GenericName[sl]=Projekt QMake -GenericName[sr]=QMake пројекат -GenericName[sr@Latn]=QMake projekat -GenericName[sv]=Qmake-projekt -GenericName[ta]=க்யுமேக் பிராஜக்ட் -GenericName[tg]=Лоиҳаи QMake -GenericName[tr]=QMake Projesi -GenericName[uz]=QMake loyihasi -GenericName[uz@cyrillic]=QMake лойиҳаси -GenericName[zh_CN]=QMake 工程 -GenericName[zh_TW]=QMake 專案 -ServiceTypes=TDevelop/Project -X-TDE-Library=libtdevtrollproject -X-TDevelop-Version=5 -X-TDevelop-Args= diff --git a/buildtools/qmake/tdevtrollproject.rc b/buildtools/qmake/tdevtrollproject.rc deleted file mode 100644 index 8f6e0048..00000000 --- a/buildtools/qmake/tdevtrollproject.rc +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp index 738e2534..c71afc30 100644 --- a/buildtools/qmake/trollprojectpart.cpp +++ b/buildtools/qmake/trollprojectpart.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include @@ -41,11 +41,11 @@ #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 "trollprojectwidget.h" #include "runoptionswidget.h" #include "config.h" @@ -53,15 +53,15 @@ #include "qmakeoptionswidget.h" #include "scope.h" -#include +#include #include -typedef TDevGenericFactory TrollProjectFactory; -static const TDevPluginInfo data("tdevtrollproject"); -K_EXPORT_COMPONENT_FACTORY( libtdevtrollproject, TrollProjectFactory( data ) ) +typedef KDevGenericFactory TrollProjectFactory; +static const KDevPluginInfo data("kdevtrollproject"); +K_EXPORT_COMPONENT_FACTORY( libkdevtrollproject, TrollProjectFactory( data ) ) TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQStringList& args ) - : TDevBuildTool(&data, parent, name ? name : "TrollProjectPart") + : KDevBuildTool(&data, parent, name ? name : "TrollProjectPart") { setInstance(TrollProjectFactory::instance()); @@ -70,7 +70,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS else m_tmakeProject = false; - setXMLFile("tdevtrollproject.rc"); + setXMLFile("kdevtrollproject.rc"); m_executeProjectAfterBuild = false; m_executeTargetAfterBuild = false; @@ -405,7 +405,7 @@ void TrollProjectPart::openProject(const TQString &dirName, const TQString &proj DomUtil::writeEntry(dom, "/kdevtrollproject/run/directoryradio", "executable"); } - TDevProject::openProject( dirName, projectName ); + KDevProject::openProject( dirName, projectName ); } @@ -475,7 +475,7 @@ TQString TrollProjectPart::runDirectory() const TQString cwd; if( DomUtil::readBoolEntry(dom, "/kdevtrollproject/run/useglobalprogram", true) ) { - cwd = defaultRunDirectory("tdevtrollproject"); + cwd = defaultRunDirectory("kdevtrollproject"); }else { TQString name = m_widget->getCurrentOutputFilename(); @@ -788,7 +788,7 @@ bool TrollProjectPart::isDirty() return false; } -TDevProject::Options TrollProjectPart::options( ) const +KDevProject::Options TrollProjectPart::options( ) const { return UsesTQMakeBuildSystem; } diff --git a/buildtools/qmake/trollprojectpart.h b/buildtools/qmake/trollprojectpart.h index 2b673b59..e36ef202 100644 --- a/buildtools/qmake/trollprojectpart.h +++ b/buildtools/qmake/trollprojectpart.h @@ -21,14 +21,14 @@ #include #include -#include "tdevbuildtool.h" +#include "kdevbuildtool.h" class KDialogBase; class TrollProjectWidget; class KDirWatch; class TQMakeDefaultOpts; -class TrollProjectPart : public TDevBuildTool +class TrollProjectPart : public KDevBuildTool { Q_OBJECT diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp index 12d814a5..68dfad8e 100644 --- a/buildtools/qmake/trollprojectwidget.cpp +++ b/buildtools/qmake/trollprojectwidget.cpp @@ -60,14 +60,14 @@ #include #include -#include "tdevcore.h" -#include "tdevpartcontroller.h" -#include "tdevmainwindow.h" +#include "kdevcore.h" +#include "kdevpartcontroller.h" +#include "kdevmainwindow.h" #include "trollprojectpart.h" -#include "tdevappfrontend.h" -#include "tdevmakefrontend.h" -#include "tdevlanguagesupport.h" -#include "tdevcreatefile.h" +#include "kdevappfrontend.h" +#include "kdevmakefrontend.h" +#include "kdevlanguagesupport.h" +#include "kdevcreatefile.h" #include "subclassesdlg.h" #include "addfilesdialog.h" #include "urlutil.h" @@ -1403,7 +1403,7 @@ void TrollProjectWidget::slotNewFile() return ; } } - TDevCreateFile * createFileSupport = m_part->extension( "TDevelop/CreateFile" ); + KDevCreateFile * createFileSupport = m_part->extension( "TDevelop/CreateFile" ); TQString fcext; if( gitem ) { @@ -1437,7 +1437,7 @@ void TrollProjectWidget::slotNewFile() fcext = TQString(); } } - TDevCreateFile::CreatedFile crFile = + KDevCreateFile::CreatedFile crFile = createFileSupport->createNewFile( fcext, projectDirectory() + TQString(TQChar(TQDir::separator()))+ m_shownSubproject->relativePath() ); } @@ -1683,7 +1683,7 @@ void TrollProjectWidget::slotDetailsContextMenu( TDEListView *, TQListViewItem * } else if ( r == idInsNewFile ) { - TDevCreateFile * createFileSupport = m_part->extension( "TDevelop/CreateFile" ); + KDevCreateFile * createFileSupport = m_part->extension( "TDevelop/CreateFile" ); TQString fcext; switch ( titem->groupType ) { @@ -1714,7 +1714,7 @@ void TrollProjectWidget::slotDetailsContextMenu( TDEListView *, TQListViewItem * default: fcext = TQString(); } - TDevCreateFile::CreatedFile crFile = + KDevCreateFile::CreatedFile crFile = createFileSupport->createNewFile( fcext, cleanSubprojectPath ); } -- cgit v1.2.3