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. --- vcs/cvsservice/CMakeLists.txt | 12 ++-- vcs/cvsservice/Makefile.am | 18 ++--- vcs/cvsservice/README.dox | 2 +- vcs/cvsservice/bufferedstringreader.h | 2 +- vcs/cvsservice/cvsentry.h | 2 +- vcs/cvsservice/cvsfileinfoprovider.cpp | 4 +- vcs/cvsservice/cvsfileinfoprovider.h | 4 +- vcs/cvsservice/cvsoptions.cpp | 10 +-- vcs/cvsservice/cvsoptions.h | 6 +- vcs/cvsservice/cvspart.cpp | 38 +++++----- vcs/cvsservice/cvspart.h | 8 +-- vcs/cvsservice/cvspartimpl.cpp | 24 +++---- vcs/cvsservice/cvspartimpl.h | 18 ++--- vcs/cvsservice/cvsprocesswidget.cpp | 6 +- vcs/cvsservice/integrator/CMakeLists.txt | 4 +- vcs/cvsservice/integrator/Makefile.am | 4 +- vcs/cvsservice/integrator/cvsserviceintegrator.cpp | 10 +-- vcs/cvsservice/integrator/cvsserviceintegrator.h | 4 +- .../integrator/kdevcvsserviceintegrator.desktop | 45 ++++++++++++ .../integrator/tdevcvsserviceintegrator.desktop | 45 ------------ vcs/cvsservice/kdev_cvs.png | Bin 0 -> 721 bytes vcs/cvsservice/kdev_cvs.xcf | Bin 0 -> 18033 bytes vcs/cvsservice/kdevcvsservice.desktop | 77 +++++++++++++++++++++ vcs/cvsservice/kdevcvsservicepart.rc | 36 ++++++++++ vcs/cvsservice/tdev_cvs.png | Bin 721 -> 0 bytes vcs/cvsservice/tdev_cvs.xcf | Bin 18033 -> 0 bytes vcs/cvsservice/tdevcvsservice.desktop | 77 --------------------- vcs/cvsservice/tdevcvsservicepart.rc | 36 ---------- 28 files changed, 246 insertions(+), 246 deletions(-) create mode 100644 vcs/cvsservice/integrator/kdevcvsserviceintegrator.desktop delete mode 100644 vcs/cvsservice/integrator/tdevcvsserviceintegrator.desktop create mode 100644 vcs/cvsservice/kdev_cvs.png create mode 100644 vcs/cvsservice/kdev_cvs.xcf create mode 100644 vcs/cvsservice/kdevcvsservice.desktop create mode 100644 vcs/cvsservice/kdevcvsservicepart.rc delete mode 100644 vcs/cvsservice/tdev_cvs.png delete mode 100644 vcs/cvsservice/tdev_cvs.xcf delete mode 100644 vcs/cvsservice/tdevcvsservice.desktop delete mode 100644 vcs/cvsservice/tdevcvsservicepart.rc (limited to 'vcs/cvsservice') diff --git a/vcs/cvsservice/CMakeLists.txt b/vcs/cvsservice/CMakeLists.txt index c8cd2b35..dc50d646 100644 --- a/vcs/cvsservice/CMakeLists.txt +++ b/vcs/cvsservice/CMakeLists.txt @@ -30,14 +30,14 @@ link_directories( ##### other data ################################ tde_install_icons( ) -install( FILES tdevcvsservice.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdev_cvs.png DESTINATION ${DATA_INSTALL_DIR}/tdevcvsservice/pics ) -install( FILES buildcvs.sh DESTINATION ${DATA_INSTALL_DIR}/tdevcvsservice ) +install( FILES kdevcvsservice.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdev_cvs.png DESTINATION ${DATA_INSTALL_DIR}/kdevcvsservice/pics ) +install( FILES buildcvs.sh DESTINATION ${DATA_INSTALL_DIR}/kdevcvsservice ) -##### libtdevcvsservice (module) ################ +##### libkdevcvsservice (module) ################ -tde_add_kpart( libtdevcvsservice AUTOMOC +tde_add_kpart( libkdevcvsservice AUTOMOC SOURCES cvspart.cpp cvspartimpl.cpp cvsformbase.ui cvsform.cpp commitdialogbase.ui commitdlg.cpp cvsoptionswidgetbase.ui @@ -52,7 +52,7 @@ tde_add_kpart( libtdevcvsservice AUTOMOC editorsdialogbase.ui editorsdialog.cpp annotatedialog.cpp annotatepage.cpp annotateview.cpp LINK - tdevextensions-static tdevwidgets-shared tdevelop-shared + kdevextensions-static kdevwidgets-shared tdevelop-shared cvsservice tdehtml-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/vcs/cvsservice/Makefile.am b/vcs/cvsservice/Makefile.am index 3ce9dc40..63560056 100644 --- a/vcs/cvsservice/Makefile.am +++ b/vcs/cvsservice/Makefile.am @@ -3,12 +3,12 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \ -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util -I$(top_srcdir)/lib/widgets $(all_includes) -I$(kde_includes)/tde -kde_module_LTLIBRARIES = libtdevcvsservice.la -libtdevcvsservice_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevcvsservice_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ - $(top_builddir)/lib/widgets/libtdevwidgets.la $(LIB_TDEHTML) -lcvsservice $(top_builddir)/lib/interfaces/extensions/libtdevextensions.la +kde_module_LTLIBRARIES = libkdevcvsservice.la +libkdevcvsservice_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevcvsservice_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ + $(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_TDEHTML) -lcvsservice $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la -libtdevcvsservice_la_SOURCES = cvspart.cpp cvspartimpl.cpp cvsformbase.ui \ +libkdevcvsservice_la_SOURCES = cvspart.cpp cvspartimpl.cpp cvsformbase.ui \ cvsform.cpp commitdialogbase.ui commitdlg.cpp cvsoptionswidgetbase.ui \ cvsoptionswidget.cpp cvsprocesswidget.cpp cvsentry.cpp cvsdir.cpp changelog.cpp \ cvsoptions.cpp checkoutdialogbase.ui checkoutdialog.cpp tagdialog.cpp tagdialogbase.ui \ @@ -29,12 +29,12 @@ METASOURCES = AUTO ICONS = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevcvsservice.desktop +service_DATA = kdevcvsservice.desktop -servicepicsdir = $(kde_datadir)/tdevcvsservice/pics -servicepics_DATA = tdev_cvs.png +servicepicsdir = $(kde_datadir)/kdevcvsservice/pics +servicepics_DATA = kdev_cvs.png -rcdir = $(kde_datadir)/tdevcvsservice +rcdir = $(kde_datadir)/kdevcvsservice rc_DATA = buildcvs.sh SUBDIRS = integrator diff --git a/vcs/cvsservice/README.dox b/vcs/cvsservice/README.dox index bb6dfd60..1ff0b528 100644 --- a/vcs/cvsservice/README.dox +++ b/vcs/cvsservice/README.dox @@ -37,7 +37,7 @@ Implementation of this component is done by: one wants to perform: exception to this are the cvslog* classes which do start cvs jobs independently archiving parallelism with the CvsProcesssWidget. - CVSDir and CVSEntry provide abstraction for accessing to local CVS information - - CVSFileInfoProvider is an implementation of TDevVCSFileInfoProvider interface + - CVSFileInfoProvider is an implementation of KDevVCSFileInfoProvider interface and collects data about files stats: for CVS, both synch (fetch data from local sandbox) and asynch (fetch from repository server) are working with some minor bugs in the parsing of 'cvs status' output for the latter. (Sync means that information are collected diff --git a/vcs/cvsservice/bufferedstringreader.h b/vcs/cvsservice/bufferedstringreader.h index 05ce6ad6..c7548b59 100644 --- a/vcs/cvsservice/bufferedstringreader.h +++ b/vcs/cvsservice/bufferedstringreader.h @@ -16,7 +16,7 @@ class CvsServicePart; class TDEConfig; -class TDevProject; +class KDevProject; /* This class helps when we have to collect a string list from a text * stream, just as many cvs commands do. The problem is that the these commands diff --git a/vcs/cvsservice/cvsentry.h b/vcs/cvsservice/cvsentry.h index d4e51de8..9a2e4d6d 100644 --- a/vcs/cvsservice/cvsentry.h +++ b/vcs/cvsservice/cvsentry.h @@ -15,7 +15,7 @@ #include #include -#include +#include class CVSDir; diff --git a/vcs/cvsservice/cvsfileinfoprovider.cpp b/vcs/cvsservice/cvsfileinfoprovider.cpp index 2e0c960a..cbfc726f 100644 --- a/vcs/cvsservice/cvsfileinfoprovider.cpp +++ b/vcs/cvsservice/cvsfileinfoprovider.cpp @@ -15,7 +15,7 @@ #include #include -#include +#include #include #include @@ -32,7 +32,7 @@ /////////////////////////////////////////////////////////////////////////////// CVSFileInfoProvider::CVSFileInfoProvider( CvsServicePart *parent, CvsService_stub *cvsService ) - : TDevVCSFileInfoProvider( parent, "cvsfileinfoprovider" ), + : KDevVCSFileInfoProvider( parent, "cvsfileinfoprovider" ), m_requestStatusJob( 0 ), m_cvsService( cvsService ), m_cachedDirEntries( 0 ) { connect( this, TQT_SIGNAL(needStatusUpdate(const CVSDir&)), this, TQT_SLOT(updateStatusFor(const CVSDir&))); diff --git a/vcs/cvsservice/cvsfileinfoprovider.h b/vcs/cvsservice/cvsfileinfoprovider.h index 09b7b9b8..8bc3a6fe 100644 --- a/vcs/cvsservice/cvsfileinfoprovider.h +++ b/vcs/cvsservice/cvsfileinfoprovider.h @@ -14,7 +14,7 @@ #include -#include +#include #include "cvsservicedcopIface.h" #include "cvsdir.h" #include "bufferedstringreader.h" @@ -28,7 +28,7 @@ Provider for CVS file information @author Mario Scalas */ -class CVSFileInfoProvider : public TDevVCSFileInfoProvider, virtual public CVSServiceDCOPIface +class CVSFileInfoProvider : public KDevVCSFileInfoProvider, virtual public CVSServiceDCOPIface { Q_OBJECT diff --git a/vcs/cvsservice/cvsoptions.cpp b/vcs/cvsservice/cvsoptions.cpp index 6511a38f..2cdf5c92 100644 --- a/vcs/cvsservice/cvsoptions.cpp +++ b/vcs/cvsservice/cvsoptions.cpp @@ -17,7 +17,7 @@ #include #include "domutil.h" -#include "tdevproject.h" +#include "kdevproject.h" #include "cvsoptions.h" /////////////////////////////////////////////////////////////////////////////// @@ -80,9 +80,9 @@ CvsOptions* CvsOptions::instance() /////////////////////////////////////////////////////////////////////////////// -void CvsOptions::save( TDevProject *project ) +void CvsOptions::save( KDevProject *project ) { - kdDebug( 9006 ) << " **** CvsOptions::save( TDevProject* ) here" << endl; + kdDebug( 9006 ) << " **** CvsOptions::save( KDevProject* ) here" << endl; Q_ASSERT( project ); TQDomDocument &dom = *project->projectDom(); @@ -105,9 +105,9 @@ void CvsOptions::save( TDevProject *project ) /////////////////////////////////////////////////////////////////////////////// -void CvsOptions::load( TDevProject *project ) +void CvsOptions::load( KDevProject *project ) { - kdDebug( 9006 ) << " **** CvsOptions::load( TDevProject* ) here" << endl; + kdDebug( 9006 ) << " **** CvsOptions::load( KDevProject* ) here" << endl; Q_ASSERT( project ); TQDomDocument &dom = *project->projectDom(); diff --git a/vcs/cvsservice/cvsoptions.h b/vcs/cvsservice/cvsoptions.h index f54e6273..c4daf301 100644 --- a/vcs/cvsservice/cvsoptions.h +++ b/vcs/cvsservice/cvsoptions.h @@ -17,7 +17,7 @@ class CvsServicePart; class TDEConfig; -class TDevProject; +class KDevProject; /* This class represents the command line options for the used cvs commands. * It uses the singleton pattern. @@ -32,9 +32,9 @@ public: virtual ~CvsOptions(); - void save( TDevProject *project ); + void save( KDevProject *project ); /// \FIXME parameter should be const!! - void load( TDevProject *project ); + void load( KDevProject *project ); void setRecursiveWhenCommitRemove( bool b ); bool recursiveWhenCommitRemove() const; diff --git a/vcs/cvsservice/cvspart.cpp b/vcs/cvsservice/cvspart.cpp index 276a4d15..2bda55f1 100644 --- a/vcs/cvsservice/cvspart.cpp +++ b/vcs/cvsservice/cvspart.cpp @@ -37,17 +37,17 @@ #include #include -#include -#include - -#include "tdevcore.h" -#include "tdevmakefrontend.h" -#include "tdevdifffrontend.h" -#include "tdevappfrontend.h" -#include "tdevplugininfo.h" +#include +#include + +#include "kdevcore.h" +#include "kdevmakefrontend.h" +#include "kdevdifffrontend.h" +#include "kdevappfrontend.h" +#include "kdevplugininfo.h" #include "domutil.h" -#include "tdevmainwindow.h" -#include "tdevproject.h" +#include "kdevmainwindow.h" +#include "kdevproject.h" #include "urlutil.h" #include "cvsform.h" @@ -72,16 +72,16 @@ bool g_projectWasJustCreated = false; // Plugin factory /////////////////////////////////////////////////////////////////////////////// -static const TDevPluginInfo data("tdevcvsservice"); -typedef TDevGenericFactory CvsFactory; -K_EXPORT_COMPONENT_FACTORY( libtdevcvsservice, CvsFactory( data ) ) +static const KDevPluginInfo data("kdevcvsservice"); +typedef KDevGenericFactory CvsFactory; +K_EXPORT_COMPONENT_FACTORY( libkdevcvsservice, CvsFactory( data ) ) /////////////////////////////////////////////////////////////////////////////// // class CvsServicePart /////////////////////////////////////////////////////////////////////////////// CvsServicePart::CvsServicePart( TQObject *parent, const char *name, const TQStringList & ) - : TDevVersionControl( &data, parent, + : KDevVersionControl( &data, parent, name ? name : "CvsService" ), actionCommit( 0 ), actionDiff( 0 ), actionLog( 0 ), actionAnnotate(0), actionAdd( 0 ), actionAddBinary( 0 ), actionRemove( 0 ), actionUpdate( 0 ), @@ -126,10 +126,10 @@ void CvsServicePart::init() this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); - connect( core(), TQT_SIGNAL(stopButtonClicked(TDevPlugin*)), - this, TQT_SLOT(slotStopButtonClicked(TDevPlugin*)) ); + connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), + this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) ); - m_impl->m_widget->setIcon( UserIcon( "tdev_cvs", TDEIcon::DefaultState, CvsFactory::instance()) ); + m_impl->m_widget->setIcon( UserIcon( "kdev_cvs", TDEIcon::DefaultState, CvsFactory::instance()) ); TQWhatsThis::add( m_impl->processWidget(), i18n("CVS

Concurrent Versions System operations window. Shows output of Cervisia CVS Service.") ); m_impl->processWidget()->setCaption(i18n("CvsService Output")); mainWindow()->embedOutputView( m_impl->processWidget(), i18n("CvsService"), i18n("cvs output") ); @@ -243,7 +243,7 @@ bool CvsServicePart::fetchFromRepository() /////////////////////////////////////////////////////////////////////////////// -TDevVCSFileInfoProvider *CvsServicePart::fileInfoProvider() const +KDevVCSFileInfoProvider *CvsServicePart::fileInfoProvider() const { return m_impl->fileInfoProvider(); } @@ -704,7 +704,7 @@ void CvsServicePart::slotRemoveFromIgnoreList() /////////////////////////////////////////////////////////////////////////////// -void CvsServicePart::slotStopButtonClicked( TDevPlugin* which ) +void CvsServicePart::slotStopButtonClicked( KDevPlugin* which ) { if ( which != 0 && which != this ) return; diff --git a/vcs/cvsservice/cvspart.h b/vcs/cvsservice/cvspart.h index 61015fda..e2df8ce0 100644 --- a/vcs/cvsservice/cvspart.h +++ b/vcs/cvsservice/cvspart.h @@ -17,7 +17,7 @@ #include #include #include -#include "tdevversioncontrol.h" +#include "kdevversioncontrol.h" class Context; class TQPopupMenu; @@ -34,7 +34,7 @@ class CvsService_stub; class Repository_stub; class CvsServicePartImpl; -class CvsServicePart : public TDevVersionControl +class CvsServicePart : public KDevVersionControl { Q_OBJECT @@ -63,7 +63,7 @@ public: /** * @return the info provider for VCS sandboxes */ - virtual TDevVCSFileInfoProvider *fileInfoProvider() const; + virtual KDevVCSFileInfoProvider *fileInfoProvider() const; /** * @param dirPath absolute path of the directory * @return true if the the directory is a valid CVS sandbox @@ -129,7 +129,7 @@ private slots: void projectConfigWidget( KDialogBase *dlg ); //! Called when the user wishes to stop an operation. - void slotStopButtonClicked( TDevPlugin* ); + void slotStopButtonClicked( KDevPlugin* ); private slots: void init(); diff --git a/vcs/cvsservice/cvspartimpl.cpp b/vcs/cvsservice/cvspartimpl.cpp index 112ea997..01c85df3 100644 --- a/vcs/cvsservice/cvspartimpl.cpp +++ b/vcs/cvsservice/cvspartimpl.cpp @@ -29,12 +29,12 @@ #include // KDevelop SDK stuff #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include // Part's widgets #include "cvsprocesswidget.h" #include "checkoutdialog.h" @@ -309,7 +309,7 @@ CvsProcessWidget *CvsServicePartImpl::processWidget() const /////////////////////////////////////////////////////////////////////////////// -TDevMainWindow *CvsServicePartImpl::mainWindow() const +KDevMainWindow *CvsServicePartImpl::mainWindow() const { return m_part->mainWindow(); } @@ -323,16 +323,16 @@ TQString CvsServicePartImpl::projectDirectory() const /////////////////////////////////////////////////////////////////////////////// -TDevCore *CvsServicePartImpl::core() const +KDevCore *CvsServicePartImpl::core() const { return m_part->core(); } /////////////////////////////////////////////////////////////////////////////// -TDevDiffFrontend *CvsServicePartImpl::diffFrontend() const +KDevDiffFrontend *CvsServicePartImpl::diffFrontend() const { - return m_part->extension("TDevelop/DiffFrontend"); + return m_part->extension("TDevelop/DiffFrontend"); } /////////////////////////////////////////////////////////////////////////////// @@ -774,7 +774,7 @@ void CvsServicePartImpl::createNewProject( const TQString &dirName, kdDebug( 9006 ) << " ** Will run the following command: " << endl << cmdLine << endl; kdDebug( 9006 ) << " ** on directory: " << dirName << endl; - if (TDevMakeFrontend *makeFrontend = m_part->extension("TDevelop/MakeFrontend")) + if (KDevMakeFrontend *makeFrontend = m_part->extension("TDevelop/MakeFrontend")) makeFrontend->queueCommand( dirName, cmdLine ); } @@ -902,7 +902,7 @@ void CvsServicePartImpl::emitFileStateModified( const KURL::List &/*urls*/, VCSF /////////////////////////////////////////////////////////////////////////////// -TDevVCSFileInfoProvider *CvsServicePartImpl::fileInfoProvider() const +KDevVCSFileInfoProvider *CvsServicePartImpl::fileInfoProvider() const { return m_fileInfoProvider; } diff --git a/vcs/cvsservice/cvspartimpl.h b/vcs/cvsservice/cvspartimpl.h index 32ee04f5..ade7ffe4 100644 --- a/vcs/cvsservice/cvspartimpl.h +++ b/vcs/cvsservice/cvspartimpl.h @@ -17,18 +17,18 @@ #include #include -#include +#include class CvsServicePart; class KDialogBase; class KURL; class CvsProcessWidget; -class TDevMainWindow; -class TDevCore; -class TDevDiffFrontend; +class KDevMainWindow; +class KDevCore; +class KDevDiffFrontend; class TQDir; class JobScheduler; -class TDevVCSFileInfoProvider; +class KDevVCSFileInfoProvider; class CVSFileInfoProvider; /** @@ -183,7 +183,7 @@ public: /** * @return a reference to the custom FileInforProvider object (FORWARDER) */ - TDevVCSFileInfoProvider *fileInfoProvider() const; + KDevVCSFileInfoProvider *fileInfoProvider() const; // Helpers @@ -309,10 +309,10 @@ private: static const TQString changeLogPrependString; // Internal short-cuts - TDevMainWindow *mainWindow() const; - TDevCore *core() const; + KDevMainWindow *mainWindow() const; + KDevCore *core() const; TQString projectDirectory() const; - TDevDiffFrontend *diffFrontend() const; + KDevDiffFrontend *diffFrontend() const; /** Locate and setup DCOP CvsService */ bool requestCvsService(); diff --git a/vcs/cvsservice/cvsprocesswidget.cpp b/vcs/cvsservice/cvsprocesswidget.cpp index e218e00e..bb8fb459 100644 --- a/vcs/cvsservice/cvsprocesswidget.cpp +++ b/vcs/cvsservice/cvsprocesswidget.cpp @@ -18,9 +18,9 @@ #include #include -#include "tdevpartcontroller.h" -#include "tdevmainwindow.h" -#include "tdevcore.h" +#include "kdevpartcontroller.h" +#include "kdevmainwindow.h" +#include "kdevcore.h" #include "cvspart.h" #include "cvsprocesswidget.h" diff --git a/vcs/cvsservice/integrator/CMakeLists.txt b/vcs/cvsservice/integrator/CMakeLists.txt index e615784e..a17393d8 100644 --- a/vcs/cvsservice/integrator/CMakeLists.txt +++ b/vcs/cvsservice/integrator/CMakeLists.txt @@ -25,7 +25,7 @@ link_directories( ##### other data ################################ -install( FILES tdevcvsserviceintegrator.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevcvsserviceintegrator.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) ##### libcvsserviceintegrator (module) ########## @@ -35,6 +35,6 @@ tde_add_kpart( libcvsserviceintegrator AUTOMOC cvsserviceintegrator.cpp integratordlgbase.ui fetcherdlgbase.ui integratordlg.cpp initdlg.ui LINK - tdevextras-shared tdevelop-shared cvsservice + kdevextras-shared tdevelop-shared cvsservice DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/vcs/cvsservice/integrator/Makefile.am b/vcs/cvsservice/integrator/Makefile.am index 36f5dcee..f3eb47fe 100644 --- a/vcs/cvsservice/integrator/Makefile.am +++ b/vcs/cvsservice/integrator/Makefile.am @@ -5,8 +5,8 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = libcvsserviceintegrator.la libcvsserviceintegrator_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) libcvsserviceintegrator_la_LIBADD = \ - $(top_builddir)/lib/interfaces/extras/libtdevextras.la $(top_builddir)/lib/libtdevelop.la -lcvsservice + $(top_builddir)/lib/interfaces/extras/libkdevextras.la $(top_builddir)/lib/libtdevelop.la -lcvsservice noinst_HEADERS = cvsserviceintegrator.h integratordlg.h libcvsserviceintegrator_la_SOURCES = cvsserviceintegrator.cpp \ integratordlgbase.ui fetcherdlgbase.ui integratordlg.cpp initdlg.ui -kde_services_DATA = tdevcvsserviceintegrator.desktop +kde_services_DATA = kdevcvsserviceintegrator.desktop diff --git a/vcs/cvsservice/integrator/cvsserviceintegrator.cpp b/vcs/cvsservice/integrator/cvsserviceintegrator.cpp index 7f2fbbeb..1bbc3b11 100644 --- a/vcs/cvsservice/integrator/cvsserviceintegrator.cpp +++ b/vcs/cvsservice/integrator/cvsserviceintegrator.cpp @@ -19,18 +19,18 @@ ***************************************************************************/ #include "cvsserviceintegrator.h" -#include -#include +#include +#include #include "integratordlg.h" -static const TDevPluginInfo data("tdevcvsserviceintegrator"); -typedef TDevGenericFactory CVSIntegratorFactory; +static const KDevPluginInfo data("kdevcvsserviceintegrator"); +typedef KDevGenericFactory CVSIntegratorFactory; K_EXPORT_COMPONENT_FACTORY( libcvsserviceintegrator, CVSIntegratorFactory(data) ) CVSServiceIntegrator::CVSServiceIntegrator(TQObject* parent, const char* name, const TQStringList args) - :TDevVCSIntegrator(parent, name) + :KDevVCSIntegrator(parent, name) { } diff --git a/vcs/cvsservice/integrator/cvsserviceintegrator.h b/vcs/cvsservice/integrator/cvsserviceintegrator.h index b3a8af9a..ebf4224e 100644 --- a/vcs/cvsservice/integrator/cvsserviceintegrator.h +++ b/vcs/cvsservice/integrator/cvsserviceintegrator.h @@ -20,11 +20,11 @@ #ifndef CVSSERVICEINTEGRATOR_H #define CVSSERVICEINTEGRATOR_H -#include +#include #include -class CVSServiceIntegrator: public TDevVCSIntegrator { +class CVSServiceIntegrator: public KDevVCSIntegrator { Q_OBJECT public: diff --git a/vcs/cvsservice/integrator/kdevcvsserviceintegrator.desktop b/vcs/cvsservice/integrator/kdevcvsserviceintegrator.desktop new file mode 100644 index 00000000..a6f189f7 --- /dev/null +++ b/vcs/cvsservice/integrator/kdevcvsserviceintegrator.desktop @@ -0,0 +1,45 @@ +[Desktop Entry] +Type=Service +Name=KDevCVSIntegrator +Name[da]=TDevelop CVS-integration +Name[nds]=TDevelop-CVS-Integreren +Name[sk]=KDev CVS integrácia +Name[sv]=TDevelop CVS-integration +Name[zh_TW]=TDevelop CVS 整合器 +Comment=CVS Service Project Integration Facility +Comment[ca]=Facilitat d'integració amb projectes que usin CVS +Comment[da]=CVS service projektintegration +Comment[de]=CVS-Dienst-Projektintegration +Comment[el]=Λειτουργία ενσωμάτωσης υπηρεσίας CVS στο έργο +Comment[es]=Facilidad de integración con proyectos que utilicen CVS +Comment[et]=CVS-teenuse projekti põimimisvahend +Comment[eu]=CVS zerbitzuen proiektuen integrazio-tresna +Comment[fa]=تسهیلات مجتمع‌سازی پروژۀ خدمت CVS +Comment[fr]=Fonction d'intégration pour un projet utilisant le service CVS +Comment[gl]=Utilidade para a integración de proxectos do servizo CVS +Comment[hu]=Integrálás a Cvsservice-szel +Comment[it]=Funzione di integrazione del progetto CVS Service +Comment[ja]=CVS サービス プロジェクト統合ツール +Comment[ms]=Kemudahan Integrasi Projek Servis CVS +Comment[nds]=Projektintegreren för den CVS-Deenst +Comment[ne]=CVS सेवा परियोजना एकिकरण सुविधा +Comment[nl]=CVS project-integratie +Comment[pl]=Integracja z usługą CVS +Comment[pt]=Integração com Projectos de Serviço CVS +Comment[pt_BR]=Facilidade de Integração ao Projeto do Serviço CVS +Comment[ru]=Интеграция CVS +Comment[sk]=Integrácia CVS projektu +Comment[sr]=Интеграција Cervisia-је у пројекат +Comment[sr@Latn]=Integracija Cervisia-je u projekat +Comment[sv]=Funktion för integrering av CVS-tjänst i projekt +Comment[tr]=CVS Servis Projesi Bütünleştirme Aracı +Comment[zh_CN]=CVS 服务工程集成功能 +Comment[zh_TW]=CVS 服務專案整合工具 +Icon=cervisia +Exec=blubb +ServiceTypes=TDevelop/VCSIntegrator +X-TDE-Library=libcvsserviceintegrator +X-TDevelop-Default=true +X-TDevelop-VCS=CVS +X-TDevelop-VCSPlugin=kdevcvsservice +X-TDevelop-Version=5 diff --git a/vcs/cvsservice/integrator/tdevcvsserviceintegrator.desktop b/vcs/cvsservice/integrator/tdevcvsserviceintegrator.desktop deleted file mode 100644 index a6f189f7..00000000 --- a/vcs/cvsservice/integrator/tdevcvsserviceintegrator.desktop +++ /dev/null @@ -1,45 +0,0 @@ -[Desktop Entry] -Type=Service -Name=KDevCVSIntegrator -Name[da]=TDevelop CVS-integration -Name[nds]=TDevelop-CVS-Integreren -Name[sk]=KDev CVS integrácia -Name[sv]=TDevelop CVS-integration -Name[zh_TW]=TDevelop CVS 整合器 -Comment=CVS Service Project Integration Facility -Comment[ca]=Facilitat d'integració amb projectes que usin CVS -Comment[da]=CVS service projektintegration -Comment[de]=CVS-Dienst-Projektintegration -Comment[el]=Λειτουργία ενσωμάτωσης υπηρεσίας CVS στο έργο -Comment[es]=Facilidad de integración con proyectos que utilicen CVS -Comment[et]=CVS-teenuse projekti põimimisvahend -Comment[eu]=CVS zerbitzuen proiektuen integrazio-tresna -Comment[fa]=تسهیلات مجتمع‌سازی پروژۀ خدمت CVS -Comment[fr]=Fonction d'intégration pour un projet utilisant le service CVS -Comment[gl]=Utilidade para a integración de proxectos do servizo CVS -Comment[hu]=Integrálás a Cvsservice-szel -Comment[it]=Funzione di integrazione del progetto CVS Service -Comment[ja]=CVS サービス プロジェクト統合ツール -Comment[ms]=Kemudahan Integrasi Projek Servis CVS -Comment[nds]=Projektintegreren för den CVS-Deenst -Comment[ne]=CVS सेवा परियोजना एकिकरण सुविधा -Comment[nl]=CVS project-integratie -Comment[pl]=Integracja z usługą CVS -Comment[pt]=Integração com Projectos de Serviço CVS -Comment[pt_BR]=Facilidade de Integração ao Projeto do Serviço CVS -Comment[ru]=Интеграция CVS -Comment[sk]=Integrácia CVS projektu -Comment[sr]=Интеграција Cervisia-је у пројекат -Comment[sr@Latn]=Integracija Cervisia-je u projekat -Comment[sv]=Funktion för integrering av CVS-tjänst i projekt -Comment[tr]=CVS Servis Projesi Bütünleştirme Aracı -Comment[zh_CN]=CVS 服务工程集成功能 -Comment[zh_TW]=CVS 服務專案整合工具 -Icon=cervisia -Exec=blubb -ServiceTypes=TDevelop/VCSIntegrator -X-TDE-Library=libcvsserviceintegrator -X-TDevelop-Default=true -X-TDevelop-VCS=CVS -X-TDevelop-VCSPlugin=kdevcvsservice -X-TDevelop-Version=5 diff --git a/vcs/cvsservice/kdev_cvs.png b/vcs/cvsservice/kdev_cvs.png new file mode 100644 index 00000000..921b0674 Binary files /dev/null and b/vcs/cvsservice/kdev_cvs.png differ diff --git a/vcs/cvsservice/kdev_cvs.xcf b/vcs/cvsservice/kdev_cvs.xcf new file mode 100644 index 00000000..aafee609 Binary files /dev/null and b/vcs/cvsservice/kdev_cvs.xcf differ diff --git a/vcs/cvsservice/kdevcvsservice.desktop b/vcs/cvsservice/kdevcvsservice.desktop new file mode 100644 index 00000000..921e91d1 --- /dev/null +++ b/vcs/cvsservice/kdevcvsservice.desktop @@ -0,0 +1,77 @@ +[Desktop Entry] +Type=Service +Exec=blubb +Comment=CVS Integration using Cervisia's cvsservice. http://www.kde.org/apps/cervisia/ +Comment[ca]=Integració amb el CVS emprant el cvsservice de Cervisia. http://www.kde.org/apps/cervisia/ +Comment[da]=CVS Integration ved brug af Cervisias cvsservice. http://www.kde.org/apps/cervisia/ +Comment[de]=CVS-Integration mit Hilfe von Cervisias cvsservice. http://www.kde.org/apps/cervisia/ +Comment[el]=Ενσωμάτωση CVS χρησιμοποιώντας τη cvsservice του Cervisia. http://www.kde.org/apps/cervisia/ +Comment[es]=Integración con CVS utilizando el cvsservice. http://www.kde.org/apps/cervisia/ +Comment[et]=CVS põimimine Cervisia cvsservice'i abil. http://www.kde.org/apps/cervisia/ +Comment[eu]=CVS integrazioa Cervisia-ren cvsservice erabiliz. http://www.kde.org/apps/cervisia/ +Comment[fa]=مجتمع‌سازی CVS، با استفاده از خدمت cvs متعلق به Cervisia. http://www.kde.org/apps/cervisia/ +Comment[fr]=Intégration de CVS à l'aide du processus « cvsservice » de Cervisia. http://www.kde.org/apps/cervisia/ +Comment[ga]=Comhtháthú CVS le cvsservice Cervisia. http://www.kde.org/apps/cervisia/ +Comment[gl]=Integración CVS usando o servizo cvsservice de Cervisia. http://www.kde.org/apps/cervisia/ +Comment[hu]=CVS-integráció a Cervisia cvsservice segítségével. http://www.kde.org/apps/cervisia/ +Comment[it]=Integrazione del CVS utilizzando il cvsservice di Cervisia. http://www.kde.org/apps/cervisia/ +Comment[ja]=CVS 統合は、Cervisia の CVS サービスを利用します。http://www.kde.org/apps/cervisia/ +Comment[ms]=Integrasi CVS menggunakan cvsservice Cervisia. http://www.kde.org/apps/cervisia/ +Comment[nds]=CVS-Integreren över den CVS-Service vun Cervisia. http://www.kde.org/apps/cervisia/ +Comment[ne]= Cervisia's cvsservice प्रयोग गरेर CVS एकिकरण । http://www.kde.org/apps/cervisia/ +Comment[nl]=CVS-integratie via Cervisia's cvsservice. Zie http://www.kde.org/apps/cervisia/ +Comment[pl]=Integracja z CVS-em za pomocą usługi CVS Cervisii http://www.kde.org/apps/cervisia/ +Comment[pt]=Integração do CVS usando o cvsservice do Cervisia. http://www.kde.org/apps/cervisia/ +Comment[pt_BR]=Integração com o CVS usando o cvsservice do Cervisia. http://www.kde.org/apps/cervisia/ +Comment[ru]=Интеграция CVS с использованием Cervisia cvsservice. http://www.kde.org/apps/cervisia/ +Comment[sk]=Integrácia CVS pomocou Cervisia Cvs služby. http://www.kde.org/apps/cervisia/ +Comment[sl]=Integracija CVS z uporabo Cervisijeve cvsservice. http://www.kde.org/apps/cervisia/ +Comment[sr]=Интеграција CVS-а помоћу Cervisia-jиног cvsservice. http://www.kde.org/apps/cervisia/ +Comment[sr@Latn]=Integracija CVS-a pomoću Cervisia-jinog cvsservice. http://www.kde.org/apps/cervisia/ +Comment[sv]=Integrering av CVS med användning av Cervisias CVS-tjänst. http://www.kde.org/apps/cervisia/ +Comment[tr]=Cervisia'nın cvsservice'i kullanılarak CVS bütünleştirilmesi http://www.kde.org/apps/cervisia/ +Comment[zh_CN]=使用 Cervisia 的 cvsservice 的 CVS 集成。http://www.kde.org/apps/cervisia/ +Comment[zh_TW]=使用 Cervisia 服務做 CVS 整合。http://www.kde.org/apps/cervisia/ +Name=KDevCvsService +Name[da]=TDevelop CVS-service +Name[nds]=TDevelop-CVS-Deenst +Name[sk]=KDev Cvs služba +Name[sv]=TDevelop CVS-tjänst +Name[zh_TW]=TDevelop CVS 服務 +GenericName=CVS Integration (Cervisia) +GenericName[ca]=Integració amb CVS (Cervisia) +GenericName[de]=Unterstützung für CVS (Cervisia) +GenericName[el]=Ενσωμάτωση CVS (Cervisia) +GenericName[es]=Integración con CVS (Cervisia) +GenericName[et]=CVS põimimine (Cervisia) +GenericName[eu]=CVS integrazioa (Cervisia) +GenericName[fa]=مجتمع‌سازی CVS (Cervisia) +GenericName[fr]=Intégration de CVS (Cervisia) +GenericName[ga]=Comhtháthú CVS (Cervisia) +GenericName[gl]=Integración CVS (Cervisia) +GenericName[hu]=CVS-integráció (Cervisia) +GenericName[it]=Integrazione CVS (Cervisia) +GenericName[ja]=CVS 統合 (Cervisia) +GenericName[ms]=Integrasi CVS (Cervisia) +GenericName[nds]=Ünnerstütten för CVS (Cervisia) +GenericName[ne]=CVS एकिकरण (Cervisia) +GenericName[nl]=CVS-integratie (Cervisia) +GenericName[pl]=Integracja z CVS-em (Cervisia) +GenericName[pt]=Integração com CVS (Cervisia) +GenericName[pt_BR]=Integração com o CVS (Cervisia) +GenericName[ru]=Интеграция CVS (Cervisia) +GenericName[sk]=CVS integrácia (Cervisia) +GenericName[sl]=Integracija CVS (Cervisia) +GenericName[sr]=Интеграција CVS-а (Cervisia) +GenericName[sr@Latn]=Integracija CVS-a (Cervisia) +GenericName[sv]=Integrering av CVS (Cervisia) +GenericName[ta]=CVS ஒருங்கிணை (செர்விசியா) +GenericName[tg]=Интегратсияи CVS (Cervisia) +GenericName[tr]=CVS Bütünleştirmesi (Cervisia) +GenericName[zh_CN]=CVS 集成(Cervisia) +GenericName[zh_TW]=CVS 整合（Cervisia） +Icon=cervisia +ServiceTypes=TDevelop/VersionControl +X-TDE-Library=libkdevcvsservice +X-TDevelop-Version=5 +X-TDevelop-Properties=VCS,CVSService diff --git a/vcs/cvsservice/kdevcvsservicepart.rc b/vcs/cvsservice/kdevcvsservicepart.rc new file mode 100644 index 00000000..a1bce434 --- /dev/null +++ b/vcs/cvsservice/kdevcvsservicepart.rc @@ -0,0 +1,36 @@ + + + +

+ + &Version Control + + + &CVS Service + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vcs/cvsservice/tdev_cvs.png b/vcs/cvsservice/tdev_cvs.png deleted file mode 100644 index 921b0674..00000000 Binary files a/vcs/cvsservice/tdev_cvs.png and /dev/null differ diff --git a/vcs/cvsservice/tdev_cvs.xcf b/vcs/cvsservice/tdev_cvs.xcf deleted file mode 100644 index aafee609..00000000 Binary files a/vcs/cvsservice/tdev_cvs.xcf and /dev/null differ diff --git a/vcs/cvsservice/tdevcvsservice.desktop b/vcs/cvsservice/tdevcvsservice.desktop deleted file mode 100644 index 5b8bb530..00000000 --- a/vcs/cvsservice/tdevcvsservice.desktop +++ /dev/null @@ -1,77 +0,0 @@ -[Desktop Entry] -Type=Service -Exec=blubb -Comment=CVS Integration using Cervisia's cvsservice. http://www.kde.org/apps/cervisia/ -Comment[ca]=Integració amb el CVS emprant el cvsservice de Cervisia. http://www.kde.org/apps/cervisia/ -Comment[da]=CVS Integration ved brug af Cervisias cvsservice. http://www.kde.org/apps/cervisia/ -Comment[de]=CVS-Integration mit Hilfe von Cervisias cvsservice. http://www.kde.org/apps/cervisia/ -Comment[el]=Ενσωμάτωση CVS χρησιμοποιώντας τη cvsservice του Cervisia. http://www.kde.org/apps/cervisia/ -Comment[es]=Integración con CVS utilizando el cvsservice. http://www.kde.org/apps/cervisia/ -Comment[et]=CVS põimimine Cervisia cvsservice'i abil. http://www.kde.org/apps/cervisia/ -Comment[eu]=CVS integrazioa Cervisia-ren cvsservice erabiliz. http://www.kde.org/apps/cervisia/ -Comment[fa]=مجتمع‌سازی CVS، با استفاده از خدمت cvs متعلق به Cervisia. http://www.kde.org/apps/cervisia/ -Comment[fr]=Intégration de CVS à l'aide du processus « cvsservice » de Cervisia. http://www.kde.org/apps/cervisia/ -Comment[ga]=Comhtháthú CVS le cvsservice Cervisia. http://www.kde.org/apps/cervisia/ -Comment[gl]=Integración CVS usando o servizo cvsservice de Cervisia. http://www.kde.org/apps/cervisia/ -Comment[hu]=CVS-integráció a Cervisia cvsservice segítségével. http://www.kde.org/apps/cervisia/ -Comment[it]=Integrazione del CVS utilizzando il cvsservice di Cervisia. http://www.kde.org/apps/cervisia/ -Comment[ja]=CVS 統合は、Cervisia の CVS サービスを利用します。http://www.kde.org/apps/cervisia/ -Comment[ms]=Integrasi CVS menggunakan cvsservice Cervisia. http://www.kde.org/apps/cervisia/ -Comment[nds]=CVS-Integreren över den CVS-Service vun Cervisia. http://www.kde.org/apps/cervisia/ -Comment[ne]= Cervisia's cvsservice प्रयोग गरेर CVS एकिकरण । http://www.kde.org/apps/cervisia/ -Comment[nl]=CVS-integratie via Cervisia's cvsservice. Zie http://www.kde.org/apps/cervisia/ -Comment[pl]=Integracja z CVS-em za pomocą usługi CVS Cervisii http://www.kde.org/apps/cervisia/ -Comment[pt]=Integração do CVS usando o cvsservice do Cervisia. http://www.kde.org/apps/cervisia/ -Comment[pt_BR]=Integração com o CVS usando o cvsservice do Cervisia. http://www.kde.org/apps/cervisia/ -Comment[ru]=Интеграция CVS с использованием Cervisia cvsservice. http://www.kde.org/apps/cervisia/ -Comment[sk]=Integrácia CVS pomocou Cervisia Cvs služby. http://www.kde.org/apps/cervisia/ -Comment[sl]=Integracija CVS z uporabo Cervisijeve cvsservice. http://www.kde.org/apps/cervisia/ -Comment[sr]=Интеграција CVS-а помоћу Cervisia-jиног cvsservice. http://www.kde.org/apps/cervisia/ -Comment[sr@Latn]=Integracija CVS-a pomoću Cervisia-jinog cvsservice. http://www.kde.org/apps/cervisia/ -Comment[sv]=Integrering av CVS med användning av Cervisias CVS-tjänst. http://www.kde.org/apps/cervisia/ -Comment[tr]=Cervisia'nın cvsservice'i kullanılarak CVS bütünleştirilmesi http://www.kde.org/apps/cervisia/ -Comment[zh_CN]=使用 Cervisia 的 cvsservice 的 CVS 集成。http://www.kde.org/apps/cervisia/ -Comment[zh_TW]=使用 Cervisia 服務做 CVS 整合。http://www.kde.org/apps/cervisia/ -Name=KDevCvsService -Name[da]=TDevelop CVS-service -Name[nds]=TDevelop-CVS-Deenst -Name[sk]=KDev Cvs služba -Name[sv]=TDevelop CVS-tjänst -Name[zh_TW]=TDevelop CVS 服務 -GenericName=CVS Integration (Cervisia) -GenericName[ca]=Integració amb CVS (Cervisia) -GenericName[de]=Unterstützung für CVS (Cervisia) -GenericName[el]=Ενσωμάτωση CVS (Cervisia) -GenericName[es]=Integración con CVS (Cervisia) -GenericName[et]=CVS põimimine (Cervisia) -GenericName[eu]=CVS integrazioa (Cervisia) -GenericName[fa]=مجتمع‌سازی CVS (Cervisia) -GenericName[fr]=Intégration de CVS (Cervisia) -GenericName[ga]=Comhtháthú CVS (Cervisia) -GenericName[gl]=Integración CVS (Cervisia) -GenericName[hu]=CVS-integráció (Cervisia) -GenericName[it]=Integrazione CVS (Cervisia) -GenericName[ja]=CVS 統合 (Cervisia) -GenericName[ms]=Integrasi CVS (Cervisia) -GenericName[nds]=Ünnerstütten för CVS (Cervisia) -GenericName[ne]=CVS एकिकरण (Cervisia) -GenericName[nl]=CVS-integratie (Cervisia) -GenericName[pl]=Integracja z CVS-em (Cervisia) -GenericName[pt]=Integração com CVS (Cervisia) -GenericName[pt_BR]=Integração com o CVS (Cervisia) -GenericName[ru]=Интеграция CVS (Cervisia) -GenericName[sk]=CVS integrácia (Cervisia) -GenericName[sl]=Integracija CVS (Cervisia) -GenericName[sr]=Интеграција CVS-а (Cervisia) -GenericName[sr@Latn]=Integracija CVS-a (Cervisia) -GenericName[sv]=Integrering av CVS (Cervisia) -GenericName[ta]=CVS ஒருங்கிணை (செர்விசியா) -GenericName[tg]=Интегратсияи CVS (Cervisia) -GenericName[tr]=CVS Bütünleştirmesi (Cervisia) -GenericName[zh_CN]=CVS 集成(Cervisia) -GenericName[zh_TW]=CVS 整合（Cervisia） -Icon=cervisia -ServiceTypes=TDevelop/VersionControl -X-TDE-Library=libtdevcvsservice -X-TDevelop-Version=5 -X-TDevelop-Properties=VCS,CVSService diff --git a/vcs/cvsservice/tdevcvsservicepart.rc b/vcs/cvsservice/tdevcvsservicepart.rc deleted file mode 100644 index a1bce434..00000000 --- a/vcs/cvsservice/tdevcvsservicepart.rc +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - &Version Control - - - &CVS Service - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.1