diff options
Diffstat (limited to 'vcs/perforce')
-rw-r--r-- | vcs/perforce/CMakeLists.txt | 8 | ||||
-rw-r--r-- | vcs/perforce/Makefile.am | 12 | ||||
-rw-r--r-- | vcs/perforce/integrator/CMakeLists.txt | 4 | ||||
-rw-r--r-- | vcs/perforce/integrator/Makefile.am | 4 | ||||
-rw-r--r-- | vcs/perforce/integrator/perforceintegrator.cpp | 10 | ||||
-rw-r--r-- | vcs/perforce/integrator/perforceintegrator.h | 4 | ||||
-rw-r--r-- | vcs/perforce/integrator/pfintegratordlg.h | 2 | ||||
-rw-r--r-- | vcs/perforce/integrator/tdevperforceintegrator.desktop (renamed from vcs/perforce/integrator/kdevperforceintegrator.desktop) | 0 | ||||
-rw-r--r-- | vcs/perforce/perforcepart.cpp | 28 | ||||
-rw-r--r-- | vcs/perforce/perforcepart.h | 6 | ||||
-rw-r--r-- | vcs/perforce/tdevperforce.desktop (renamed from vcs/perforce/kdevperforce.desktop) | 2 | ||||
-rw-r--r-- | vcs/perforce/tdevperforcepart.rc (renamed from vcs/perforce/kdevperforcepart.rc) | 0 |
12 files changed, 40 insertions, 40 deletions
diff --git a/vcs/perforce/CMakeLists.txt b/vcs/perforce/CMakeLists.txt index 549eadb8..f0964379 100644 --- a/vcs/perforce/CMakeLists.txt +++ b/vcs/perforce/CMakeLists.txt @@ -27,13 +27,13 @@ link_directories( ##### other data ################################ -install( FILES kdevperforce.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES tdevperforce.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -##### libkdevperforce (module) ################## +##### libtdevperforce (module) ################## -tde_add_kpart( libkdevperforce AUTOMOC +tde_add_kpart( libtdevperforce AUTOMOC SOURCES perforcepart.cpp commitdlg.cpp - LINK kdevextensions-static tdevelop-shared + LINK tdevextensions-static tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/vcs/perforce/Makefile.am b/vcs/perforce/Makefile.am index 36e19325..09fb0e9e 100644 --- a/vcs/perforce/Makefile.am +++ b/vcs/perforce/Makefile.am @@ -3,17 +3,17 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \ -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util $(all_includes) -kde_module_LTLIBRARIES = libkdevperforce.la -libkdevperforce_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libkdevperforce_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la +kde_module_LTLIBRARIES = libtdevperforce.la +libtdevperforce_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libtdevperforce_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/interfaces/extensions/libtdevextensions.la -libkdevperforce_la_SOURCES = perforcepart.cpp commitdlg.cpp +libtdevperforce_la_SOURCES = perforcepart.cpp commitdlg.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = kdevperforce.desktop +service_DATA = tdevperforce.desktop -rcdir = $(kde_datadir)/kdevperforce +rcdir = $(kde_datadir)/tdevperforce SUBDIRS = integrator diff --git a/vcs/perforce/integrator/CMakeLists.txt b/vcs/perforce/integrator/CMakeLists.txt index e939e3ba..95985418 100644 --- a/vcs/perforce/integrator/CMakeLists.txt +++ b/vcs/perforce/integrator/CMakeLists.txt @@ -26,7 +26,7 @@ link_directories( ##### other data ################################ -install( FILES kdevperforceintegrator.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES tdevperforceintegrator.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) ##### libperforceintegrator (module) ############ @@ -35,6 +35,6 @@ tde_add_kpart( libperforceintegrator AUTOMOC SOURCES perforceintegrator.cpp pfintegratordlgbase.ui pfintegratordlg.cpp - LINK kdevextras-shared tdevelop-shared + LINK tdevextras-shared tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/vcs/perforce/integrator/Makefile.am b/vcs/perforce/integrator/Makefile.am index 38e80bcd..e400e241 100644 --- a/vcs/perforce/integrator/Makefile.am +++ b/vcs/perforce/integrator/Makefile.am @@ -5,9 +5,9 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = libperforceintegrator.la libperforceintegrator_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) libperforceintegrator_la_LIBADD =\ - $(top_builddir)/lib/interfaces/extras/libkdevextras.la\ + $(top_builddir)/lib/interfaces/extras/libtdevextras.la\ $(top_builddir)/lib/libtdevelop.la -kde_services_DATA = kdevperforceintegrator.desktop +kde_services_DATA = tdevperforceintegrator.desktop noinst_HEADERS = perforceintegrator.h pfintegratordlg.h libperforceintegrator_la_SOURCES = perforceintegrator.cpp \ pfintegratordlgbase.ui pfintegratordlg.cpp diff --git a/vcs/perforce/integrator/perforceintegrator.cpp b/vcs/perforce/integrator/perforceintegrator.cpp index bc7c0988..74fdf54f 100644 --- a/vcs/perforce/integrator/perforceintegrator.cpp +++ b/vcs/perforce/integrator/perforceintegrator.cpp @@ -19,19 +19,19 @@ ***************************************************************************/ #include "perforceintegrator.h" -#include <kdevgenericfactory.h> -#include <kdevplugininfo.h> +#include <tdevgenericfactory.h> +#include <tdevplugininfo.h> #include "pfintegratordlg.h" -static const KDevPluginInfo data("kdevperforceintegrator"); -typedef KDevGenericFactory<PerforceIntegrator> PerforceIntegratorFactory; +static const TDevPluginInfo data("tdevperforceintegrator"); +typedef TDevGenericFactory<PerforceIntegrator> PerforceIntegratorFactory; K_EXPORT_COMPONENT_FACTORY( libperforceintegrator, PerforceIntegratorFactory(data) ) PerforceIntegrator::PerforceIntegrator(TQObject* parent, const char* name, const TQStringList // args ) - :KDevVCSIntegrator(parent, name) + :TDevVCSIntegrator(parent, name) { } diff --git a/vcs/perforce/integrator/perforceintegrator.h b/vcs/perforce/integrator/perforceintegrator.h index 2b82046f..c97ff82f 100644 --- a/vcs/perforce/integrator/perforceintegrator.h +++ b/vcs/perforce/integrator/perforceintegrator.h @@ -20,11 +20,11 @@ #ifndef PERFORCEINTEGRATOR_H #define PERFORCEINTEGRATOR_H -#include <kdevvcsintegrator.h> +#include <tdevvcsintegrator.h> #include <tqstringlist.h> -class PerforceIntegrator : public KDevVCSIntegrator +class PerforceIntegrator : public TDevVCSIntegrator { Q_OBJECT diff --git a/vcs/perforce/integrator/pfintegratordlg.h b/vcs/perforce/integrator/pfintegratordlg.h index 3e7bf4de..5398475b 100644 --- a/vcs/perforce/integrator/pfintegratordlg.h +++ b/vcs/perforce/integrator/pfintegratordlg.h @@ -21,7 +21,7 @@ #define PFINTEGRATORDLG_H #include "pfintegratordlgbase.h" -#include <kdevvcsintegrator.h> +#include <tdevvcsintegrator.h> class PFIntegratorDlg: public PFIntegratorDlgBase, public VCSDialog { Q_OBJECT diff --git a/vcs/perforce/integrator/kdevperforceintegrator.desktop b/vcs/perforce/integrator/tdevperforceintegrator.desktop index 78ad9bf2..78ad9bf2 100644 --- a/vcs/perforce/integrator/kdevperforceintegrator.desktop +++ b/vcs/perforce/integrator/tdevperforceintegrator.desktop diff --git a/vcs/perforce/perforcepart.cpp b/vcs/perforce/perforcepart.cpp index f92666b6..72672b1e 100644 --- a/vcs/perforce/perforcepart.cpp +++ b/vcs/perforce/perforcepart.cpp @@ -17,7 +17,7 @@ #include <tqregexp.h> #include <tdepopupmenu.h> #include <kdebug.h> -#include <kdevgenericfactory.h> +#include <tdevgenericfactory.h> #include <kprocess.h> #include <tdemessagebox.h> #include <tdeapplication.h> @@ -25,21 +25,21 @@ #include <kurl.h> #include <tdeparts/part.h> -#include "kdevpartcontroller.h" -#include "kdevcore.h" -#include "kdevmakefrontend.h" -#include "kdevdifffrontend.h" -#include "kdevplugininfo.h" +#include "tdevpartcontroller.h" +#include "tdevcore.h" +#include "tdevmakefrontend.h" +#include "tdevdifffrontend.h" +#include "tdevplugininfo.h" #include "commitdlg.h" #include "execcommand.h" -static const KDevPluginInfo data("kdevperforce"); +static const TDevPluginInfo data("tdevperforce"); -typedef KDevGenericFactory<PerforcePart> PerforceFactory; -K_EXPORT_COMPONENT_FACTORY( libkdevperforce, PerforceFactory( data ) ) +typedef TDevGenericFactory<PerforcePart> PerforceFactory; +K_EXPORT_COMPONENT_FACTORY( libtdevperforce, PerforceFactory( data ) ) PerforcePart::PerforcePart( TQObject *parent, const char *name, const TQStringList & ) - : KDevVersionControl( &data, parent, name ? name : "PerforcePart" ) + : TDevVersionControl( &data, parent, name ? name : "PerforcePart" ) { setInstance(PerforceFactory::instance()); setupActions(); @@ -140,7 +140,7 @@ void PerforcePart::execCommand( const TQString& cmd, const TQString& filename ) command += " && p4 " + cmd + " "; command += name; - if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("TDevelop/MakeFrontend")) + if (TDevMakeFrontend *makeFrontend = extension<TDevMakeFrontend>("TDevelop/MakeFrontend")) makeFrontend->queueCommand(dir, command); } @@ -183,7 +183,7 @@ void PerforcePart::commit( const TQString& filename ) TQString command("echo " + message); command += " | p4 submit -i"; - if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("TDevelop/MakeFrontend")) + if (TDevMakeFrontend *makeFrontend = extension<TDevMakeFrontend>("TDevelop/MakeFrontend")) makeFrontend->queueCommand("", command); } @@ -208,7 +208,7 @@ void PerforcePart::update( const TQString& filename ) command += " && p4 sync "; command += name; - if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("TDevelop/MakeFrontend")) + if (TDevMakeFrontend *makeFrontend = extension<TDevMakeFrontend>("TDevelop/MakeFrontend")) makeFrontend->queueCommand(dir, command); } @@ -277,7 +277,7 @@ void PerforcePart::slotDiffFinished( const TQString& diff, const TQString& err ) TQString strippedDiff = diff; strippedDiff.replace( rx, "--- \\2\n+++ \\2\n" ); - if (KDevDiffFrontend *diffFrontend = extension<KDevDiffFrontend>("TDevelop/DiffFrontend")) + if (TDevDiffFrontend *diffFrontend = extension<TDevDiffFrontend>("TDevelop/DiffFrontend")) diffFrontend->showDiff( strippedDiff ); } diff --git a/vcs/perforce/perforcepart.h b/vcs/perforce/perforcepart.h index 7c034424..2af8ff5f 100644 --- a/vcs/perforce/perforcepart.h +++ b/vcs/perforce/perforcepart.h @@ -13,14 +13,14 @@ #ifndef _PERFORCEPART_H_ #define _PERFORCEPART_H_ -#include <kdevversioncontrol.h> +#include <tdevversioncontrol.h> #include <tdelocale.h> class Context; class TQPopupMenu; class TDEAction; -class PerforcePart : public KDevVersionControl +class PerforcePart : public TDevVersionControl { Q_OBJECT @@ -34,7 +34,7 @@ public: virtual void createNewProject(const TQString& /* dir */) {} virtual bool fetchFromRepository() { return true; } - virtual KDevVCSFileInfoProvider *fileInfoProvider() const { return 0; } + virtual TDevVCSFileInfoProvider *fileInfoProvider() const { return 0; } virtual bool isValidDirectory(const TQString& /* dirPath*/) const { return true; } diff --git a/vcs/perforce/kdevperforce.desktop b/vcs/perforce/tdevperforce.desktop index d837faeb..4f73f5e9 100644 --- a/vcs/perforce/kdevperforce.desktop +++ b/vcs/perforce/tdevperforce.desktop @@ -77,6 +77,6 @@ GenericName[tr]=Perforce Bütünleştirmesi GenericName[zh_CN]=Perforce 集成 GenericName[zh_TW]=Perforce 整合 ServiceTypes=TDevelop/VersionControl -X-TDE-Library=libkdevperforce +X-TDE-Library=libtdevperforce X-TDevelop-Version=5 X-TDevelop-Properties=VCS,PerforceVCS diff --git a/vcs/perforce/kdevperforcepart.rc b/vcs/perforce/tdevperforcepart.rc index 27b5fe08..27b5fe08 100644 --- a/vcs/perforce/kdevperforcepart.rc +++ b/vcs/perforce/tdevperforcepart.rc |