diff options
Diffstat (limited to 'vcs/perforce')
-rw-r--r-- | vcs/perforce/CMakeLists.txt | 6 | ||||
-rw-r--r-- | vcs/perforce/commitdlg.cpp | 8 | ||||
-rw-r--r-- | vcs/perforce/commitdlg.h | 2 | ||||
-rw-r--r-- | vcs/perforce/integrator/CMakeLists.txt | 6 | ||||
-rw-r--r-- | vcs/perforce/integrator/kdevperforceintegrator.desktop | 37 | ||||
-rw-r--r-- | vcs/perforce/integrator/perforceintegrator.h | 2 | ||||
-rw-r--r-- | vcs/perforce/integrator/pfintegratordlg.h | 2 | ||||
-rw-r--r-- | vcs/perforce/kdevperforce.desktop | 81 | ||||
-rw-r--r-- | vcs/perforce/perforcepart.cpp | 44 | ||||
-rw-r--r-- | vcs/perforce/perforcepart.h | 2 |
10 files changed, 49 insertions, 141 deletions
diff --git a/vcs/perforce/CMakeLists.txt b/vcs/perforce/CMakeLists.txt index 549eadb8..bb3c69a4 100644 --- a/vcs/perforce/CMakeLists.txt +++ b/vcs/perforce/CMakeLists.txt @@ -27,7 +27,11 @@ link_directories( ##### other data ################################ -install( FILES kdevperforce.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +tde_create_translated_desktop( + SOURCE kdevperforce.desktop + DESTINATION ${SERVICES_INSTALL_DIR} + PO_DIR tdevelop-desktops +) ##### libkdevperforce (module) ################## diff --git a/vcs/perforce/commitdlg.cpp b/vcs/perforce/commitdlg.cpp index c5706903..daa882d4 100644 --- a/vcs/perforce/commitdlg.cpp +++ b/vcs/perforce/commitdlg.cpp @@ -17,7 +17,7 @@ #include <tqtextedit.h> #include <tqpushbutton.h> #include <tqregexp.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdeapplication.h> #include <tdelocale.h> #include <klineedit.h> @@ -103,9 +103,9 @@ void CommitDialog::setDepotFiles( const TQStringList& lst ) args << (*it); } - ExecCommand* cmd = new ExecCommand( "p4", args, TQString(), TQStringList(), TQT_TQOBJECT(this) ); - connect( cmd, TQT_SIGNAL(finished( const TQString&, const TQString& )), - this, TQT_SLOT(getFilesFinished( const TQString&, const TQString& )) ); + ExecCommand* cmd = new ExecCommand( "p4", args, TQString(), TQStringList(), this ); + connect( cmd, TQ_SIGNAL(finished( const TQString&, const TQString& )), + this, TQ_SLOT(getFilesFinished( const TQString&, const TQString& )) ); } void CommitDialog::getFilesFinished( const TQString& out, const TQString& /* err */ ) diff --git a/vcs/perforce/commitdlg.h b/vcs/perforce/commitdlg.h index 7fa70404..a2dbf2fd 100644 --- a/vcs/perforce/commitdlg.h +++ b/vcs/perforce/commitdlg.h @@ -23,7 +23,7 @@ class TDEProcess; class CommitDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: CommitDialog( TQWidget *parent = 0, const char *name = 0 ); diff --git a/vcs/perforce/integrator/CMakeLists.txt b/vcs/perforce/integrator/CMakeLists.txt index e939e3ba..8db10aef 100644 --- a/vcs/perforce/integrator/CMakeLists.txt +++ b/vcs/perforce/integrator/CMakeLists.txt @@ -26,7 +26,11 @@ link_directories( ##### other data ################################ -install( FILES kdevperforceintegrator.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +tde_create_translated_desktop( + SOURCE kdevperforceintegrator.desktop + DESTINATION ${SERVICES_INSTALL_DIR} + PO_DIR tdevelop-desktops +) ##### libperforceintegrator (module) ############ diff --git a/vcs/perforce/integrator/kdevperforceintegrator.desktop b/vcs/perforce/integrator/kdevperforceintegrator.desktop index 54939787..ef1591ae 100644 --- a/vcs/perforce/integrator/kdevperforceintegrator.desktop +++ b/vcs/perforce/integrator/kdevperforceintegrator.desktop @@ -1,40 +1,9 @@ [Desktop Entry] -Type=Service Name=KDevPerforceIntegrator -Name[da]=TDevelop Perforce-integration -Name[nds]=TDevelop-Perforce-Integreren -Name[sk]=KDev Perforce integrácia -Name[sv]=TDevelop Perforce-integration -Name[zh_TW]=TDevelop Perforce 整合器 + Comment=Perforce Project Integration Facility -Comment[ca]=Facilitat per a la integració amb projectes Perforce -Comment[da]=Perforce projektintegration -Comment[de]=Perforce-Projektintegration -Comment[el]=Λειτουργία ενσωμάτωσης Perforce στο έργο -Comment[es]=Entorno para integración con proyectos Perforce -Comment[et]=Perforce projekti põimimisvahend -Comment[eu]=Perforce proiektuen integrazio-tresna -Comment[fa]=تسهیلات مجتمعسازی پروژۀ Perforce -Comment[fr]=Fonction d'intégration pour un projet utilisant Perforce -Comment[gl]=Utilidade para a integración de proxectos Perforce -Comment[hu]=Integrálás a Perforce-szal -Comment[it]=Funzione di integrazione del progetto Perforce -Comment[ja]=Perforce プロジェクト統合ツール -Comment[ms]=Kemudahan Integrasi Projek Perforce -Comment[nds]=Perforce-Projektintegreren -Comment[ne]=परफोर्स परियोजना एकिकरण सुविधा -Comment[nl]=Perforce project-integratie -Comment[pl]=Integracja z Perforce -Comment[pt]=Integração com Projectos Perforce -Comment[pt_BR]=Facilidade de Integração ao Projeto de Perforce -Comment[ru]=Интеграция Perforce -Comment[sk]=Perforce projektová integrácia -Comment[sr]=Интеграција Perforce-а у пројекат -Comment[sr@Latn]=Integracija Perforce-a u projekat -Comment[sv]=Funktion för integrering av Perforce i projekt -Comment[tr]=Perforce Proje Bütünleştirme Aracı -Comment[zh_CN]=Perforce 工程集成功能 -Comment[zh_TW]=Perforce 專案整合工具 + +Type=Service Exec=blubb X-TDE-ServiceTypes=TDevelop/VCSIntegrator X-TDE-Library=libperforceintegrator diff --git a/vcs/perforce/integrator/perforceintegrator.h b/vcs/perforce/integrator/perforceintegrator.h index 2b82046f..4384d583 100644 --- a/vcs/perforce/integrator/perforceintegrator.h +++ b/vcs/perforce/integrator/perforceintegrator.h @@ -26,7 +26,7 @@ class PerforceIntegrator : public KDevVCSIntegrator { -Q_OBJECT +TQ_OBJECT public: PerforceIntegrator(TQObject* parent, const char* name, const TQStringList args = TQStringList()); diff --git a/vcs/perforce/integrator/pfintegratordlg.h b/vcs/perforce/integrator/pfintegratordlg.h index 3e7bf4de..71a48b11 100644 --- a/vcs/perforce/integrator/pfintegratordlg.h +++ b/vcs/perforce/integrator/pfintegratordlg.h @@ -24,7 +24,7 @@ #include <kdevvcsintegrator.h> class PFIntegratorDlg: public PFIntegratorDlgBase, public VCSDialog { -Q_OBJECT +TQ_OBJECT public: PFIntegratorDlg(TQWidget *parent = 0, const char *name = 0); diff --git a/vcs/perforce/kdevperforce.desktop b/vcs/perforce/kdevperforce.desktop index d882799f..dd438812 100644 --- a/vcs/perforce/kdevperforce.desktop +++ b/vcs/perforce/kdevperforce.desktop @@ -1,81 +1,12 @@ [Desktop Entry] -Type=Service -Exec=blubb -Comment=Integrates Perforce, a software configuration management system. http://www.perforce.com/ -Comment[ca]=Integra Perforce, un sistema de gestió de la configuració del programari. http://www.perforce.com/ -Comment[da]=Integrerer Perforce, et software-indstilling håndteringssystem. http://www.perforce.com/ -Comment[de]=Integration von Perforce, einem System zur Verwaltung von Software-Konfigurationen. http://www.perforce.com/ -Comment[el]=Ενσωματώνει το Perforce, ένα σύστημα διαχείρισης και ρύθμισης λογισμικού.http://www.perforce.com/ -Comment[es]=Integra Perforce, un sistema de adminsitración de la configuración del software. http://www.perforce.com/ -Comment[et]=Integreerib tarkvaraseadistuste haldamise süsteemi Perforce. http://www.perforce.com/ -Comment[eu]=Perforce integratzen du, software konfiguazio kudeaketa sistema bat. http://www.perforce.com/ -Comment[fa]=Perforce را مجتمعسازی میکند. یک سیستم مدیریت پیکربندی نرمافزار. http://www.perforce.com/ -Comment[fr]=Intègre « PerForce », un système de gestion de configuration de logiciels. http:/www.perforce.com/ -Comment[gl]=Integra Perforce, un sistema de xestións de configuracións. http://www.perforce.com/ -Comment[hi]=परफ़ोर्स को इंटीग्रेट करता है, जो कि सॉफ्टवेयर कॉन्फ़िगरेशन प्रबंधन तंत्र है. http://www.perforce.com/ -Comment[hu]=Integrációt biztosít a Perforce szoftverkonfigurációs rendszerrel - http://www.perforce.com/ -Comment[it]=Integra Perforce, un sistema per la configurazione software. http://www.perforce.com/ -Comment[ja]=ソフトウェア設定管理システム Perforce を統合します。 -Comment[ms]=Menggabungkan Perforce, sebuah sistem pengurusan tetapan perisian. http://www.perforce.com/ -Comment[nds]=Integreren vun Perforce, en Systeem för't Plegen vun Programminstellen. http://www.perforce.com/ -Comment[ne]=परफोर्स एकिकरण गर्दछ, सफ्टवेयर कन्फिगरेसन व्यवस्थापन प्रणाली http://www.perforce.com/ -Comment[nl]=Integreert Perforce, een systeem voor softwareconfiguratie. Zie http://www.perforce.com/ -Comment[pl]=Integracja z Perforce, systemem zarządzania konfiguracją oprogramowania. http://www.perforce.com/ -Comment[pt]=Integra o Perforce, um sistema de gestão de configurações de 'software'. http://www.perforce.com/ -Comment[pt_BR]=Integra o Perforce, um software de configuração e gerenciamento do sistema. http://www.perforce.com/ -Comment[ru]=Интегрирует Perforce, систему управления конфигурациями программного обеспечения. http://www.perforce.com/ -Comment[sk]=Integrácia Perforce, konfiguračný projektový manažment. http://www.perforce.com/ -Comment[sl]=Integrira Perforce, upravljalni sistem programja. http://www.perforce.com/ -Comment[sr]=Интегрише Perforce, систем за управљање подешавањем софтвера. http://www.perforce.com/ -Comment[sr@Latn]=Integriše Perforce, sistem za upravljanje podešavanjem softvera. http://www.perforce.com/ -Comment[sv]=Integrerar Perforce, ett konfigurationshanteringsverktyg för programvara. http://www.perforce.com/ -Comment[ta]=ஒருங்கிணைக்கும் Perforce, ஒரு மென்பொருள் மேலாளர் அமைப்பு. http://www.perforce.com/ -Comment[tg]=Интеграл намудани Perforce, барномаи идоракунандаро шарҳи барномаҳои таъмин нигоҳ медорад.http://www.perforce.com/ -Comment[tr]=Bir yazılım ayar yönetimi sistemi olan Perforce'u bütünleştirir. http://www.perforce.com/ -Comment[zh_CN]=集成 Perforce,系统配置管理软件 http://www.perforce.com/ -Comment[zh_TW]=整合 Perforce,一套軟體設定管理系統。http://www.perforce.com/ Name=KDevPerforce -Name[da]=TDevelop Perforce -Name[de]=Unterstützung für Perforce (TDevelop) -Name[hi]=के-डेव-परफ़ोर्स -Name[nds]=Perforce-Ünnerstütten för TDevelop -Name[sk]=KDev Perforce -Name[sv]=TDevelop Perforce -Name[ta]=Kdev Perforce -Name[zh_TW]=TDevelop Perforce + GenericName=Perforce Integration -GenericName[ca]=Integració amb Perforce -GenericName[da]=Perforce integration -GenericName[de]=Perforce-Integration -GenericName[el]=Ενσωμάτωση Perforce -GenericName[es]=Integración de Perforce -GenericName[et]=Perforce'i põimimine -GenericName[eu]=Perforce integrazioa -GenericName[fa]=مجتمعسازی Perforce -GenericName[fr]=Intégration de « Perforce » -GenericName[ga]=Comhtháthú Perforce -GenericName[gl]=Integración de Perforce -GenericName[hi]=परफ़ोर्स इंटीग्रेशन -GenericName[hu]=Perforce-integráció -GenericName[it]=Integrazione di Perforce -GenericName[ms]=Intergrasi Perforce -GenericName[nds]=Perforce-Integreren -GenericName[ne]=परफोर्स इन्टिग्रेसन -GenericName[nl]=Perforce-integratie -GenericName[pl]=Integracja z Perforce -GenericName[pt]=Integração com o Perforce -GenericName[pt_BR]=Integração com o Perforce -GenericName[ru]=Интеграция Perforce -GenericName[sk]=Perforce integrácia -GenericName[sl]=Integracija Perforce -GenericName[sr]=Интеграција perforce-а -GenericName[sr@Latn]=Integracija perforce-a -GenericName[sv]=Integrering av Perforce -GenericName[ta]=Perforce ஒருங்கிணைப்பு -GenericName[tg]=Интегратсия Perforce -GenericName[tr]=Perforce Bütünleştirmesi -GenericName[zh_CN]=Perforce 集成 -GenericName[zh_TW]=Perforce 整合 + +Comment=Integrates Perforce, a software configuration management system. http://www.perforce.com/ + +Type=Service +Exec=blubb X-TDE-ServiceTypes=TDevelop/VersionControl X-TDE-Library=libkdevperforce X-TDevelop-Version=5 diff --git a/vcs/perforce/perforcepart.cpp b/vcs/perforce/perforcepart.cpp index f92666b6..e3229fb6 100644 --- a/vcs/perforce/perforcepart.cpp +++ b/vcs/perforce/perforcepart.cpp @@ -18,7 +18,7 @@ #include <tdepopupmenu.h> #include <kdebug.h> #include <kdevgenericfactory.h> -#include <kprocess.h> +#include <tdeprocess.h> #include <tdemessagebox.h> #include <tdeapplication.h> #include <tdeaction.h> @@ -33,19 +33,19 @@ #include "commitdlg.h" #include "execcommand.h" -static const KDevPluginInfo data("kdevperforce"); +static const KDevPluginInfo pluginData("kdevperforce"); typedef KDevGenericFactory<PerforcePart> PerforceFactory; -K_EXPORT_COMPONENT_FACTORY( libkdevperforce, PerforceFactory( data ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevperforce, PerforceFactory( pluginData ) ) PerforcePart::PerforcePart( TQObject *parent, const char *name, const TQStringList & ) - : KDevVersionControl( &data, parent, name ? name : "PerforcePart" ) + : KDevVersionControl( &pluginData, parent, name ? name : "PerforcePart" ) { setInstance(PerforceFactory::instance()); setupActions(); - connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); } @@ -54,31 +54,31 @@ PerforcePart::~PerforcePart() void PerforcePart::setupActions() { - actionEdit = new TDEAction( i18n("Edit"), 0, this, TQT_SLOT(slotActionEdit()), + actionEdit = new TDEAction( i18n("Edit"), 0, this, TQ_SLOT(slotActionEdit()), actionCollection(), "perforce_edit" ); actionEdit->setToolTip(i18n("Edit")); actionEdit->setWhatsThis(i18n("<b>Edit</b><p>Opens file(s) in a client workspace for edit.")); - actionRevert = new TDEAction( i18n("Revert"), 0, this, TQT_SLOT(slotActionRevert()), + actionRevert = new TDEAction( i18n("Revert"), 0, this, TQ_SLOT(slotActionRevert()), actionCollection(), "perforce_revert" ); actionRevert->setToolTip(i18n("Revert")); actionRevert->setWhatsThis(i18n("<b>Revert</b><p>Discards changes made to open files.")); - actionSubmit = new TDEAction( i18n("Submit"), 0, this, TQT_SLOT(slotActionCommit()), + actionSubmit = new TDEAction( i18n("Submit"), 0, this, TQ_SLOT(slotActionCommit()), actionCollection(), "perforce_submit" ); actionSubmit->setToolTip(i18n("Submit")); actionSubmit->setWhatsThis(i18n("<b>Submit</b><p>Sends changes made to open files to the depot.")); - actionSync = new TDEAction( i18n("Sync"), 0, this, TQT_SLOT(slotActionUpdate()), + actionSync = new TDEAction( i18n("Sync"), 0, this, TQ_SLOT(slotActionUpdate()), actionCollection(), "perforce_sync" ); actionSync->setToolTip(i18n("Sync")); actionSync->setWhatsThis(i18n("<b>Sync</b><p>Copies files from the depot into the workspace.")); - actionDiff = new TDEAction( i18n("Diff Against Repository"), 0, this, TQT_SLOT(slotActionDiff()), + actionDiff = new TDEAction( i18n("Diff Against Repository"), 0, this, TQ_SLOT(slotActionDiff()), actionCollection(), "perforce_diff" ); actionDiff->setToolTip(i18n("Diff against repository")); actionDiff->setWhatsThis(i18n("<b>Diff against repository</b><p>Compares a client workspace file to a revision in the depot.")); - actionAdd = new TDEAction( i18n("Add to Repository"), 0, this, TQT_SLOT(slotActionAdd()), + actionAdd = new TDEAction( i18n("Add to Repository"), 0, this, TQ_SLOT(slotActionAdd()), actionCollection(), "perforce_add" ); actionAdd->setToolTip(i18n("Add to repository")); actionAdd->setWhatsThis(i18n("<b>Add to repository</b><p>Open file(s) in a client workspace for addition to the depot.")); - actionRemove = new TDEAction( i18n("Remove From Repository"), 0, this, TQT_SLOT(slotActionRemove()), + actionRemove = new TDEAction( i18n("Remove From Repository"), 0, this, TQ_SLOT(slotActionRemove()), actionCollection(), "perforce_remove" ); actionRemove->setToolTip(i18n("Remove from repository")); actionRemove->setWhatsThis(i18n("<b>Remove from repository</b><p>Open file(s) in a client workspace for deletion from the depot.")); @@ -97,26 +97,26 @@ void PerforcePart::contextMenu(TQPopupMenu *popup, const Context *context) sub->insertTitle( i18n("Actions for %1").arg(name) ); int id = sub->insertItem( i18n("Edit"), - this, TQT_SLOT(slotEdit()) ); + this, TQ_SLOT(slotEdit()) ); sub->setWhatsThis(id, i18n("<b>Edit</b><p>Opens file(s) in a client workspace for edit.")); id = sub->insertItem( i18n("Revert"), - this, TQT_SLOT(slotRevert()) ); + this, TQ_SLOT(slotRevert()) ); sub->setWhatsThis(id, i18n("<b>Revert</b><p>Discards changes made to open files.")); id = sub->insertItem( i18n("Submit"), - this, TQT_SLOT(slotCommit()) ); + this, TQ_SLOT(slotCommit()) ); sub->setWhatsThis(id, i18n("<b>Submit</b><p>Sends changes made to open files to the depot.")); id = sub->insertItem( i18n("Sync"), - this, TQT_SLOT(slotUpdate()) ); + this, TQ_SLOT(slotUpdate()) ); sub->setWhatsThis(id, i18n("<b>Sync</b><p>Copies files from the depot into the workspace.")); sub->insertSeparator(); id = sub->insertItem( i18n("Diff Against Repository"), - this, TQT_SLOT(slotDiff()) ); + this, TQ_SLOT(slotDiff()) ); sub->setWhatsThis(id, i18n("<b>Diff against repository</b><p>Compares a client workspace file to a revision in the depot.")); id = sub->insertItem( i18n("Add to Repository"), - this, TQT_SLOT(slotAdd()) ); + this, TQ_SLOT(slotAdd()) ); sub->setWhatsThis(id, i18n("<b>Add to repository</b><p>Open file(s) in a client workspace for addition to the depot.")); id = sub->insertItem( i18n("Remove From Repository"), - this, TQT_SLOT(slotRemove()) ); + this, TQ_SLOT(slotRemove()) ); sub->setWhatsThis(id, i18n("<b>Remove from repository</b><p>Open file(s) in a client workspace for deletion from the depot.")); id = popup->insertItem(i18n("Perforce"), sub); } @@ -243,8 +243,8 @@ void PerforcePart::diff( const TQString& filename ) args << "-du"; args << name; ExecCommand* cmv = new ExecCommand( "p4", args, TQString(), TQStringList(), this ); - connect( cmv, TQT_SIGNAL(finished( const TQString&, const TQString& )), - this, TQT_SLOT(slotDiffFinished( const TQString&, const TQString& )) ); + connect( cmv, TQ_SIGNAL(finished( const TQString&, const TQString& )), + this, TQ_SLOT(slotDiffFinished( const TQString&, const TQString& )) ); } void PerforcePart::slotDiffFinished( const TQString& diff, const TQString& err ) diff --git a/vcs/perforce/perforcepart.h b/vcs/perforce/perforcepart.h index 7c034424..6980eaab 100644 --- a/vcs/perforce/perforcepart.h +++ b/vcs/perforce/perforcepart.h @@ -22,7 +22,7 @@ class TDEAction; class PerforcePart : public KDevVersionControl { - Q_OBJECT + TQ_OBJECT public: |