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 /vcs/clearcase | |
parent | aba2788b428dc53243407902e9ccbb20b97a69fd (diff) | |
download | tdevelop-6392f5a9dfce2bf83617d49bb7f332181ec6004e.tar.gz tdevelop-6392f5a9dfce2bf83617d49bb7f332181ec6004e.zip |
Revert "Finish renaming tdevelop components"
This reverts commit 722ce1efbac31c61b1d4b13f7e075c9f311e3e73.
Diffstat (limited to 'vcs/clearcase')
-rw-r--r-- | vcs/clearcase/CMakeLists.txt | 8 | ||||
-rw-r--r-- | vcs/clearcase/Makefile.am | 10 | ||||
-rw-r--r-- | vcs/clearcase/clearcasefileinfoprovider.cpp | 4 | ||||
-rw-r--r-- | vcs/clearcase/clearcasefileinfoprovider.h | 2 | ||||
-rw-r--r-- | vcs/clearcase/clearcasemanipulator.h | 2 | ||||
-rw-r--r-- | vcs/clearcase/clearcasepart.cpp | 40 | ||||
-rw-r--r-- | vcs/clearcase/clearcasepart.h | 8 | ||||
-rw-r--r-- | vcs/clearcase/integrator/CMakeLists.txt | 4 | ||||
-rw-r--r-- | vcs/clearcase/integrator/Makefile.am | 4 | ||||
-rw-r--r-- | vcs/clearcase/integrator/ccintegratordlg.h | 2 | ||||
-rw-r--r-- | vcs/clearcase/integrator/clearcaseintegrator.cpp | 10 | ||||
-rw-r--r-- | vcs/clearcase/integrator/clearcaseintegrator.h | 4 | ||||
-rw-r--r-- | vcs/clearcase/integrator/kdevclearcaseintegrator.desktop (renamed from vcs/clearcase/integrator/tdevclearcaseintegrator.desktop) | 0 | ||||
-rw-r--r-- | vcs/clearcase/kdevclearcase.desktop (renamed from vcs/clearcase/tdevclearcase.desktop) | 2 |
14 files changed, 50 insertions, 50 deletions
diff --git a/vcs/clearcase/CMakeLists.txt b/vcs/clearcase/CMakeLists.txt index 94ca0536..4dbed390 100644 --- a/vcs/clearcase/CMakeLists.txt +++ b/vcs/clearcase/CMakeLists.txt @@ -27,15 +27,15 @@ link_directories( ##### other data ################################ -install( FILES tdevclearcase.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevclearcase.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -##### libtdevclearcase (module) ################# +##### libkdevclearcase (module) ################# -tde_add_kpart( libtdevclearcase AUTOMOC +tde_add_kpart( libkdevclearcase AUTOMOC SOURCES clearcasepart.cpp commentdlg.cpp clearcasefileinfoprovider.cpp clearcasemanipulator.cpp - LINK tdevextensions-static tdevelop-shared + LINK kdevextensions-static tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/vcs/clearcase/Makefile.am b/vcs/clearcase/Makefile.am index 36a2e7b6..630a1346 100644 --- a/vcs/clearcase/Makefile.am +++ b/vcs/clearcase/Makefile.am @@ -3,16 +3,16 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \ -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util $(all_includes) -kde_module_LTLIBRARIES = libtdevclearcase.la -libtdevclearcase_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevclearcase_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/interfaces/extensions/libtdevextensions.la +kde_module_LTLIBRARIES = libkdevclearcase.la +libkdevclearcase_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevclearcase_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la -libtdevclearcase_la_SOURCES = clearcasepart.cpp commentdlg.cpp \ +libkdevclearcase_la_SOURCES = clearcasepart.cpp commentdlg.cpp \ clearcasefileinfoprovider.cpp clearcasemanipulator.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevclearcase.desktop +service_DATA = kdevclearcase.desktop SUBDIRS = integrator diff --git a/vcs/clearcase/clearcasefileinfoprovider.cpp b/vcs/clearcase/clearcasefileinfoprovider.cpp index db7cbcc1..1e18f8e1 100644 --- a/vcs/clearcase/clearcasefileinfoprovider.cpp +++ b/vcs/clearcase/clearcasefileinfoprovider.cpp @@ -11,13 +11,13 @@ // #include "clearcasefileinfoprovider.h" #include "clearcasepart.h" -#include "tdevversioncontrol.h" +#include "kdevversioncontrol.h" #include <kprocess.h> #include <tqapplication.h> ClearcaseFileinfoProvider::ClearcaseFileinfoProvider(ClearcasePart *parent) - : TDevVCSFileInfoProvider( (TDevVersionControl*) parent, "clearcasefileinfoprovider") + : KDevVCSFileInfoProvider( (KDevVersionControl*) parent, "clearcasefileinfoprovider") { vcsInfo_ = NULL; diff --git a/vcs/clearcase/clearcasefileinfoprovider.h b/vcs/clearcase/clearcasefileinfoprovider.h index 4c29da44..0f6f7d06 100644 --- a/vcs/clearcase/clearcasefileinfoprovider.h +++ b/vcs/clearcase/clearcasefileinfoprovider.h @@ -19,7 +19,7 @@ /** @author KDevelop Authors */ -class ClearcaseFileinfoProvider : public TDevVCSFileInfoProvider +class ClearcaseFileinfoProvider : public KDevVCSFileInfoProvider { Q_OBJECT diff --git a/vcs/clearcase/clearcasemanipulator.h b/vcs/clearcase/clearcasemanipulator.h index 42a5cee0..0cb795e3 100644 --- a/vcs/clearcase/clearcasemanipulator.h +++ b/vcs/clearcase/clearcasemanipulator.h @@ -12,7 +12,7 @@ #ifndef CLEARCASEMANIPULATOR_H #define CLEARCASEMANIPULATOR_H -#include "tdevversioncontrol.h" +#include "kdevversioncontrol.h" #include <kprocess.h> diff --git a/vcs/clearcase/clearcasepart.cpp b/vcs/clearcase/clearcasepart.cpp index 338675d5..aeb1eea9 100644 --- a/vcs/clearcase/clearcasepart.cpp +++ b/vcs/clearcase/clearcasepart.cpp @@ -17,33 +17,33 @@ #include <tdepopupmenu.h> #include <kdebug.h> -#include <tdevgenericfactory.h> +#include <kdevgenericfactory.h> #include <tdelocale.h> #include <kprocess.h> #include <tdemessagebox.h> #include <tdeapplication.h> -#include "tdevcore.h" -#include "tdevmakefrontend.h" -#include "tdevdifffrontend.h" -#include "tdevappfrontend.h" +#include "kdevcore.h" +#include "kdevmakefrontend.h" +#include "kdevdifffrontend.h" +#include "kdevappfrontend.h" #include "execcommand.h" #include "domutil.h" -#include "tdevmainwindow.h" -#include "tdevproject.h" -#include "tdevplugininfo.h" +#include "kdevmainwindow.h" +#include "kdevproject.h" +#include "kdevplugininfo.h" #include "clearcasefileinfoprovider.h" #include "clearcasemanipulator.h" -static const TDevPluginInfo data("tdevclearcase"); +static const KDevPluginInfo data("kdevclearcase"); -typedef TDevGenericFactory<ClearcasePart> ClearcaseFactory; -K_EXPORT_COMPONENT_FACTORY( libtdevclearcase, ClearcaseFactory( data ) ) +typedef KDevGenericFactory<ClearcasePart> ClearcaseFactory; +K_EXPORT_COMPONENT_FACTORY( libkdevclearcase, ClearcaseFactory( data ) ) ClearcasePart::ClearcasePart( TQObject *parent, const char *name, const TQStringList & ) - : TDevVersionControl( &data, parent, name ? name : "ClearcasePart" ), + : KDevVersionControl( &data, parent, name ? name : "ClearcasePart" ), default_checkin(""), default_checkout(""), default_uncheckout("-rm"), @@ -144,7 +144,7 @@ void ClearcasePart::slotCheckin() command += " "; command += KShellProcess::quote(name); - if (TDevMakeFrontend *makeFrontend = extension<TDevMakeFrontend>("TDevelop/MakeFrontend")) + if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("TDevelop/MakeFrontend")) makeFrontend->queueCommand(dir, command); } @@ -176,7 +176,7 @@ void ClearcasePart::slotCheckout() command += " "; command += KShellProcess::quote(name); - if (TDevMakeFrontend *makeFrontend = extension<TDevMakeFrontend>("TDevelop/MakeFrontend")) + if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("TDevelop/MakeFrontend")) makeFrontend->queueCommand(dir, command); emit finishedFetching(dir); @@ -199,7 +199,7 @@ void ClearcasePart::slotUncheckout() command += " "; command += KShellProcess::quote(name); - if (TDevMakeFrontend *makeFrontend = extension<TDevMakeFrontend>("TDevelop/MakeFrontend")) + if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("TDevelop/MakeFrontend")) makeFrontend->queueCommand(dir, command); emit finishedFetching(dir); @@ -228,7 +228,7 @@ void ClearcasePart::slotCreate() command += " "; command += KShellProcess::quote(name); - if (TDevMakeFrontend *makeFrontend = extension<TDevMakeFrontend>("TDevelop/MakeFrontend")) + if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("TDevelop/MakeFrontend")) makeFrontend->queueCommand(dir, command); emit finishedFetching(dir); @@ -255,7 +255,7 @@ void ClearcasePart::slotRemove() command += " "; command += KShellProcess::quote(name); - if (TDevMakeFrontend *makeFrontend = extension<TDevMakeFrontend>("TDevelop/MakeFrontend")) + if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("TDevelop/MakeFrontend")) makeFrontend->queueCommand(dir, command); emit finishedFetching(dir); @@ -279,7 +279,7 @@ void ClearcasePart::slotListHistory() command += " "; command += KShellProcess::quote(name); - if (TDevMakeFrontend *makeFrontend = extension<TDevMakeFrontend>("TDevelop/MakeFrontend")) + if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("TDevelop/MakeFrontend")) makeFrontend->queueCommand(dir, command); } @@ -333,7 +333,7 @@ void ClearcasePart::slotDiffFinished( const TQString& diff, const TQString& err return; } - if (TDevDiffFrontend *diffFrontend = extension<TDevDiffFrontend>("TDevelop/DiffFrontend")) + if (KDevDiffFrontend *diffFrontend = extension<KDevDiffFrontend>("TDevelop/DiffFrontend")) diffFrontend->showDiff( diff ); } @@ -354,7 +354,7 @@ void ClearcasePart::slotListCheckouts() command += " && cleartool lsco "; command += DomUtil::readEntry(dom, "/kdevclearcase/lscheckout_options", default_lscheckout); - if (TDevMakeFrontend *makeFrontend = extension<TDevMakeFrontend>("TDevelop/MakeFrontend")) + if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("TDevelop/MakeFrontend")) makeFrontend->queueCommand(dir, command); } diff --git a/vcs/clearcase/clearcasepart.h b/vcs/clearcase/clearcasepart.h index 52129141..be63e674 100644 --- a/vcs/clearcase/clearcasepart.h +++ b/vcs/clearcase/clearcasepart.h @@ -12,12 +12,12 @@ #ifndef _CLEARCASEPART_H_ #define _CLEARCASEPART_H_ -#include <tdevversioncontrol.h> +#include <kdevversioncontrol.h> class Context; class TQPopupMenu; -class ClearcasePart : public TDevVersionControl { +class ClearcasePart : public KDevVersionControl { Q_OBJECT @@ -36,7 +36,7 @@ public: virtual void createNewProject(const TQString& dir) {} virtual bool fetchFromRepository() { return true; } - virtual TDevVCSFileInfoProvider *fileInfoProvider() const { return fileInfoProvider_; } + virtual KDevVCSFileInfoProvider *fileInfoProvider() const { return fileInfoProvider_; } virtual bool isValidDirectory(const TQString &dirPath) const; private slots: @@ -60,7 +60,7 @@ private: TQString popupfile_; TQString viewname; - TDevVCSFileInfoProvider *fileInfoProvider_; + KDevVCSFileInfoProvider *fileInfoProvider_; }; #endif diff --git a/vcs/clearcase/integrator/CMakeLists.txt b/vcs/clearcase/integrator/CMakeLists.txt index bd527272..ccc3348f 100644 --- a/vcs/clearcase/integrator/CMakeLists.txt +++ b/vcs/clearcase/integrator/CMakeLists.txt @@ -26,7 +26,7 @@ link_directories( ##### other data ################################ -install( FILES tdevclearcaseintegrator.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevclearcaseintegrator.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) ##### libclearcaseintegrator (module) ########### @@ -35,6 +35,6 @@ tde_add_kpart( libclearcaseintegrator AUTOMOC SOURCES clearcaseintegrator.cpp ccintegratordlgbase.ui ccintegratordlg.cpp - LINK tdevextras-shared tdevelop-shared + LINK kdevextras-shared tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/vcs/clearcase/integrator/Makefile.am b/vcs/clearcase/integrator/Makefile.am index 98e39465..a9d50a98 100644 --- a/vcs/clearcase/integrator/Makefile.am +++ b/vcs/clearcase/integrator/Makefile.am @@ -5,9 +5,9 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = libclearcaseintegrator.la libclearcaseintegrator_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) libclearcaseintegrator_la_LIBADD =\ - $(top_builddir)/lib/interfaces/extras/libtdevextras.la\ + $(top_builddir)/lib/interfaces/extras/libkdevextras.la\ $(top_builddir)/lib/libtdevelop.la -kde_services_DATA = tdevclearcaseintegrator.desktop +kde_services_DATA = kdevclearcaseintegrator.desktop noinst_HEADERS = clearcaseintegrator.h ccintegratordlg.h libclearcaseintegrator_la_SOURCES = clearcaseintegrator.cpp \ ccintegratordlgbase.ui ccintegratordlg.cpp diff --git a/vcs/clearcase/integrator/ccintegratordlg.h b/vcs/clearcase/integrator/ccintegratordlg.h index 2eb1e2e3..f427b2b3 100644 --- a/vcs/clearcase/integrator/ccintegratordlg.h +++ b/vcs/clearcase/integrator/ccintegratordlg.h @@ -21,7 +21,7 @@ #define CCINTEGRATORDLG_H #include "ccintegratordlgbase.h" -#include <tdevvcsintegrator.h> +#include <kdevvcsintegrator.h> class CCIntegratorDlg: public CCIntegratorDlgBase, public VCSDialog { Q_OBJECT diff --git a/vcs/clearcase/integrator/clearcaseintegrator.cpp b/vcs/clearcase/integrator/clearcaseintegrator.cpp index f00783b4..4e8c1a0b 100644 --- a/vcs/clearcase/integrator/clearcaseintegrator.cpp +++ b/vcs/clearcase/integrator/clearcaseintegrator.cpp @@ -19,19 +19,19 @@ ***************************************************************************/ #include "clearcaseintegrator.h" -#include <tdevgenericfactory.h> -#include <tdevplugininfo.h> +#include <kdevgenericfactory.h> +#include <kdevplugininfo.h> #include "ccintegratordlg.h" -static const TDevPluginInfo data("tdevclearcaseintegrator"); -typedef TDevGenericFactory<ClearcaseIntegrator> ClearcaseIntegratorFactory; +static const KDevPluginInfo data("kdevclearcaseintegrator"); +typedef KDevGenericFactory<ClearcaseIntegrator> ClearcaseIntegratorFactory; K_EXPORT_COMPONENT_FACTORY( libclearcaseintegrator, ClearcaseIntegratorFactory(data) ) ClearcaseIntegrator::ClearcaseIntegrator(TQObject* parent, const char* name, const TQStringList // args ) - :TDevVCSIntegrator(parent, name) + :KDevVCSIntegrator(parent, name) { } diff --git a/vcs/clearcase/integrator/clearcaseintegrator.h b/vcs/clearcase/integrator/clearcaseintegrator.h index 4e431da6..3859c1f9 100644 --- a/vcs/clearcase/integrator/clearcaseintegrator.h +++ b/vcs/clearcase/integrator/clearcaseintegrator.h @@ -20,11 +20,11 @@ #ifndef CLEARCASEINTEGRATOR_H #define CLEARCASEINTEGRATOR_H -#include <tdevvcsintegrator.h> +#include <kdevvcsintegrator.h> #include <tqstringlist.h> -class ClearcaseIntegrator : public TDevVCSIntegrator +class ClearcaseIntegrator : public KDevVCSIntegrator { Q_OBJECT diff --git a/vcs/clearcase/integrator/tdevclearcaseintegrator.desktop b/vcs/clearcase/integrator/kdevclearcaseintegrator.desktop index 4bc49cfc..4bc49cfc 100644 --- a/vcs/clearcase/integrator/tdevclearcaseintegrator.desktop +++ b/vcs/clearcase/integrator/kdevclearcaseintegrator.desktop diff --git a/vcs/clearcase/tdevclearcase.desktop b/vcs/clearcase/kdevclearcase.desktop index 687e5c67..9b3df9df 100644 --- a/vcs/clearcase/tdevclearcase.desktop +++ b/vcs/clearcase/kdevclearcase.desktop @@ -77,6 +77,6 @@ GenericName[tr]=ClearCase Bütünleştirmesi GenericName[zh_CN]=ClearCase集成 GenericName[zh_TW]=ClearCase 整合 ServiceTypes=TDevelop/VersionControl -X-TDE-Library=libtdevclearcase +X-TDE-Library=libkdevclearcase X-TDevelop-Version=5 X-TDevelop-Properties=VCS,ClearcaseVCS |