diff options
Diffstat (limited to 'vcs')
110 files changed, 396 insertions, 874 deletions
diff --git a/vcs/clearcase/CMakeLists.txt b/vcs/clearcase/CMakeLists.txt index 90d83940..8d9734bd 100644 --- a/vcs/clearcase/CMakeLists.txt +++ b/vcs/clearcase/CMakeLists.txt @@ -28,7 +28,11 @@ link_directories( ##### other data ################################ -install( FILES kdevclearcase.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +tde_create_translated_desktop( + SOURCE kdevclearcase.desktop + DESTINATION ${SERVICES_INSTALL_DIR} + PO_DIR tdevelop-desktops +) ##### libkdevclearcase (module) ################# diff --git a/vcs/clearcase/clearcasefileinfoprovider.cpp b/vcs/clearcase/clearcasefileinfoprovider.cpp index 1e18f8e1..dceb9b9e 100644 --- a/vcs/clearcase/clearcasefileinfoprovider.cpp +++ b/vcs/clearcase/clearcasefileinfoprovider.cpp @@ -21,7 +21,7 @@ ClearcaseFileinfoProvider::ClearcaseFileinfoProvider(ClearcasePart *parent) { vcsInfo_ = NULL; - connect(parent, TQT_SIGNAL(statusReady(const VCSFileInfoMap&, void*)), TQT_SIGNAL(triggerUpdate(const VCSFileInfoMap&, void*))); + connect(parent, TQ_SIGNAL(statusReady(const VCSFileInfoMap&, void*)), TQ_SIGNAL(triggerUpdate(const VCSFileInfoMap&, void*))); kdevVCS_ = parent; } diff --git a/vcs/clearcase/clearcasefileinfoprovider.h b/vcs/clearcase/clearcasefileinfoprovider.h index 0f6f7d06..848f7704 100644 --- a/vcs/clearcase/clearcasefileinfoprovider.h +++ b/vcs/clearcase/clearcasefileinfoprovider.h @@ -21,7 +21,7 @@ */ class ClearcaseFileinfoProvider : public KDevVCSFileInfoProvider { - Q_OBJECT + TQ_OBJECT public: ClearcaseFileinfoProvider(ClearcasePart *parent); diff --git a/vcs/clearcase/clearcasepart.cpp b/vcs/clearcase/clearcasepart.cpp index aeb1eea9..700de36b 100644 --- a/vcs/clearcase/clearcasepart.cpp +++ b/vcs/clearcase/clearcasepart.cpp @@ -37,13 +37,13 @@ #include "clearcasemanipulator.h" -static const KDevPluginInfo data("kdevclearcase"); +static const KDevPluginInfo pluginData("kdevclearcase"); typedef KDevGenericFactory<ClearcasePart> ClearcaseFactory; -K_EXPORT_COMPONENT_FACTORY( libkdevclearcase, ClearcaseFactory( data ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevclearcase, ClearcaseFactory( pluginData ) ) ClearcasePart::ClearcasePart( TQObject *parent, const char *name, const TQStringList & ) - : KDevVersionControl( &data, parent, name ? name : "ClearcasePart" ), + : KDevVersionControl( &pluginData, parent, name ? name : "ClearcasePart" ), default_checkin(""), default_checkout(""), default_uncheckout("-rm"), @@ -60,8 +60,8 @@ ClearcasePart::ClearcasePart( TQObject *parent, const char *name, const TQString fileInfoProvider_ = new ClearcaseFileinfoProvider(this); setInstance(ClearcaseFactory::instance()); - 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 *)) ); } ClearcasePart::~ClearcasePart() @@ -88,26 +88,26 @@ void ClearcasePart::contextMenu(TQPopupMenu *popup, const Context *context) TQString name = fi.fileName(); sub->insertTitle( i18n("Actions for %1").arg(name) ); sub->insertItem( i18n("Checkin"), - this, TQT_SLOT(slotCheckin()) ); + this, TQ_SLOT(slotCheckin()) ); sub->insertItem( i18n("Checkout"), - this, TQT_SLOT(slotCheckout()) ); + this, TQ_SLOT(slotCheckout()) ); sub->insertItem( i18n("Uncheckout"), - this, TQT_SLOT(slotUncheckout()) ); + this, TQ_SLOT(slotUncheckout()) ); sub->insertSeparator(); sub->insertItem( i18n("Create Element"), - this, TQT_SLOT(slotCreate()) ); + this, TQ_SLOT(slotCreate()) ); sub->insertItem( i18n("Remove Element"), - this, TQT_SLOT(slotRemove()) ); + this, TQ_SLOT(slotRemove()) ); sub->insertSeparator(); sub->insertItem( i18n("History"), - this, TQT_SLOT(slotListHistory()) ); + this, TQ_SLOT(slotListHistory()) ); sub->insertSeparator(); sub->insertItem( i18n("Diff"), - this, TQT_SLOT(slotDiff()) ); + this, TQ_SLOT(slotDiff()) ); sub->insertSeparator(); sub->insertItem( i18n("List Checkouts"), - this, TQT_SLOT(slotListCheckouts()) ); + this, TQ_SLOT(slotListCheckouts()) ); popup->insertItem(i18n("Clearcase"), sub); @@ -304,8 +304,8 @@ void ClearcasePart::slotDiff() args << name; ExecCommand* cmv = new ExecCommand( "cleartool", args, dir, env, 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& )) ); } diff --git a/vcs/clearcase/clearcasepart.h b/vcs/clearcase/clearcasepart.h index be63e674..866e312c 100644 --- a/vcs/clearcase/clearcasepart.h +++ b/vcs/clearcase/clearcasepart.h @@ -18,7 +18,7 @@ class Context; class TQPopupMenu; class ClearcasePart : public KDevVersionControl { - Q_OBJECT + TQ_OBJECT public: diff --git a/vcs/clearcase/commentdlg.cpp b/vcs/clearcase/commentdlg.cpp index 2f93ab49..f940b77c 100644 --- a/vcs/clearcase/commentdlg.cpp +++ b/vcs/clearcase/commentdlg.cpp @@ -46,8 +46,8 @@ CcaseCommentDlg::CcaseCommentDlg(bool bCheckin) buttonbox->addStretch(); TQPushButton *ok = buttonbox->addButton(KStdGuiItem::ok()); TQPushButton *cancel = buttonbox->addButton(KStdGuiItem::cancel()); - connect(ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); - connect(cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); + connect(ok, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) ); + connect(cancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) ); ok->setDefault(true); buttonbox->layout(); layout2->addWidget(buttonbox, 0); diff --git a/vcs/clearcase/commentdlg.h b/vcs/clearcase/commentdlg.h index 0ce9d5ce..1967dfb8 100644 --- a/vcs/clearcase/commentdlg.h +++ b/vcs/clearcase/commentdlg.h @@ -18,7 +18,7 @@ class CcaseCommentDlg : public TQDialog { -Q_OBJECT +TQ_OBJECT public: CcaseCommentDlg(bool = FALSE); diff --git a/vcs/clearcase/integrator/CMakeLists.txt b/vcs/clearcase/integrator/CMakeLists.txt index ccc3348f..478a762c 100644 --- a/vcs/clearcase/integrator/CMakeLists.txt +++ b/vcs/clearcase/integrator/CMakeLists.txt @@ -26,7 +26,11 @@ link_directories( ##### other data ################################ -install( FILES kdevclearcaseintegrator.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +tde_create_translated_desktop( + SOURCE kdevclearcaseintegrator.desktop + DESTINATION ${SERVICES_INSTALL_DIR} + PO_DIR tdevelop-desktops +) ##### libclearcaseintegrator (module) ########### diff --git a/vcs/clearcase/integrator/ccintegratordlg.h b/vcs/clearcase/integrator/ccintegratordlg.h index f427b2b3..3242d5d4 100644 --- a/vcs/clearcase/integrator/ccintegratordlg.h +++ b/vcs/clearcase/integrator/ccintegratordlg.h @@ -24,7 +24,7 @@ #include <kdevvcsintegrator.h> class CCIntegratorDlg: public CCIntegratorDlgBase, public VCSDialog { -Q_OBJECT +TQ_OBJECT public: CCIntegratorDlg(TQWidget *parent = 0, const char *name = 0); diff --git a/vcs/clearcase/integrator/clearcaseintegrator.h b/vcs/clearcase/integrator/clearcaseintegrator.h index 3859c1f9..ea8616a6 100644 --- a/vcs/clearcase/integrator/clearcaseintegrator.h +++ b/vcs/clearcase/integrator/clearcaseintegrator.h @@ -26,7 +26,7 @@ class ClearcaseIntegrator : public KDevVCSIntegrator { -Q_OBJECT +TQ_OBJECT public: ClearcaseIntegrator(TQObject* parent, const char* name, const TQStringList args = TQStringList()); diff --git a/vcs/clearcase/integrator/kdevclearcaseintegrator.desktop b/vcs/clearcase/integrator/kdevclearcaseintegrator.desktop index 51418398..df92219e 100644 --- a/vcs/clearcase/integrator/kdevclearcaseintegrator.desktop +++ b/vcs/clearcase/integrator/kdevclearcaseintegrator.desktop @@ -1,40 +1,9 @@ [Desktop Entry] -Type=Service Name=KDevClearcaseIntegrator -Name[da]=TDevelop Clearcase-integration -Name[nds]=TDevelop-Clearcase-Integreren -Name[sk]=KDev ClearCase integrácia -Name[sv]=TDevelop Clearcase-integration -Name[zh_TW]=TDevelop Clearcase 整合器 + Comment=Clearcase Project Integration Facility -Comment[ca]=Faciliat per a la integració amb projectes Clearcase -Comment[da]=Clearcase projektintegration -Comment[de]=Clearcase-Integration -Comment[el]=Λειτουργία ενσωμάτωσης Clearcase στο έργο -Comment[es]=Facilidad para integración con proyectos Clearcase -Comment[et]=Clearcase projekti põimimisvahend -Comment[eu]=Clearcase proiektu-integraziorako tresna -Comment[fa]=تسهیلات مجتمعسازی پروژۀ Clearcase -Comment[fr]=Fonction d'intégration pour un projet utilisant Clearcase -Comment[gl]=Utilidade para a integración de proxectos ClearCase -Comment[hu]=Integrálás Clearcase-projektekkel -Comment[it]=Funzione di integrazione del progetto ClearCase -Comment[ja]=Clearcase プロジェクト統合ツール -Comment[ms]=Kemudahan Integrasi Projek Clearcase -Comment[nds]=Projektintegreren för Clearcase -Comment[ne]=क्लेयरकेस परियोजना एकिकरण सुविधा -Comment[nl]=Clearcase-projectintegratie -Comment[pl]=Integracja z Clearcase -Comment[pt]=Integração com Projectos Clearcase -Comment[pt_BR]=Facilidade de Integração ao Projeto de Clearcase -Comment[ru]=Интеграция Clearcase -Comment[sk]=Integrácia ClearCase projektu -Comment[sr]=Интеграција Clearcase-а у пројекат -Comment[sr@Latn]=Integracija Clearcase-a u projekat -Comment[sv]=Funktion för integrering av Clearcase i projekt -Comment[tr]=Clearcase Proje Bütünleştirilmesi Aracı -Comment[zh_CN]=Clearcase 工程集成功能 -Comment[zh_TW]=Clearcase 專案整合工具 + +Type=Service Exec=blubb X-TDE-ServiceTypes=TDevelop/VCSIntegrator X-TDE-Library=libclearcaseintegrator diff --git a/vcs/clearcase/kdevclearcase.desktop b/vcs/clearcase/kdevclearcase.desktop index f88cfed3..651994e0 100644 --- a/vcs/clearcase/kdevclearcase.desktop +++ b/vcs/clearcase/kdevclearcase.desktop @@ -1,81 +1,12 @@ [Desktop Entry] -Type=Service -Exec=blubb -Comment=A plugin that provides support for Rational ClearCase, a large version control and build management system. http://www.rational.com/products/clearcase/index.jsp -Comment[ca]=Un connector que proporciona suport per a ClearCase de Rational, un potent sistema de control de versions i gestió de compilacions. http://www.rational.com/products/clearcase/index.jsp -Comment[da]=Et plugin der sørger for støtte for Rational ClearCase, et stort versionskontrol og byggehåndteringssystem. http://www.rational.com/products/clearcase/index.jsp -Comment[de]=Eine Komponente, die eine Schnittstelle zu Rational ClearCase zur Verfügung stellt, einem umfangreichen Werkzeug zur Verwaltung von Versionen und Erstellungsvorgängen. http://www.rational.com/products/clearcase/index.jsp -Comment[el]=Ένα πρόσθετο που προσφέρει υποστήριξη για το Rational ClearCase, ένα μεγάλο σύστημα διαχείρισης ελέγχου εκδόσεων και κατασκευής. http://www.rational.com/products/clearcase/index.jsp -Comment[es]=Un complemento que proporciona soporte para Rational ClearCase, un potente sistema de control de versiones y administración de compilaciones (http://www.rational.com/products/clearcase/index.jsp) -Comment[et]=See plugin pakub suure versioonikontrolli ja ehitamise haldamise süsteemi Rational ClearCase toetust. http://www.rational.com/products/clearcase/index.jsp -Comment[eu]=Rational ClearCase euskarri plugin bat. ClearCase bertsio kontrol eta eraikuntza kudeaketa sistema handi bat da. http://www.rational.com/products/clearcase/index.jsp -Comment[fa]=وصلهای که پشتیبانی برای Rational ClearCase، یک کنترل نسخۀ بزرگ و سیستم مدیریت ساختن فراهم میکند. http://www.rational.com/products/clearcase/index.jsp -Comment[fr]=Un module externe qui offre une prise en charge pour Rational ClearCase, un puissant système de contrôle de versions et de gestion de compilation. http://www.rational.com/products/clearcase/index.jsp -Comment[gl]=Extensión que proporciona soporte para Rational ClearCase, un gran sistema de control de versións e xestión da compilación. http://www.rational.com/products/clearcase/index.jsp -Comment[hu]=Bővítőmodul a Rational ClearCase komplex verziókövető rendszerhez. http://www.rational.com/products/clearcase/index.jsp -Comment[it]=Un plugin che offre il supporto per Rational ClearCase, un sistema molto vasto per il controllo di versione e la compilazione. http://www.rational.com/products/clearcase/index.jsp -Comment[ja]=大規模なバージョンコントロールやビルド管理システムの合理的な ClearCase の支援を提供するプラグイン。http://www.rational.com/products/clearcase/index.jsp -Comment[ms]=Plugin yang menyediakan sokongan untuk Rational ClearCase, sistem kawalan versi dan pengurus pembinaan yang besar. http://www.rational.com/products/clearcase/index.jsp -Comment[nds]=En Moduul, dat Ünnerstütten för "Rational ClearCase" praatstellt, en groot Verschoonkuntrull- un Opstellen-Pleegsysteem. http://www.rational.com/products/clearcase/index.jsp -Comment[ne]=एउटा प्लगइन जसले र्यासनल क्लेयरकेस, एउटा ठूलो संस्करण नियन्त्रण र निर्माण व्यवस्थापन प्रणालीका लागि समर्थन प्रदान गर्दछ । http://www.rational.com/products/clearcase/index.jsp -Comment[nl]=Een plugin die ondersteuning biedt voor Rational ClearCase, een omvangrijk versiebeheer en buildmanagement-systeem. Zie http://www.rational.com/products/clearcase/index.jsp -Comment[pl]=Wtyczka udostępniająca obsługę Rational ClearCase, dużego systemu kontroli wersji i zarządzania budowaniem. http://www.rational.com/products/clearcase/index.jsp -Comment[pt]=Um 'plugin' que oferece o suporte para o ClearCase da Rational, um sistema grande de controlo de versões e de gestão de compilações. http://www.rational.com/products/clearcase/index.jsp -Comment[pt_BR]=Um plug-in que fornece suporte para o Rational ClearCase, um grande sistema de controle de versão e gerenciamento de compilação. http://www.rational.com/products/clearcase/index.jsp -Comment[ru]=Модуль поддержки Rational ClearCase, мощной системы контроля версий и управления проектом. http://www.rational.com/products/clearcase/index.jsp -Comment[sk]=Modul poskytuje podporu pre Rational ClearCase, riadenie verzií a projektový manažment. -Comment[sl]=Vstavek, ki omogoča podporo za Rational ClearCase, velik sistem za upravljanje z različicami in grajenjem. http://www.rational.com/products/clearcase/index.jsp -Comment[sr]=Прикључак који обезбеђује подршку за Rational-ов ClearCase, велики систем за контролу верзија и управљање градњом. http://www.rational.com/products/clearcase/index.jsp -Comment[sr@Latn]=Priključak koji obezbeđuje podršku za Rational-ov ClearCase, veliki sistem za kontrolu verzija i upravljanje gradnjom. http://www.rational.com/products/clearcase/index.jsp -Comment[sv]=Ett insticksprogram som stöder Rational ClearCase, ett omfattande versions- och bygghanteringssystem. http://www.rational.com/products/clearcase/index.jsp -Comment[ta]=சொருகி ரெஷியனல் தெளிவான எழுத்தை ஆதரிக்கும்,கடைசி பதிப்பை இயக்க மற்றும் மேலாளர் அமைப்பை கட்ட.http://www.rational.com/products/clearcase/index.jsp -Comment[tg]=Модули тарафдори Rational ClearCase, барномаи назораткунандаи калони тафсир ва идоракунии лоиҳаҳо мебошад.http://www.rational.com/products/clearcase/index.jsp -Comment[tr]=Mantıksal ClearCase, büyük bir kontrol ve yapım yönetim sistemi, için destek sağlayan bir eklenti. http://www.rational.com/products/clearcase/index.jsp -Comment[zh_CN]=提供 Rational ClearCase 支持，一个大型的版本控制和编译管理系统。http://www.rational.com/products/clearcase/index.jsp -Comment[zh_TW]=提供支援 Rational ClearCase，大型的版本控制與建立管理系統的外掛程式。http://www.rational.com/products/clearcase/index.jsp Name=KDevClearCase -Name[da]=TDevelop ClearCase -Name[de]=Unterstützung für ClearCase (TDevelop) -Name[hi]=के-डेव-क्लीयर-केस -Name[nds]=ClearCase-Ünnerstütten för TDevelop -Name[sk]=KDev ClearCase -Name[sv]=TDevelop ClearCase -Name[ta]=KDevதெளிவானஎழுத்து -Name[zh_TW]=TDevelop ClearCase + GenericName=ClearCase Integration -GenericName[ca]=Integració amb ClearClase -GenericName[da]=ClearCase integration -GenericName[de]=ClearCase-Integration -GenericName[el]=Ενσωμάτωση ClearCase -GenericName[es]=Integración con ClearClase -GenericName[et]=ClearCase'i integratsioon -GenericName[eu]=ClearCase integrazioa -GenericName[fa]=مجتمعسازی ClearCase -GenericName[fr]=Intégration de « ClearCase » -GenericName[ga]=Comhtháthú ClearCase -GenericName[gl]=Integración de ClearCase -GenericName[hi]=क्लीयर-केस इंटीग्रेशन -GenericName[hu]=ClearCase-integráció -GenericName[it]=Integrazione di ClearCase -GenericName[ja]=ClearCase 統合 -GenericName[ms]=Intergrasi ClearCase -GenericName[nds]=ClearCase-Integreren -GenericName[ne]=क्लेयरकेस एकिकरण -GenericName[nl]=ClearCase-integratie -GenericName[pl]=Integracja z ClearCase -GenericName[pt]=Integração com o ClearCase -GenericName[pt_BR]=Integração com o ClearCase -GenericName[ru]=Интеграция ClearCase -GenericName[sk]=Integrácia ClearCase -GenericName[sl]=Integracija ClearCase -GenericName[sr]=Интеграција ClearCase-а -GenericName[sr@Latn]=Integracija ClearCase-a -GenericName[sv]=Integrering av ClearCase -GenericName[ta]=தெளிவான எழுத்து ஒருங்கிணைப்பு -GenericName[tg]=Интегратсияи ClearCase -GenericName[tr]=ClearCase Bütünleştirmesi -GenericName[zh_CN]=ClearCase集成 -GenericName[zh_TW]=ClearCase 整合 + +Comment=A plugin that provides support for Rational ClearCase, a large version control and build management system. http://www.rational.com/products/clearcase/index.jsp + +Type=Service +Exec=blubb X-TDE-ServiceTypes=TDevelop/VersionControl X-TDE-Library=libkdevclearcase X-TDevelop-Version=5 diff --git a/vcs/cvsservice/CMakeLists.txt b/vcs/cvsservice/CMakeLists.txt index dc50d646..ffd2eabf 100644 --- a/vcs/cvsservice/CMakeLists.txt +++ b/vcs/cvsservice/CMakeLists.txt @@ -30,7 +30,13 @@ link_directories( ##### other data ################################ tde_install_icons( ) -install( FILES kdevcvsservice.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) + +tde_create_translated_desktop( + SOURCE kdevcvsservice.desktop + DESTINATION ${SERVICES_INSTALL_DIR} + PO_DIR tdevelop-desktops +) + install( FILES kdev_cvs.png DESTINATION ${DATA_INSTALL_DIR}/kdevcvsservice/pics ) install( FILES buildcvs.sh DESTINATION ${DATA_INSTALL_DIR}/kdevcvsservice ) diff --git a/vcs/cvsservice/README.dox b/vcs/cvsservice/README.dox index 9887fac9..4a4c5b8c 100644 --- a/vcs/cvsservice/README.dox +++ b/vcs/cvsservice/README.dox @@ -23,7 +23,7 @@ mailing list. Contributions are always welcome :-) Implementation of this component is done by: - class CvsServicePart, which does provide integration within tdevelop, set-up GUI integration, forward cvs commands to the implementation (m_impl). It does also - intercepts Q_SIGNALS like "new files added to project" and "... removed from ...". + intercepts signals like "new files added to project" and "... removed from ...". - class CvsServicePartImpl implements the actual feature: more general speaking functions (like checking for whether files are in repository, provide checks on file lists, ...). @@ -73,7 +73,7 @@ Implementation of this component is done by: \todo Test with SSH repositories! \todo Share a common outputview between VCS: CvsProcessWidget should be reworked :-/ -\todo Additional Q_SLOTS for more complex stuff as status, revert, patch creation, ... +\todo Additional slots for more complex stuff as status, revert, patch creation, ... \faq <b>Does cvsservicepart support login with :pserver: or :ext: ?</b> Well, I dunno ;-) I have no ssh repositories to test so feel free to provide feedback on the subject :-) diff --git a/vcs/cvsservice/annotatedialog.cpp b/vcs/cvsservice/annotatedialog.cpp index ac9f293d..b7cbb749 100644 --- a/vcs/cvsservice/annotatedialog.cpp +++ b/vcs/cvsservice/annotatedialog.cpp @@ -33,8 +33,8 @@ AnnotateDialog::AnnotateDialog( CvsService_stub *cvsService, TQWidget *parent, c TQVBox *vbox = addVBoxPage( i18n("Annotate") ); m_cvsAnnotatePage = new AnnotatePage( m_cvsService, vbox ); - connect( m_cvsAnnotatePage, TQT_SIGNAL(requestAnnotate(const TQString)), - this, TQT_SLOT(slotAnnotate(const TQString)) ); + connect( m_cvsAnnotatePage, TQ_SIGNAL(requestAnnotate(const TQString)), + this, TQ_SLOT(slotAnnotate(const TQString)) ); } AnnotateDialog::~AnnotateDialog() @@ -61,8 +61,8 @@ void AnnotateDialog::slotAnnotate(const TQString rev) AnnotatePage * page = new AnnotatePage( m_cvsService, vbox ); page->startAnnotate(m_pathName, rev); - connect( page, TQT_SIGNAL(requestAnnotate(const TQString)), - this, TQT_SLOT(slotAnnotate(const TQString)) ); + connect( page, TQ_SIGNAL(requestAnnotate(const TQString)), + this, TQ_SLOT(slotAnnotate(const TQString)) ); } #include "annotatedialog.moc" diff --git a/vcs/cvsservice/annotatedialog.h b/vcs/cvsservice/annotatedialog.h index 67218dea..4d6b7f18 100644 --- a/vcs/cvsservice/annotatedialog.h +++ b/vcs/cvsservice/annotatedialog.h @@ -29,7 +29,7 @@ class AnnotatePage; */ class AnnotateDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: AnnotateDialog( CvsService_stub *cvsService, TQWidget *parent=0, const char *name=0, int flags=0 ); diff --git a/vcs/cvsservice/annotatepage.cpp b/vcs/cvsservice/annotatepage.cpp index e044db54..9ecf8279 100644 --- a/vcs/cvsservice/annotatepage.cpp +++ b/vcs/cvsservice/annotatepage.cpp @@ -59,10 +59,10 @@ AnnotatePage::AnnotatePage( CvsService_stub *cvsService, TQWidget *parent, const dialogLayout->add( LayoutWidget ); - connect( m_btnAnnotate, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotNewAnnotate()) ); - connect( m_leRevision, TQT_SIGNAL( returnPressed() ), - m_btnAnnotate, TQT_SLOT( setFocus() ) ); + connect( m_btnAnnotate, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotNewAnnotate()) ); + connect( m_leRevision, TQ_SIGNAL( returnPressed() ), + m_btnAnnotate, TQ_SLOT( setFocus() ) ); //Nest create the AnnotateView; it will do the actual displaying m_annotateView = new AnnotateView(this, "annotateview"); @@ -227,7 +227,7 @@ void AnnotatePage::parseAnnotateOutput(TQStringList& lines) //so we pass it as TQDateTime to the AnnotateView below TQString dateString = line.mid(23, 9); if( !dateString.isEmpty() ) - logDate.setTime_t(KRFCDate::parseDate(dateString), Qt::UTC); + logDate.setTime_t(KRFCDate::parseDate(dateString), TQt::UTC); rev = line.left(13).stripWhiteSpace(); author = line.mid(14, 8).stripWhiteSpace(); diff --git a/vcs/cvsservice/annotatepage.h b/vcs/cvsservice/annotatepage.h index 569ed935..932587f9 100644 --- a/vcs/cvsservice/annotatepage.h +++ b/vcs/cvsservice/annotatepage.h @@ -36,7 +36,7 @@ class KPushButton; */ class AnnotatePage : public TQWidget, virtual public CVSServiceDCOPIface { - Q_OBJECT + TQ_OBJECT friend class AnnotateDialog; diff --git a/vcs/cvsservice/annotateview.cpp b/vcs/cvsservice/annotateview.cpp index 89aa7f01..55f9b8fd 100644 --- a/vcs/cvsservice/annotateview.cpp +++ b/vcs/cvsservice/annotateview.cpp @@ -157,8 +157,8 @@ AnnotateView::AnnotateView(AnnotatePage *parent, const char *name) setSorting(AnnotateViewItem::LineNumberColumn); setColumnAlignment(AnnotateViewItem::LineNumberColumn, TQt::AlignRight); - connect( this, TQT_SIGNAL(executed(TQListViewItem*)), - this, TQT_SLOT(itemClicked(TQListViewItem*)) ); + connect( this, TQ_SIGNAL(executed(TQListViewItem*)), + this, TQ_SLOT(itemClicked(TQListViewItem*)) ); } diff --git a/vcs/cvsservice/annotateview.h b/vcs/cvsservice/annotateview.h index 6bc97bf2..82741b2e 100644 --- a/vcs/cvsservice/annotateview.h +++ b/vcs/cvsservice/annotateview.h @@ -32,7 +32,7 @@ class AnnotatePage; */ class AnnotateView : public TDEListView, public TQToolTip { - Q_OBJECT + TQ_OBJECT public: diff --git a/vcs/cvsservice/checkoutdialog.cpp b/vcs/cvsservice/checkoutdialog.cpp index e6bcbd05..c91f8309 100644 --- a/vcs/cvsservice/checkoutdialog.cpp +++ b/vcs/cvsservice/checkoutdialog.cpp @@ -77,10 +77,10 @@ CheckoutDialog::CheckoutDialog( CvsService_stub *cvsService, m_base = new CheckoutDialogBase( this, "checkoutdialogbase" ); setMainWidget( m_base ); - connect( m_base->fetchModulesButton, TQT_SIGNAL(clicked()), - this, TQT_SLOT(slotFetchModulesList()) ); - connect( m_base->modulesListView, TQT_SIGNAL(executed(TQListViewItem*)), - this, TQT_SLOT(slotModuleSelected(TQListViewItem*)) ); + connect( m_base->fetchModulesButton, TQ_SIGNAL(clicked()), + this, TQ_SLOT(slotFetchModulesList()) ); + connect( m_base->modulesListView, TQ_SIGNAL(executed(TQListViewItem*)), + this, TQ_SLOT(slotModuleSelected(TQListViewItem*)) ); // Avoid displaying 'file:/' when displaying the file m_base->workURLRequester->setShowLocalProtocol( false ); diff --git a/vcs/cvsservice/checkoutdialog.h b/vcs/cvsservice/checkoutdialog.h index 51388bc5..9aef6483 100644 --- a/vcs/cvsservice/checkoutdialog.h +++ b/vcs/cvsservice/checkoutdialog.h @@ -29,7 +29,7 @@ class TQListViewItem; */ class CheckoutDialog : public KDialogBase, virtual public CVSServiceDCOPIface { - Q_OBJECT + TQ_OBJECT public: CheckoutDialog( CvsService_stub *cvsService, TQWidget *parent = 0, diff --git a/vcs/cvsservice/commitdialogbase.ui b/vcs/cvsservice/commitdialogbase.ui index 12844638..667176f2 100644 --- a/vcs/cvsservice/commitdialogbase.ui +++ b/vcs/cvsservice/commitdialogbase.ui @@ -132,9 +132,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/vcs/cvsservice/commitdlg.cpp b/vcs/cvsservice/commitdlg.cpp index f47516ed..206fe754 100644 --- a/vcs/cvsservice/commitdlg.cpp +++ b/vcs/cvsservice/commitdlg.cpp @@ -33,8 +33,8 @@ CommitDialog::CommitDialog( const TQString &changeLogfileNamePath, TQWidget *parent ) : CommitDialogBase( parent, "commitdialog", true ) { - connect( buttonOk, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); - connect( buttonCancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); + connect( buttonOk, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) ); + connect( buttonCancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) ); setChangeLogFileName( changeLogfileNamePath ); } diff --git a/vcs/cvsservice/commitdlg.h b/vcs/cvsservice/commitdlg.h index c955836f..5d01ff20 100644 --- a/vcs/cvsservice/commitdlg.h +++ b/vcs/cvsservice/commitdlg.h @@ -23,7 +23,7 @@ class TQCheckBox; class CommitDialog : public CommitDialogBase { - Q_OBJECT + TQ_OBJECT public: CommitDialog( const TQString &changeLogfileNamePath, TQWidget *parent = 0 ); diff --git a/vcs/cvsservice/cvsdiffpage.h b/vcs/cvsservice/cvsdiffpage.h index ec3e4f36..4adfbb9c 100644 --- a/vcs/cvsservice/cvsdiffpage.h +++ b/vcs/cvsservice/cvsdiffpage.h @@ -28,7 +28,7 @@ Implementation for the form displaying 'cvs diff' output. */ class CVSDiffPage : public TQWidget, virtual public CVSServiceDCOPIface { - Q_OBJECT + TQ_OBJECT public: CVSDiffPage( CvsService_stub *cvsService, TQWidget *parent=0, const char *name=0, int flags=0 ); diff --git a/vcs/cvsservice/cvsentry.cpp b/vcs/cvsservice/cvsentry.cpp index bf478f7c..c30e15a8 100644 --- a/vcs/cvsservice/cvsentry.cpp +++ b/vcs/cvsservice/cvsentry.cpp @@ -97,7 +97,7 @@ void CVSEntry::parse( const TQString &aLine, const CVSDir& dir ) { TQDateTime date( TQDateTime::fromString( timeStamp() ) ); TQDateTime fileDateUTC; - fileDateUTC.setTime_t( TQFileInfo(dir, fileName()).lastModified().toTime_t(), Qt::UTC ); + fileDateUTC.setTime_t( TQFileInfo(dir, fileName()).lastModified().toTime_t(), TQt::UTC ); if ( date != fileDateUTC ) m_state = Modified; } @@ -183,5 +183,3 @@ VCSFileInfo CVSEntry::toVCSFileInfo() const return VCSFileInfo( fileName(), revision(), revision(), fileState ); } - -//kate: space-indent on; indent-width 4; replace-tabs on; diff --git a/vcs/cvsservice/cvsfileinfoprovider.cpp b/vcs/cvsservice/cvsfileinfoprovider.cpp index cbfc726f..e71e8a28 100644 --- a/vcs/cvsservice/cvsfileinfoprovider.cpp +++ b/vcs/cvsservice/cvsfileinfoprovider.cpp @@ -35,7 +35,7 @@ CVSFileInfoProvider::CVSFileInfoProvider( CvsServicePart *parent, CvsService_stu : 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&))); + connect( this, TQ_SIGNAL(needStatusUpdate(const CVSDir&)), this, TQ_SLOT(updateStatusFor(const CVSDir&))); } /////////////////////////////////////////////////////////////////////////////// @@ -146,7 +146,7 @@ void CVSFileInfoProvider::updateStatusFor(const CVSDir& dir) * item conains any childs. Therefor we need to give FileTree some time * to update the directory item before we give the status infos. */ - TQTimer::singleShot( 1000, this, TQT_SLOT(propagateUpdate()) ); + TQTimer::singleShot( 1000, this, TQ_SLOT(propagateUpdate()) ); } /////////////////////////////////////////////////////////////////////////////// @@ -311,4 +311,3 @@ void CVSFileInfoProvider::printOutFileInfoMap( const VCSFileInfoMap &map ) } #include "cvsfileinfoprovider.moc" -// kate: space-indent on; indent-width 4; replace-tabs on; diff --git a/vcs/cvsservice/cvsfileinfoprovider.h b/vcs/cvsservice/cvsfileinfoprovider.h index 8bc3a6fe..be2ff803 100644 --- a/vcs/cvsservice/cvsfileinfoprovider.h +++ b/vcs/cvsservice/cvsfileinfoprovider.h @@ -30,7 +30,7 @@ Provider for CVS file information */ class CVSFileInfoProvider : public KDevVCSFileInfoProvider, virtual public CVSServiceDCOPIface { - Q_OBJECT + TQ_OBJECT public: CVSFileInfoProvider( CvsServicePart *parent, CvsService_stub *cvsService ); @@ -77,4 +77,3 @@ private: }; #endif -//kate: space-indent on; indent-width 4; diff --git a/vcs/cvsservice/cvsform.h b/vcs/cvsservice/cvsform.h index b8fe6acd..280565cf 100644 --- a/vcs/cvsservice/cvsform.h +++ b/vcs/cvsservice/cvsform.h @@ -20,7 +20,7 @@ information about setting up the cvs repository. */ class CvsForm : public CvsFormBase { - Q_OBJECT + TQ_OBJECT public: CvsForm( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 ); diff --git a/vcs/cvsservice/cvslogdialog.cpp b/vcs/cvsservice/cvslogdialog.cpp index 21169346..fb189234 100644 --- a/vcs/cvsservice/cvslogdialog.cpp +++ b/vcs/cvsservice/cvslogdialog.cpp @@ -42,8 +42,8 @@ CVSLogDialog::CVSLogDialog( CvsService_stub *cvsService, TQWidget *parent, const TQVBox *vbox = addVBoxPage( i18n("Log From CVS") ); m_cvsLogPage = new CVSLogPage( m_cvsService, vbox ); - connect( m_cvsLogPage, TQT_SIGNAL(diffRequested(const TQString&, const TQString&, const TQString&)), - this, TQT_SLOT(slotDiffRequested(const TQString&, const TQString&, const TQString&)) ); + connect( m_cvsLogPage, TQ_SIGNAL(diffRequested(const TQString&, const TQString&, const TQString&)), + this, TQ_SLOT(slotDiffRequested(const TQString&, const TQString&, const TQString&)) ); } /////////////////////////////////////////////////////////////////////////////// @@ -66,8 +66,8 @@ void CVSLogDialog::startLog( const TQString &workDir, const TQString &pathName ) m_cvsLogPage = new CVSLogPage( m_cvsService, vbox ); this->resize( m_cvsLogPage->size() ); - connect( m_cvsLogPage, TQT_SIGNAL(linkClicked(const TQString&, const TQString&)), - this, TQT_SLOT(slotDiffRequested(const TQString&, const TQString&)) ); + connect( m_cvsLogPage, TQ_SIGNAL(linkClicked(const TQString&, const TQString&)), + this, TQ_SLOT(slotDiffRequested(const TQString&, const TQString&)) ); */ m_cvsLogPage->startLog( workDir, pathName ); } diff --git a/vcs/cvsservice/cvslogdialog.h b/vcs/cvsservice/cvslogdialog.h index e3d3614e..6faf8f59 100644 --- a/vcs/cvsservice/cvslogdialog.h +++ b/vcs/cvsservice/cvslogdialog.h @@ -25,7 +25,7 @@ Implementation for the form displaying 'cvs log' output. */ class CVSLogDialog : public KDialogBase { - Q_OBJECT + TQ_OBJECT public: CVSLogDialog( CvsService_stub *cvsService, TQWidget *parent=0, const char *name=0, int flags=0 ); diff --git a/vcs/cvsservice/cvslogpage.cpp b/vcs/cvsservice/cvslogpage.cpp index 4b2d7fb4..756d28d1 100644 --- a/vcs/cvsservice/cvslogpage.cpp +++ b/vcs/cvsservice/cvslogpage.cpp @@ -46,7 +46,7 @@ CVSLogPage::CVSLogPage( CvsService_stub *cvsService, TQWidget *parent, const cha m_textBrowser->setMinimumWidth(fontMetrics().width('X')*50); m_textBrowser->setMinimumHeight(fontMetrics().width('X')*43); - connect( m_textBrowser, TQT_SIGNAL(linkClicked( const TQString& )), this, TQT_SLOT(slotLinkClicked( const TQString& )) ); + connect( m_textBrowser, TQ_SIGNAL(linkClicked( const TQString& )), this, TQ_SLOT(slotLinkClicked( const TQString& )) ); } /////////////////////////////////////////////////////////////////////////////// diff --git a/vcs/cvsservice/cvslogpage.h b/vcs/cvsservice/cvslogpage.h index badfcfd6..63c63a14 100644 --- a/vcs/cvsservice/cvslogpage.h +++ b/vcs/cvsservice/cvslogpage.h @@ -27,7 +27,7 @@ Implementation for the form displaying 'cvs log' output. */ class CVSLogPage : public TQWidget, virtual public CVSServiceDCOPIface { - Q_OBJECT + TQ_OBJECT public: CVSLogPage( CvsService_stub *cvsService, TQWidget *parent=0, const char *name=0, int flags=0 ); diff --git a/vcs/cvsservice/cvsoptionswidget.h b/vcs/cvsservice/cvsoptionswidget.h index dd58797a..5794d22e 100644 --- a/vcs/cvsservice/cvsoptionswidget.h +++ b/vcs/cvsservice/cvsoptionswidget.h @@ -22,7 +22,7 @@ class TQVBoxLayout; class CvsOptionsWidget : public CvsOptionsWidgetBase { - Q_OBJECT + TQ_OBJECT public: CvsOptionsWidget( TQWidget *parent, const char *name=0 ); diff --git a/vcs/cvsservice/cvspart.cpp b/vcs/cvsservice/cvspart.cpp index 2bda55f1..ca7c26ab 100644 --- a/vcs/cvsservice/cvspart.cpp +++ b/vcs/cvsservice/cvspart.cpp @@ -72,16 +72,16 @@ bool g_projectWasJustCreated = false; // Plugin factory /////////////////////////////////////////////////////////////////////////////// -static const KDevPluginInfo data("kdevcvsservice"); +static const KDevPluginInfo pluginData("kdevcvsservice"); typedef KDevGenericFactory<CvsServicePart> CvsFactory; -K_EXPORT_COMPONENT_FACTORY( libkdevcvsservice, CvsFactory( data ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevcvsservice, CvsFactory( pluginData ) ) /////////////////////////////////////////////////////////////////////////////// // class CvsServicePart /////////////////////////////////////////////////////////////////////////////// CvsServicePart::CvsServicePart( TQObject *parent, const char *name, const TQStringList & ) - : KDevVersionControl( &data, parent, + : KDevVersionControl( &pluginData, parent, name ? name : "CvsService" ), actionCommit( 0 ), actionDiff( 0 ), actionLog( 0 ), actionAnnotate(0), actionAdd( 0 ), actionAddBinary( 0 ), actionRemove( 0 ), actionUpdate( 0 ), @@ -96,10 +96,10 @@ CvsServicePart::CvsServicePart( TQObject *parent, const char *name, const TQStri m_impl = new CvsServicePartImpl( this ); // Load / store project configuration every time project is opened/closed - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) ); - connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(slotProjectClosed()) ); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(slotProjectOpened()) ); + connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(slotProjectClosed()) ); - TQTimer::singleShot(0, this, TQT_SLOT(init())); + TQTimer::singleShot(0, this, TQ_SLOT(init())); } /////////////////////////////////////////////////////////////////////////////// @@ -119,15 +119,15 @@ void CvsServicePart::init() setupActions(); // Re-route our implementation signal for when check-out finishes to the standard signal - connect( m_impl, TQT_SIGNAL(checkoutFinished(TQString)), TQT_SIGNAL(finishedFetching(TQString)) ); + connect( m_impl, TQ_SIGNAL(checkoutFinished(TQString)), TQ_SIGNAL(finishedFetching(TQString)) ); // Context menu - connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), - this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); - connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), - this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); - connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), - this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) ); + connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), + this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(stopButtonClicked(KDevPlugin*)), + this, TQ_SLOT(slotStopButtonClicked(KDevPlugin*)) ); m_impl->m_widget->setIcon( UserIcon( "kdev_cvs", TDEIcon::DefaultState, CvsFactory::instance()) ); TQWhatsThis::add( m_impl->processWidget(), i18n("<b>CVS</b><p>Concurrent Versions System operations window. Shows output of Cervisia CVS Service.") ); @@ -144,92 +144,92 @@ void CvsServicePart::setupActions() // context at runtime. See CvsServicePart::contextMenu(). actionCommit = new TDEAction( i18n("&Commit to Repository"), 0, this, - TQT_SLOT(slotActionCommit()), actionCollection(), "cvsservice_commit" ); + TQ_SLOT(slotActionCommit()), actionCollection(), "cvsservice_commit" ); actionCommit->setToolTip( i18n("Commit file(s)") ); actionCommit->setWhatsThis( i18n("<b>Commit file(s)</b><p>Commits file to repository if modified.") ); - actionDiff = new TDEAction( i18n("&Difference Between Revisions"), 0, this, TQT_SLOT(slotActionDiff()), + actionDiff = new TDEAction( i18n("&Difference Between Revisions"), 0, this, TQ_SLOT(slotActionDiff()), actionCollection(), "cvsservice_diff" ); actionDiff->setToolTip( i18n("Build difference") ); actionDiff->setWhatsThis( i18n("<b>Build difference</b><p>Builds difference between releases.") ); - actionLog = new TDEAction( i18n("Generate &Log"), 0, this, TQT_SLOT(slotActionLog()), + actionLog = new TDEAction( i18n("Generate &Log"), 0, this, TQ_SLOT(slotActionLog()), actionCollection(), "cvsservice_log" ); actionLog->setToolTip( i18n("Generate log") ); actionLog->setWhatsThis( i18n("<b>Generate log</b><p>Produces log for this file.") ); - actionAnnotate = new TDEAction( i18n("&Annotate"), 0, this, TQT_SLOT(slotActionAnnotate()), + actionAnnotate = new TDEAction( i18n("&Annotate"), 0, this, TQ_SLOT(slotActionAnnotate()), actionCollection(), "cvsservice_annotate" ); actionAnnotate->setToolTip( i18n("Generate annotations") ); actionAnnotate->setWhatsThis( i18n("<b>Annotate</b><p>Produces annotations for this file.") ); - 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(), "cvsservice_add" ); actionAdd->setToolTip( i18n("Add file to repository") ); actionAdd->setWhatsThis( i18n("<b>Add to repository</b><p>Adds file to repository.") ); - actionEdit = new TDEAction( i18n("&Edit Files"), 0, this, TQT_SLOT(slotActionEdit()), + actionEdit = new TDEAction( i18n("&Edit Files"), 0, this, TQ_SLOT(slotActionEdit()), actionCollection(), "cvsservice_edit" ); actionEdit->setToolTip( i18n("Mark as being edited") ); actionEdit->setWhatsThis( i18n("<b>Mark as being edited</b><p>Mark the files as being edited.") ); - actionUnEdit = new TDEAction( i18n("&Unedit Files"), 0, this, TQT_SLOT(slotActionUnEdit()), + actionUnEdit = new TDEAction( i18n("&Unedit Files"), 0, this, TQ_SLOT(slotActionUnEdit()), actionCollection(), "cvsservice_unedit" ); actionUnEdit->setToolTip( i18n("Remove editing mark from files") ); actionUnEdit->setWhatsThis( i18n("<b>Remove editing mark</b><p>Remove the editing mark from the files.") ); - actionEditors = new TDEAction( i18n("&Show Editors"), 0, this, TQT_SLOT(slotActionEditors()), + actionEditors = new TDEAction( i18n("&Show Editors"), 0, this, TQ_SLOT(slotActionEditors()), actionCollection(), "cvsservice_editors" ); actionEditors->setToolTip( i18n("Show editors") ); actionEditors->setWhatsThis( i18n("<b>Show editors</b><p>Shows the list of users who are editing files.") ); actionAddBinary = new TDEAction( i18n("Add to Repository as &Binary"), 0, this, - TQT_SLOT(slotActionAddBinary()), actionCollection(), "cvsservice_add_bin" ); + TQ_SLOT(slotActionAddBinary()), actionCollection(), "cvsservice_add_bin" ); actionAddBinary->setToolTip( i18n("Add file to repository as binary") ); actionAddBinary->setWhatsThis( i18n("<b>Add to repository as binary</b><p>Adds file to repository as binary (-kb option).") ); actionRemove = new TDEAction( i18n("&Remove From Repository"), 0, this, - TQT_SLOT(slotActionRemove()), actionCollection(), "cvsservice_remove" ); + TQ_SLOT(slotActionRemove()), actionCollection(), "cvsservice_remove" ); actionRemove->setToolTip( i18n("Remove from repository") ); actionRemove->setWhatsThis( i18n("<b>Remove from repository</b><p>Removes file(s) from repository.") ); actionUpdate = new TDEAction( i18n("&Update/Revert to Another Release"), 0, this, - TQT_SLOT(slotActionUpdate()), actionCollection(), "cvsservice_update" ); + TQ_SLOT(slotActionUpdate()), actionCollection(), "cvsservice_update" ); actionUpdate->setToolTip( i18n("Update/revert") ); actionUpdate->setWhatsThis( i18n("<b>Update/revert to another release</b><p>Updates/reverts file(s) to another release.") ); actionRemoveSticky = new TDEAction( i18n("R&emove Sticky Flag"), 0, - this, TQT_SLOT(slotActionRemoveSticky()), actionCollection(), "cvsservice_removesticky" ); + this, TQ_SLOT(slotActionRemoveSticky()), actionCollection(), "cvsservice_removesticky" ); actionRemoveSticky->setToolTip( i18n("Remove sticky flag") ); actionRemoveSticky->setWhatsThis( i18n("<b>Remove sticky flag</b><p>Removes sticky flag from file(s).") ); actionTag = new TDEAction( i18n("Make &Tag/Branch"), 0, - this, TQT_SLOT(slotActionTag()), actionCollection(), "cvsservice_tag" ); + this, TQ_SLOT(slotActionTag()), actionCollection(), "cvsservice_tag" ); actionTag->setToolTip( i18n("Make tag/branch") ); actionTag->setWhatsThis( i18n("<b>Make tag/branch</b><p>Tags/branches selected file(s).") ); actionUnTag = new TDEAction( i18n("&Delete Tag"), 0, - this, TQT_SLOT(slotActionUnTag()), actionCollection(), "cvsservice_untag" ); + this, TQ_SLOT(slotActionUnTag()), actionCollection(), "cvsservice_untag" ); actionUnTag->setToolTip( i18n("Delete tag") ); actionUnTag->setWhatsThis( i18n("<b>Delete tag</b><p>Delete tag from selected file(s).") ); actionAddToIgnoreList = new TDEAction( i18n("&Ignore in CVS Operations"), 0, - this, TQT_SLOT(slotActionAddToIgnoreList()), actionCollection(), "cvsservice_ignore" ); + this, TQ_SLOT(slotActionAddToIgnoreList()), actionCollection(), "cvsservice_ignore" ); actionAddToIgnoreList->setToolTip( i18n("Ignore in CVS operations") ); actionAddToIgnoreList->setWhatsThis( i18n("<b>Ignore in CVS operations</b><p>Ignore file(s) by adding it to .cvsignore file.") ); actionRemoveFromIgnoreList = new TDEAction( i18n("Do &Not Ignore in CVS Operations"), 0, - this, TQT_SLOT(slotActionRemoveFromIgnoreList()), actionCollection(), "cvsservice_donot_ignore" ); + this, TQ_SLOT(slotActionRemoveFromIgnoreList()), actionCollection(), "cvsservice_donot_ignore" ); actionRemoveFromIgnoreList->setToolTip( i18n("Do not ignore in CVS operations") ); actionRemoveFromIgnoreList->setWhatsThis( i18n("<b>Do not ignore in CVS operations</b><p>Do not ignore file(s) by removing\nit from .cvsignore file.") ); actionLogin = new TDEAction( i18n("&Log to Server"), 0, this, - TQT_SLOT(slotActionLogin()), actionCollection(), "cvsservice_login" ); + TQ_SLOT(slotActionLogin()), actionCollection(), "cvsservice_login" ); actionLogin->setToolTip( i18n("Login to server") ); actionLogin->setWhatsThis( i18n("<b>Login to server</b><p>Logs in to the CVS server.") ); actionLogout = new TDEAction( i18n("L&ogout From Server"), 0, this, - TQT_SLOT(slotActionLogout()), actionCollection(), "cvsservice_logout" ); + TQ_SLOT(slotActionLogout()), actionCollection(), "cvsservice_logout" ); actionLogout->setToolTip( i18n("Logout from server") ); actionLogout->setWhatsThis( i18n("<b>Logout from server</b><p>Logs out from the CVS server.") ); } @@ -278,7 +278,7 @@ void CvsServicePart::projectConfigWidget( KDialogBase *dlg ) { TQVBox *vbox = dlg->addVBoxPage( i18n("CvsService"), i18n("CvsService"), BarIcon( info()->icon(), TDEIcon::SizeMedium) ); CvsOptionsWidget *w = new CvsOptionsWidget( (TQWidget *)vbox, "cvs config widget" ); - connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); + connect( dlg, TQ_SIGNAL(okClicked()), w, TQ_SLOT(accept()) ); } /////////////////////////////////////////////////////////////////////////////// @@ -320,45 +320,45 @@ void CvsServicePart::contextMenu( TQPopupMenu *popup, const Context *context ) if (context->hasType( Context::FileContext )) popup->insertSeparator(); - int id = subMenu->insertItem( actionCommit->text(), this, TQT_SLOT(slotCommit()) ); + int id = subMenu->insertItem( actionCommit->text(), this, TQ_SLOT(slotCommit()) ); subMenu->setWhatsThis(id, i18n("<b>Commit file(s)</b><p>Commits file to repository if modified.")); // CvsService let to do log and diff operations only on one file (or directory) at time if (m_urls.count() == 1) { - id = subMenu->insertItem( actionDiff->text(), this, TQT_SLOT(slotDiff()) ); + id = subMenu->insertItem( actionDiff->text(), this, TQ_SLOT(slotDiff()) ); subMenu->setWhatsThis(id, i18n("<b>Build difference</b><p>Builds difference between releases.")); - id = subMenu->insertItem( actionLog->text(), this, TQT_SLOT(slotLog()) ); + id = subMenu->insertItem( actionLog->text(), this, TQ_SLOT(slotLog()) ); subMenu->setWhatsThis(id, i18n("<b>Generate log</b><p>Produces log for this file.")); - id = subMenu->insertItem( actionAnnotate->text(), this, TQT_SLOT(slotAnnotate()) ); + id = subMenu->insertItem( actionAnnotate->text(), this, TQ_SLOT(slotAnnotate()) ); subMenu->setWhatsThis(id, i18n("<b>Generate Annotate</b><p>Produces annotation output for this file.")); } - id = subMenu->insertItem( actionEditors->text(), this, TQT_SLOT(slotEditors()) ); + id = subMenu->insertItem( actionEditors->text(), this, TQ_SLOT(slotEditors()) ); subMenu->setWhatsThis(id, i18n("<b>Show editors</b><p>Shows the list of users who are editing files.")); - id = subMenu->insertItem( actionEdit->text(), this, TQT_SLOT(slotEdit()) ); + id = subMenu->insertItem( actionEdit->text(), this, TQ_SLOT(slotEdit()) ); subMenu->setWhatsThis(id, i18n("<b>Mark as beeing edited</b><p>Mark the files as beeing edited.")); - id = subMenu->insertItem( actionUnEdit->text(), this, TQT_SLOT(slotUnEdit()) ); + id = subMenu->insertItem( actionUnEdit->text(), this, TQ_SLOT(slotUnEdit()) ); subMenu->setWhatsThis(id, i18n("<b>Remove editing mark</b><p>Remove the editing mark from the files.")); - id = subMenu->insertItem( actionAdd->text(), this, TQT_SLOT(slotAdd()) ); + id = subMenu->insertItem( actionAdd->text(), this, TQ_SLOT(slotAdd()) ); subMenu->setWhatsThis(id, i18n("<b>Add to repository</b><p>Adds file to repository.")); - id = subMenu->insertItem( actionAddBinary->text(), this, TQT_SLOT(slotAddBinary()) ); + id = subMenu->insertItem( actionAddBinary->text(), this, TQ_SLOT(slotAddBinary()) ); subMenu->setWhatsThis(id, i18n("<b>Add to repository as binary</b><p>Adds file to repository as binary (-kb option).")); - id = subMenu->insertItem( actionRemove->text(), this, TQT_SLOT(slotRemove()) ); + id = subMenu->insertItem( actionRemove->text(), this, TQ_SLOT(slotRemove()) ); subMenu->setWhatsThis(id, i18n("<b>Remove from repository</b><p>Removes file(s) from repository.")); subMenu->insertSeparator(); - id = subMenu->insertItem( actionTag->text(), this, TQT_SLOT(slotTag()) ); + id = subMenu->insertItem( actionTag->text(), this, TQ_SLOT(slotTag()) ); subMenu->setWhatsThis(id, i18n("<b>Make tag/branch</b><p>Tags/branches selected file(s).")); - id = subMenu->insertItem( actionUnTag->text(), this, TQT_SLOT(slotUnTag()) ); + id = subMenu->insertItem( actionUnTag->text(), this, TQ_SLOT(slotUnTag()) ); subMenu->setWhatsThis(id, i18n("<b>Delete tag</b><p>Delete tag from selected file(s).")); - id = subMenu->insertItem( actionUpdate->text(), this, TQT_SLOT(slotUpdate()) ); + id = subMenu->insertItem( actionUpdate->text(), this, TQ_SLOT(slotUpdate()) ); subMenu->setWhatsThis(id, i18n("<b>Update/revert to another release</b><p>Updates/reverts file(s) to another release.")); - id = subMenu->insertItem( actionRemoveSticky->text(), this, TQT_SLOT(slotRemoveSticky()) ); + id = subMenu->insertItem( actionRemoveSticky->text(), this, TQ_SLOT(slotRemoveSticky()) ); subMenu->setWhatsThis(id, i18n("<b>Remove sticky flag</b><p>Removes sticky flag from file(s).")); subMenu->insertSeparator(); - id = subMenu->insertItem( actionAddToIgnoreList->text(), this, TQT_SLOT(slotAddToIgnoreList()) ); + id = subMenu->insertItem( actionAddToIgnoreList->text(), this, TQ_SLOT(slotAddToIgnoreList()) ); subMenu->setWhatsThis(id, i18n("<b>Ignore in CVS operations</b><p>Ignore file(s) by adding it to .cvsignore file.")); - id = subMenu->insertItem( actionRemoveFromIgnoreList->text(), this, TQT_SLOT(slotRemoveFromIgnoreList()) ); + id = subMenu->insertItem( actionRemoveFromIgnoreList->text(), this, TQ_SLOT(slotRemoveFromIgnoreList()) ); subMenu->setWhatsThis(id, i18n("<b>Do not ignore in CVS operations</b><p>Do not ignore file(s) by removing\nit from .cvsignore file.")); // Now insert in parent menu @@ -750,8 +750,8 @@ void CvsServicePart::slotProjectOpened() options->load( project() ); // When files are added to project they may be added to/removed from repository too - connect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList&)), this, TQT_SLOT(slotAddFilesToProject(const TQStringList &)) ); - connect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList&)), this, TQT_SLOT(slotRemovedFilesFromProject(const TQStringList &)) ); + connect( project(), TQ_SIGNAL(addedFilesToProject(const TQStringList&)), this, TQ_SLOT(slotAddFilesToProject(const TQStringList &)) ); + connect( project(), TQ_SIGNAL(removedFilesFromProject(const TQStringList&)), this, TQ_SLOT(slotRemovedFilesFromProject(const TQStringList &)) ); } /////////////////////////////////////////////////////////////////////////////// @@ -772,8 +772,8 @@ void CvsServicePart::slotProjectClosed() delete options; // We don't have a project anymore ... - disconnect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList&)), this, TQT_SLOT(slotAddFilesToProject(const TQStringList &)) ); - disconnect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList&)), this, TQT_SLOT(slotRemovedFilesFromProject(const TQStringList &)) ); + disconnect( project(), TQ_SIGNAL(addedFilesToProject(const TQStringList&)), this, TQ_SLOT(slotAddFilesToProject(const TQStringList &)) ); + disconnect( project(), TQ_SIGNAL(removedFilesFromProject(const TQStringList&)), this, TQ_SLOT(slotRemovedFilesFromProject(const TQStringList &)) ); } #include "cvspart.moc" diff --git a/vcs/cvsservice/cvspart.h b/vcs/cvsservice/cvspart.h index e2df8ce0..99008dc8 100644 --- a/vcs/cvsservice/cvspart.h +++ b/vcs/cvsservice/cvspart.h @@ -36,7 +36,7 @@ class CvsServicePartImpl; class CvsServicePart : public KDevVersionControl { - Q_OBJECT + TQ_OBJECT friend class CvsServicePartImpl; diff --git a/vcs/cvsservice/cvspartimpl.cpp b/vcs/cvsservice/cvspartimpl.cpp index 01c85df3..28203e91 100644 --- a/vcs/cvsservice/cvspartimpl.cpp +++ b/vcs/cvsservice/cvspartimpl.cpp @@ -80,7 +80,7 @@ CvsServicePartImpl::CvsServicePartImpl( CvsServicePart *part, const char *name ) m_scheduler = new DirectScheduler( m_widget ); m_fileInfoProvider = new CVSFileInfoProvider( part, m_cvsService ); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) ); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(slotProjectOpened()) ); } else { @@ -374,7 +374,7 @@ bool CvsServicePartImpl::checkout() modulePath = dlg.workDir() + dlg.module(); m_scheduler->schedule( job ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), this, TQT_SLOT(slotCheckoutFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), this, TQ_SLOT(slotCheckoutFinished(bool,int)) ); return true; } } @@ -406,7 +406,7 @@ void CvsServicePartImpl::commit( const KURL::List& urlList ) } m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), this, TQT_SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), this, TQ_SLOT(slotJobFinished(bool,int)) ); // 2. if requested to do so, add an entry to the Changelog too if (dlg.mustAddToChangeLog()) @@ -448,7 +448,7 @@ void CvsServicePartImpl::update( const KURL::List& urlList ) additionalOptions ); m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), this, TQT_SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), this, TQ_SLOT(slotJobFinished(bool,int)) ); doneOperation(); } @@ -465,7 +465,7 @@ void CvsServicePartImpl::add( const KURL::List& urlList, bool binary ) DCOPRef cvsJob = m_cvsService->add( fileList(), binary ); m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), this, TQT_SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), this, TQ_SLOT(slotJobFinished(bool,int)) ); doneOperation(); } @@ -531,7 +531,7 @@ void CvsServicePartImpl::unedit( const KURL::List& urlList) DCOPRef cvsJob = m_cvsService->unedit( fileList() ); m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), this, TQT_SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), this, TQ_SLOT(slotJobFinished(bool,int)) ); doneOperation(); } @@ -548,7 +548,7 @@ void CvsServicePartImpl::edit( const KURL::List& urlList) DCOPRef cvsJob = m_cvsService->edit( fileList() ); m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), this, TQT_SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), this, TQ_SLOT(slotJobFinished(bool,int)) ); doneOperation(); } @@ -582,8 +582,8 @@ void CvsServicePartImpl::remove( const KURL::List& urlList ) DCOPRef cvsJob = m_cvsService->remove( fileList(), true ); m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), - this, TQT_SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), + this, TQ_SLOT(slotJobFinished(bool,int)) ); doneOperation(); } @@ -606,8 +606,8 @@ void CvsServicePartImpl::removeStickyFlag( const KURL::List& urlList ) "-A" ); m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), - this, TQT_SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), + this, TQ_SLOT(slotJobFinished(bool,int)) ); doneOperation(); } @@ -656,8 +656,8 @@ void CvsServicePartImpl::diff( const KURL::List& urlList ) } m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), - this, TQT_SLOT(slotDiffFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), + this, TQ_SLOT(slotDiffFinished(bool,int)) ); doneOperation(); } @@ -680,8 +680,8 @@ void CvsServicePartImpl::tag( const KURL::List& urlList ) dlg.isBranch(), dlg.force() ); m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), - this, TQT_SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), + this, TQ_SLOT(slotJobFinished(bool,int)) ); doneOperation(); } @@ -705,8 +705,8 @@ void CvsServicePartImpl::unTag( const KURL::List& urlList ) dlg.isBranch(), dlg.force() ); m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), - this, TQT_SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), + this, TQ_SLOT(slotJobFinished(bool,int)) ); doneOperation(); } @@ -747,7 +747,7 @@ void CvsServicePartImpl::createNewProject( const TQString &dirName, DCOPRef cvsJob = m_cvsService->import( dirName, location, module, filesToIgnore, message, vendor, release, false ); m_scheduler->schedule( cvsJob ); - connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), this, TQT_SLOT(slotCheckoutFinished(bool,int)) ); + connect( processWidget(), TQ_SIGNAL(jobFinished(bool,int)), this, TQ_SLOT(slotCheckoutFinished(bool,int)) ); */ TQString rsh_preamble; if ( !options->cvsRshEnvVar().isEmpty() ) diff --git a/vcs/cvsservice/cvspartimpl.h b/vcs/cvsservice/cvspartimpl.h index ade7ffe4..d64ad625 100644 --- a/vcs/cvsservice/cvspartimpl.h +++ b/vcs/cvsservice/cvspartimpl.h @@ -45,7 +45,7 @@ class CvsServicePartImpl : public TQObject { friend class CvsServicePart; - Q_OBJECT + TQ_OBJECT public: //! Available Cvs operations diff --git a/vcs/cvsservice/cvsprocesswidget.cpp b/vcs/cvsservice/cvsprocesswidget.cpp index bb8fb459..87e917a5 100644 --- a/vcs/cvsservice/cvsprocesswidget.cpp +++ b/vcs/cvsservice/cvsprocesswidget.cpp @@ -140,7 +140,7 @@ bool CvsProcessWidget::startJob( const DCOPRef &aJob ) kdDebug(9006) << "Running: " << cmdLine << endl; // disconnect 3rd party slots from our signals - disconnect( TQT_SIGNAL(jobFinished(bool, int)) ); + disconnect( TQ_SIGNAL(jobFinished(bool, int)) ); showInfo( i18n("Started job: %1").arg( cmdLine ) ); diff --git a/vcs/cvsservice/cvsprocesswidget.h b/vcs/cvsservice/cvsprocesswidget.h index c8f9c8af..7a9337f8 100644 --- a/vcs/cvsservice/cvsprocesswidget.h +++ b/vcs/cvsservice/cvsprocesswidget.h @@ -26,7 +26,7 @@ class TQStyleSheetItem; class CvsProcessWidget : public TQTextEdit, virtual public CVSServiceDCOPIface { - Q_OBJECT + TQ_OBJECT public: CvsProcessWidget( CvsService_stub *service, CvsServicePart *part, diff --git a/vcs/cvsservice/diffdialog.h b/vcs/cvsservice/diffdialog.h index 28b0c181..b1e630f3 100644 --- a/vcs/cvsservice/diffdialog.h +++ b/vcs/cvsservice/diffdialog.h @@ -22,7 +22,7 @@ */ class DiffDialog : public DiffDialogBase { - Q_OBJECT + TQ_OBJECT public: DiffDialog(const CVSEntry &entry, TQWidget *parent = 0, const char *name = 0, WFlags f = 0 ); diff --git a/vcs/cvsservice/diffdialogbase.ui b/vcs/cvsservice/diffdialogbase.ui index 97bbd918..06c9b11c 100644 --- a/vcs/cvsservice/diffdialogbase.ui +++ b/vcs/cvsservice/diffdialogbase.ui @@ -201,9 +201,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -218,9 +215,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/vcs/cvsservice/diffwidget.cpp b/vcs/cvsservice/diffwidget.cpp index 008dc867..1119c6ff 100644 --- a/vcs/cvsservice/diffwidget.cpp +++ b/vcs/cvsservice/diffwidget.cpp @@ -75,14 +75,14 @@ TQPopupMenu* KDiffTextEdit::createPopupMenu( const TQPoint& p ) } if ( !extPartsTranslated.isEmpty() ) popup->insertSeparator( i ); - connect( popup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(popupActivated(int)) ); + connect( popup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(popupActivated(int)) ); - popup->insertItem( SmallIconSet( "document-save-as" ), i18n( "&Save As..." ), this, TQT_SLOT(saveAs()), CTRL + Key_S, POPUP_BASE - 2, 0 ); + popup->insertItem( SmallIconSet( "document-save-as" ), i18n( "&Save As..." ), this, TQ_SLOT(saveAs()), CTRL + Key_S, POPUP_BASE - 2, 0 ); popup->setItemEnabled( POPUP_BASE - 2, length() > 0 ); popup->insertSeparator( 1 ); - popup->insertItem( i18n( "Highlight Syntax" ), this, TQT_SLOT(toggleSyntaxHighlight()), 0, POPUP_BASE - 1, 2 ); + popup->insertItem( i18n( "Highlight Syntax" ), this, TQ_SLOT(toggleSyntaxHighlight()), 0, POPUP_BASE - 1, 2 ); popup->setItemChecked( POPUP_BASE - 1, _highlight ); popup->insertSeparator( 3 ); @@ -184,7 +184,7 @@ DiffWidget::DiffWidget( TQWidget *parent, const char *name, WFlags f ): te->setReadOnly( true ); te->setTextFormat( TQTextEdit::PlainText ); // te->setMinimumSize( 300, 200 ); - connect( te, TQT_SIGNAL(externalPartRequested(const TQString&)), this, TQT_SLOT(loadExtPart(const TQString&)) ); + connect( te, TQ_SIGNAL(externalPartRequested(const TQString&)), this, TQ_SLOT(loadExtPart(const TQString&)) ); TQVBoxLayout* layout = new TQVBoxLayout( this ); layout->addWidget( te ); @@ -222,7 +222,7 @@ void DiffWidget::loadExtPart( const TQString& partName ) if ( !extService ) return; - extPart = KParts::ComponentFactory::createPartInstanceFromService<KParts::ReadOnlyPart>( extService, this, 0, TQT_TQOBJECT(this), 0 ); + extPart = KParts::ComponentFactory::createPartInstanceFromService<KParts::ReadOnlyPart>( extService, this, 0, this, 0 ); if ( !extPart || !extPart->widget() ) return; @@ -301,10 +301,10 @@ void DiffWidget::openURL( const KURL& url ) if ( !job ) return; - connect( job, TQT_SIGNAL(data( TDEIO::Job *, const TQByteArray & )), - this, TQT_SLOT(slotAppend( TDEIO::Job*, const TQByteArray& )) ); - connect( job, TQT_SIGNAL(result( TDEIO::Job * )), - this, TQT_SLOT(slotFinished()) ); + connect( job, TQ_SIGNAL(data( TDEIO::Job *, const TQByteArray & )), + this, TQ_SLOT(slotAppend( TDEIO::Job*, const TQByteArray& )) ); + connect( job, TQ_SIGNAL(result( TDEIO::Job * )), + this, TQ_SLOT(slotFinished()) ); } void DiffWidget::contextMenuEvent( TQContextMenuEvent* /* e */ ) @@ -312,7 +312,7 @@ void DiffWidget::contextMenuEvent( TQContextMenuEvent* /* e */ ) TQPopupMenu* popup = new TQPopupMenu( this ); if ( !te->isVisible() ) - popup->insertItem( i18n("Display &Raw Output"), this, TQT_SLOT(showTextEdit()) ); + popup->insertItem( i18n("Display &Raw Output"), this, TQ_SLOT(showTextEdit()) ); popup->exec( TQCursor::pos() ); delete popup; diff --git a/vcs/cvsservice/diffwidget.h b/vcs/cvsservice/diffwidget.h index 9142aa8a..b14f5860 100644 --- a/vcs/cvsservice/diffwidget.h +++ b/vcs/cvsservice/diffwidget.h @@ -31,7 +31,7 @@ namespace KParts { // Helper class that displays a modified RMB popup menu class KDiffTextEdit: public TQTextEdit { - Q_OBJECT + TQ_OBJECT public: KDiffTextEdit( TQWidget* parent = 0, const char* name = 0 ); @@ -60,7 +60,7 @@ private: class DiffWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: diff --git a/vcs/cvsservice/editorsdialog.h b/vcs/cvsservice/editorsdialog.h index 5bf19b65..86030c14 100644 --- a/vcs/cvsservice/editorsdialog.h +++ b/vcs/cvsservice/editorsdialog.h @@ -21,7 +21,7 @@ class TQStringList; class EditorsDialog: public EditorsDialogBase, virtual public CVSServiceDCOPIface { -Q_OBJECT +TQ_OBJECT public: EditorsDialog(CvsService_stub *cvsService, TQWidget *parent = 0, const char *name = 0); diff --git a/vcs/cvsservice/editorsdialogbase.ui b/vcs/cvsservice/editorsdialogbase.ui index 37af7c1b..7e1fa65f 100644 --- a/vcs/cvsservice/editorsdialogbase.ui +++ b/vcs/cvsservice/editorsdialogbase.ui @@ -60,9 +60,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/vcs/cvsservice/integrator/CMakeLists.txt b/vcs/cvsservice/integrator/CMakeLists.txt index a17393d8..dabad069 100644 --- a/vcs/cvsservice/integrator/CMakeLists.txt +++ b/vcs/cvsservice/integrator/CMakeLists.txt @@ -25,7 +25,11 @@ link_directories( ##### other data ################################ -install( FILES kdevcvsserviceintegrator.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +tde_create_translated_desktop( + SOURCE kdevcvsserviceintegrator.desktop + DESTINATION ${SERVICES_INSTALL_DIR} + PO_DIR tdevelop-desktops +) ##### libcvsserviceintegrator (module) ########## diff --git a/vcs/cvsservice/integrator/cvsserviceintegrator.h b/vcs/cvsservice/integrator/cvsserviceintegrator.h index ebf4224e..70b18751 100644 --- a/vcs/cvsservice/integrator/cvsserviceintegrator.h +++ b/vcs/cvsservice/integrator/cvsserviceintegrator.h @@ -25,7 +25,7 @@ #include <tqstringlist.h> class CVSServiceIntegrator: public KDevVCSIntegrator { -Q_OBJECT +TQ_OBJECT public: CVSServiceIntegrator(TQObject* parent, const char* name, const TQStringList args = TQStringList()); diff --git a/vcs/cvsservice/integrator/integratordlg.h b/vcs/cvsservice/integrator/integratordlg.h index ac6d7f9d..817fc622 100644 --- a/vcs/cvsservice/integrator/integratordlg.h +++ b/vcs/cvsservice/integrator/integratordlg.h @@ -26,7 +26,7 @@ class TQDomDocument; class IntegratorDlg: public IntegratorDlgBase, public VCSDialog { -Q_OBJECT +TQ_OBJECT public: IntegratorDlg(CVSServiceIntegrator *integrator, TQWidget *parent = 0, const char *name = 0); diff --git a/vcs/cvsservice/integrator/integratordlgbase.ui b/vcs/cvsservice/integrator/integratordlgbase.ui index 6660faab..5dc8ae11 100644 --- a/vcs/cvsservice/integrator/integratordlgbase.ui +++ b/vcs/cvsservice/integrator/integratordlgbase.ui @@ -389,11 +389,11 @@ <tabstop>login</tabstop> <tabstop>init</tabstop> </tabstops> -<Q_SLOTS> +<slots> <slot>init_clicked()</slot> <slot>login_clicked()</slot> <slot>createModule_clicked()</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/vcs/cvsservice/integrator/kdevcvsserviceintegrator.desktop b/vcs/cvsservice/integrator/kdevcvsserviceintegrator.desktop index 623fc827..ff914214 100644 --- a/vcs/cvsservice/integrator/kdevcvsserviceintegrator.desktop +++ b/vcs/cvsservice/integrator/kdevcvsserviceintegrator.desktop @@ -1,40 +1,9 @@ [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 服務專案整合工具 + +Type=Service Icon=cervisia Exec=blubb X-TDE-ServiceTypes=TDevelop/VCSIntegrator diff --git a/vcs/cvsservice/kdevcvsservice.desktop b/vcs/cvsservice/kdevcvsservice.desktop index fed6b6e4..e96e6011 100644 --- a/vcs/cvsservice/kdevcvsservice.desktop +++ b/vcs/cvsservice/kdevcvsservice.desktop @@ -1,75 +1,12 @@ [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） + +Comment=CVS Integration using Cervisia's cvsservice. http://www.kde.org/apps/cervisia/ + +Type=Service +Exec=blubb Icon=cervisia X-TDE-ServiceTypes=TDevelop/VersionControl X-TDE-Library=libkdevcvsservice diff --git a/vcs/cvsservice/releaseinputdialog.h b/vcs/cvsservice/releaseinputdialog.h index dc5597af..7e4befd2 100644 --- a/vcs/cvsservice/releaseinputdialog.h +++ b/vcs/cvsservice/releaseinputdialog.h @@ -20,7 +20,7 @@ */ class ReleaseInputDialog : public ReleaseInputDialogBase { - Q_OBJECT + TQ_OBJECT public: diff --git a/vcs/cvsservice/releaseinputdialogbase.ui b/vcs/cvsservice/releaseinputdialogbase.ui index 92687fb8..1132e928 100644 --- a/vcs/cvsservice/releaseinputdialogbase.ui +++ b/vcs/cvsservice/releaseinputdialogbase.ui @@ -188,9 +188,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -205,9 +202,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/vcs/cvsservice/tagdialog.h b/vcs/cvsservice/tagdialog.h index d912c7ff..f20ab853 100644 --- a/vcs/cvsservice/tagdialog.h +++ b/vcs/cvsservice/tagdialog.h @@ -22,7 +22,7 @@ */ class TagDialog : public TagDialogBase { - Q_OBJECT + TQ_OBJECT public: TagDialog( const TQString &caption, TQWidget *parent = 0, const char *name = 0 ); diff --git a/vcs/cvsservice/tagdialogbase.ui b/vcs/cvsservice/tagdialogbase.ui index dc12e6bc..e5e52848 100644 --- a/vcs/cvsservice/tagdialogbase.ui +++ b/vcs/cvsservice/tagdialogbase.ui @@ -113,9 +113,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> @@ -130,9 +127,6 @@ <property name="text"> <string>&Cancel</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> 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..f343d9a8 100644 --- a/vcs/perforce/commitdlg.cpp +++ b/vcs/perforce/commitdlg.cpp @@ -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..8d7975e8 100644 --- a/vcs/perforce/perforcepart.cpp +++ b/vcs/perforce/perforcepart.cpp @@ -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: diff --git a/vcs/subversion/CMakeLists.txt b/vcs/subversion/CMakeLists.txt index fb51fe3d..87fdf293 100644 --- a/vcs/subversion/CMakeLists.txt +++ b/vcs/subversion/CMakeLists.txt @@ -30,15 +30,20 @@ link_directories( ##### other data ################################ -install( FILES +tde_create_translated_desktop( + SOURCE kdevsubversion.desktop kdevsvn+file.protocol kdevsvn+http.protocol kdevsvn+https.protocol kdevsvn+ssh.protocol kdevsvn+svn.protocol - DESTINATION ${SERVICES_INSTALL_DIR} ) + DESTINATION ${SERVICES_INSTALL_DIR} + PO_DIR tdevelop-desktops +) -install( FILES - kdevsvnd.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/kded ) +tde_create_translated_desktop( + SOURCE kdevsvnd.desktop + DESTINATION ${SERVICES_INSTALL_DIR}/kded + PO_DIR tdevelop-desktops +) ##### libkdevsubversion (module) ################ diff --git a/vcs/subversion/commitdlg.cpp b/vcs/subversion/commitdlg.cpp index cd6fedab..f1987250 100644 --- a/vcs/subversion/commitdlg.cpp +++ b/vcs/subversion/commitdlg.cpp @@ -32,7 +32,7 @@ bool CommitDlg::eventFilter( TQObject* obj, TQEvent* ev ) { if( ev->type() == TQEvent::KeyPress ) { - TQKeyEvent* k = TQT_TQKEYEVENT(ev); + TQKeyEvent* k = static_cast<TQKeyEvent*>(ev); if( ( k->key() == TQt::Key_Return || k->key() == TQt::Key_Enter ) && k->state() == TQt::ControlButton ) { accept(); @@ -43,5 +43,3 @@ bool CommitDlg::eventFilter( TQObject* obj, TQEvent* ev ) } #include "commitdlg.moc" - -//kate: space-indent on; indent-width 4; replace-tabs on; auto-insert-doxygen on; indent-mode cstyle; diff --git a/vcs/subversion/commitdlg.h b/vcs/subversion/commitdlg.h index 2f9d5a85..f4fc320e 100644 --- a/vcs/subversion/commitdlg.h +++ b/vcs/subversion/commitdlg.h @@ -25,7 +25,7 @@ class CommitDlg : public CommitDlgBase { - Q_OBJECT + TQ_OBJECT public: CommitDlg( TQWidget* = 0 ); @@ -34,5 +34,3 @@ protected: }; #endif - -//kate: space-indent on; indent-width 4; replace-tabs on; auto-insert-doxygen on; indent-mode cstyle; diff --git a/vcs/subversion/integrator/CMakeLists.txt b/vcs/subversion/integrator/CMakeLists.txt index 2256b8e3..68471be6 100644 --- a/vcs/subversion/integrator/CMakeLists.txt +++ b/vcs/subversion/integrator/CMakeLists.txt @@ -26,7 +26,11 @@ link_directories( ##### other data ################################ -install( FILES kdevsubversionintegrator.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +tde_create_translated_desktop( + SOURCE kdevsubversionintegrator.desktop + DESTINATION ${SERVICES_INSTALL_DIR} + PO_DIR tdevelop-desktops +) ##### libsubversionintegrator (module) ########## diff --git a/vcs/subversion/integrator/kdevsubversionintegrator.desktop b/vcs/subversion/integrator/kdevsubversionintegrator.desktop index 39e6cdcd..90cac221 100644 --- a/vcs/subversion/integrator/kdevsubversionintegrator.desktop +++ b/vcs/subversion/integrator/kdevsubversionintegrator.desktop @@ -1,40 +1,9 @@ [Desktop Entry] -Type=Service Name=KDevSubversionIntegrator -Name[da]=TDevelop Subversion-integration -Name[nds]=TDevelop-Subversion-Integreren -Name[sk]=KDev Subversion integrácia -Name[sv]=TDevelop Subversion-integration -Name[zh_TW]=TDevelop Subversion 整合器 + Comment=Subversion Project Integration Facility -Comment[ca]=Facilitat per a la integració amb Subversion -Comment[da]=Subversion projektintegration -Comment[de]=Subversion-Projektintegration -Comment[el]=Λειτουργία ενσωμάτωσης Subversion στο έργο -Comment[es]=Facilidad para integración con proyectos que utilicen Subversion -Comment[et]=Subversion projekti põimimisvahend -Comment[eu]=Subversion proiektuen integrazio-tesna -Comment[fa]=تسهیلات مجتمعسازی پروژۀ زیرنسخه -Comment[fr]=Fonction d'intégration pour un projet utilisant Subversion -Comment[gl]=Utilidade para a integración de proxectos Subversión -Comment[hu]=Projektintegrálást tesz lehetővé a Subversion-nel -Comment[it]=Funzione di integrazione del progetto Subversion -Comment[ja]=Subversion プロジェクト統合ツール -Comment[ms]=Kemudahan Integrasi Projek Subversion -Comment[nds]=Subversion-Projektintegreren -Comment[ne]=सबभर्सन परियोजना एकिकरण सुविधा -Comment[nl]=Subversion project-integratie -Comment[pl]=Integracja z Subversion -Comment[pt]=Integração com Projectos Subversion -Comment[pt_BR]=Facilidade de Integração ao Projeto de Subversão -Comment[ru]=Интеграция Subversion -Comment[sk]=Subversion projektová integrácia -Comment[sr]=Интеграција Subversion-а у пројекат -Comment[sr@Latn]=Integracija Subversion-a u projekat -Comment[sv]=Funktion för integrering av Subversion i projekt -Comment[tr]=Subversion Proje Bütünleştirme Aracı -Comment[zh_CN]=Subversion 工程集成功能 -Comment[zh_TW]=Subversion 專案整合工具 + +Type=Service Icon=application-vnd.tde.misc Exec=blubb X-TDE-ServiceTypes=TDevelop/VCSIntegrator diff --git a/vcs/subversion/integrator/subversionintegrator.h b/vcs/subversion/integrator/subversionintegrator.h index 01c43516..b7fa9731 100644 --- a/vcs/subversion/integrator/subversionintegrator.h +++ b/vcs/subversion/integrator/subversionintegrator.h @@ -26,7 +26,7 @@ class SubversionIntegrator : public KDevVCSIntegrator { -Q_OBJECT +TQ_OBJECT public: SubversionIntegrator(TQObject* parent, const char* name, const TQStringList args = TQStringList()); diff --git a/vcs/subversion/integrator/svnintegratordlg.h b/vcs/subversion/integrator/svnintegratordlg.h index ccf1686f..dfdb7aa6 100644 --- a/vcs/subversion/integrator/svnintegratordlg.h +++ b/vcs/subversion/integrator/svnintegratordlg.h @@ -24,7 +24,7 @@ #include <kdevvcsintegrator.h> class SvnIntegratorDlg: public SvnIntegratorDlgBase, public VCSDialog { -Q_OBJECT +TQ_OBJECT public: SvnIntegratorDlg(TQWidget *parent = 0, const char *name = 0); diff --git a/vcs/subversion/kdevsubversion.desktop b/vcs/subversion/kdevsubversion.desktop index 4e9d2d93..1d9d15d6 100644 --- a/vcs/subversion/kdevsubversion.desktop +++ b/vcs/subversion/kdevsubversion.desktop @@ -1,32 +1,12 @@ [Desktop Entry] -Type=Service -Exec=blubb -Comment=Subversion -Comment[fa]=زیرنسخه -Comment[hi]=सबवर्सन -Comment[ne]=सबभर्सन -Comment[pt_BR]=Subversão -Comment[ru]=Интеграция Subversion -Comment[ta]=உப பதிப்பு -Comment[tg]=Интегратсия Subversion Name=KDevsubversion -Name[da]=TDevelop Subversion -Name[de]=Unterstützung für Subversion (TDevelop) -Name[hi]=के-डेव-सबवर्सन -Name[nds]=Subversion-Ünnerstütten för TDevelop -Name[sk]=KDev Subversion -Name[sv]=TDevelop Subversion -Name[ta]=kdev உப பதிப்பு -Name[tg]=KDevзер-ривоят -Name[zh_TW]=TDevelop Subversion + GenericName=Subversion -GenericName[fa]=زیرنسخه -GenericName[hi]=सबवर्सन -GenericName[ne]=सबभर्सन -GenericName[pt_BR]=Subversão -GenericName[ru]=Интеграция Subversion -GenericName[ta]=துணை பதிப்பு -GenericName[tg]=Зер-ривоят + +Comment=Subversion + +Type=Service +Exec=blubb Icon=application-vnd.tde.misc X-TDE-ServiceTypes=TDevelop/VersionControl X-TDE-Library=libkdevsubversion diff --git a/vcs/subversion/kdevsvn+file.protocol b/vcs/subversion/kdevsvn+file.protocol index 412c3800..477444d7 100644 --- a/vcs/subversion/kdevsvn+file.protocol +++ b/vcs/subversion/kdevsvn+file.protocol @@ -13,27 +13,8 @@ deleteRecursive=true listing=Name,Size,Date,Owner defaultMimetype=application/octet-stream Icon=remote + Description=Subversion ioslave for TDevelop -Description[ca]=L'esclau io (ioslave) Subversion per a TDevelop -Description[de]=Ein-/Ausgabemodul für Subversion (TDevelop) -Description[el]=Subversion ioslave για το TDevelop -Description[es]=El ioslave de Subversion para TDevelop -Description[et]=TDevelopi Subversioni IO-moodul -Description[fr]=Esclave d'E/S (ioslave) Subversion pour TDevelop -Description[hu]=Subversion KDE-protokoll a TDevelophoz -Description[it]=ioslave di subversion per TDevelop -Description[ja]=TDevelop のための Subversion ioslave -Description[ms]=IOslave Subversion untuk TDevelop -Description[nds]=TDevelop-In-/Utgaavmoduul för Subversion -Description[nl]=Subversion-ioslave voor TDevelop -Description[pl]=Wtyczka protokołu Subversion dla TDevelopa -Description[pt]='Ioslave' do Subversion para o TDevelop -Description[pt_BR]='Ioslave' do Subversion para o TDevelop -Description[ru]=Поддержка протокола Subversion для TDevelop -Description[sk]=Subversion ioslave pre TDevelop -Description[sr]=KIOSlave Subversion-а за TDevelop -Description[sr@Latn]=KIOSlave Subversion-a za TDevelop -Description[sv]=Subversion I/O-slav för TDevelop -Description[zh_TW]=TDevelop 的 Subversion ioslave + maxInstances=5 class=:internet diff --git a/vcs/subversion/kdevsvn+http.protocol b/vcs/subversion/kdevsvn+http.protocol index 5a063b85..4503c8a5 100644 --- a/vcs/subversion/kdevsvn+http.protocol +++ b/vcs/subversion/kdevsvn+http.protocol @@ -13,27 +13,8 @@ deleteRecursive=true listing=Name,Size,Date,Owner defaultMimetype=application/octet-stream Icon=remote + Description=Subversion ioslave for TDevelop -Description[ca]=L'esclau io (ioslave) Subversion per a TDevelop -Description[de]=Ein-/Ausgabemodul für Subversion (TDevelop) -Description[el]=Subversion ioslave για το TDevelop -Description[es]=El ioslave de Subversion para TDevelop -Description[et]=TDevelopi Subversioni IO-moodul -Description[fr]=Esclave d'E/S (ioslave) Subversion pour TDevelop -Description[hu]=Subversion KDE-protokoll a TDevelophoz -Description[it]=ioslave di subversion per TDevelop -Description[ja]=TDevelop のための Subversion ioslave -Description[ms]=IOslave Subversion untuk TDevelop -Description[nds]=TDevelop-In-/Utgaavmoduul för Subversion -Description[nl]=Subversion-ioslave voor TDevelop -Description[pl]=Wtyczka protokołu Subversion dla TDevelopa -Description[pt]='Ioslave' do Subversion para o TDevelop -Description[pt_BR]='Ioslave' do Subversion para o TDevelop -Description[ru]=Поддержка протокола Subversion для TDevelop -Description[sk]=Subversion ioslave pre TDevelop -Description[sr]=KIOSlave Subversion-а за TDevelop -Description[sr@Latn]=KIOSlave Subversion-a za TDevelop -Description[sv]=Subversion I/O-slav för TDevelop -Description[zh_TW]=TDevelop 的 Subversion ioslave + maxInstances=5 class=:internet diff --git a/vcs/subversion/kdevsvn+https.protocol b/vcs/subversion/kdevsvn+https.protocol index d064e575..3d56d347 100644 --- a/vcs/subversion/kdevsvn+https.protocol +++ b/vcs/subversion/kdevsvn+https.protocol @@ -13,27 +13,8 @@ deleteRecursive=true listing=Name,Size,Date,Owner defaultMimetype=application/octet-stream Icon=remote + Description=Subversion ioslave for TDevelop -Description[ca]=L'esclau io (ioslave) Subversion per a TDevelop -Description[de]=Ein-/Ausgabemodul für Subversion (TDevelop) -Description[el]=Subversion ioslave για το TDevelop -Description[es]=El ioslave de Subversion para TDevelop -Description[et]=TDevelopi Subversioni IO-moodul -Description[fr]=Esclave d'E/S (ioslave) Subversion pour TDevelop -Description[hu]=Subversion KDE-protokoll a TDevelophoz -Description[it]=ioslave di subversion per TDevelop -Description[ja]=TDevelop のための Subversion ioslave -Description[ms]=IOslave Subversion untuk TDevelop -Description[nds]=TDevelop-In-/Utgaavmoduul för Subversion -Description[nl]=Subversion-ioslave voor TDevelop -Description[pl]=Wtyczka protokołu Subversion dla TDevelopa -Description[pt]='Ioslave' do Subversion para o TDevelop -Description[pt_BR]='Ioslave' do Subversion para o TDevelop -Description[ru]=Поддержка протокола Subversion для TDevelop -Description[sk]=Subversion ioslave pre TDevelop -Description[sr]=KIOSlave Subversion-а за TDevelop -Description[sr@Latn]=KIOSlave Subversion-a za TDevelop -Description[sv]=Subversion I/O-slav för TDevelop -Description[zh_TW]=TDevelop 的 Subversion ioslave + maxInstances=5 class=:internet diff --git a/vcs/subversion/kdevsvn+ssh.protocol b/vcs/subversion/kdevsvn+ssh.protocol index 512b4a90..2ef57093 100644 --- a/vcs/subversion/kdevsvn+ssh.protocol +++ b/vcs/subversion/kdevsvn+ssh.protocol @@ -13,27 +13,8 @@ deleteRecursive=true listing=Name,Size,Date,Owner defaultMimetype=application/octet-stream Icon=remote + Description=Subversion ioslave for TDevelop -Description[ca]=L'esclau io (ioslave) Subversion per a TDevelop -Description[de]=Ein-/Ausgabemodul für Subversion (TDevelop) -Description[el]=Subversion ioslave για το TDevelop -Description[es]=El ioslave de Subversion para TDevelop -Description[et]=TDevelopi Subversioni IO-moodul -Description[fr]=Esclave d'E/S (ioslave) Subversion pour TDevelop -Description[hu]=Subversion KDE-protokoll a TDevelophoz -Description[it]=ioslave di subversion per TDevelop -Description[ja]=TDevelop のための Subversion ioslave -Description[ms]=IOslave Subversion untuk TDevelop -Description[nds]=TDevelop-In-/Utgaavmoduul för Subversion -Description[nl]=Subversion-ioslave voor TDevelop -Description[pl]=Wtyczka protokołu Subversion dla TDevelopa -Description[pt]='Ioslave' do Subversion para o TDevelop -Description[pt_BR]='Ioslave' do Subversion para o TDevelop -Description[ru]=Поддержка протокола Subversion для TDevelop -Description[sk]=Subversion ioslave pre TDevelop -Description[sr]=KIOSlave Subversion-а за TDevelop -Description[sr@Latn]=KIOSlave Subversion-a za TDevelop -Description[sv]=Subversion I/O-slav för TDevelop -Description[zh_TW]=TDevelop 的 Subversion ioslave + maxInstances=5 class=:internet diff --git a/vcs/subversion/kdevsvn+svn.protocol b/vcs/subversion/kdevsvn+svn.protocol index 8f496854..a35363ea 100644 --- a/vcs/subversion/kdevsvn+svn.protocol +++ b/vcs/subversion/kdevsvn+svn.protocol @@ -13,27 +13,8 @@ deleteRecursive=true listing=Name,Size,Date,Owner defaultMimetype=application/octet-stream Icon=remote + Description=Subversion ioslave for TDevelop -Description[ca]=L'esclau io (ioslave) Subversion per a TDevelop -Description[de]=Ein-/Ausgabemodul für Subversion (TDevelop) -Description[el]=Subversion ioslave για το TDevelop -Description[es]=El ioslave de Subversion para TDevelop -Description[et]=TDevelopi Subversioni IO-moodul -Description[fr]=Esclave d'E/S (ioslave) Subversion pour TDevelop -Description[hu]=Subversion KDE-protokoll a TDevelophoz -Description[it]=ioslave di subversion per TDevelop -Description[ja]=TDevelop のための Subversion ioslave -Description[ms]=IOslave Subversion untuk TDevelop -Description[nds]=TDevelop-In-/Utgaavmoduul för Subversion -Description[nl]=Subversion-ioslave voor TDevelop -Description[pl]=Wtyczka protokołu Subversion dla TDevelopa -Description[pt]='Ioslave' do Subversion para o TDevelop -Description[pt_BR]='Ioslave' do Subversion para o TDevelop -Description[ru]=Поддержка протокола Subversion для TDevelop -Description[sk]=Subversion ioslave pre TDevelop -Description[sr]=KIOSlave Subversion-а за TDevelop -Description[sr@Latn]=KIOSlave Subversion-a za TDevelop -Description[sv]=Subversion I/O-slav för TDevelop -Description[zh_TW]=TDevelop 的 Subversion ioslave + maxInstances=5 class=:internet diff --git a/vcs/subversion/kdevsvnd.cpp b/vcs/subversion/kdevsvnd.cpp index 1fc4afc8..30e76f0e 100644 --- a/vcs/subversion/kdevsvnd.cpp +++ b/vcs/subversion/kdevsvnd.cpp @@ -36,7 +36,7 @@ #include "commitdlg.h" extern "C" { - KDE_EXPORT KDEDModule *create_kdevsvnd(const TQCString &name) { + TDE_EXPORT KDEDModule *create_kdevsvnd(const TQCString &name) { return new KDevSvnd(name); } } diff --git a/vcs/subversion/kdevsvnd.desktop b/vcs/subversion/kdevsvnd.desktop index 1bbdbe72..7b58d718 100644 --- a/vcs/subversion/kdevsvnd.desktop +++ b/vcs/subversion/kdevsvnd.desktop @@ -1,29 +1,9 @@ [Desktop Entry] -Type=Service Name=TDevelop Subversion Module -Name[ca]=Mòdul de Subversion per a TDevelop -Name[da]=TDevelop Subversion-Modul -Name[de]=Subversion-Komponente (TDevelop) -Name[el]=Άρθρωμα subversion του TDevelop -Name[es]=Módulo de Subversion de TDevelop -Name[et]=TDevelopi Subversioni Moodul -Name[fr]=Module Subversion pour TDevelop -Name[hu]=TDevelop-Modul a Subversion kezeléséhez -Name[it]=Modulo Subversion di TDevelop -Name[ja]=TDevelop Subversion モジュール -Name[ms]=Modul Subversion TDevelop -Name[nds]=TDevelop-Moduul för Subversion -Name[nl]=TDevelop Subversion-Module -Name[pl]=Modul Subversion dla TDevelopa -Name[pt]=Módulo de Subversion do TDevelop -Name[pt_BR]=Módulo de Subversion do TDevelop -Name[ru]=Модуль Subversion для TDevelop -Name[sk]=TDevelop Subversion Modul -Name[sr]=TDevelop-ов модул за Subversion -Name[sr@Latn]=TDevelop-ov Modul za Subversion -Name[sv]=TDevelop Subversion-Modul -Name[zh_TW]=TDevelop Subversion 模組 + Comment=Provides subversion client services with TDevelop + +Type=Service X-TDE-ServiceTypes=KDEDModule X-TDE-ModuleType=Library X-TDE-Library=kdevsvnd diff --git a/vcs/subversion/kdevsvnd.h b/vcs/subversion/kdevsvnd.h index a3a1c2f6..2066b5f3 100644 --- a/vcs/subversion/kdevsvnd.h +++ b/vcs/subversion/kdevsvnd.h @@ -28,7 +28,7 @@ class KDevSvnd : public KDEDModule { -Q_OBJECT +TQ_OBJECT // K_DCOP diff --git a/vcs/subversion/kdevsvnd_widgets.cpp b/vcs/subversion/kdevsvnd_widgets.cpp index 0fd2c20b..9f3eb3f9 100644 --- a/vcs/subversion/kdevsvnd_widgets.cpp +++ b/vcs/subversion/kdevsvnd_widgets.cpp @@ -27,9 +27,9 @@ SvnSSLTrustPrompt::SvnSSLTrustPrompt( TQWidget* parent, const char* name, bool m btnPermanent->setText(i18n("Accept Permanently")); btnTemporary->setText(i18n("Accept Temporarily")); btnReject->setText(i18n("Reject")); - connect( btnPermanent, TQT_SIGNAL(clicked()), this, TQT_SLOT(setPermanent()) ); - connect( btnTemporary, TQT_SIGNAL(clicked()), this, TQT_SLOT(setTemporary()) ); - connect( btnReject, TQT_SIGNAL(clicked()), this, TQT_SLOT(setRejected ()) ); + connect( btnPermanent, TQ_SIGNAL(clicked()), this, TQ_SLOT(setPermanent()) ); + connect( btnTemporary, TQ_SIGNAL(clicked()), this, TQ_SLOT(setTemporary()) ); + connect( btnReject, TQ_SIGNAL(clicked()), this, TQ_SLOT(setRejected ()) ); } SvnSSLTrustPrompt::~SvnSSLTrustPrompt() {} diff --git a/vcs/subversion/kdevsvnd_widgets.h b/vcs/subversion/kdevsvnd_widgets.h index 3967cb35..48a11372 100644 --- a/vcs/subversion/kdevsvnd_widgets.h +++ b/vcs/subversion/kdevsvnd_widgets.h @@ -18,7 +18,7 @@ #include "svnssltrustpromptbase.h" class SvnSSLTrustPrompt : public SvnSSLTrustPromptBase{ -Q_OBJECT +TQ_OBJECT public: SvnSSLTrustPrompt( TQWidget* parent=0, const char* name=0, bool modal=true, WFlags f=0 ); diff --git a/vcs/subversion/subversion_core.cpp b/vcs/subversion/subversion_core.cpp index e9c89ece..c0a97129 100644 --- a/vcs/subversion/subversion_core.cpp +++ b/vcs/subversion/subversion_core.cpp @@ -127,7 +127,7 @@ void subversionCore::resolve( const KURL::List& list ) { s << cmd << *it << recurse; SimpleJob * job = TDEIO::special(servURL, parms, true); job->setWindow( m_part->mainWindow()->main() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); } } @@ -142,7 +142,7 @@ void subversionCore::update( const KURL::List& list ) { s << cmd << list << rev << TQString( "HEAD" ); SimpleJob * job = TDEIO::special(servURL, parms, false); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); initProcessDlg( (TDEIO::Job*)job, i18n("Subversion Update") , i18n("Subversion Update") ); } @@ -160,7 +160,7 @@ void subversionCore::diff( const KURL::List& list, const TQString& where){ TQString revkind2 = "WORKING"; s << cmd << *it << *it << rev1 << revkind1 << rev2 << revkind2 << true ; TDEIO::SimpleJob * job = TDEIO::special(servURL, parms, true); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); TDEIO::NetAccess::synchronousRun( job, 0 ); if ( diffresult.count() > 0 ) { //check kompare is available @@ -241,7 +241,7 @@ void subversionCore::diffAsync( const KURL &pathOrUrl1, const KURL &pathOrUrl2, s << cmd << pathOrUrl1 << pathOrUrl2 << rev1 << revKind1 << rev2 << revKind2 << recurse; s << pegdiff; TDEIO::SimpleJob * job = TDEIO::special(servURL, parms, false); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotDiffResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotDiffResult( TDEIO::Job * ) ) ); initProcessDlg( (TDEIO::Job*)job, pathOrUrl1.prettyURL(), pathOrUrl2.prettyURL() ); } @@ -261,7 +261,7 @@ void subversionCore::commit( const KURL::List& list, bool recurse, bool keeplock s << *it; } SimpleJob * job = TDEIO::special(servURL, parms, false); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); if( list.count() == 1 ) initProcessDlg( (TDEIO::Job*)job, (*(list.begin())).prettyURL() , i18n("Commit to remote repository") ); else if( list.count() > 1 ) @@ -295,7 +295,7 @@ void subversionCore::svnLog( const KURL::List& list, s << *it; } SimpleJob * job = TDEIO::special(servURL, parms, false); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotLogResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotLogResult( TDEIO::Job * ) ) ); // progress info. LogView is allowed and meaninful only for one url in KDev3.4 initProcessDlg( (TDEIO::Job*)job, (*(list.begin())).prettyURL() , i18n("Subversion Log View") ); } @@ -316,7 +316,7 @@ void subversionCore::blame( const KURL &url, UrlMode mode, int revstart, TQStrin s << revstart << revKindStart << revend << revKindEnd ; SimpleJob * job = TDEIO::special(servURL, parms, false); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotBlameResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotBlameResult( TDEIO::Job * ) ) ); initProcessDlg( (TDEIO::Job*)job, url.prettyURL() , i18n("Subversion Blame") ); } @@ -332,7 +332,7 @@ void subversionCore::add( const KURL::List& list ) { // add/delete/revert works on local copy. Don't need to show progress dialog SimpleJob * job = TDEIO::special(servURL, parms, false); job->setWindow( m_part->mainWindow()->main() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); } void subversionCore::del( const KURL::List& list ) { @@ -346,7 +346,7 @@ void subversionCore::del( const KURL::List& list ) { // add/delete/revert works on local copy. Don't need to show progress dialog SimpleJob * job = TDEIO::special(servURL, parms, false); job->setWindow( m_part->mainWindow()->main() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); } void subversionCore::revert( const KURL::List& list ) { @@ -359,7 +359,7 @@ void subversionCore::revert( const KURL::List& list ) { s << cmd << list; SimpleJob * job = TDEIO::special(servURL, parms, false); job->setWindow( m_part->mainWindow()->main() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); } void subversionCore::checkout() { @@ -377,7 +377,7 @@ void subversionCore::checkout() { servURL.setProtocol( "kdevsvn+" + servURL.protocol() ); //make sure it starts with "svn" SimpleJob * job = TDEIO::special(servURL,parms, true); job->setWindow( m_part->mainWindow()->main() ); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotEndCheckout( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotEndCheckout( TDEIO::Job * ) ) ); } } @@ -393,7 +393,7 @@ void subversionCore::switchTree( const KURL &path, const KURL &repositUrl, s << recurse << revNum << revKind; SimpleJob * job = TDEIO::special(servURL, parms, false); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); initProcessDlg( (TDEIO::Job*)job, repositUrl.prettyURL() , path.prettyURL() ); } @@ -408,7 +408,7 @@ void subversionCore::switchRelocate( const KURL &path, s << cmd << path << currentUrl << newUrl << recurse; SimpleJob * job = TDEIO::special(servURL, parms, false); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); // this doesn't contact repository } @@ -423,7 +423,7 @@ void subversionCore::svnCopy( const KURL &src, int srcRev, const TQString &srcRe s << cmd << src << srcRev << srcRevKind << dest; SimpleJob * job = TDEIO::special(servURL, parms, false); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); initProcessDlg( (TDEIO::Job*)job, src.prettyURL(), dest.prettyURL() ); } @@ -440,7 +440,7 @@ void subversionCore::merge( const KURL &src1, int rev1, TQString revKind1, s << recurse << ignore_ancestry << force << dry_run; SimpleJob * job = TDEIO::special(servURL, parms, false); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); initProcessDlg( (TDEIO::Job*)job, src1.prettyURL() + "\n" + src2.prettyURL() , wc_path.prettyURL() ); } @@ -722,10 +722,10 @@ void subversionCore::initProcessDlg( TDEIO::Job *job, const TQString &src, const progress->setSourceUrl( src ); progress->setDestUrl( dest ); progress->setJob( job ); - connect( job, TQT_SIGNAL( totalSize(TDEIO::Job*, TDEIO::filesize_t) ), - progress, TQT_SLOT( slotTotalSize (TDEIO::Job*, TDEIO::filesize_t) ) ); - connect( job, TQT_SIGNAL( processedSize(TDEIO::Job*, TDEIO::filesize_t) ), - progress, TQT_SLOT( slotProcessedSize(TDEIO::Job*, TDEIO::filesize_t) ) ); + connect( job, TQ_SIGNAL( totalSize(TDEIO::Job*, TDEIO::filesize_t) ), + progress, TQ_SLOT( slotTotalSize (TDEIO::Job*, TDEIO::filesize_t) ) ); + connect( job, TQ_SIGNAL( processedSize(TDEIO::Job*, TDEIO::filesize_t) ), + progress, TQ_SLOT( slotProcessedSize(TDEIO::Job*, TDEIO::filesize_t) ) ); } void subversionCore::createNewProject( const TQString& // dirName diff --git a/vcs/subversion/subversion_core.h b/vcs/subversion/subversion_core.h index f2f3f6da..e67f845f 100644 --- a/vcs/subversion/subversion_core.h +++ b/vcs/subversion/subversion_core.h @@ -39,7 +39,7 @@ class SvnLogViewWidget; // class subversionCore : public TQObject, public DCOPObject class subversionCore : public TQObject { - Q_OBJECT + TQ_OBJECT // K_DCOP diff --git a/vcs/subversion/subversion_fileinfo.cpp b/vcs/subversion/subversion_fileinfo.cpp index 45d44d1e..f845c035 100644 --- a/vcs/subversion/subversion_fileinfo.cpp +++ b/vcs/subversion/subversion_fileinfo.cpp @@ -155,7 +155,7 @@ bool SVNFileInfoProvider::requestStatus( const TQString &dirPath, void *callerDa s << cmd << KURL( TQFileInfo( rPath ).absFilePath() ) << checkRepos << recursive; KURL servURL = "kdevsvn+http://fakeserver_this_is_normal_behavior/"; job = TDEIO::special(servURL, parms, false); - connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotResult( TDEIO::Job * ) ) ); + connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ), this, TQ_SLOT( slotResult( TDEIO::Job * ) ) ); if( checkRepos ) m_part->svncore()->initProcessDlg( job, dirPath, i18n("Subversion File/Directory Status") ); return true; diff --git a/vcs/subversion/subversion_fileinfo.h b/vcs/subversion/subversion_fileinfo.h index 9b322463..b41bb0b1 100644 --- a/vcs/subversion/subversion_fileinfo.h +++ b/vcs/subversion/subversion_fileinfo.h @@ -36,7 +36,7 @@ Provider for SVN file information */ class SVNFileInfoProvider : public KDevVCSFileInfoProvider, public DCOPObject/*, virtual public DCOPClient*/ { - Q_OBJECT + TQ_OBJECT // K_DCOP diff --git a/vcs/subversion/subversion_part.cpp b/vcs/subversion/subversion_part.cpp index f3f43cd9..be5f2b24 100644 --- a/vcs/subversion/subversion_part.cpp +++ b/vcs/subversion/subversion_part.cpp @@ -56,15 +56,15 @@ using namespace SvnGlobal; -static const KDevPluginInfo data("kdevsubversion"); +static const KDevPluginInfo pluginData("kdevsubversion"); typedef KDevGenericFactory<subversionPart> subversionFactory; -K_EXPORT_COMPONENT_FACTORY( libkdevsubversion, subversionFactory( data ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevsubversion, subversionFactory( pluginData ) ) //bool g_projectWasJustCreated = false; subversionPart::subversionPart(TQObject *parent, const char *name, const TQStringList& ) - : KDevVersionControl(&data, parent, name ? name : "Subversion" ) { + : KDevVersionControl(&pluginData, parent, name ? name : "Subversion" ) { setInstance(subversionFactory::instance()); m_projWidget = 0; @@ -74,14 +74,14 @@ subversionPart::subversionPart(TQObject *parent, const char *name, const TQStrin setupActions(); - connect( m_impl, TQT_SIGNAL(checkoutFinished(TQString)), TQT_SIGNAL(finishedFetching(TQString)) ); + connect( m_impl, TQ_SIGNAL(checkoutFinished(TQString)), TQ_SIGNAL(finishedFetching(TQString)) ); // Context menu - connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); - connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); - connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) ); - connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) ); - connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(slotProjectClosed()) ); + connect( core(), TQ_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQ_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); + connect( core(), TQ_SIGNAL(projectConfigWidget(KDialogBase*)), this, TQ_SLOT(projectConfigWidget(KDialogBase*)) ); + connect( core(), TQ_SIGNAL(stopButtonClicked(KDevPlugin*)), this, TQ_SLOT(slotStopButtonClicked(KDevPlugin*)) ); + connect( core(), TQ_SIGNAL(projectOpened()), this, TQ_SLOT(slotProjectOpened()) ); + connect( core(), TQ_SIGNAL(projectClosed()), this, TQ_SLOT(slotProjectClosed()) ); m_impl->processWidget()->setCaption(i18n( "Subversion Output" )); mainWindow()->embedOutputView( (TQWidget*)m_impl->processWidget(), i18n( "Subversion" ), i18n( "Subversion messages" ) ); @@ -98,65 +98,65 @@ subversionPart::~subversionPart() { } void subversionPart::setupActions() { - actionCommit = new TDEAction( i18n("&Commit to Repository..."), 0, this, TQT_SLOT(slotActionCommit()), actionCollection(), "subversion_commit" ); + actionCommit = new TDEAction( i18n("&Commit to Repository..."), 0, this, TQ_SLOT(slotActionCommit()), actionCollection(), "subversion_commit" ); actionCommit->setToolTip( i18n("Commit file(s)") ); actionCommit->setWhatsThis( i18n("<b>Commit file(s)</b><p>Commits file to repository if modified.") ); - /* actionDiff = new TDEAction( i18n("&Difference Between Revisions"), 0, this, TQT_SLOT(slotActionDiff()), + /* actionDiff = new TDEAction( i18n("&Difference Between Revisions"), 0, this, TQ_SLOT(slotActionDiff()), actionCollection(), "subversion_diff" ); actionDiff->setToolTip( i18n("Build difference") ); actionDiff->setWhatsThis( i18n("<b>Build difference</b><p>Builds difference between releases.") ); */ - actionAdd = new TDEAction( i18n("&Add to Repository"), 0, this, TQT_SLOT(slotActionAdd()), actionCollection(), "subversion_add" ); + actionAdd = new TDEAction( i18n("&Add to Repository"), 0, this, TQ_SLOT(slotActionAdd()), actionCollection(), "subversion_add" ); actionAdd->setToolTip( i18n("Add file to repository") ); actionAdd->setWhatsThis( i18n("<b>Add file to repository</b><p>Adds file to repository.") ); - actionLog = new TDEAction( i18n("Show logs..."), 0, this, TQT_SLOT(slotLog()), actionCollection(), "subversion_log" ); - actionBlame = new TDEAction( i18n("Blame..."), 0, this, TQT_SLOT(slotBlame()), actionCollection(), "subversion_blame"); + actionLog = new TDEAction( i18n("Show logs..."), 0, this, TQ_SLOT(slotLog()), actionCollection(), "subversion_log" ); + actionBlame = new TDEAction( i18n("Blame..."), 0, this, TQ_SLOT(slotBlame()), actionCollection(), "subversion_blame"); - actionRemove = new TDEAction( i18n("&Remove From Repository"), 0, this, TQT_SLOT(slotActionDel()), actionCollection(), "subversion_remove" ); + actionRemove = new TDEAction( i18n("&Remove From Repository"), 0, this, TQ_SLOT(slotActionDel()), actionCollection(), "subversion_remove" ); actionRemove->setToolTip( i18n("Remove from repository") ); actionRemove->setWhatsThis( i18n("<b>Remove from repository</b><p>Removes file(s) from repository.") ); - actionUpdate = new TDEAction( i18n("&Update"), 0, this, TQT_SLOT(slotActionUpdate()), actionCollection(), "subversion_update" ); + actionUpdate = new TDEAction( i18n("&Update"), 0, this, TQ_SLOT(slotActionUpdate()), actionCollection(), "subversion_update" ); actionUpdate->setToolTip( i18n("Update") ); actionUpdate->setWhatsThis( i18n("<b>Update</b><p>Updates file(s) from repository.") ); - actionDiffLocal = new TDEAction( i18n("&Diff to BASE"), 0, this, TQT_SLOT(slotActionDiffLocal()), actionCollection(), "subversion_diff_local" ); + actionDiffLocal = new TDEAction( i18n("&Diff to BASE"), 0, this, TQ_SLOT(slotActionDiffLocal()), actionCollection(), "subversion_diff_local" ); actionDiffLocal->setToolTip( i18n("Diff to BASE") ); actionDiffLocal->setWhatsThis( i18n("<b>Diff to disk</b><p>Diff current file to the BASE checked out copy.") ); - actionDiffHead = new TDEAction( i18n("&Diff to HEAD"), 0, this, TQT_SLOT(slotActionDiffLocal()), actionCollection(), "subversion_diff_head" ); + actionDiffHead = new TDEAction( i18n("&Diff to HEAD"), 0, this, TQ_SLOT(slotActionDiffLocal()), actionCollection(), "subversion_diff_head" ); actionDiffHead->setToolTip( i18n("Diff to HEAD") ); actionDiffHead->setWhatsThis( i18n("<b>Diff HEAD</b><p>Diff the current file to HEAD in svn.") ); - actionRevert = new TDEAction( i18n("&Revert"), 0, this, TQT_SLOT(slotActionRevert()), actionCollection(), "subversion_revert" ); + actionRevert = new TDEAction( i18n("&Revert"), 0, this, TQ_SLOT(slotActionRevert()), actionCollection(), "subversion_revert" ); actionRevert->setToolTip( i18n("Revert") ); actionRevert->setWhatsThis( i18n("<b>Revert</b><p>Undo local changes.") ); /* actionAddToIgnoreList = new TDEAction( i18n("&Ignore in Subversion Operations"), 0, - this, TQT_SLOT(slotActionAddToIgnoreList()), actionCollection(), "subversion_ignore" ); + this, TQ_SLOT(slotActionAddToIgnoreList()), actionCollection(), "subversion_ignore" ); actionAddToIgnoreList->setToolTip( i18n("Ignore in Subversion operations") ); actionAddToIgnoreList->setWhatsThis( i18n("<b>Ignore in Subversion operations</b><p>Ignores file(s).") ); actionRemoveFromIgnoreList = new TDEAction( i18n("Do &Not Ignore in Subversion Operations"), 0, - this, TQT_SLOT(slotActionRemoveFromIgnoreList()), actionCollection(), "subversion_donot_ignore" ); + this, TQ_SLOT(slotActionRemoveFromIgnoreList()), actionCollection(), "subversion_donot_ignore" ); actionRemoveFromIgnoreList->setToolTip( i18n("Do not ignore in Subversion operations") ); actionRemoveFromIgnoreList->setWhatsThis( i18n("<b>Do not ignore in Subversion operations</b><p>Do not ignore file(s).") ); */ actionResolve = new TDEAction( i18n("Re&solve Conflicting State"), 0, - this, TQT_SLOT(slotActionResolve()), actionCollection(), "subversion_resolve" ); + this, TQ_SLOT(slotActionResolve()), actionCollection(), "subversion_resolve" ); actionResolve->setToolTip( i18n("Resolve the conflicting state of a file after a merge") ); actionResolve->setWhatsThis( i18n("<b>Resolve the conflicting state</b><p>Remove the conflict state that can be set on a file after a merge failed.") ); actionSwitch = new TDEAction( i18n("Switch this working copy to URL.."), 0, - this, TQT_SLOT(slotSwitch()), actionCollection(), "subversion_switch" ); + this, TQ_SLOT(slotSwitch()), actionCollection(), "subversion_switch" ); // warn slogCopy(), slotMerge only works on context menu. There is no main-menu action actionCopy = new TDEAction( i18n("Copy this working copy to URL.."), 0, - this, TQT_SLOT(slotCopy()), actionCollection(), "subversion_copy" ); + this, TQ_SLOT(slotCopy()), actionCollection(), "subversion_copy" ); actionMerge = new TDEAction( i18n("Merge difference to working copy"), 0, - this, TQT_SLOT(slotMerge()), actionCollection(), "subversion_merge" ); + this, TQ_SLOT(slotMerge()), actionCollection(), "subversion_merge" ); } TQWidget* subversionPart::newProjectWidget( TQWidget* parent ) { @@ -213,48 +213,48 @@ if(!project()) if (context->hasType( Context::FileContext )) popup->insertSeparator(); - int id = subMenu->insertItem( actionCommit->text(), this, TQT_SLOT(slotCommit()) ); + int id = subMenu->insertItem( actionCommit->text(), this, TQ_SLOT(slotCommit()) ); // CvsService let to do log and diff operations only on one file (or directory) at time /* if (m_urls.count() == 1) { - subMenu->insertItem( actionDiff->text(), this, TQT_SLOT(slotDiff()) ); - subMenu->insertItem( actionLog->text(), this, TQT_SLOT(slotLog()) ); + subMenu->insertItem( actionDiff->text(), this, TQ_SLOT(slotDiff()) ); + subMenu->insertItem( actionLog->text(), this, TQ_SLOT(slotLog()) ); }*/ subMenu->setWhatsThis(id, i18n("<b>Commit file(s)</b><p>Commits file to repository if modified.")); - id = subMenu->insertItem( actionAdd->text(), this, TQT_SLOT(slotAdd()) ); + id = subMenu->insertItem( actionAdd->text(), this, TQ_SLOT(slotAdd()) ); subMenu->setWhatsThis(id, i18n("<b>Add file to repository</b><p>Adds file to repository.")); - id = subMenu->insertItem( actionRemove->text(), this, TQT_SLOT(slotDel()) ); + id = subMenu->insertItem( actionRemove->text(), this, TQ_SLOT(slotDel()) ); subMenu->setWhatsThis(id, i18n("<b>Remove from repository</b><p>Removes file(s) from repository.")); - id = subMenu->insertItem( actionLog->text(), this, TQT_SLOT(slotLog()) ); + id = subMenu->insertItem( actionLog->text(), this, TQ_SLOT(slotLog()) ); subMenu->setWhatsThis(id, i18n("<b>Show logs..</b><p>View Logs")); - id = subMenu->insertItem( actionBlame->text(), this, TQT_SLOT(slotBlame()) ); + id = subMenu->insertItem( actionBlame->text(), this, TQ_SLOT(slotBlame()) ); subMenu->setWhatsThis(id, i18n("<b>Blame 0:HEAD </b><p>Show Annotate")); subMenu->insertSeparator(); - id = subMenu->insertItem( actionDiffLocal->text(), this, TQT_SLOT(slotDiffLocal()) ); + id = subMenu->insertItem( actionDiffLocal->text(), this, TQ_SLOT(slotDiffLocal()) ); subMenu->setWhatsThis(id, i18n("<b>Diff</b><p>Diff file to local disk.")); - id = subMenu->insertItem( actionDiffHead->text(), this, TQT_SLOT(slotDiffHead()) ); + id = subMenu->insertItem( actionDiffHead->text(), this, TQ_SLOT(slotDiffHead()) ); subMenu->setWhatsThis(id, i18n("<b>Diff</b><p>Diff file to repository.")); - id = subMenu->insertItem( actionUpdate->text(), this, TQT_SLOT(slotUpdate()) ); + id = subMenu->insertItem( actionUpdate->text(), this, TQ_SLOT(slotUpdate()) ); subMenu->setWhatsThis(id, i18n("<b>Update</b><p>Updates file(s) from repository.")); - id = subMenu->insertItem( actionRevert->text(), this, TQT_SLOT(slotRevert()) ); + id = subMenu->insertItem( actionRevert->text(), this, TQ_SLOT(slotRevert()) ); subMenu->setWhatsThis(id, i18n("<b>Revert</b><p>Undo local changes.") ); - id = subMenu->insertItem( actionResolve->text(), this, TQT_SLOT(slotResolve()) ); + id = subMenu->insertItem( actionResolve->text(), this, TQ_SLOT(slotResolve()) ); subMenu->setWhatsThis(id, i18n("<b>Resolve</b><p>Resolve conflicting state.") ); - id = subMenu->insertItem( actionSwitch->text(), this, TQT_SLOT(slotSwitch()) ); + id = subMenu->insertItem( actionSwitch->text(), this, TQ_SLOT(slotSwitch()) ); subMenu->setWhatsThis(id, i18n("<b>Switch</b><p>Switch working tree.") ); - id = subMenu->insertItem( actionCopy->text(), this, TQT_SLOT(slotCopy()) ); + id = subMenu->insertItem( actionCopy->text(), this, TQ_SLOT(slotCopy()) ); subMenu->setWhatsThis(id, i18n("<b>Copy</b><p>Copy from/between path/URLs") ); - id = subMenu->insertItem( actionMerge->text(), this, TQT_SLOT(slotMerge()) ); + id = subMenu->insertItem( actionMerge->text(), this, TQ_SLOT(slotMerge()) ); subMenu->setWhatsThis(id, i18n("<b>Merge</b><p>Merge difference to working copy") ); /* subMenu->insertSeparator(); - id = subMenu->insertItem( actionAddToIgnoreList->text(), this, TQT_SLOT(slotAddToIgnoreList()) ); + id = subMenu->insertItem( actionAddToIgnoreList->text(), this, TQ_SLOT(slotAddToIgnoreList()) ); subMenu->setWhatsThis(id, i18n("<b>Ignore in Subversion operations</b><p>Ignores file(s).")); - id = subMenu->insertItem( actionRemoveFromIgnoreList->text(), this, TQT_SLOT(slotRemoveFromIgnoreList()) ); + id = subMenu->insertItem( actionRemoveFromIgnoreList->text(), this, TQ_SLOT(slotRemoveFromIgnoreList()) ); subMenu->setWhatsThis(id, i18n("<b>Do not ignore in Subversion operations</b><p>Do not ignore file(s).")); */ // Now insert in parent menu @@ -529,16 +529,16 @@ void subversionPart::slotProjectOpened() { } */ //loadOptions(); /// \FIXME slots - //connect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList&)), this, TQT_SLOT(slotAddFilesToProject(const TQStringList &)) ); - //connect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList&)), this, TQT_SLOT(slotRemovedFilesFromProject(const TQStringList &)) ); + //connect( project(), TQ_SIGNAL(addedFilesToProject(const TQStringList&)), this, TQ_SLOT(slotAddFilesToProject(const TQStringList &)) ); + //connect( project(), TQ_SIGNAL(removedFilesFromProject(const TQStringList&)), this, TQ_SLOT(slotRemovedFilesFromProject(const TQStringList &)) ); } void subversionPart::slotProjectClosed() { kdDebug(9036) << "subversion :projectClosed" << endl; //saveOptions(); /// \FIXME slots - //disconnect( project(), TQT_SIGNAL(addedFilesToProject(const TQStringList&)), this, TQT_SLOT(slotAddFilesToProject(const TQStringList &)) ); - //disconnect( project(), TQT_SIGNAL(removedFilesFromProject(const TQStringList&)), this, TQT_SLOT(slotRemovedFilesFromProject(const TQStringList &)) ); + //disconnect( project(), TQ_SIGNAL(addedFilesToProject(const TQStringList&)), this, TQ_SLOT(slotAddFilesToProject(const TQStringList &)) ); + //disconnect( project(), TQ_SIGNAL(removedFilesFromProject(const TQStringList&)), this, TQ_SLOT(slotRemovedFilesFromProject(const TQStringList &)) ); } void subversionPart::savePartialProjectSession(TQDomElement* dom) { diff --git a/vcs/subversion/subversion_part.h b/vcs/subversion/subversion_part.h index 1847567d..12289623 100644 --- a/vcs/subversion/subversion_part.h +++ b/vcs/subversion/subversion_part.h @@ -38,7 +38,7 @@ class SvnInfoHolder; class subversionPart : public KDevVersionControl { - Q_OBJECT + TQ_OBJECT public: diff --git a/vcs/subversion/subversion_widget.cpp b/vcs/subversion/subversion_widget.cpp index 95b31f6b..8cedf78f 100644 --- a/vcs/subversion/subversion_widget.cpp +++ b/vcs/subversion/subversion_widget.cpp @@ -39,7 +39,7 @@ subversionWidget::subversionWidget( subversionPart *part, TQWidget *parent, cons m_closeButton = new TQPushButton( tab() ); m_closeButton->setText( i18n("Close") ); tab()->setCornerWidget(m_closeButton); - connect( m_closeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(closeCurrentTab()) ); + connect( m_closeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(closeCurrentTab()) ); } subversionWidget::~subversionWidget() diff --git a/vcs/subversion/subversion_widget.h b/vcs/subversion/subversion_widget.h index d59f8394..a987dc84 100644 --- a/vcs/subversion/subversion_widget.h +++ b/vcs/subversion/subversion_widget.h @@ -40,7 +40,7 @@ class TQPushButton; // class subversionWidget : public SvnOutputWidgetBase class subversionWidget : public KTabWidget { - Q_OBJECT + TQ_OBJECT public: subversionWidget(subversionPart *part, TQWidget *parent, const char* name); diff --git a/vcs/subversion/subversiondiff.ui b/vcs/subversion/subversiondiff.ui index a624e6bb..5d92a4bb 100644 --- a/vcs/subversion/subversiondiff.ui +++ b/vcs/subversion/subversiondiff.ui @@ -74,9 +74,6 @@ <property name="text"> <string>&OK</string> </property> - <property name="accel"> - <string></string> - </property> <property name="autoDefault"> <bool>true</bool> </property> diff --git a/vcs/subversion/svn_blamewidget.cpp b/vcs/subversion/svn_blamewidget.cpp index 87647525..78f09102 100644 --- a/vcs/subversion/svn_blamewidget.cpp +++ b/vcs/subversion/svn_blamewidget.cpp @@ -99,8 +99,8 @@ SvnBlameFileSelectDlg::SvnBlameFileSelectDlg( TQWidget *parent ) m_layout->addWidget( m_okBtn, 1, 0 ); m_layout->addWidget( m_cancelBtn, 1, 1 ); - connect( m_okBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); - connect( m_cancelBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) ); + connect( m_okBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(accept()) ); + connect( m_cancelBtn, TQ_SIGNAL(clicked()), this, TQ_SLOT(reject()) ); } SvnBlameFileSelectDlg::~SvnBlameFileSelectDlg() {} diff --git a/vcs/subversion/svn_blamewidget.h b/vcs/subversion/svn_blamewidget.h index c0ea42af..19f14238 100644 --- a/vcs/subversion/svn_blamewidget.h +++ b/vcs/subversion/svn_blamewidget.h @@ -39,7 +39,7 @@ public: class TQListView; class SvnBlameWidget : public TQWidget { - Q_OBJECT + TQ_OBJECT public: SvnBlameWidget( TQWidget * parent = 0, const char * name = 0, bool modal = FALSE, WFlags f = 0 ); @@ -55,7 +55,7 @@ protected: }; class SvnBlameFileSelectDlg : public TQDialog { - Q_OBJECT + TQ_OBJECT public: SvnBlameFileSelectDlg( TQWidget *parent = 0L ); diff --git a/vcs/subversion/svn_commitdlgbase.ui b/vcs/subversion/svn_commitdlgbase.ui index 75937324..465f171b 100644 --- a/vcs/subversion/svn_commitdlgbase.ui +++ b/vcs/subversion/svn_commitdlgbase.ui @@ -70,9 +70,6 @@ <property name="text"> <string>Keep Locks</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQLayoutWidget" row="2" column="2"> <property name="name"> @@ -107,9 +104,6 @@ <property name="text"> <string>Recursive</string> </property> - <property name="accel"> - <string></string> - </property> </widget> </grid> </widget> diff --git a/vcs/subversion/svn_copywidget.cpp b/vcs/subversion/svn_copywidget.cpp index 30b25fd7..094b9684 100644 --- a/vcs/subversion/svn_copywidget.cpp +++ b/vcs/subversion/svn_copywidget.cpp @@ -13,10 +13,10 @@ SvnCopyDialog::SvnCopyDialog( const TQString &reqPath, SvnGlobal::SvnInfoHolder { reqEdit->setText( reqPath ); - connect( urlRadio, TQT_SIGNAL(clicked()), this, TQT_SLOT(setSourceAsUrl()) ); - connect( pathRadio, TQT_SIGNAL(clicked()), this, TQT_SLOT(setSourceAsLocalPath()) ); - connect( revnumRadio, TQT_SIGNAL(toggled(bool)), revnumInput, TQT_SLOT(setEnabled(bool)) ); - connect( revnumRadio, TQT_SIGNAL(toggled(bool)), revkindCombo, TQT_SLOT(setDisabled(bool)) ); + connect( urlRadio, TQ_SIGNAL(clicked()), this, TQ_SLOT(setSourceAsUrl()) ); + connect( pathRadio, TQ_SIGNAL(clicked()), this, TQ_SLOT(setSourceAsLocalPath()) ); + connect( revnumRadio, TQ_SIGNAL(toggled(bool)), revnumInput, TQ_SLOT(setEnabled(bool)) ); + connect( revnumRadio, TQ_SIGNAL(toggled(bool)), revkindCombo, TQ_SLOT(setDisabled(bool)) ); // In many cases, users copy from reository to repository. This is for making tag/branche. // The case where copying from local path to repository may be lesser than the above one. diff --git a/vcs/subversion/svn_copywidget.h b/vcs/subversion/svn_copywidget.h index 8dd9826f..1d03fa99 100644 --- a/vcs/subversion/svn_copywidget.h +++ b/vcs/subversion/svn_copywidget.h @@ -11,7 +11,7 @@ class KURL; class SvnCopyDialog : public SvnCopyDialogBase { - Q_OBJECT + TQ_OBJECT public: SvnCopyDialog( const TQString &reqPath, SvnGlobal::SvnInfoHolder *holder, TQWidget *parent ); diff --git a/vcs/subversion/svn_fileselectdlg_commit.h b/vcs/subversion/svn_fileselectdlg_commit.h index a2cf07e7..94ed2a54 100644 --- a/vcs/subversion/svn_fileselectdlg_commit.h +++ b/vcs/subversion/svn_fileselectdlg_commit.h @@ -32,7 +32,7 @@ class subversionPart; class SVNFileSelectDlgCommit : public SvnCommitDlgBase{ -Q_OBJECT +TQ_OBJECT public: diff --git a/vcs/subversion/svn_logviewoptiondlgbase.ui b/vcs/subversion/svn_logviewoptiondlgbase.ui index 25ed4987..45b34a95 100644 --- a/vcs/subversion/svn_logviewoptiondlgbase.ui +++ b/vcs/subversion/svn_logviewoptiondlgbase.ui @@ -34,9 +34,6 @@ <property name="text"> <string>Do not show logs before branching point</string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQButtonGroup" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> diff --git a/vcs/subversion/svn_logviewwidget.cpp b/vcs/subversion/svn_logviewwidget.cpp index 10e55a9f..ac9b982b 100644 --- a/vcs/subversion/svn_logviewwidget.cpp +++ b/vcs/subversion/svn_logviewwidget.cpp @@ -44,7 +44,7 @@ SvnLogViewWidget::SvnLogViewWidget(subversionPart *part, TQWidget *parent) m_layout = new TQGridLayout( this, 1, 1, 11, 6, "SvnLogViewWidgetBaseLayout"); splitter1 = new TQSplitter( this, "splitter1" ); - splitter1->setOrientation( Qt::Horizontal ); + splitter1->setOrientation( TQt::Horizontal ); splitter1->setMargin(1); listView1 = new TQListView( splitter1, "listView1" ); @@ -64,7 +64,7 @@ SvnLogViewWidget::SvnLogViewWidget(subversionPart *part, TQWidget *parent) TQFont textEdit1_font( textEdit1->font() ); textEdit1_font.setPointSize( 9 ); textEdit1->setFont( textEdit1_font ); - textEdit1->setFocusPolicy( TQ_WheelFocus ); + textEdit1->setFocusPolicy( TQWidget::WheelFocus ); textEdit1->setReadOnly( TRUE ); m_layout->addWidget( splitter1, 0, 0 ); @@ -73,9 +73,9 @@ SvnLogViewWidget::SvnLogViewWidget(subversionPart *part, TQWidget *parent) resize( TQSize(692, 343).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); - connect( listView1, TQT_SIGNAL(clicked( TQListViewItem *)), this, TQT_SLOT(slotClicked(TQListViewItem*)) ); - connect( listView1, TQT_SIGNAL(contextMenuRequested( TQListViewItem*, const TQPoint&, int )), - this, TQT_SLOT(contextMenuRequested(TQListViewItem*, const TQPoint&, int)) ); + connect( listView1, TQ_SIGNAL(clicked( TQListViewItem *)), this, TQ_SLOT(slotClicked(TQListViewItem*)) ); + connect( listView1, TQ_SIGNAL(contextMenuRequested( TQListViewItem*, const TQPoint&, int )), + this, TQ_SLOT(contextMenuRequested(TQListViewItem*, const TQPoint&, int)) ); } SvnLogViewWidget::~SvnLogViewWidget() { @@ -128,8 +128,8 @@ void SvnLogViewWidget::contextMenuRequested( TQListViewItem *item, const TQPoint if( !m_ctxLogItem ) return; TQPopupMenu *menu = new TQPopupMenu(this); - menu->insertItem( i18n("Blame this revision"), this, TQT_SLOT(blameThis()) ); - menu->insertItem( i18n("Difference to previous revision"), this, TQT_SLOT(diffToPrevious()) ); + menu->insertItem( i18n("Blame this revision"), this, TQ_SLOT(blameThis()) ); + menu->insertItem( i18n("Difference to previous revision"), this, TQ_SLOT(diffToPrevious()) ); menu->exec( pos ); } void SvnLogViewWidget::blameThis() @@ -195,10 +195,10 @@ SvnLogViewOptionDlg::SvnLogViewOptionDlg( TQWidget *parent, const char* name, bo radio4->setChecked(true); //start revistion by revision keyword radio5->setChecked(true); //end revision by revision number reinstallRevisionSpecifiers(); - connect( intInput1, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setStartRevnumRadio()) ); - connect( comboBox1, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(setStartRevkindRadio()) ); - connect( intInput2, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(setEndRevnumRadio()) ); - connect( comboBox2, TQT_SIGNAL(activated(const TQString&)), this, TQT_SLOT(setEndRevkindRadio()) ); + connect( intInput1, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setStartRevnumRadio()) ); + connect( comboBox1, TQ_SIGNAL(activated(const TQString&)), this, TQ_SLOT(setStartRevkindRadio()) ); + connect( intInput2, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(setEndRevnumRadio()) ); + connect( comboBox2, TQ_SIGNAL(activated(const TQString&)), this, TQ_SLOT(setEndRevkindRadio()) ); } SvnLogViewOptionDlg::~SvnLogViewOptionDlg() {} diff --git a/vcs/subversion/svn_logviewwidget.h b/vcs/subversion/svn_logviewwidget.h index acd9b1f0..c3f94bec 100644 --- a/vcs/subversion/svn_logviewwidget.h +++ b/vcs/subversion/svn_logviewwidget.h @@ -46,7 +46,7 @@ class SvnLogHolder{ }; class SvnLogViewWidget : public /*SvnLogViewWidgetBase*/ TQWidget { - Q_OBJECT + TQ_OBJECT public: SvnLogViewWidget(subversionPart *part, TQWidget *parent); @@ -73,7 +73,7 @@ private: }; class SvnLogViewOptionDlg : public SvnLogViewOptionDlgBase { - Q_OBJECT + TQ_OBJECT public: SvnLogViewOptionDlg(TQWidget *parent=0, const char* name=0, bool modal=TRUE, WFlags f=0); diff --git a/vcs/subversion/svn_mergewidget.cpp b/vcs/subversion/svn_mergewidget.cpp index 50731690..5885e6b7 100644 --- a/vcs/subversion/svn_mergewidget.cpp +++ b/vcs/subversion/svn_mergewidget.cpp @@ -33,10 +33,10 @@ SvnMergeDialog::SvnMergeDialog( const KURL &wcTarget, TQWidget *parent ) { dest->setURL( wcTarget.prettyURL() ); - connect( revnumbtn1, TQT_SIGNAL(toggled(bool)), revnum1, TQT_SLOT(setEnabled(bool)) ); - connect( revnumbtn1, TQT_SIGNAL(toggled(bool)), revkind1, TQT_SLOT(setDisabled(bool)) ); - connect( revnumbtn2, TQT_SIGNAL(toggled(bool)), revnum2, TQT_SLOT(setEnabled(bool)) ); - connect( revnumbtn2, TQT_SIGNAL(toggled(bool)), revkind2, TQT_SLOT(setDisabled(bool)) ); + connect( revnumbtn1, TQ_SIGNAL(toggled(bool)), revnum1, TQ_SLOT(setEnabled(bool)) ); + connect( revnumbtn1, TQ_SIGNAL(toggled(bool)), revkind1, TQ_SLOT(setDisabled(bool)) ); + connect( revnumbtn2, TQ_SIGNAL(toggled(bool)), revnum2, TQ_SLOT(setEnabled(bool)) ); + connect( revnumbtn2, TQ_SIGNAL(toggled(bool)), revkind2, TQ_SLOT(setDisabled(bool)) ); revkind1->setDisabled(true); revnum2->setDisabled(true); } diff --git a/vcs/subversion/svn_mergewidget.h b/vcs/subversion/svn_mergewidget.h index 34439e58..8513beac 100644 --- a/vcs/subversion/svn_mergewidget.h +++ b/vcs/subversion/svn_mergewidget.h @@ -31,7 +31,7 @@ class KURL; class SvnMergeDialog : public SvnMergeOptionDialogBase { - Q_OBJECT + TQ_OBJECT public: SvnMergeDialog( const KURL &wcTarget, TQWidget *parent = NULL ); diff --git a/vcs/subversion/svn_switchdlgbase.ui b/vcs/subversion/svn_switchdlgbase.ui index b1811858..9a4e9c38 100644 --- a/vcs/subversion/svn_switchdlgbase.ui +++ b/vcs/subversion/svn_switchdlgbase.ui @@ -196,9 +196,9 @@ <slot>accept()</slot> </connection> </connections> -<Q_SLOTS> +<slots> <slot>Form1_destroyed( TQObject * )</slot> -</Q_SLOTS> +</slots> <layoutdefaults spacing="6" margin="11"/> <includes> <include location="global" impldecl="in implementation">klineedit.h</include> diff --git a/vcs/subversion/svn_switchwidget.cpp b/vcs/subversion/svn_switchwidget.cpp index 7149cce2..490d20b7 100644 --- a/vcs/subversion/svn_switchwidget.cpp +++ b/vcs/subversion/svn_switchwidget.cpp @@ -11,8 +11,8 @@ SvnSwitchDlg::SvnSwitchDlg( const SvnGlobal::SvnInfoHolder *holder, : SvnSwitchDlgBase( parent ) , m_info( holder ) { - connect( switchOnlyRadio, TQT_SIGNAL(clicked()), this, TQT_SLOT(resetCurrentRepositoryUrlEdit()) ); - connect( relocationRadio , TQT_SIGNAL(clicked()), this, TQT_SLOT(resetCurrentRepositoryUrlEdit()) ); + connect( switchOnlyRadio, TQ_SIGNAL(clicked()), this, TQ_SLOT(resetCurrentRepositoryUrlEdit()) ); + connect( relocationRadio , TQ_SIGNAL(clicked()), this, TQ_SLOT(resetCurrentRepositoryUrlEdit()) ); // set switch only switchOnlyRadio->setChecked( true ); wcUrlEdit->setText( wcPath ); diff --git a/vcs/subversion/svn_switchwidget.h b/vcs/subversion/svn_switchwidget.h index 4aec67db..0d207657 100644 --- a/vcs/subversion/svn_switchwidget.h +++ b/vcs/subversion/svn_switchwidget.h @@ -10,7 +10,7 @@ namespace SvnGlobal class SvnSwitchDlg : public SvnSwitchDlgBase { - Q_OBJECT + TQ_OBJECT public: SvnSwitchDlg( const SvnGlobal::SvnInfoHolder *holder, diff --git a/vcs/subversion/svn_tdeio.cpp b/vcs/subversion/svn_tdeio.cpp index 80343d8c..24959c37 100644 --- a/vcs/subversion/svn_tdeio.cpp +++ b/vcs/subversion/svn_tdeio.cpp @@ -1801,7 +1801,7 @@ svn_error_t *tdeio_svnProtocol::clientCertSSLPrompt( // kdWarning()<<" Communication with dcop failed - fail to get certfile "<<endl; // return SVN_NO_ERROR; // } -// if (replyType != TQSTRING_OBJECT_NAME_STRING) { +// if (replyType != "TQString") { // kdWarning()<<" unexpected reply type "<<endl; // return SVN_NO_ERROR; // } @@ -1918,7 +1918,7 @@ svn_error_t *tdeio_svnProtocol::commitLogPrompt( const char **log_msg, const cha return err; } - if ( replyType != TQSTRING_OBJECT_NAME_STRING ) { + if ( replyType != "TQString" ) { kdWarning() << "Unexpected reply type" << endl; svn_error_t *err = svn_error_create( SVN_ERR_EXTERNAL_PROGRAM, NULL, apr_pstrdup( pool, "Fail to call kded_kdevsvnd via DCOP." ) ); @@ -2186,7 +2186,7 @@ void tdeio_svnProtocol::wc_resolve( const KURL& wc, bool recurse ) { extern "C" { - KDE_EXPORT int kdemain(int argc, char **argv) { + TDE_EXPORT int kdemain(int argc, char **argv) { TDEInstance instance( "tdeio_kdevsvn" ); kdDebug(9036) << "*** Starting tdeio_kdevsvn " << endl; diff --git a/vcs/subversion/svnssltrustpromptbase.ui b/vcs/subversion/svnssltrustpromptbase.ui index fc72c0d5..26e70c41 100644 --- a/vcs/subversion/svnssltrustpromptbase.ui +++ b/vcs/subversion/svnssltrustpromptbase.ui @@ -26,9 +26,6 @@ <property name="text"> <string></string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQListView" row="1" column="0" rowspan="1" colspan="3"> <column> @@ -64,9 +61,6 @@ <property name="text"> <string></string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQPushButton" row="2" column="1"> <property name="name"> @@ -75,9 +69,6 @@ <property name="text"> <string></string> </property> - <property name="accel"> - <string></string> - </property> </widget> <widget class="TQLabel" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> |