diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-05-25 15:37:31 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-05-25 15:37:31 +0900 |
commit | 6392f5a9dfce2bf83617d49bb7f332181ec6004e (patch) | |
tree | ab69e390f7962b7e7dda1a3a64f035c61c751cf4 /parts/distpart | |
parent | aba2788b428dc53243407902e9ccbb20b97a69fd (diff) | |
download | tdevelop-6392f5a9dfce2bf83617d49bb7f332181ec6004e.tar.gz tdevelop-6392f5a9dfce2bf83617d49bb7f332181ec6004e.zip |
Revert "Finish renaming tdevelop components"
This reverts commit 722ce1efbac31c61b1d4b13f7e075c9f311e3e73.
Diffstat (limited to 'parts/distpart')
-rw-r--r-- | parts/distpart/CMakeLists.txt | 8 | ||||
-rw-r--r-- | parts/distpart/Makefile.am | 14 | ||||
-rw-r--r-- | parts/distpart/distpart_part.cpp | 16 | ||||
-rw-r--r-- | parts/distpart/distpart_part.h | 8 | ||||
-rw-r--r-- | parts/distpart/distpart_widget.cpp | 6 | ||||
-rw-r--r-- | parts/distpart/distpart_widget.h | 2 | ||||
-rw-r--r-- | parts/distpart/kdevdistpart.desktop (renamed from parts/distpart/tdevdistpart.desktop) | 2 | ||||
-rw-r--r-- | parts/distpart/kdevpart_distpart.rc (renamed from parts/distpart/tdevpart_distpart.rc) | 0 | ||||
-rw-r--r-- | parts/distpart/specsupport.cpp | 12 |
9 files changed, 34 insertions, 34 deletions
diff --git a/parts/distpart/CMakeLists.txt b/parts/distpart/CMakeLists.txt index 586b5346..15fcb85e 100644 --- a/parts/distpart/CMakeLists.txt +++ b/parts/distpart/CMakeLists.txt @@ -27,13 +27,13 @@ link_directories( ##### other data ################################ -install( FILES tdevdistpart.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevpart_distpart.rc DESTINATION ${DATA_INSTALL_DIR}/tdevdistpart ) +install( FILES kdevdistpart.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevpart_distpart.rc DESTINATION ${DATA_INSTALL_DIR}/kdevdistpart ) -##### libtdevdistpart (module) ################## +##### libkdevdistpart (module) ################## -tde_add_kpart( libtdevdistpart AUTOMOC +tde_add_kpart( libkdevdistpart AUTOMOC SOURCES distpart_ui.ui distpart_part.cpp distpart_widget.cpp packagebase.cpp lsmsupport.cpp specsupport.cpp diff --git a/parts/distpart/Makefile.am b/parts/distpart/Makefile.am index 8b5e69db..52f4a5ba 100644 --- a/parts/distpart/Makefile.am +++ b/parts/distpart/Makefile.am @@ -1,16 +1,16 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \ -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util $(all_includes) -kde_module_LTLIBRARIES = libtdevdistpart.la -libtdevdistpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevdistpart_la_LIBADD = $(top_builddir)/lib/libtdevelop.la +kde_module_LTLIBRARIES = libkdevdistpart.la +libkdevdistpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevdistpart_la_LIBADD = $(top_builddir)/lib/libtdevelop.la -libtdevdistpart_la_SOURCES = distpart_ui.ui distpart_part.cpp distpart_widget.cpp packagebase.cpp lsmsupport.cpp specsupport.cpp +libkdevdistpart_la_SOURCES = distpart_ui.ui distpart_part.cpp distpart_widget.cpp packagebase.cpp lsmsupport.cpp specsupport.cpp METASOURCES = AUTO KDEICON = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevdistpart.desktop +service_DATA = kdevdistpart.desktop -rc_DATA = tdevpart_distpart.rc -rcdir = $(kde_datadir)/tdevdistpart +rc_DATA = kdevpart_distpart.rc +rcdir = $(kde_datadir)/kdevdistpart diff --git a/parts/distpart/distpart_part.cpp b/parts/distpart/distpart_part.cpp index 01ef30b0..e8a3e11a 100644 --- a/parts/distpart/distpart_part.cpp +++ b/parts/distpart/distpart_part.cpp @@ -23,27 +23,27 @@ #include <kiconloader.h> #include <tdelocale.h> -#include <tdevgenericfactory.h> +#include <kdevgenericfactory.h> #include <kdebug.h> -#include "tdevcore.h" -#include <tdevplugininfo.h> +#include "kdevcore.h" +#include <kdevplugininfo.h> #include "distpart_widget.h" #include <kdialogbase.h> -typedef TDevGenericFactory<DistpartPart> DistpartFactory; -static const TDevPluginInfo data("tdevdistpart"); -K_EXPORT_COMPONENT_FACTORY( libtdevdistpart, DistpartFactory( data ) ) +typedef KDevGenericFactory<DistpartPart> DistpartFactory; +static const KDevPluginInfo data("kdevdistpart"); +K_EXPORT_COMPONENT_FACTORY( libkdevdistpart, DistpartFactory( data ) ) DistpartPart::DistpartPart(TQObject *parent, const char *name, const TQStringList &) - : TDevPlugin(&data, parent, name ? name : "DistpartPart") { + : KDevPlugin(&data, parent, name ? name : "DistpartPart") { kdDebug(9007) << "DistpartPart::DistpartPart()" << endl; setInstance(DistpartFactory::instance()); - setXMLFile("tdevpart_distpart.rc"); + setXMLFile("kdevpart_distpart.rc"); m_action = new TDEAction( i18n("Distribution && Publishing"), "package", 0, this, TQT_SLOT(show()), diff --git a/parts/distpart/distpart_part.h b/parts/distpart/distpart_part.h index d1d05a24..aa019c4d 100644 --- a/parts/distpart/distpart_part.h +++ b/parts/distpart/distpart_part.h @@ -19,12 +19,12 @@ ***************************************************************************/ -#ifndef __TDEVPART_DISTPART_H__ -#define __TDEVPART_DISTPART_H__ +#ifndef __KDEVPART_DISTPART_H__ +#define __KDEVPART_DISTPART_H__ #include <tqguardedptr.h> -#include <tdevplugin.h> +#include <kdevplugin.h> #include <tdeaction.h> #include "packagebase.h" @@ -32,7 +32,7 @@ class DistpartDialog; class KDialogBase; -class DistpartPart : public TDevPlugin { +class DistpartPart : public KDevPlugin { Q_OBJECT diff --git a/parts/distpart/distpart_widget.cpp b/parts/distpart/distpart_widget.cpp index 0999ca72..c628fe26 100644 --- a/parts/distpart/distpart_widget.cpp +++ b/parts/distpart/distpart_widget.cpp @@ -27,12 +27,12 @@ #include <tdefiledialog.h> #include <tdeio/netaccess.h> #include <tdelocale.h> -#include "tdevproject.h" +#include "kdevproject.h" #include "domutil.h" #include <ktar.h> #include <tdemessagebox.h> -#include <tdevcore.h> +#include <kdevcore.h> #include <tqgroupbox.h> #include <tqlayout.h> #include <tqnetwork.h> @@ -44,7 +44,7 @@ #include <tqregexp.h> #include <tqstringlist.h> #include <tqtabwidget.h> -#include "tdevmakefrontend.h" +#include "kdevmakefrontend.h" #include <kprogress.h> #include <tqerrormessage.h> diff --git a/parts/distpart/distpart_widget.h b/parts/distpart/distpart_widget.h index 1e5bf68f..7a684a5a 100644 --- a/parts/distpart/distpart_widget.h +++ b/parts/distpart/distpart_widget.h @@ -32,7 +32,7 @@ #include <tqcombobox.h> #include <tqprogressbar.h> -class TDevProject; +class KDevProject; class DistpartPart; class TQUrlOperator; class TDEProcess; diff --git a/parts/distpart/tdevdistpart.desktop b/parts/distpart/kdevdistpart.desktop index 290a0a8d..1b3d095d 100644 --- a/parts/distpart/tdevdistpart.desktop +++ b/parts/distpart/kdevdistpart.desktop @@ -64,7 +64,7 @@ GenericName[zh_CN]=最终打包支持 GenericName[zh_TW]=最終包裝支援 Icon=tdevelop ServiceTypes=TDevelop/Plugin -X-TDE-Library=libtdevdistpart +X-TDE-Library=libkdevdistpart X-TDevelop-Version=5 X-TDevelop-Scope=Project X-TDevelop-Properties=ProjectPackaging diff --git a/parts/distpart/tdevpart_distpart.rc b/parts/distpart/kdevpart_distpart.rc index 8b142d04..8b142d04 100644 --- a/parts/distpart/tdevpart_distpart.rc +++ b/parts/distpart/kdevpart_distpart.rc diff --git a/parts/distpart/specsupport.cpp b/parts/distpart/specsupport.cpp index 38f8f385..06a0bb67 100644 --- a/parts/distpart/specsupport.cpp +++ b/parts/distpart/specsupport.cpp @@ -19,8 +19,8 @@ ***************************************************************************/ #include "specsupport.h" -#include "tdevproject.h" -#include "tdevmakefrontend.h" +#include "kdevproject.h" +#include "kdevmakefrontend.h" #include "distpart_widget.h" #include <kdebug.h> @@ -79,11 +79,11 @@ void SpecSupport::slotbuildAllPushButtonPressed() { return; } else - if (TDevMakeFrontend *makeFrontend = m_part->extension<TDevMakeFrontend>("TDevelop/MakeFrontend")) + if (KDevMakeFrontend *makeFrontend = m_part->extension<KDevMakeFrontend>("TDevelop/MakeFrontend")) makeFrontend->queueCommand(dir,"cd " + TDEProcess::quote(dir) + " && cp " + TDEProcess::quote(getAppSource()) + " " + TDEProcess::quote(*(map.find("_sourcedir")))); } - if (TDevMakeFrontend *makeFrontend = m_part->extension<TDevMakeFrontend>("TDevelop/MakeFrontend")) + if (KDevMakeFrontend *makeFrontend = m_part->extension<KDevMakeFrontend>("TDevelop/MakeFrontend")) makeFrontend->queueCommand(dir,"cd " + TDEProcess::quote((((it = map.find("_specdir")) != map.end()) ? (*it) : dir)) + " && rpmbuild -ba " + m_part->project()->projectName() + ".spec"); } @@ -178,11 +178,11 @@ void SpecSupport::slotsrcPackagePushButtonPressed() { return; } else - if (TDevMakeFrontend *makeFrontend = m_part->extension<TDevMakeFrontend>("TDevelop/MakeFrontend")) + if (KDevMakeFrontend *makeFrontend = m_part->extension<KDevMakeFrontend>("TDevelop/MakeFrontend")) makeFrontend->queueCommand(dir,"cd " + TDEProcess::quote(dir) + " && cp " + TDEProcess::quote(getAppSource()) + " " + TDEProcess::quote(*(map.find("_sourcedir")))); } - if (TDevMakeFrontend *makeFrontend = m_part->extension<TDevMakeFrontend>("TDevelop/MakeFrontend")) + if (KDevMakeFrontend *makeFrontend = m_part->extension<KDevMakeFrontend>("TDevelop/MakeFrontend")) makeFrontend->queueCommand(dir,"cd " + TDEProcess::quote((((it = map.find("_specdir")) != map.end()) ? (*it) : dir)) + " && rpmbuild -bs " + m_part->project()->projectName() + ".spec"); } |