diff options
Diffstat (limited to 'vcs')
106 files changed, 2032 insertions, 2032 deletions
diff --git a/vcs/clearcase/clearcasefileinfoprovider.cpp b/vcs/clearcase/clearcasefileinfoprovider.cpp index 66dec0c8..8d43d48d 100644 --- a/vcs/clearcase/clearcasefileinfoprovider.cpp +++ b/vcs/clearcase/clearcasefileinfoprovider.cpp @@ -14,14 +14,14 @@ #include "kdevversioncontrol.h" #include <kprocess.h> -#include <qapplication.h> +#include <tqapplication.h> ClearcaseFileinfoProvider::ClearcaseFileinfoProvider(ClearcasePart *parent) : KDevVCSFileInfoProvider( (KDevVersionControl*) parent, "clearcasefileinfoprovider") { vcsInfo_ = NULL; - connect(parent, SIGNAL(statusReady(const VCSFileInfoMap&, void*)), SIGNAL(triggerUpdate(const VCSFileInfoMap&, void*))); + connect(parent, TQT_SIGNAL(statusReady(const VCSFileInfoMap&, void*)), TQT_SIGNAL(triggerUpdate(const VCSFileInfoMap&, void*))); kdevVCS_ = parent; } @@ -32,7 +32,7 @@ ClearcaseFileinfoProvider::~ClearcaseFileinfoProvider() } -const VCSFileInfoMap* ClearcaseFileinfoProvider::status( const QString &dirPath ) { +const VCSFileInfoMap* ClearcaseFileinfoProvider::status( const TQString &dirPath ) { if (curDirPath_ == dirPath) return vcsInfo_; @@ -45,7 +45,7 @@ const VCSFileInfoMap* ClearcaseFileinfoProvider::status( const QString &dirPath return vcsInfo_; } -bool ClearcaseFileinfoProvider::requestStatus( const QString &dirPath, void *callerData, bool recursive, bool checkRepos ) { +bool ClearcaseFileinfoProvider::requestStatus( const TQString &dirPath, void *callerData, bool recursive, bool checkRepos ) { VCSFileInfoMap* vcsDirInfos = ccManipulator_.retreiveFilesInfos(dirPath); @@ -58,9 +58,9 @@ bool ClearcaseFileinfoProvider::requestStatus( const QString &dirPath, void *cal -QStringList ClearcaseFileinfoProvider::registeredEntryList() const +TQStringList ClearcaseFileinfoProvider::registeredEntryList() const { - QStringList l; + TQStringList l; return l; } diff --git a/vcs/clearcase/clearcasefileinfoprovider.h b/vcs/clearcase/clearcasefileinfoprovider.h index b716d01b..24d38c2a 100644 --- a/vcs/clearcase/clearcasefileinfoprovider.h +++ b/vcs/clearcase/clearcasefileinfoprovider.h @@ -28,20 +28,20 @@ public: virtual ~ClearcaseFileinfoProvider(); // -- Sync interface - const VCSFileInfoMap *status( const QString &dirPath ) ; + const VCSFileInfoMap *status( const TQString &dirPath ) ; // -- Async interface for requesting data - bool requestStatus( const QString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true ); + bool requestStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true ); private: - QStringList registeredEntryList() const; + TQStringList registeredEntryList() const; private: ClearcaseManipulator ccManipulator_; - QString curDirPath_; + TQString curDirPath_; VCSFileInfoMap* vcsInfo_; ClearcasePart* kdevVCS_; diff --git a/vcs/clearcase/clearcasemanipulator.cpp b/vcs/clearcase/clearcasemanipulator.cpp index c51436ba..5c9563f9 100644 --- a/vcs/clearcase/clearcasemanipulator.cpp +++ b/vcs/clearcase/clearcasemanipulator.cpp @@ -13,8 +13,8 @@ #include <kprocess.h> -#include <qregexp.h> -#include <qstring.h> +#include <tqregexp.h> +#include <tqstring.h> #include <stdlib.h> #include <libgen.h> @@ -78,15 +78,15 @@ ClearcaseManipulator::~ClearcaseManipulator() {} -bool ClearcaseManipulator::isCCRepository( const QString & directory ) { - QString cmd; +bool ClearcaseManipulator::isCCRepository( const TQString & directory ) { + TQString cmd; cmd = "cd " + directory + " && cleartool pwv -root"; if ( system(cmd.ascii()) == 0 ) return true; return false; } -VCSFileInfoMap* ClearcaseManipulator::retreiveFilesInfos(const QString& directory) { +VCSFileInfoMap* ClearcaseManipulator::retreiveFilesInfos(const TQString& directory) { VCSFileInfoMap* fileInfoMap = new VCSFileInfoMap(); @@ -104,9 +104,9 @@ VCSFileInfoMap* ClearcaseManipulator::retreiveFilesInfos(const QString& director int pos = 0; int lastPos = -1; - QStringList outputList; - outputList = outputList.split(CT_DESC_SEPARATOR, QString(line), true ); - outputList[Name] = QString(basename((char*)outputList[Name].ascii())); + TQStringList outputList; + outputList = outputList.split(CT_DESC_SEPARATOR, TQString(line), true ); + outputList[Name] = TQString(basename((char*)outputList[Name].ascii())); VCSFileInfo::FileState state; if (outputList[ClearcaseManipulator::State] == "unreserved" || outputList[ClearcaseManipulator::State] == "reserved") { diff --git a/vcs/clearcase/clearcasemanipulator.h b/vcs/clearcase/clearcasemanipulator.h index baa7c17f..0cb795e3 100644 --- a/vcs/clearcase/clearcasemanipulator.h +++ b/vcs/clearcase/clearcasemanipulator.h @@ -16,7 +16,7 @@ #include <kprocess.h> -#include <qregexp.h> +#include <tqregexp.h> #include <string> @@ -29,9 +29,9 @@ class ClearcaseManipulator { ~ClearcaseManipulator(); - static bool isCCRepository(const QString& directory); + static bool isCCRepository(const TQString& directory); - VCSFileInfoMap* retreiveFilesInfos(const QString& directory); + VCSFileInfoMap* retreiveFilesInfos(const TQString& directory); private: enum FileInfosFields { diff --git a/vcs/clearcase/clearcasepart.cpp b/vcs/clearcase/clearcasepart.cpp index 6c11a4a6..198cc1db 100644 --- a/vcs/clearcase/clearcasepart.cpp +++ b/vcs/clearcase/clearcasepart.cpp @@ -12,8 +12,8 @@ #include "clearcasepart.h" #include "commentdlg.h" -#include <qfileinfo.h> -#include <qpopupmenu.h> +#include <tqfileinfo.h> +#include <tqpopupmenu.h> #include <kpopupmenu.h> #include <kdebug.h> @@ -42,7 +42,7 @@ static const KDevPluginInfo data("kdevclearcase"); typedef KDevGenericFactory<ClearcasePart> ClearcaseFactory; K_EXPORT_COMPONENT_FACTORY( libkdevclearcase, ClearcaseFactory( data ) ) -ClearcasePart::ClearcasePart( QObject *parent, const char *name, const QStringList & ) +ClearcasePart::ClearcasePart( TQObject *parent, const char *name, const TQStringList & ) : KDevVersionControl( &data, parent, name ? name : "ClearcasePart" ), default_checkin(""), default_checkout(""), @@ -60,8 +60,8 @@ ClearcasePart::ClearcasePart( QObject *parent, const char *name, const QStringLi fileInfoProvider_ = new ClearcaseFileinfoProvider(this); setInstance(ClearcaseFactory::instance()); - connect( core(), SIGNAL(contextMenu(QPopupMenu *, const Context *)), - this, SLOT(contextMenu(QPopupMenu *, const Context *)) ); + connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); } ClearcasePart::~ClearcasePart() @@ -69,45 +69,45 @@ ClearcasePart::~ClearcasePart() -bool ClearcasePart::isValidDirectory(const QString &dirPath) const { +bool ClearcasePart::isValidDirectory(const TQString &dirPath) const { return isValidCCDirectory_; } -void ClearcasePart::contextMenu(QPopupMenu *popup, const Context *context) +void ClearcasePart::contextMenu(TQPopupMenu *popup, const Context *context) { if (context->hasType( Context::FileContext )) { const FileContext *fcontext = static_cast<const FileContext*>(context); popupfile_ = fcontext->urls().first().path(); - QFileInfo fi(popupfile_); + TQFileInfo fi(popupfile_); popup->insertSeparator(); KPopupMenu *sub = new KPopupMenu(popup); - QString name = fi.fileName(); + TQString name = fi.fileName(); sub->insertTitle( i18n("Actions for %1").arg(name) ); sub->insertItem( i18n("Checkin"), - this, SLOT(slotCheckin()) ); + this, TQT_SLOT(slotCheckin()) ); sub->insertItem( i18n("Checkout"), - this, SLOT(slotCheckout()) ); + this, TQT_SLOT(slotCheckout()) ); sub->insertItem( i18n("Uncheckout"), - this, SLOT(slotUncheckout()) ); + this, TQT_SLOT(slotUncheckout()) ); sub->insertSeparator(); sub->insertItem( i18n("Create Element"), - this, SLOT(slotCreate()) ); + this, TQT_SLOT(slotCreate()) ); sub->insertItem( i18n("Remove Element"), - this, SLOT(slotRemove()) ); + this, TQT_SLOT(slotRemove()) ); sub->insertSeparator(); sub->insertItem( i18n("History"), - this, SLOT(slotListHistory()) ); + this, TQT_SLOT(slotListHistory()) ); sub->insertSeparator(); sub->insertItem( i18n("Diff"), - this, SLOT(slotDiff()) ); + this, TQT_SLOT(slotDiff()) ); sub->insertSeparator(); sub->insertItem( i18n("List Checkouts"), - this, SLOT(slotListCheckouts()) ); + this, TQT_SLOT(slotListCheckouts()) ); popup->insertItem(i18n("Clearcase"), sub); @@ -120,23 +120,23 @@ void ClearcasePart::contextMenu(QPopupMenu *popup, const Context *context) void ClearcasePart::slotCheckin() { - QString dir, name; - QFileInfo fi(popupfile_); + TQString dir, name; + TQFileInfo fi(popupfile_); dir = fi.dirPath(); name = fi.fileName(); CcaseCommentDlg dlg(FALSE); - if (dlg.exec() == QDialog::Rejected) + if (dlg.exec() == TQDialog::Rejected) return; - QDomDocument &dom = *this->projectDom(); - QString message = DomUtil::readEntry(dom,"/kdevclearcase/checkin_options",default_checkin); + TQDomDocument &dom = *this->projectDom(); + TQString message = DomUtil::readEntry(dom,"/kdevclearcase/checkin_options",default_checkin); if(dlg.logMessage().isEmpty()) message += "-nc "; else message += "-c \"" + dlg.logMessage() + "\""; - QString command("cd "); + TQString command("cd "); command += KShellProcess::quote(dir); command += " && "; command += " cleartool checkin "; @@ -151,17 +151,17 @@ void ClearcasePart::slotCheckin() void ClearcasePart::slotCheckout() { - QString dir, name; - QFileInfo fi(popupfile_); + TQString dir, name; + TQFileInfo fi(popupfile_); dir = fi.dirPath(); name = fi.fileName(); CcaseCommentDlg dlg(TRUE); - if (dlg.exec() == QDialog::Rejected) + if (dlg.exec() == TQDialog::Rejected) return; - QDomDocument &dom = *this->projectDom(); - QString message = DomUtil::readEntry(dom,"/kdevclearcase/checkout_options",default_checkout); + TQDomDocument &dom = *this->projectDom(); + TQString message = DomUtil::readEntry(dom,"/kdevclearcase/checkout_options",default_checkout); if(!dlg.isReserved()) message += "-unres "; if(dlg.logMessage().isEmpty()) @@ -169,7 +169,7 @@ void ClearcasePart::slotCheckout() else message += "-c \"" + dlg.logMessage() + "\""; - QString command("cd "); + TQString command("cd "); command += KShellProcess::quote(dir); command += " && cleartool checkout "; command += message; @@ -185,14 +185,14 @@ void ClearcasePart::slotCheckout() void ClearcasePart::slotUncheckout() { - QString dir, name; - QFileInfo fi(popupfile_); + TQString dir, name; + TQFileInfo fi(popupfile_); dir = fi.dirPath(); name = fi.fileName(); - QDomDocument &dom = *this->projectDom(); + TQDomDocument &dom = *this->projectDom(); - QString command("cd "); + TQString command("cd "); command += KShellProcess::quote(dir); command += " && cleartool uncheckout "; command += DomUtil::readEntry(dom,"/kdevclearcase/uncheckout_options",default_uncheckout); @@ -207,16 +207,16 @@ void ClearcasePart::slotUncheckout() void ClearcasePart::slotCreate() { - QFileInfo fi(popupfile_); - QString dir = fi.dirPath(); - QString name = fi.fileName(); + TQFileInfo fi(popupfile_); + TQString dir = fi.dirPath(); + TQString name = fi.fileName(); - QDomDocument &dom = *this->projectDom(); + TQDomDocument &dom = *this->projectDom(); // Checking whether current directory is checked out or not is cumbersome so skip it for now - QString command("cd "); + TQString command("cd "); command += KShellProcess::quote(dir); - QFileInfo di(dir); + TQFileInfo di(dir); if(!di.isWritable()) { // Work-around to check if directory is checked out command += " && cleartool co -unres -nc "; command += KShellProcess::quote(dir); @@ -237,15 +237,15 @@ void ClearcasePart::slotCreate() void ClearcasePart::slotRemove() { - QFileInfo fi(popupfile_); - QString dir = fi.dirPath(); - QString name = fi.fileName(); + TQFileInfo fi(popupfile_); + TQString dir = fi.dirPath(); + TQString name = fi.fileName(); - QDomDocument &dom = *this->projectDom(); + TQDomDocument &dom = *this->projectDom(); - QString command("cd "); + TQString command("cd "); command += KShellProcess::quote(dir); - QFileInfo di(dir); + TQFileInfo di(dir); if(!di.isWritable()) { // Work-around to check if directory is checked out command += " && cleartool co -unres -nc "; command += KShellProcess::quote(dir); @@ -263,16 +263,16 @@ void ClearcasePart::slotRemove() void ClearcasePart::slotListHistory() { - QFileInfo fi(popupfile_); - QString dir = fi.dirPath(); - QString name = fi.fileName(); - QStringList args; - QStringList env; - QString str; + TQFileInfo fi(popupfile_); + TQString dir = fi.dirPath(); + TQString name = fi.fileName(); + TQStringList args; + TQStringList env; + TQString str; - QDomDocument &dom = *this->projectDom(); + TQDomDocument &dom = *this->projectDom(); - QString command("cd "); + TQString command("cd "); command += KShellProcess::quote(dir); command += " && cleartool lshistory "; command += DomUtil::readEntry(dom, "/kdevclearcase/lshistory_options", default_lshistory); @@ -285,31 +285,31 @@ void ClearcasePart::slotListHistory() void ClearcasePart::slotDiff() { - QFileInfo fi(popupfile_); - QString dir = fi.dirPath(); - QString name = fi.fileName(); - QStringList args; - QStringList env; - QString str; + TQFileInfo fi(popupfile_); + TQString dir = fi.dirPath(); + TQString name = fi.fileName(); + TQStringList args; + TQStringList env; + TQString str; - QDomDocument &dom = *this->projectDom(); + TQDomDocument &dom = *this->projectDom(); args << "diff"; str = DomUtil::readEntry(dom,"/kdevclearcase/diff_options",default_diff); if (str.length()) { - QStringList list = QStringList::split(' ',str); - for(QStringList::Iterator it = list.begin(); it != list.end(); ++it) args << *it; + TQStringList list = TQStringList::split(' ',str); + for(TQStringList::Iterator it = list.begin(); it != list.end(); ++it) args << *it; } args << name; ExecCommand* cmv = new ExecCommand( "cleartool", args, dir, env, this ); - connect( cmv, SIGNAL(finished( const QString&, const QString& )), - this, SLOT(slotDiffFinished( const QString&, const QString& )) ); + connect( cmv, TQT_SIGNAL(finished( const TQString&, const TQString& )), + this, TQT_SLOT(slotDiffFinished( const TQString&, const TQString& )) ); } -void ClearcasePart::slotDiffFinished( const QString& diff, const QString& err ) +void ClearcasePart::slotDiffFinished( const TQString& diff, const TQString& err ) { if ( diff.isNull() && err.isNull() ) { kdDebug(9000) << "clearcase diff canceled" << endl; @@ -323,7 +323,7 @@ void ClearcasePart::slotDiffFinished( const QString& diff, const QString& err ) if ( !err.isEmpty() ) { int s = KMessageBox::warningContinueCancelList( 0, i18n("Clearcase outputted errors during diff. Do you still want to continue?"), - QStringList::split( "\n", err, false ), i18n("Errors During Diff") ); + TQStringList::split( "\n", err, false ), i18n("Errors During Diff") ); if ( s != KMessageBox::Continue ) return; } @@ -339,17 +339,17 @@ void ClearcasePart::slotDiffFinished( const QString& diff, const QString& err ) void ClearcasePart::slotListCheckouts() { - QString dir; - QFileInfo fi(popupfile_); + TQString dir; + TQFileInfo fi(popupfile_); if (fi.isDir()) { dir = fi.absFilePath(); } else { dir = fi.dirPath(); } - QDomDocument &dom = *this->projectDom(); + TQDomDocument &dom = *this->projectDom(); - QString command("cd "); + TQString command("cd "); command += KShellProcess::quote(dir); command += " && cleartool lsco "; command += DomUtil::readEntry(dom, "/kdevclearcase/lscheckout_options", default_lscheckout); diff --git a/vcs/clearcase/clearcasepart.h b/vcs/clearcase/clearcasepart.h index 2f82b61d..f6d8cd39 100644 --- a/vcs/clearcase/clearcasepart.h +++ b/vcs/clearcase/clearcasepart.h @@ -21,25 +21,25 @@ class ClearcasePart : public KDevVersionControl { Q_OBJECT public: - ClearcasePart( QObject *parent, const char *name, const QStringList & ); + ClearcasePart( TQObject *parent, const char *name, const TQStringList & ); ~ClearcasePart(); - const QString default_checkin; - const QString default_checkout; - const QString default_uncheckout; - const QString default_create; - const QString default_remove; - const QString default_lshistory; - const QString default_lscheckout; - const QString default_diff; + const TQString default_checkin; + const TQString default_checkout; + const TQString default_uncheckout; + const TQString default_create; + const TQString default_remove; + const TQString default_lshistory; + const TQString default_lscheckout; + const TQString default_diff; - virtual void createNewProject(const QString& dir) {} + virtual void createNewProject(const TQString& dir) {} virtual bool fetchFromRepository() { return true; } virtual KDevVCSFileInfoProvider *fileInfoProvider() const { return fileInfoProvider_; } - virtual bool isValidDirectory(const QString &dirPath) const; + virtual bool isValidDirectory(const TQString &dirPath) const; private slots: - void contextMenu(QPopupMenu *popup, const Context *context); + void contextMenu(TQPopupMenu *popup, const Context *context); void slotCheckin(); void slotCheckout(); @@ -48,7 +48,7 @@ private slots: void slotCreate(); void slotRemove(); void slotDiff(); - void slotDiffFinished( const QString& diff, const QString& err ); + void slotDiffFinished( const TQString& diff, const TQString& err ); void slotListHistory(); void slotListCheckouts(); @@ -56,8 +56,8 @@ private slots: private: bool isValidCCDirectory_; - QString popupfile_; - QString viewname; + TQString popupfile_; + TQString viewname; KDevVCSFileInfoProvider *fileInfoProvider_; }; diff --git a/vcs/clearcase/commentdlg.cpp b/vcs/clearcase/commentdlg.cpp index 36b3bc6f..df9fc10b 100644 --- a/vcs/clearcase/commentdlg.cpp +++ b/vcs/clearcase/commentdlg.cpp @@ -11,9 +11,9 @@ #include "commentdlg.h" -#include <qlayout.h> -#include <qlabel.h> -#include <qpushbutton.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqpushbutton.h> #include <kapplication.h> #include <kbuttonbox.h> #include <klocale.h> @@ -21,33 +21,33 @@ #include <kstdguiitem.h> CcaseCommentDlg::CcaseCommentDlg(bool bCheckin) - : QDialog(0, "", true) + : TQDialog(0, "", true) { setCaption( i18n("Clearcase Comment") ); - QBoxLayout *layout = new QVBoxLayout(this, 10); + TQBoxLayout *layout = new TQVBoxLayout(this, 10); - QLabel *messagelabel = new QLabel(i18n("Enter log message:"), this); + TQLabel *messagelabel = new TQLabel(i18n("Enter log message:"), this); messagelabel->setMinimumSize(messagelabel->sizeHint()); layout->addWidget(messagelabel, 0); - _edit = new QMultiLineEdit(this); - QFontMetrics fm(_edit->fontMetrics()); + _edit = new TQMultiLineEdit(this); + TQFontMetrics fm(_edit->fontMetrics()); _edit->setMinimumSize(fm.width("0")*40, fm.lineSpacing()*3); layout->addWidget(_edit, 10); - QBoxLayout *layout2 = new QHBoxLayout(layout); + TQBoxLayout *layout2 = new TQHBoxLayout(layout); if(bCheckin) { - _check = new QCheckBox(i18n("Reserve"), this); + _check = new TQCheckBox(i18n("Reserve"), this); layout2->addWidget(_check); } KButtonBox *buttonbox = new KButtonBox(this); buttonbox->addStretch(); - QPushButton *ok = buttonbox->addButton(KStdGuiItem::ok()); - QPushButton *cancel = buttonbox->addButton(KStdGuiItem::cancel()); - connect(ok, SIGNAL(clicked()), SLOT(accept()) ); - connect(cancel, SIGNAL(clicked()), SLOT(reject()) ); + 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()) ); ok->setDefault(true); buttonbox->layout(); layout2->addWidget(buttonbox, 0); diff --git a/vcs/clearcase/commentdlg.h b/vcs/clearcase/commentdlg.h index 8ac50a38..953a9a4e 100644 --- a/vcs/clearcase/commentdlg.h +++ b/vcs/clearcase/commentdlg.h @@ -12,21 +12,21 @@ #ifndef _CLEARCASECOMMENTDLG_H_ #define _CLEARCASECOMMENTDLG_H_ -#include <qcheckbox.h> -#include <qdialog.h> -#include <qmultilineedit.h> +#include <tqcheckbox.h> +#include <tqdialog.h> +#include <tqmultilineedit.h> class CcaseCommentDlg : public QDialog { Q_OBJECT public: CcaseCommentDlg(bool = FALSE); - QString logMessage() { return _edit->text(); }; + TQString logMessage() { return _edit->text(); }; bool isReserved() { return (_check) ? _check->isChecked() : FALSE; }; private: - QMultiLineEdit *_edit; - QCheckBox* _check; + TQMultiLineEdit *_edit; + TQCheckBox* _check; }; #endif diff --git a/vcs/clearcase/integrator/ccintegratordlg.cpp b/vcs/clearcase/integrator/ccintegratordlg.cpp index 51ab6f0d..8e89cf94 100644 --- a/vcs/clearcase/integrator/ccintegratordlg.cpp +++ b/vcs/clearcase/integrator/ccintegratordlg.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include "ccintegratordlg.h" -CCIntegratorDlg::CCIntegratorDlg(QWidget *parent, const char *name) +CCIntegratorDlg::CCIntegratorDlg(TQWidget *parent, const char *name) :CCIntegratorDlgBase(parent, name) { } @@ -28,11 +28,11 @@ void CCIntegratorDlg::accept() { } -void CCIntegratorDlg::init(const QString &/*projectName*/, const QString &/*projectLocation*/) +void CCIntegratorDlg::init(const TQString &/*projectName*/, const TQString &/*projectLocation*/) { } -QWidget *CCIntegratorDlg::self() +TQWidget *CCIntegratorDlg::self() { return const_cast<CCIntegratorDlg*>(this); } diff --git a/vcs/clearcase/integrator/ccintegratordlg.h b/vcs/clearcase/integrator/ccintegratordlg.h index 04cbb62b..bbb23955 100644 --- a/vcs/clearcase/integrator/ccintegratordlg.h +++ b/vcs/clearcase/integrator/ccintegratordlg.h @@ -26,11 +26,11 @@ class CCIntegratorDlg: public CCIntegratorDlgBase, public VCSDialog { Q_OBJECT public: - CCIntegratorDlg(QWidget *parent = 0, const char *name = 0); + CCIntegratorDlg(TQWidget *parent = 0, const char *name = 0); virtual void accept(); - virtual void init(const QString &projectName, const QString &projectLocation); - virtual QWidget *self(); + virtual void init(const TQString &projectName, const TQString &projectLocation); + virtual TQWidget *self(); }; #endif diff --git a/vcs/clearcase/integrator/clearcaseintegrator.cpp b/vcs/clearcase/integrator/clearcaseintegrator.cpp index c99c5c3e..4e8c1a0b 100644 --- a/vcs/clearcase/integrator/clearcaseintegrator.cpp +++ b/vcs/clearcase/integrator/clearcaseintegrator.cpp @@ -28,8 +28,8 @@ static const KDevPluginInfo data("kdevclearcaseintegrator"); typedef KDevGenericFactory<ClearcaseIntegrator> ClearcaseIntegratorFactory; K_EXPORT_COMPONENT_FACTORY( libclearcaseintegrator, ClearcaseIntegratorFactory(data) ) -ClearcaseIntegrator::ClearcaseIntegrator(QObject* parent, const char* name, - const QStringList // args +ClearcaseIntegrator::ClearcaseIntegrator(TQObject* parent, const char* name, + const TQStringList // args ) :KDevVCSIntegrator(parent, name) { @@ -39,13 +39,13 @@ ClearcaseIntegrator::~ClearcaseIntegrator() { } -VCSDialog* ClearcaseIntegrator::fetcher(QWidget* // parent +VCSDialog* ClearcaseIntegrator::fetcher(TQWidget* // parent ) { return 0; } -VCSDialog* ClearcaseIntegrator::integrator(QWidget* parent) +VCSDialog* ClearcaseIntegrator::integrator(TQWidget* parent) { CCIntegratorDlg *dlg = new CCIntegratorDlg(parent); return dlg; diff --git a/vcs/clearcase/integrator/clearcaseintegrator.h b/vcs/clearcase/integrator/clearcaseintegrator.h index a306bd70..385f1976 100644 --- a/vcs/clearcase/integrator/clearcaseintegrator.h +++ b/vcs/clearcase/integrator/clearcaseintegrator.h @@ -22,17 +22,17 @@ #include <kdevvcsintegrator.h> -#include <qstringlist.h> +#include <tqstringlist.h> class ClearcaseIntegrator : public KDevVCSIntegrator { Q_OBJECT public: - ClearcaseIntegrator(QObject* parent, const char* name, const QStringList args = QStringList()); + ClearcaseIntegrator(TQObject* parent, const char* name, const TQStringList args = TQStringList()); ~ClearcaseIntegrator(); - virtual VCSDialog* fetcher(QWidget* parent); - virtual VCSDialog* integrator(QWidget* parent); + virtual VCSDialog* fetcher(TQWidget* parent); + virtual VCSDialog* integrator(TQWidget* parent); }; diff --git a/vcs/cvsservice/annotatedialog.cpp b/vcs/cvsservice/annotatedialog.cpp index 08d0f24f..2937b2bb 100644 --- a/vcs/cvsservice/annotatedialog.cpp +++ b/vcs/cvsservice/annotatedialog.cpp @@ -9,9 +9,9 @@ * * ***************************************************************************/ -#include <qvbox.h> -#include <qdir.h> -#include <qstringlist.h> +#include <tqvbox.h> +#include <tqdir.h> +#include <tqstringlist.h> #include <kmessagebox.h> #include <klocale.h> @@ -23,18 +23,18 @@ #include "annotatedialog.h" #include "annotatepage.h" -AnnotateDialog::AnnotateDialog( CvsService_stub *cvsService, QWidget *parent, const char *name, int ) +AnnotateDialog::AnnotateDialog( CvsService_stub *cvsService, TQWidget *parent, const char *name, int ) : KDialogBase( Tabbed, i18n("CVS Annotate Dialog"), Close, Close, parent, name? name : "annotateformdialog", false /*modal*/, true /*separator*/ ), m_cvsService( cvsService ) { setWFlags( getWFlags() | WDestructiveClose ); - QVBox *vbox = addVBoxPage( i18n("Annotate") ); + TQVBox *vbox = addVBoxPage( i18n("Annotate") ); m_cvsAnnotatePage = new AnnotatePage( m_cvsService, vbox ); - connect( m_cvsAnnotatePage, SIGNAL(requestAnnotate(const QString)), - this, SLOT(slotAnnotate(const QString)) ); + connect( m_cvsAnnotatePage, TQT_SIGNAL(requestAnnotate(const TQString)), + this, TQT_SLOT(slotAnnotate(const TQString)) ); } AnnotateDialog::~AnnotateDialog() @@ -42,7 +42,7 @@ AnnotateDialog::~AnnotateDialog() kdDebug(9006) << "AnnotateDialog::~AnnotateDialog()" << endl; } -void AnnotateDialog::startFirstAnnotate( const QString pathName, const QString revision ) +void AnnotateDialog::startFirstAnnotate( const TQString pathName, const TQString revision ) { kdDebug(9006) << "AnnotateDialog::startFirstAnnotate() pathName = " << pathName << "revision = " << revision << endl; @@ -53,16 +53,16 @@ void AnnotateDialog::startFirstAnnotate( const QString pathName, const QString r m_cvsAnnotatePage->startAnnotate( pathName, revision ); } -void AnnotateDialog::slotAnnotate(const QString rev) +void AnnotateDialog::slotAnnotate(const TQString rev) { - kdDebug(9006) << "AnnotateDialog::slotAnnotate(QString) revision = " << rev << endl; + kdDebug(9006) << "AnnotateDialog::slotAnnotate(TQString) revision = " << rev << endl; - QVBox *vbox = addVBoxPage( i18n("Annotate")+" "+rev ); + TQVBox *vbox = addVBoxPage( i18n("Annotate")+" "+rev ); AnnotatePage * page = new AnnotatePage( m_cvsService, vbox ); page->startAnnotate(m_pathName, rev); - connect( page, SIGNAL(requestAnnotate(const QString)), - this, SLOT(slotAnnotate(const QString)) ); + connect( page, TQT_SIGNAL(requestAnnotate(const TQString)), + this, TQT_SLOT(slotAnnotate(const TQString)) ); } #include "annotatedialog.moc" diff --git a/vcs/cvsservice/annotatedialog.h b/vcs/cvsservice/annotatedialog.h index 7fea14f1..c887264d 100644 --- a/vcs/cvsservice/annotatedialog.h +++ b/vcs/cvsservice/annotatedialog.h @@ -31,7 +31,7 @@ class AnnotateDialog : public KDialogBase { Q_OBJECT public: - AnnotateDialog( CvsService_stub *cvsService, QWidget *parent=0, const char *name=0, int flags=0 ); + AnnotateDialog( CvsService_stub *cvsService, TQWidget *parent=0, const char *name=0, int flags=0 ); virtual ~AnnotateDialog(); /** @@ -45,7 +45,7 @@ public: * * @param pathName The file for which to run cvs annotate */ - void startFirstAnnotate( const QString pathName, const QString revision = "" ); + void startFirstAnnotate( const TQString pathName, const TQString revision = "" ); private slots: /** @@ -53,10 +53,10 @@ private slots: * The output gets shown in a new page. * @param rev The revision which will be annotated */ - void slotAnnotate(const QString rev); + void slotAnnotate(const TQString rev); private: - QString m_pathName; + TQString m_pathName; AnnotatePage *m_cvsAnnotatePage; CvsService_stub *m_cvsService; diff --git a/vcs/cvsservice/annotatepage.cpp b/vcs/cvsservice/annotatepage.cpp index fea16ece..71918304 100644 --- a/vcs/cvsservice/annotatepage.cpp +++ b/vcs/cvsservice/annotatepage.cpp @@ -9,11 +9,11 @@ * * ***************************************************************************/ -#include <qlayout.h> -#include <qregexp.h> -#include <qstringlist.h> -#include <qdatetime.h> -#include <qlabel.h> +#include <tqlayout.h> +#include <tqregexp.h> +#include <tqstringlist.h> +#include <tqdatetime.h> +#include <tqlabel.h> #include <kmessagebox.h> #include <kcursor.h> @@ -32,20 +32,20 @@ #include "annotatepage.h" #include "annotateview.h" -AnnotatePage::AnnotatePage( CvsService_stub *cvsService, QWidget *parent, const char *name, int ) +AnnotatePage::AnnotatePage( CvsService_stub *cvsService, TQWidget *parent, const char *name, int ) : DCOPObject( "CvsAnnotatePageDCOPIface" ), - QWidget( parent, name? name : "annotateformpage" ), + TQWidget( parent, name? name : "annotateformpage" ), m_cvsService( cvsService ), m_cvsAnnotateJob( 0 ) { kdDebug(9006) << "AnnotatePage::AnnotatePage()" << endl; - QLayout *dialogLayout = new QVBoxLayout( this ); + TQLayout *dialogLayout = new TQVBoxLayout( this ); //First create the top-line where user can choose a revision - QWidget * LayoutWidget = new QWidget( this ); - QHBoxLayout * AnnotateLayout = new QHBoxLayout( LayoutWidget ); + TQWidget * LayoutWidget = new TQWidget( this ); + TQHBoxLayout * AnnotateLayout = new TQHBoxLayout( LayoutWidget ); - QLabel * lblRevision = new QLabel( LayoutWidget ); + TQLabel * lblRevision = new TQLabel( LayoutWidget ); AnnotateLayout->addWidget( lblRevision ); lblRevision->setText( tr( "Revision:" ) ); @@ -55,14 +55,14 @@ AnnotatePage::AnnotatePage( CvsService_stub *cvsService, QWidget *parent, const m_btnAnnotate = new KPushButton( LayoutWidget ); AnnotateLayout->addWidget( m_btnAnnotate ); m_btnAnnotate->setText( tr( "&Annotate" ) ); - m_btnAnnotate->setAccel( QKeySequence( tr( "Alt+A" ) ) ); + m_btnAnnotate->setAccel( TQKeySequence( tr( "Alt+A" ) ) ); dialogLayout->add( LayoutWidget ); - connect( m_btnAnnotate, SIGNAL(clicked()), - this, SLOT(slotNewAnnotate()) ); - connect( m_leRevision, SIGNAL( returnPressed() ), - m_btnAnnotate, SLOT( setFocus() ) ); + connect( m_btnAnnotate, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotNewAnnotate()) ); + connect( m_leRevision, TQT_SIGNAL( returnPressed() ), + m_btnAnnotate, TQT_SLOT( setFocus() ) ); //Nest create the AnnotateView; it will do the actual displaying m_annotateView = new AnnotateView(this, "annotateview"); @@ -76,7 +76,7 @@ AnnotatePage::~AnnotatePage() delete m_cvsAnnotateJob; } -void AnnotatePage::startAnnotate( const QString pathName, const QString revision ) +void AnnotatePage::startAnnotate( const TQString pathName, const TQString revision ) { kdDebug(9006) << "AnnotatePage::startAnnotate() pathName = " << pathName << "revision = " << revision << endl; @@ -90,7 +90,7 @@ void AnnotatePage::startAnnotate( const QString pathName, const QString revision // establish connections to the signals of the cvs m_job connectDCOPSignal( job.app(), job.obj(), "jobExited(bool, int)", "slotJobExited(bool, int)", true ); - connectDCOPSignal( job.app(), job.obj(), "receivedStdout(QString)", "slotReceivedOutput(QString)", true ); + connectDCOPSignal( job.app(), job.obj(), "receivedStdout(TQString)", "slotReceivedOutput(TQString)", true ); //clear both the outputbuffer and the AnnotateView m_output = ""; @@ -111,19 +111,19 @@ void AnnotatePage::slotJobExited( bool normalExit, int exitStatus ) } //split the collected output and pass the lines to the parser function - QStringList lines = QStringList::split("\n", m_output); + TQStringList lines = TQStringList::split("\n", m_output); parseAnnotateOutput(lines); } -void AnnotatePage::slotReceivedOutput( QString someOutput ) +void AnnotatePage::slotReceivedOutput( TQString someOutput ) { - kdDebug(9006) << "AnnotatePage::slotReceivedOutput(QString)" << endl; + kdDebug(9006) << "AnnotatePage::slotReceivedOutput(TQString)" << endl; m_output += someOutput; } -void AnnotatePage::slotReceivedErrors( QString ) +void AnnotatePage::slotReceivedErrors( TQString ) { - kdDebug(9006) << "AnnotatePage::slotReceivedErrors(QString)" << endl; + kdDebug(9006) << "AnnotatePage::slotReceivedErrors(TQString)" << endl; } void AnnotatePage::cancel() @@ -132,22 +132,22 @@ void AnnotatePage::cancel() m_cvsAnnotateJob->cancel(); } -void AnnotatePage::parseAnnotateOutput(QStringList& lines) +void AnnotatePage::parseAnnotateOutput(TQStringList& lines) { - kdDebug(9006) << "AnnotatePage::parseAnnotateOutput(QStringList)" << endl; + kdDebug(9006) << "AnnotatePage::parseAnnotateOutput(TQStringList)" << endl; /** * First we need to parse the output of "cvs log" which the dcop-interface delivers * everytime annotate is requested. - * The QMap m_comments stores the revisions together with the matching comments. + * The TQMap m_comments stores the revisions together with the matching comments. * The comments will be passed to the AnnotateView in order to display them as QToolTip */ - QString line, comment, rev; + TQString line, comment, rev; enum { Begin, Tags, Admin, Revision, Author, Branches, Comment, Finished } state; - QStringList::Iterator it = lines.begin(); + TQStringList::Iterator it = lines.begin(); state = Begin; do { @@ -187,7 +187,7 @@ void AnnotatePage::parseAnnotateOutput(QStringList& lines) else if( line == "=============================================================================" ) state = Finished; if( state == Comment ) - comment += QString("\n") + line; + comment += TQString("\n") + line; else m_comments[rev] = comment; break; @@ -214,18 +214,18 @@ void AnnotatePage::parseAnnotateOutput(QStringList& lines) } ++it; - QString author, content; - QString oldRevision = ""; //we always store the last revision to recognice... + TQString author, content; + TQString oldRevision = ""; //we always store the last revision to recognice... bool changeColor = false; //...when the AnnotateView needs to change the coloring - QDateTime logDate; + TQDateTime logDate; do { line = *it; //the log date should be printed according to the user's global setting - //so we pass it as QDateTime to the AnnotateView below - QString dateString = line.mid(23, 9); + //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); diff --git a/vcs/cvsservice/annotatepage.h b/vcs/cvsservice/annotatepage.h index 2a062804..b6a52b66 100644 --- a/vcs/cvsservice/annotatepage.h +++ b/vcs/cvsservice/annotatepage.h @@ -13,9 +13,9 @@ #define ANNOTATEPAGE_H #include "cvsservicedcopIface.h" -#include <qwidget.h> -#include <qmap.h> -#include <qlistview.h> +#include <tqwidget.h> +#include <tqmap.h> +#include <tqlistview.h> class CvsJob_stub; class CvsService_stub; @@ -34,7 +34,7 @@ class KPushButton; * * @author Robert Gruber <[email protected]> */ -class AnnotatePage : public QWidget, virtual public CVSServiceDCOPIface +class AnnotatePage : public TQWidget, virtual public CVSServiceDCOPIface { Q_OBJECT @@ -42,7 +42,7 @@ class AnnotatePage : public QWidget, virtual public CVSServiceDCOPIface friend class AnnotateView; public: - AnnotatePage( CvsService_stub *cvsService, QWidget *parent=0, const char *name=0, int flags=0 ); + AnnotatePage( CvsService_stub *cvsService, TQWidget *parent=0, const char *name=0, int flags=0 ); virtual ~AnnotatePage(); /** @@ -50,7 +50,7 @@ public: * @param pathName The filename to annotate * @param revision The CVS revision number */ - void startAnnotate( const QString pathName, const QString revision="" ); + void startAnnotate( const TQString pathName, const TQString revision="" ); /** * Cancels the current operation if any @@ -64,13 +64,13 @@ signals: * a new page with the annotate output for the given revision. * @param rev The revision for which a new annotate run is requested */ - void requestAnnotate(const QString rev); + void requestAnnotate(const TQString rev); private slots: // DCOP Iface virtual void slotJobExited( bool normalExit, int exitStatus ); - virtual void slotReceivedOutput( QString someOutput ); - virtual void slotReceivedErrors( QString someErrors ); + virtual void slotReceivedOutput( TQString someOutput ); + virtual void slotReceivedErrors( TQString someErrors ); /** * This slot is connected to the button next to m_leRevision. @@ -84,7 +84,7 @@ private: * This method is executed after the cvs annotate job finished. * It parses the output and passes it to the AnnotateView */ - void parseAnnotateOutput(QStringList& lines); + void parseAnnotateOutput(TQStringList& lines); /** @@ -92,7 +92,7 @@ private: * Everytime slotReceivedOutput() is called by dcop * we append the gained data to this buffer. */ - QString m_output; + TQString m_output; /** * This is the AnnotateView. It gets nested into this page. */ @@ -100,11 +100,11 @@ private: /** * The file for which this page holds the annotate output. */ - QString m_pathName; + TQString m_pathName; /** * Maps the checkin comments to revision numbers */ - QMap<QString, QString> m_comments; + TQMap<TQString, TQString> m_comments; /** * With this KLineEdit and the KPushButton next to it diff --git a/vcs/cvsservice/annotateview.cpp b/vcs/cvsservice/annotateview.cpp index 93a2a46d..afc185cd 100644 --- a/vcs/cvsservice/annotateview.cpp +++ b/vcs/cvsservice/annotateview.cpp @@ -15,9 +15,9 @@ #include "annotateview.h" -#include <qheader.h> -#include <qdatetime.h> -#include <qpainter.h> +#include <tqheader.h> +#include <tqdatetime.h> +#include <tqpainter.h> #include <kglobalsettings.h> #include <kglobal.h> #include <klocale.h> @@ -32,21 +32,21 @@ class AnnotateViewItem : public QListViewItem public: enum { LineNumberColumn, AuthorColumn, DateColumn,ContentColumn }; - AnnotateViewItem(AnnotateView *parent, QString rev, QString author, - QDateTime date, QString content, QString comment, + AnnotateViewItem(AnnotateView *parent, TQString rev, TQString author, + TQDateTime date, TQString content, TQString comment, bool odd, int linenumber); - virtual int compare(QListViewItem *item, int col, bool ascending) const; - virtual int width(const QFontMetrics &, const QListView *, int col) const; - virtual QString text(int col) const; - virtual void paintCell(QPainter *, const QColorGroup &, int, int, int); + virtual int compare(TQListViewItem *item, int col, bool ascending) const; + virtual int width(const TQFontMetrics &, const TQListView *, int col) const; + virtual TQString text(int col) const; + virtual void paintCell(TQPainter *, const TQColorGroup &, int, int, int); private: - QString m_revision; - QString m_author; - QString m_content; - QString m_comment; - QDateTime m_logDate; + TQString m_revision; + TQString m_author; + TQString m_content; + TQString m_comment; + TQDateTime m_logDate; bool m_odd; int m_lineNumber; @@ -57,10 +57,10 @@ private: const int AnnotateViewItem::BORDER = 4; -AnnotateViewItem::AnnotateViewItem(AnnotateView *parent, QString rev, - QString author, QDateTime date, QString content, QString comment, +AnnotateViewItem::AnnotateViewItem(AnnotateView *parent, TQString rev, + TQString author, TQDateTime date, TQString content, TQString comment, bool odd, int linenumber) - : QListViewItem(parent) + : TQListViewItem(parent) , m_revision(rev) , m_author(author) , m_content(content) @@ -71,7 +71,7 @@ AnnotateViewItem::AnnotateViewItem(AnnotateView *parent, QString rev, {} -int AnnotateViewItem::compare(QListViewItem *item, int, bool) const +int AnnotateViewItem::compare(TQListViewItem *item, int, bool) const { int linenum1 = m_lineNumber; int linenum2 = static_cast<AnnotateViewItem*>(item)->m_lineNumber; @@ -80,14 +80,14 @@ int AnnotateViewItem::compare(QListViewItem *item, int, bool) const } -QString AnnotateViewItem::text(int col) const +TQString AnnotateViewItem::text(int col) const { switch (col) { case LineNumberColumn: - return QString::number(m_lineNumber); + return TQString::number(m_lineNumber); case AuthorColumn: - return (m_revision + QChar(' ') + m_author); + return (m_revision + TQChar(' ') + m_author); case DateColumn: return KGlobal::locale()->formatDate(m_logDate.date(), true); case ContentColumn: @@ -96,13 +96,13 @@ QString AnnotateViewItem::text(int col) const ; }; - return QString::null; + return TQString::null; } -void AnnotateViewItem::paintCell(QPainter *p, const QColorGroup &, int col, int width, int align) +void AnnotateViewItem::paintCell(TQPainter *p, const TQColorGroup &, int col, int width, int align) { - QColor backgroundColor; + TQColor backgroundColor; switch (col) { @@ -119,7 +119,7 @@ void AnnotateViewItem::paintCell(QPainter *p, const QColorGroup &, int col, int p->fillRect(0, 0, width, height(), backgroundColor); - QString str = text(col); + TQString str = text(col); if (str.isEmpty()) return; @@ -130,7 +130,7 @@ void AnnotateViewItem::paintCell(QPainter *p, const QColorGroup &, int col, int } -int AnnotateViewItem::width(const QFontMetrics &fm, const QListView *, int col) const +int AnnotateViewItem::width(const TQFontMetrics &fm, const TQListView *, int col) const { return fm.width(text(col)) + 2*BORDER; } @@ -141,43 +141,43 @@ int AnnotateViewItem::width(const QFontMetrics &fm, const QListView *, int col) /******************************************************************************/ AnnotateView::AnnotateView(AnnotatePage *parent, const char *name) - : KListView(parent, name), QToolTip( viewport() ), + : KListView(parent, name), TQToolTip( viewport() ), m_page(parent) { - setFrameStyle(QFrame::WinPanel | QFrame::Sunken); + setFrameStyle(TQFrame::WinPanel | TQFrame::Sunken); setAllColumnsShowFocus(true); setShowToolTips(false); header()->hide(); - addColumn(QString::null); - addColumn(QString::null); - addColumn(QString::null); - addColumn(QString::null); + addColumn(TQString::null); + addColumn(TQString::null); + addColumn(TQString::null); + addColumn(TQString::null); setSorting(AnnotateViewItem::LineNumberColumn); setColumnAlignment(AnnotateViewItem::LineNumberColumn, Qt::AlignRight); - connect( this, SIGNAL(executed(QListViewItem*)), - this, SLOT(itemClicked(QListViewItem*)) ); + connect( this, TQT_SIGNAL(executed(TQListViewItem*)), + this, TQT_SLOT(itemClicked(TQListViewItem*)) ); } -void AnnotateView::addLine(QString rev, QString author, QDateTime date, - QString content, QString comment, bool odd) +void AnnotateView::addLine(TQString rev, TQString author, TQDateTime date, + TQString content, TQString comment, bool odd) { new AnnotateViewItem(this, rev, author, date, content, comment, odd, childCount()+1); } -QSize AnnotateView::sizeHint() const +TQSize AnnotateView::sizeHint() const { - QFontMetrics fm(fontMetrics()); - return QSize(100 * fm.width("0"), 20 * fm.lineSpacing()); + TQFontMetrics fm(fontMetrics()); + return TQSize(100 * fm.width("0"), 20 * fm.lineSpacing()); } -void AnnotateView::maybeTip( const QPoint & p ) +void AnnotateView::maybeTip( const TQPoint & p ) { AnnotateViewItem * item = dynamic_cast<AnnotateViewItem*>( itemAt( p ) ); if (!item) @@ -189,9 +189,9 @@ void AnnotateView::maybeTip( const QPoint & p ) return; } - QRect r = itemRect( item ); + TQRect r = itemRect( item ); //get the dimension of the author + the date column - QRect headerRect = header()->sectionRect(AnnotateViewItem::AuthorColumn); + TQRect headerRect = header()->sectionRect(AnnotateViewItem::AuthorColumn); headerRect = headerRect.unite(header()->sectionRect(AnnotateViewItem::DateColumn)); r.setLeft(headerRect.left()); @@ -205,7 +205,7 @@ void AnnotateView::maybeTip( const QPoint & p ) } } -void AnnotateView::itemClicked(QListViewItem *item) +void AnnotateView::itemClicked(TQListViewItem *item) { kdDebug(9006) << "itemClicked()" << endl; diff --git a/vcs/cvsservice/annotateview.h b/vcs/cvsservice/annotateview.h index 6c9cded9..4e05930b 100644 --- a/vcs/cvsservice/annotateview.h +++ b/vcs/cvsservice/annotateview.h @@ -18,7 +18,7 @@ #include <klistview.h> -#include <qtooltip.h> +#include <tqtooltip.h> class QDateTime; class AnnotatePage; @@ -38,17 +38,17 @@ public: explicit AnnotateView(AnnotatePage *parent, const char *name=0 ); - void addLine(QString rev, QString author, QDateTime date, QString content, - QString comment, bool odd); + void addLine(TQString rev, TQString author, TQDateTime date, TQString content, + TQString comment, bool odd); - virtual QSize sizeHint() const; - void maybeTip( const QPoint & p ); + virtual TQSize sizeHint() const; + void maybeTip( const TQPoint & p ); private: AnnotatePage * m_page; public slots: - void itemClicked(QListViewItem *item); + void itemClicked(TQListViewItem *item); }; diff --git a/vcs/cvsservice/bufferedstringreader.cpp b/vcs/cvsservice/bufferedstringreader.cpp index 5c2151fc..bdaa26f3 100644 --- a/vcs/cvsservice/bufferedstringreader.cpp +++ b/vcs/cvsservice/bufferedstringreader.cpp @@ -27,16 +27,16 @@ BufferedStringReader::~BufferedStringReader() /////////////////////////////////////////////////////////////////////////////// -QStringList BufferedStringReader::process( const QString &otherChars ) +TQStringList BufferedStringReader::process( const TQString &otherChars ) { // Add to previous buffered chars m_stringBuffer += otherChars; - QStringList strings; + TQStringList strings; // Now find all the basic strings in the buffer int pos; while ( (pos = m_stringBuffer.find('\n')) != -1) { - QString line = m_stringBuffer.left( pos ); + TQString line = m_stringBuffer.left( pos ); if (!line.isEmpty()) { strings.append( line ); diff --git a/vcs/cvsservice/bufferedstringreader.h b/vcs/cvsservice/bufferedstringreader.h index 1f96c0d1..6f34ed4c 100644 --- a/vcs/cvsservice/bufferedstringreader.h +++ b/vcs/cvsservice/bufferedstringreader.h @@ -12,7 +12,7 @@ #ifndef BUFFEREDSTRINGREADER_H #define BUFFEREDSTRINGREADER_H -#include <qstringlist.h> +#include <tqstringlist.h> class CvsServicePart; class KConfig; @@ -36,9 +36,9 @@ public: * as many '\n'-terminated strings as found. * @param otherChars additional chars to be added to the buffer */ - QStringList process( const QString &otherChars ); + TQStringList process( const TQString &otherChars ); private: - QString m_stringBuffer; + TQString m_stringBuffer; }; #endif // BUFFEREDSTRINGREADER_H diff --git a/vcs/cvsservice/changelog.cpp b/vcs/cvsservice/changelog.cpp index a63a2b92..1e676f43 100644 --- a/vcs/cvsservice/changelog.cpp +++ b/vcs/cvsservice/changelog.cpp @@ -9,9 +9,9 @@ * * ***************************************************************************/ -#include <qdatetime.h> -#include <qfile.h> -#include <qtextstream.h> +#include <tqdatetime.h> +#include <tqfile.h> +#include <tqtextstream.h> #include <kemailsettings.h> @@ -24,7 +24,7 @@ ChangeLogEntry::ChangeLogEntry() authorEmail = emailConfig.getSetting( KEMailSettings::EmailAddress ); authorName = emailConfig.getSetting( KEMailSettings::RealName ); - QDate currDate = QDate::currentDate(); + TQDate currDate = TQDate::currentDate(); date = currDate.toString( "yyyy-MM-dd" ); } @@ -32,38 +32,38 @@ ChangeLogEntry::~ChangeLogEntry() { } -void ChangeLogEntry::addLine( const QString &aLine ) +void ChangeLogEntry::addLine( const TQString &aLine ) { lines << aLine; } -void ChangeLogEntry::addLines( const QStringList &someLines ) +void ChangeLogEntry::addLines( const TQStringList &someLines ) { lines += someLines; } -void streamCopy( QTextStream &is, QTextStream &os ) +void streamCopy( TQTextStream &is, TQTextStream &os ) { while (!is.eof()) os << is.readLine() << "\n"; // readLine() eats '\n' !! } -void ChangeLogEntry::addToLog( const QString &logFilePath, const bool prepend, const QString &startLineString ) +void ChangeLogEntry::addToLog( const TQString &logFilePath, const bool prepend, const TQString &startLineString ) { if (prepend) // add on head { - QString fakeLogFilePath = logFilePath + ".fake"; + TQString fakeLogFilePath = logFilePath + ".fake"; - QFile fakeFile( fakeLogFilePath ); - QFile changeLogFile( logFilePath ); + TQFile fakeFile( fakeLogFilePath ); + TQFile changeLogFile( logFilePath ); { if (!fakeFile.open( IO_WriteOnly | IO_Append)) return; if (changeLogFile.open( IO_ReadOnly )) // A Changelog already exist { - QTextStream is( &changeLogFile ); - QTextStream os( &fakeFile ); + TQTextStream is( &changeLogFile ); + TQTextStream os( &fakeFile ); // Put current entry os << toString( startLineString ); @@ -72,7 +72,7 @@ void ChangeLogEntry::addToLog( const QString &logFilePath, const bool prepend, c } else // ChangeLog doesn't exist: just write our entry { - QTextStream t( &fakeFile ); + TQTextStream t( &fakeFile ); t << toString( startLineString ); } fakeFile.close(); @@ -85,8 +85,8 @@ void ChangeLogEntry::addToLog( const QString &logFilePath, const bool prepend, c if (changeLogFile.open( IO_WriteOnly )) { - QTextStream os( &changeLogFile ); - QTextStream is( &fakeFile ); + TQTextStream os( &changeLogFile ); + TQTextStream is( &fakeFile ); // Write the rest of the change log file streamCopy( is, os ); @@ -97,18 +97,18 @@ void ChangeLogEntry::addToLog( const QString &logFilePath, const bool prepend, c } else // add on tail { - QFile f( logFilePath ); + TQFile f( logFilePath ); if (!f.open( IO_WriteOnly | IO_Append)) return; - QTextStream t( &f ); + TQTextStream t( &f ); t << toString( startLineString ); } } -QString ChangeLogEntry::toString( const QString &startLineString ) const +TQString ChangeLogEntry::toString( const TQString &startLineString ) const { - QString header = date + " " + authorName + " <" + authorEmail + ">\n"; + TQString header = date + " " + authorName + " <" + authorEmail + ">\n"; return header + startLineString + lines.join( "\n" + startLineString ) + "\n\n"; } diff --git a/vcs/cvsservice/changelog.h b/vcs/cvsservice/changelog.h index 3d512f95..a1b50ffa 100644 --- a/vcs/cvsservice/changelog.h +++ b/vcs/cvsservice/changelog.h @@ -12,7 +12,7 @@ #ifndef CHANGELOG_H #define CHANGELOG_H -#include <qstringlist.h> +#include <tqstringlist.h> /** A class which abstracts the building of an entry in the ChangeLog file (it formats name, e-mail and text). @@ -26,20 +26,20 @@ public: ~ChangeLogEntry(); //! Add a single line to the lines for this entry - void addLine( const QString &aLine ); + void addLine( const TQString &aLine ); //! Add a bunch of lines for this entry - void addLines( const QStringList &someLines ); + void addLines( const TQStringList &someLines ); //! Pretty format for this entry: you may insert a line tag (such as tab ("\t") or 4 spaces (" ") //! or whatever you want (such as "\t * ") - QString toString( const QString &startLineString = QString::null ) const; + TQString toString( const TQString &startLineString = TQString::null ) const; //! Once the entry is completed one would like to write on a file! (You may add on start of file //! prepend == true, or append on tail (prepend == false) - void addToLog( const QString &logFilePath, const bool prepend = true, const QString &startLineString = "\t" ); + void addToLog( const TQString &logFilePath, const bool prepend = true, const TQString &startLineString = "\t" ); - QString authorName, + TQString authorName, authorEmail, date; - QStringList lines; + TQStringList lines; }; #endif diff --git a/vcs/cvsservice/checkoutdialog.cpp b/vcs/cvsservice/checkoutdialog.cpp index 7fb9455c..82c64052 100644 --- a/vcs/cvsservice/checkoutdialog.cpp +++ b/vcs/cvsservice/checkoutdialog.cpp @@ -9,11 +9,11 @@ * * ***************************************************************************/ -#include <qcheckbox.h> -#include <qpushbutton.h> -#include <qcombobox.h> -#include <qfile.h> -#include <qtextstream.h> +#include <tqcheckbox.h> +#include <tqpushbutton.h> +#include <tqcombobox.h> +#include <tqfile.h> +#include <tqtextstream.h> #include <klistview.h> #include <kurlrequester.h> @@ -38,7 +38,7 @@ // Constants /////////////////////////////////////////////////////////////////////////////// -const QString SSS( ":" ); // Server String Separator :) +const TQString SSS( ":" ); // Server String Separator :) /////////////////////////////////////////////////////////////////////////////// // class ModuleListViewItem @@ -48,19 +48,19 @@ class ModuleListViewItem : public KListViewItem { public: ModuleListViewItem( KListView *listview, - const QString &moduleAlias, const QString &moduleRealPath ) + const TQString &moduleAlias, const TQString &moduleRealPath ) : KListViewItem( listview ) { setAlias( moduleAlias ); setRealPath( moduleRealPath ); } - void setAlias( const QString &aName ) { setText( 0, aName); } - QString alias() const { return text(0); } - void setRealPath( const QString &aRealPath ) { setText(1, aRealPath); } - QString realPath() const { return text(1); } + void setAlias( const TQString &aName ) { setText( 0, aName); } + TQString alias() const { return text(0); } + void setRealPath( const TQString &aRealPath ) { setText(1, aRealPath); } + TQString realPath() const { return text(1); } -// virtual QString text() const { return name(); } +// virtual TQString text() const { return name(); } }; /////////////////////////////////////////////////////////////////////////////// @@ -68,7 +68,7 @@ public: /////////////////////////////////////////////////////////////////////////////// CheckoutDialog::CheckoutDialog( CvsService_stub *cvsService, - QWidget *parent, const char *name, WFlags ) : + TQWidget *parent, const char *name, WFlags ) : DCOPObject( "CheckoutDialogDCOPIface" ), KDialogBase( parent, name? name : "checkoutdialog", true, i18n("CVS Checkout"), Ok | Cancel, Ok, true ), @@ -77,10 +77,10 @@ CheckoutDialog::CheckoutDialog( CvsService_stub *cvsService, m_base = new CheckoutDialogBase( this, "checkoutdialogbase" ); setMainWidget( m_base ); - connect( m_base->fetchModulesButton, SIGNAL(clicked()), - this, SLOT(slotFetchModulesList()) ); - connect( m_base->modulesListView, SIGNAL(executed(QListViewItem*)), - this, SLOT(slotModuleSelected(QListViewItem*)) ); + connect( m_base->fetchModulesButton, TQT_SIGNAL(clicked()), + this, TQT_SLOT(slotFetchModulesList()) ); + connect( m_base->modulesListView, TQT_SIGNAL(executed(TQListViewItem*)), + this, TQT_SLOT(slotModuleSelected(TQListViewItem*)) ); // Avoid displaying 'file:/' when displaying the file m_base->workURLRequester->setShowLocalProtocol( false ); @@ -91,7 +91,7 @@ CheckoutDialog::CheckoutDialog( CvsService_stub *cvsService, // And suggest to use the default projects dir set in KDevelop's preferences KConfig *config = kapp->config(); config->setGroup("General Options"); - QString defaultProjectsDir = config->readPathEntry("DefaultProjectsDir", QDir::homeDirPath()+"/"); + TQString defaultProjectsDir = config->readPathEntry("DefaultProjectsDir", TQDir::homeDirPath()+"/"); setWorkDir( defaultProjectsDir ); } @@ -104,28 +104,28 @@ CheckoutDialog::~CheckoutDialog() /////////////////////////////////////////////////////////////////////////////// -QString CheckoutDialog::serverPath() const +TQString CheckoutDialog::serverPath() const { return m_base->serverPaths->currentText(); } /////////////////////////////////////////////////////////////////////////////// -void CheckoutDialog::fillServerPaths( const QStringList &serverPaths ) +void CheckoutDialog::fillServerPaths( const TQStringList &serverPaths ) { m_base->serverPaths->insertStringList( serverPaths ); } /////////////////////////////////////////////////////////////////////////////// -QString CheckoutDialog::workDir() const +TQString CheckoutDialog::workDir() const { return m_base->workURLRequester->url(); } /////////////////////////////////////////////////////////////////////////////// -void CheckoutDialog::setWorkDir( const QString &aDir ) +void CheckoutDialog::setWorkDir( const TQString &aDir ) { m_base->workURLRequester->setURL( aDir ); } @@ -139,14 +139,14 @@ bool CheckoutDialog::pruneDirs() const /////////////////////////////////////////////////////////////////////////////// -QString CheckoutDialog::tag() const +TQString CheckoutDialog::tag() const { return m_base->tagEdit->text(); } /////////////////////////////////////////////////////////////////////////////// -QString CheckoutDialog::module() const +TQString CheckoutDialog::module() const { return m_base->moduleEdit->text(); } @@ -168,7 +168,7 @@ void CheckoutDialog::slotFetchModulesList() // We only need to know when it finishes and then will grab the output // by using m_job->output() :-) connectDCOPSignal( job.app(), job.obj(), "jobFinished(bool,int)", "slotJobExited(bool,int)", true ); - connectDCOPSignal( job.app(), job.obj(), "receivedStdout(QString)", "receivedOutput(QString)", true ); + connectDCOPSignal( job.app(), job.obj(), "receivedStdout(TQString)", "receivedOutput(TQString)", true ); kdDebug() << "Running: " << m_job->cvsCommand() << endl; m_job->execute(); @@ -187,35 +187,35 @@ void CheckoutDialog::slotJobExited( bool /*normalExit*/, int /*exitStatus*/ ) /////////////////////////////////////////////////////////////////////////////// -void CheckoutDialog::slotReceivedOutput( QString someOutput ) +void CheckoutDialog::slotReceivedOutput( TQString someOutput ) { kdDebug( 9006 ) << " Received output: " << someOutput << endl; setCursor( KCursor::arrowCursor() ); // Fill the modules KListView if the list obtained is not empty - // QStringList modules = m_job->output(); - QStringList modules = QStringList::split( "\n", someOutput ); + // TQStringList modules = m_job->output(); + TQStringList modules = TQStringList::split( "\n", someOutput ); if (modules.count() <= 0) return; - QStringList::iterator it = modules.begin(); + TQStringList::iterator it = modules.begin(); for ( ; it != modules.end(); ++it ) { - QStringList l = QStringList::split( " ", (*it) ); + TQStringList l = TQStringList::split( " ", (*it) ); // Now, l[0] is the module name, l[1] is ... another string ;-) new ModuleListViewItem( m_base->modulesListView, l[0], l[1] ); } } -void CheckoutDialog::slotReceivedErrors( QString someErrors ) +void CheckoutDialog::slotReceivedErrors( TQString someErrors ) { kdDebug( 9006 ) << " Received errors: " << someErrors << endl; } /////////////////////////////////////////////////////////////////////////////// -void CheckoutDialog::slotModuleSelected( QListViewItem * ) +void CheckoutDialog::slotModuleSelected( TQListViewItem * ) { ModuleListViewItem *aModuleItem = static_cast<ModuleListViewItem*>( m_base->modulesListView->selectedItem() @@ -230,21 +230,21 @@ void CheckoutDialog::slotModuleSelected( QListViewItem * ) void CheckoutDialog::fetchUserCvsRepositories() { - QStringList repositories; + TQStringList repositories; - QFile cvspass( QDir::homeDirPath() + QDir::separator() + ".cvspass" ); + TQFile cvspass( TQDir::homeDirPath() + TQDir::separator() + ".cvspass" ); if (!cvspass.open( IO_ReadOnly )) return; - QByteArray data = cvspass.readAll(); + TQByteArray data = cvspass.readAll(); cvspass.close(); - QTextIStream istream( data ); + TQTextIStream istream( data ); // Entries are like: // /1 :pserver:[email protected]:2401/home/kde Ahz:UIK?=d ? // /1 :pserver:mario@xamel:2401/home/cvsroot aJT_d'K?=d ? while (!istream.eof()) { - QString line = istream.readLine(); - QStringList lineElements = QStringList::split( " ", line ); + TQString line = istream.readLine(); + TQStringList lineElements = TQStringList::split( " ", line ); if (lineElements.count() > 1) { repositories << lineElements[ 1 ]; } @@ -257,9 +257,9 @@ void CheckoutDialog::fetchUserCvsRepositories() void CheckoutDialog::slotOk() { - QString errorMessage = QString::null; + TQString errorMessage = TQString::null; - if (!(workDir().length() > 0) && QFile::exists( workDir() )) + if (!(workDir().length() > 0) && TQFile::exists( workDir() )) errorMessage = i18n( "Please, choose a valid working directory" ); else if (!(serverPath().length() > 0)) errorMessage = i18n( "Please, choose a CVS server." ); diff --git a/vcs/cvsservice/checkoutdialog.h b/vcs/cvsservice/checkoutdialog.h index 597a806a..a44ef397 100644 --- a/vcs/cvsservice/checkoutdialog.h +++ b/vcs/cvsservice/checkoutdialog.h @@ -31,7 +31,7 @@ class CheckoutDialog : public KDialogBase, virtual public CVSServiceDCOPIface { Q_OBJECT public: - CheckoutDialog( CvsService_stub *cvsService, QWidget *parent = 0, + CheckoutDialog( CvsService_stub *cvsService, TQWidget *parent = 0, const char *name = 0, WFlags f = 0 ); virtual ~CheckoutDialog(); @@ -40,23 +40,23 @@ public: /** * @return a server path string (i.e. :pserver:[email protected]:/home/kde) */ - QString serverPath() const; + TQString serverPath() const; /** * @param serverPaths a list of server location to use when filling the widget */ - void fillServerPaths( const QStringList &serverPaths ); + void fillServerPaths( const TQStringList &serverPaths ); /** * @return the directory which the user has fetched the module in */ - QString workDir() const; + TQString workDir() const; /** * @param aDir directory which fetched modules will be put in (ending with '/') */ - void setWorkDir( const QString &aDir ); + void setWorkDir( const TQString &aDir ); /** * @return the module the user has chosen to check-out from repository */ - QString module() const; + TQString module() const; /** * @return */ @@ -64,15 +64,15 @@ public: /** * @return */ - QString tag() const; + TQString tag() const; private slots: - void slotModuleSelected( QListViewItem *item ); + void slotModuleSelected( TQListViewItem *item ); void slotFetchModulesList(); // DCOP Iface virtual void slotJobExited( bool normalExit, int exitStatus ); - virtual void slotReceivedOutput( QString someOutput ); - virtual void slotReceivedErrors( QString someErrors ); + virtual void slotReceivedOutput( TQString someOutput ); + virtual void slotReceivedErrors( TQString someErrors ); private: /** diff --git a/vcs/cvsservice/commitdlg.cpp b/vcs/cvsservice/commitdlg.cpp index 4c7eac97..a3988c06 100644 --- a/vcs/cvsservice/commitdlg.cpp +++ b/vcs/cvsservice/commitdlg.cpp @@ -11,11 +11,11 @@ * * ***************************************************************************/ -#include <qlayout.h> -#include <qlabel.h> -#include <qcheckbox.h> -#include <qtextedit.h> -#include <qpushbutton.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqcheckbox.h> +#include <tqtextedit.h> +#include <tqpushbutton.h> #include <kapplication.h> #include <kbuttonbox.h> @@ -30,20 +30,20 @@ /////////////////////////////////////////////////////////////////////////////// -CommitDialog::CommitDialog( const QString &changeLogfileNamePath, QWidget *parent ) +CommitDialog::CommitDialog( const TQString &changeLogfileNamePath, TQWidget *parent ) : CommitDialogBase( parent, "commitdialog", true ) { - connect( buttonOk, SIGNAL(clicked()), SLOT(accept()) ); - connect( buttonCancel, SIGNAL(clicked()), SLOT(reject()) ); + connect( buttonOk, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) ); + connect( buttonCancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) ); setChangeLogFileName( changeLogfileNamePath ); } /////////////////////////////////////////////////////////////////////////////// -QStringList CommitDialog::logMessage() const +TQStringList CommitDialog::logMessage() const { - QStringList textLines; + TQStringList textLines; for (int i=0; i<textEdit->paragraphs(); ++i) { textLines << textEdit->text( i ); @@ -72,19 +72,19 @@ void CommitDialog::accept() return; } } - QDialog::accept(); + TQDialog::accept(); } /////////////////////////////////////////////////////////////////////////////// -void CommitDialog::setChangeLogFileName( const QString &fileName ) +void CommitDialog::setChangeLogFileName( const TQString &fileName ) { changeLogNameEdit->setText( fileName ); } /////////////////////////////////////////////////////////////////////////////// -QString CommitDialog::changeLogFileName() const +TQString CommitDialog::changeLogFileName() const { return changeLogNameEdit->text(); } diff --git a/vcs/cvsservice/commitdlg.h b/vcs/cvsservice/commitdlg.h index 3e98b269..e7ea4396 100644 --- a/vcs/cvsservice/commitdlg.h +++ b/vcs/cvsservice/commitdlg.h @@ -14,8 +14,8 @@ #ifndef _COMMITDIALOG_H_ #define _COMMITDIALOG_H_ -//#include <qdialog.h> -#include <qstringlist.h> +//#include <tqdialog.h> +#include <tqstringlist.h> #include "commitdialogbase.h" class QTextEdit; @@ -25,17 +25,17 @@ class CommitDialog : public CommitDialogBase { Q_OBJECT public: - CommitDialog( const QString &changeLogfileNamePath, QWidget *parent = 0 ); + CommitDialog( const TQString &changeLogfileNamePath, TQWidget *parent = 0 ); //! Returns the text of the log - QStringList logMessage() const; + TQStringList logMessage() const; //! Returns true if the user requests the log message to be added to the general //! Changelog file bool mustAddToChangeLog() const; //! We need to set it when showing the dialog and then when saving the file - void setChangeLogFileName( const QString &fileName ); - QString changeLogFileName() const; + void setChangeLogFileName( const TQString &fileName ); + TQString changeLogFileName() const; protected slots: //! Override: must check for message not being void. diff --git a/vcs/cvsservice/cvsdiffpage.cpp b/vcs/cvsservice/cvsdiffpage.cpp index 12947b36..7777760a 100644 --- a/vcs/cvsservice/cvsdiffpage.cpp +++ b/vcs/cvsservice/cvsdiffpage.cpp @@ -9,11 +9,11 @@ * * ***************************************************************************/ -#include <qtextedit.h> -#include <qlayout.h> -#include <qregexp.h> -#include <qdir.h> -#include <qstringlist.h> +#include <tqtextedit.h> +#include <tqlayout.h> +#include <tqregexp.h> +#include <tqdir.h> +#include <tqstringlist.h> #include <kmessagebox.h> #include <kcursor.h> @@ -33,15 +33,15 @@ /////////////////////////////////////////////////////////////////////////////// CVSDiffPage::CVSDiffPage( CvsService_stub *cvsService, - QWidget *parent, const char *name, int ) + TQWidget *parent, const char *name, int ) // Leaving it anonymous let us to have multiple objects at the same time! : DCOPObject(), // "CVSDiffPageDCOPIface" - QWidget( parent, name? name : "logformdialog" ), + TQWidget( parent, name? name : "logformdialog" ), m_diffText( 0 ), m_cvsService( cvsService ), m_cvsDiffJob( 0 ) { - QLayout *thisLayout = new QVBoxLayout( this ); + TQLayout *thisLayout = new TQVBoxLayout( this ); // This should be replaced by the diff part -// m_diffText = new QTextEdit( this, "difftextedit" ); +// m_diffText = new TQTextEdit( this, "difftextedit" ); // m_diffText->setReadOnly( true ); m_diffText = new DiffWidget( this, "difftextedit" ); @@ -59,7 +59,7 @@ CVSDiffPage::~CVSDiffPage() /////////////////////////////////////////////////////////////////////////////// -void CVSDiffPage::startDiff( const QString &fileName, const QString &v1, const QString &v2 ) +void CVSDiffPage::startDiff( const TQString &fileName, const TQString &v1, const TQString &v2 ) { kdDebug(9006) << "CVSDiffPage::startDiff()" << endl; @@ -75,7 +75,7 @@ void CVSDiffPage::startDiff( const QString &fileName, const QString &v1, const Q kdDebug(9006) << "Running command : " << m_cvsDiffJob->cvsCommand() << endl; connectDCOPSignal( job.app(), job.obj(), "jobExited(bool, int)", "slotJobExited(bool, int)", true ); - connectDCOPSignal( job.app(), job.obj(), "receivedStdout(QString)", "slotReceivedOutput(QString)", true ); + connectDCOPSignal( job.app(), job.obj(), "receivedStdout(TQString)", "slotReceivedOutput(TQString)", true ); bool success = m_cvsDiffJob->execute(); if (!success) { @@ -91,7 +91,7 @@ void CVSDiffPage::slotJobExited( bool normalExit, int /*exitStatus*/ ) if (normalExit) { - QString diffText = m_cvsDiffJob->output().join( "\n" ); + TQString diffText = m_cvsDiffJob->output().join( "\n" ); kdDebug(9006) << "*** Received: " << diffText << endl; // m_diffText->setText( diffText ); m_diffText->setDiff( m_diffString ); @@ -104,20 +104,20 @@ void CVSDiffPage::slotJobExited( bool normalExit, int /*exitStatus*/ ) /////////////////////////////////////////////////////////////////////////////// -void CVSDiffPage::slotReceivedOutput( QString someOutput ) +void CVSDiffPage::slotReceivedOutput( TQString someOutput ) { - kdDebug(9006) << "CVSDiffPage::slotReceivedOutput(QString)" << endl; + kdDebug(9006) << "CVSDiffPage::slotReceivedOutput(TQString)" << endl; kdDebug(9006) << "OUTPUT: " << someOutput << endl; - QStringList strings = m_outputBuffer.process(someOutput); + TQStringList strings = m_outputBuffer.process(someOutput); m_diffString += strings.join("\n"); } /////////////////////////////////////////////////////////////////////////////// -void CVSDiffPage::slotReceivedErrors( QString someErrors ) +void CVSDiffPage::slotReceivedErrors( TQString someErrors ) { - kdDebug(9006) << "CVSDiffPage::slotReceivedErrors(QString)" << endl; + kdDebug(9006) << "CVSDiffPage::slotReceivedErrors(TQString)" << endl; kdDebug(9006) << "ERRORS: " << someErrors << endl; } diff --git a/vcs/cvsservice/cvsdiffpage.h b/vcs/cvsservice/cvsdiffpage.h index 16a6fec6..d9bbf36d 100644 --- a/vcs/cvsservice/cvsdiffpage.h +++ b/vcs/cvsservice/cvsdiffpage.h @@ -13,7 +13,7 @@ #define CVSDIFFPAGE_H #include "cvsservicedcopIface.h" -#include <qwidget.h> +#include <tqwidget.h> #include "bufferedstringreader.h" class CvsJob_stub; @@ -26,27 +26,27 @@ Implementation for the form displaying 'cvs diff' output. @author KDevelop Authors */ -class CVSDiffPage : public QWidget, virtual public CVSServiceDCOPIface +class CVSDiffPage : public TQWidget, virtual public CVSServiceDCOPIface { Q_OBJECT public: - CVSDiffPage( CvsService_stub *cvsService, QWidget *parent=0, const char *name=0, int flags=0 ); + CVSDiffPage( CvsService_stub *cvsService, TQWidget *parent=0, const char *name=0, int flags=0 ); virtual ~CVSDiffPage(); - void startDiff( const QString &fileName, const QString &v1, const QString &v2 ); + void startDiff( const TQString &fileName, const TQString &v1, const TQString &v2 ); void cancel(); //private slots: // DCOP Iface virtual void slotJobExited( bool normalExit, int exitStatus ); - virtual void slotReceivedOutput( QString someOutput ); - virtual void slotReceivedErrors( QString someErrors ); + virtual void slotReceivedOutput( TQString someOutput ); + virtual void slotReceivedErrors( TQString someErrors ); private: - //QTextEdit *m_diffText; + //TQTextEdit *m_diffText; DiffWidget *m_diffText; BufferedStringReader m_outputBuffer; - QString m_diffString; + TQString m_diffString; CvsService_stub *m_cvsService; CvsJob_stub *m_cvsDiffJob; diff --git a/vcs/cvsservice/cvsdir.cpp b/vcs/cvsservice/cvsdir.cpp index 2b7602e6..28a4b566 100644 --- a/vcs/cvsservice/cvsdir.cpp +++ b/vcs/cvsservice/cvsdir.cpp @@ -9,8 +9,8 @@ * * ***************************************************************************/ -#include <qfile.h> -#include <qtextstream.h> +#include <tqfile.h> +#include <tqtextstream.h> #include "cvsdir.h" @@ -18,19 +18,19 @@ // class CVSDir /////////////////////////////////////////////////////////////////////////////// -CVSDir::CVSDir() : QDir() +CVSDir::CVSDir() : TQDir() { } /////////////////////////////////////////////////////////////////////////////// -CVSDir::CVSDir( const QDir &dir ) - : QDir( dir ) +CVSDir::CVSDir( const TQDir &dir ) + : TQDir( dir ) { // We deal with absolute paths only convertToAbs(); - m_cvsDir = absPath() + QDir::separator() + "CVS"; + m_cvsDir = absPath() + TQDir::separator() + "CVS"; if (isValid()) refreshEntriesCache(); @@ -39,7 +39,7 @@ CVSDir::CVSDir( const QDir &dir ) /////////////////////////////////////////////////////////////////////////////// CVSDir::CVSDir( const CVSDir &aCvsDir ) - : QDir( aCvsDir ) + : TQDir( aCvsDir ) { *this = aCvsDir; } @@ -50,7 +50,7 @@ CVSDir &CVSDir::operator=( const CVSDir &aCvsDir ) { m_cvsDir = aCvsDir.m_cvsDir; m_cachedEntries = aCvsDir.m_cachedEntries; - QDir::operator=( aCvsDir ); + TQDir::operator=( aCvsDir ); return *this; } @@ -66,54 +66,54 @@ CVSDir::~CVSDir() bool CVSDir::isValid() const { return exists() && - QFile::exists( entriesFileName() ) && - QFile::exists( rootFileName() ) && - QFile::exists( repoFileName() ); + TQFile::exists( entriesFileName() ) && + TQFile::exists( rootFileName() ) && + TQFile::exists( repoFileName() ); } /////////////////////////////////////////////////////////////////////////////// -QString CVSDir::entriesFileName() const +TQString CVSDir::entriesFileName() const { - return m_cvsDir + QDir::separator() + "Entries"; + return m_cvsDir + TQDir::separator() + "Entries"; } /////////////////////////////////////////////////////////////////////////////// -QString CVSDir::rootFileName() const +TQString CVSDir::rootFileName() const { - return m_cvsDir + QDir::separator() + "Root"; + return m_cvsDir + TQDir::separator() + "Root"; } /////////////////////////////////////////////////////////////////////////////// -QString CVSDir::repoFileName() const +TQString CVSDir::repoFileName() const { - return m_cvsDir + QDir::separator() + "Repository"; + return m_cvsDir + TQDir::separator() + "Repository"; } /////////////////////////////////////////////////////////////////////////////// -QString CVSDir::cvsIgnoreFileName() const +TQString CVSDir::cvsIgnoreFileName() const { - return absPath() + QDir::separator() + ".cvsignore"; + return absPath() + TQDir::separator() + ".cvsignore"; } /////////////////////////////////////////////////////////////////////////////// -QString CVSDir::repository() const +TQString CVSDir::repository() const { // The content of CVS/Repository is a single line with the path into the // repository of the modules checked out in this directory (just like // "kdevelop/parts/cvsservice"): so we can read a single line of the file // and we are done! - QString content; + TQString content; if (!isValid()) - return QString::null; + return TQString::null; - QByteArray bytes = cacheFile( repoFileName() ); - QTextStream t( bytes, IO_ReadOnly ); + TQByteArray bytes = cacheFile( repoFileName() ); + TQTextStream t( bytes, IO_ReadOnly ); content += t.readLine(); return content; @@ -121,18 +121,18 @@ QString CVSDir::repository() const /////////////////////////////////////////////////////////////////////////////// -QString CVSDir::root() const +TQString CVSDir::root() const { // Same as CVSDir::repository() but CVS/Root contains the path of the // CVS server as used in "cvs -d <server-path>" (in example: // ":pserver:[email protected]:/home/kde") - QString content; + TQString content; if (!isValid()) - return QString::null; + return TQString::null; - QByteArray bytes = cacheFile( repoFileName() ); - QTextStream t( bytes, IO_ReadOnly ); + TQByteArray bytes = cacheFile( repoFileName() ); + TQTextStream t( bytes, IO_ReadOnly ); content += t.readLine(); return content; @@ -140,28 +140,28 @@ QString CVSDir::root() const /////////////////////////////////////////////////////////////////////////////// -QByteArray CVSDir::cacheFile( const QString &fileName ) +TQByteArray CVSDir::cacheFile( const TQString &fileName ) { - QFile f( fileName ); + TQFile f( fileName ); if (!f.open( IO_ReadOnly )) - return QByteArray(); + return TQByteArray(); return f.readAll(); } /////////////////////////////////////////////////////////////////////////////// -QStringList CVSDir::registeredEntryList() const +TQStringList CVSDir::registeredEntryList() const { - QStringList l; + TQStringList l; if (!isValid()) return l; - QByteArray bytes = cacheFile( entriesFileName() ); - QTextStream t( bytes, IO_ReadOnly ); + TQByteArray bytes = cacheFile( entriesFileName() ); + TQTextStream t( bytes, IO_ReadOnly ); CVSEntry entry; while (!t.eof()) { - QString line = t.readLine(); + TQString line = t.readLine(); entry.parse( line, *this ); if (entry.isValid()) l.append( entry.fileName() ); @@ -171,7 +171,7 @@ QStringList CVSDir::registeredEntryList() const /////////////////////////////////////////////////////////////////////////////// -bool CVSDir::isRegistered( const QString fileName ) const +bool CVSDir::isRegistered( const TQString fileName ) const { CVSEntry entry = fileStatus( fileName ); return entry.isValid() && entry.fileName() == fileName; @@ -183,12 +183,12 @@ void CVSDir::refreshEntriesCache() const { m_cachedEntries.clear(); - QByteArray bytes = cacheFile( entriesFileName() ); - QTextStream t( bytes, IO_ReadOnly ); + TQByteArray bytes = cacheFile( entriesFileName() ); + TQTextStream t( bytes, IO_ReadOnly ); CVSEntry entry; while (!t.eof()) { - QString line = t.readLine(); + TQString line = t.readLine(); entry.parse( line, *this ); if (entry.isValid()) m_cachedEntries[ entry.fileName() ] = entry; @@ -197,7 +197,7 @@ void CVSDir::refreshEntriesCache() const /////////////////////////////////////////////////////////////////////////////// -CVSEntry CVSDir::fileStatus( const QString &fileName, bool refreshCache ) const +CVSEntry CVSDir::fileStatus( const TQString &fileName, bool refreshCache ) const { if (refreshCache) refreshEntriesCache(); @@ -212,19 +212,19 @@ CVSEntry CVSDir::fileStatus( const QString &fileName, bool refreshCache ) const /////////////////////////////////////////////////////////////////////////////// -void CVSDir::ignoreFile( const QString &fileName ) +void CVSDir::ignoreFile( const TQString &fileName ) { if (!isValid()) return; - QFile f( cvsIgnoreFileName() ); + TQFile f( cvsIgnoreFileName() ); if (!f.open( IO_ReadOnly)) return; - QByteArray cachedFile = f.readAll(); - QTextStream t( cachedFile, IO_ReadOnly | IO_WriteOnly ); + TQByteArray cachedFile = f.readAll(); + TQTextStream t( cachedFile, IO_ReadOnly | IO_WriteOnly ); - QString readFileName; + TQString readFileName; bool found = false; while (!t.eof() && !found) @@ -247,28 +247,28 @@ void CVSDir::ignoreFile( const QString &fileName ) /////////////////////////////////////////////////////////////////////////////// -void CVSDir::doNotIgnoreFile( const QString &fileName ) +void CVSDir::doNotIgnoreFile( const TQString &fileName ) { if (!isValid()) return; // 1. Read all .ignore file in memory - QFile f( cvsIgnoreFileName() ); + TQFile f( cvsIgnoreFileName() ); if (!f.open( IO_ReadOnly )) return; // No .cvsignore file? Nothing to do then! - QByteArray cachedFile = f.readAll(); - QTextIStream is( cachedFile ); + TQByteArray cachedFile = f.readAll(); + TQTextIStream is( cachedFile ); - QByteArray cachedOutputFile; - QTextOStream os( cachedOutputFile ); + TQByteArray cachedOutputFile; + TQTextOStream os( cachedOutputFile ); bool removed = false; while (!is.eof()) { - QString readLine = is.readLine(); + TQString readLine = is.readLine(); if (readLine != fileName) - os << readLine << "\n"; // QTextStream::readLine() eats the "\n" ... + os << readLine << "\n"; // TQTextStream::readLine() eats the "\n" ... else removed = true; } @@ -288,11 +288,11 @@ VCSFileInfoMap CVSDir::dirStatus() const { VCSFileInfoMap vcsInfo; /// Convert to VCSFileInfoMap: \FIXME : any speed improvement here? - QStringList entries = registeredEntryList(); - QStringList::const_iterator it = entries.begin(), end = entries.end(); + TQStringList entries = registeredEntryList(); + TQStringList::const_iterator it = entries.begin(), end = entries.end(); for ( ; it != end; ++it) { - const QString &fileName = (*it); + const TQString &fileName = (*it); const CVSEntry entry = fileStatus( fileName ); vcsInfo.insert( fileName, entry.toVCSFileInfo() ); @@ -307,11 +307,11 @@ VCSFileInfoMap *CVSDir::cacheableDirStatus() const { VCSFileInfoMap *vcsInfo = new VCSFileInfoMap; /// Convert to VCSFileInfoMap: \FIXME : any speed improvement here? - QStringList entries = registeredEntryList(); - QStringList::const_iterator it = entries.begin(), end = entries.end(); + TQStringList entries = registeredEntryList(); + TQStringList::const_iterator it = entries.begin(), end = entries.end(); for ( ; it != end; ++it) { - const QString &fileName = (*it); + const TQString &fileName = (*it); const CVSEntry entry = fileStatus( fileName ); vcsInfo->insert( fileName, entry.toVCSFileInfo() ); diff --git a/vcs/cvsservice/cvsdir.h b/vcs/cvsservice/cvsdir.h index 606f7507..bd745d3e 100644 --- a/vcs/cvsservice/cvsdir.h +++ b/vcs/cvsservice/cvsdir.h @@ -12,9 +12,9 @@ #ifndef CVSDIR_H #define CVSDIR_H -#include <qdir.h> -#include <qstringlist.h> -#include <qmap.h> +#include <tqdir.h> +#include <tqstringlist.h> +#include <tqmap.h> #include "cvsentry.h" @@ -27,7 +27,7 @@ class CVSDir : public QDir { public: CVSDir(); - CVSDir( const QDir &dir ); + CVSDir( const TQDir &dir ); explicit CVSDir( const CVSDir & ); CVSDir &operator=( const CVSDir & ); virtual ~CVSDir(); @@ -40,13 +40,13 @@ public: /** * Returns a list of all the files registered into repository */ - QStringList registeredEntryList() const; + TQStringList registeredEntryList() const; /** * @param fileName is the file name (with no path info, just the file name!) * @param refreshCache update internal cache re-parsing "<dirPath>/CVS/Entries" * @return an empty CVSEntry if the file is not present */ - CVSEntry fileStatus( const QString &fileName, bool refreshCache = false ) const; + CVSEntry fileStatus( const TQString &fileName, bool refreshCache = false ) const; /** */ VCSFileInfoMap dirStatus() const; @@ -54,49 +54,49 @@ public: /** * @return true if the file is registered into repository, false otherwise */ - bool isRegistered( const QString fileName ) const; + bool isRegistered( const TQString fileName ) const; /** * Check if the specified @p fileName is in "<CVSDIR>/.cvsignore" and, if not, * append it. */ - void ignoreFile( const QString &fileName ); + void ignoreFile( const TQString &fileName ); /** * Check if the specified @p fileName is in "<CVSDIR>/.cvsignore" and, if yes, * remove it. */ - void doNotIgnoreFile( const QString &fileName ); + void doNotIgnoreFile( const TQString &fileName ); /** * @return the content of "<CVSDIR>/CVS/Repository" */ - QString repository() const; + TQString repository() const; /** * @return the content of "<CVSDIR>/CVS/Root" */ - QString root() const; + TQString root() const; /** * @return full path of "<this-dir>/CVS/Entries" */ - QString entriesFileName() const; + TQString entriesFileName() const; /** * @return full path of "<this-dir>/CVS/Root" */ - QString rootFileName() const; + TQString rootFileName() const; /** * @return full path of "<this-dir>/CVS/Repository" */ - QString repoFileName() const; + TQString repoFileName() const; /** * @return full path of "<this-dir>/.cvsignore" */ - QString cvsIgnoreFileName() const; + TQString cvsIgnoreFileName() const; private: void refreshEntriesCache() const; - static QByteArray cacheFile( const QString &fileName ); + static TQByteArray cacheFile( const TQString &fileName ); - QString m_cvsDir; + TQString m_cvsDir; - typedef QMap<QString,CVSEntry> CVSEntriesCacheMap; + typedef TQMap<TQString,CVSEntry> CVSEntriesCacheMap; mutable CVSEntriesCacheMap m_cachedEntries; }; diff --git a/vcs/cvsservice/cvsentry.cpp b/vcs/cvsservice/cvsentry.cpp index ab8b2cc0..5db9710e 100644 --- a/vcs/cvsservice/cvsentry.cpp +++ b/vcs/cvsservice/cvsentry.cpp @@ -9,8 +9,8 @@ * * ***************************************************************************/ -#include <qfile.h> -#include <qtextstream.h> +#include <tqfile.h> +#include <tqtextstream.h> #include "cvsentry.h" #include "cvsdir.h" @@ -19,10 +19,10 @@ // Static /////////////////////////////////////////////////////////////////////////////// -const QString CVSEntry::invalidMarker = "<Invalid entry>"; -const QString CVSEntry::directoryMarker = "D"; -const QString CVSEntry::fileMarker = ""; -const QString CVSEntry::entrySeparator = "/"; +const TQString CVSEntry::invalidMarker = "<Invalid entry>"; +const TQString CVSEntry::directoryMarker = "D"; +const TQString CVSEntry::fileMarker = ""; +const TQString CVSEntry::entrySeparator = "/"; /////////////////////////////////////////////////////////////////////////////// // class CVSEntry @@ -35,7 +35,7 @@ CVSEntry::CVSEntry() /////////////////////////////////////////////////////////////////////////////// -CVSEntry::CVSEntry( const QString &aLine, const CVSDir& dir ) +CVSEntry::CVSEntry( const TQString &aLine, const CVSDir& dir ) { parse( aLine, dir ); } @@ -57,11 +57,11 @@ CVSEntry::EntryType CVSEntry::type() const /////////////////////////////////////////////////////////////////////////////// -void CVSEntry::parse( const QString &aLine, const CVSDir& dir ) +void CVSEntry::parse( const TQString &aLine, const CVSDir& dir ) { clean(); - m_fields = QStringList::split( "/", aLine ); + m_fields = TQStringList::split( "/", aLine ); if (aLine.startsWith( entrySeparator )) // Is a file? { @@ -70,7 +70,7 @@ void CVSEntry::parse( const QString &aLine, const CVSDir& dir ) else if (aLine.startsWith( directoryMarker )) // Must be a directory then { m_type = directoryEntry; // Is a directory - m_fields.pop_front(); // QStringList::split() fills and empty item in head + m_fields.pop_front(); // TQStringList::split() fills and empty item in head return; } else // What the hell is this? >:-) @@ -80,9 +80,9 @@ void CVSEntry::parse( const QString &aLine, const CVSDir& dir ) } //if we're a file, keep going - QDateTime entryFileDate(QDateTime::fromString(timeStamp())); - QDateTime realFileDate; - QFileInfo info(dir, m_fields[0]); + TQDateTime entryFileDate(TQDateTime::fromString(timeStamp())); + TQDateTime realFileDate; + TQFileInfo info(dir, m_fields[0]); realFileDate = info.lastModified(); m_state = UpToDate; @@ -95,9 +95,9 @@ void CVSEntry::parse( const QString &aLine, const CVSDir& dir ) m_state = Conflict; else { - QDateTime date( QDateTime::fromString( timeStamp() ) ); - QDateTime fileDateUTC; - fileDateUTC.setTime_t( QFileInfo(dir, fileName()).lastModified().toTime_t(), Qt::UTC ); + TQDateTime date( TQDateTime::fromString( timeStamp() ) ); + TQDateTime fileDateUTC; + fileDateUTC.setTime_t( TQFileInfo(dir, fileName()).lastModified().toTime_t(), Qt::UTC ); if ( date != fileDateUTC ) m_state = Modified; } @@ -105,52 +105,52 @@ void CVSEntry::parse( const QString &aLine, const CVSDir& dir ) /////////////////////////////////////////////////////////////////////////////// -QString CVSEntry::fileName() const +TQString CVSEntry::fileName() const { if (type() != invalidEntry && m_fields.count() >= 1) return m_fields[0]; else - return QString::null; + return TQString::null; } /////////////////////////////////////////////////////////////////////////////// -QString CVSEntry::revision() const +TQString CVSEntry::revision() const { if (type() != invalidEntry && m_fields.count() >= 2) return m_fields[1]; else - return QString::null; + return TQString::null; } /////////////////////////////////////////////////////////////////////////////// -QString CVSEntry::timeStamp() const +TQString CVSEntry::timeStamp() const { if (type() != invalidEntry && m_fields.count() >= 3) return m_fields[2]; else - return QString::null; + return TQString::null; } /////////////////////////////////////////////////////////////////////////////// -QString CVSEntry::options() const +TQString CVSEntry::options() const { if (type() != invalidEntry && m_fields.count() >= 4) return m_fields[3]; else - return QString::null; + return TQString::null; } /////////////////////////////////////////////////////////////////////////////// -QString CVSEntry::tag() const +TQString CVSEntry::tag() const { if (type() != invalidEntry && m_fields.count() >= 5) return m_fields[4]; else - return QString::null; + return TQString::null; } /////////////////////////////////////////////////////////////////////////////// diff --git a/vcs/cvsservice/cvsentry.h b/vcs/cvsservice/cvsentry.h index 1c3db926..9a2e4d6d 100644 --- a/vcs/cvsservice/cvsentry.h +++ b/vcs/cvsservice/cvsentry.h @@ -13,8 +13,8 @@ #ifndef CVSENTRY_H #define CVSENTRY_H -#include <qstring.h> -#include <qstringlist.h> +#include <tqstring.h> +#include <tqstringlist.h> #include <kdevversioncontrol.h> class CVSDir; @@ -25,32 +25,32 @@ public: enum EntryType { invalidEntry, fileEntry, directoryEntry }; enum FileState { UpToDate, Modified, Added, Conflict, Removed, Unknown }; - static const QString invalidMarker; - static const QString directoryMarker; - static const QString fileMarker; - static const QString entrySeparator; + static const TQString invalidMarker; + static const TQString directoryMarker; + static const TQString fileMarker; + static const TQString entrySeparator; CVSEntry(); - CVSEntry( const QString &aLine, const CVSDir& dir ); + CVSEntry( const TQString &aLine, const CVSDir& dir ); void clean(); - void parse( const QString &aLine, const CVSDir& dir ); + void parse( const TQString &aLine, const CVSDir& dir ); VCSFileInfo toVCSFileInfo() const; bool isValid() const { return type() != invalidEntry; } bool isDirectory() const { return type() == directoryEntry; } EntryType type() const; FileState state() const; - QString fileName() const; - QString revision() const; - QString timeStamp() const; - QString options() const; - QString tag() const; + TQString fileName() const; + TQString revision() const; + TQString timeStamp() const; + TQString options() const; + TQString tag() const; private: EntryType m_type; FileState m_state; - QStringList m_fields; + TQStringList m_fields; }; #endif diff --git a/vcs/cvsservice/cvsfileinfoprovider.cpp b/vcs/cvsservice/cvsfileinfoprovider.cpp index 1ac5bd76..cbfc726f 100644 --- a/vcs/cvsservice/cvsfileinfoprovider.cpp +++ b/vcs/cvsservice/cvsfileinfoprovider.cpp @@ -9,8 +9,8 @@ * * ***************************************************************************/ -#include <qregexp.h> -#include <qtimer.h> +#include <tqregexp.h> +#include <tqtimer.h> #include <kurl.h> #include <kdebug.h> @@ -35,7 +35,7 @@ CVSFileInfoProvider::CVSFileInfoProvider( CvsServicePart *parent, CvsService_stu : KDevVCSFileInfoProvider( parent, "cvsfileinfoprovider" ), m_requestStatusJob( 0 ), m_cvsService( cvsService ), m_cachedDirEntries( 0 ) { - connect( this, SIGNAL(needStatusUpdate(const CVSDir&)), this, SLOT(updateStatusFor(const CVSDir&))); + connect( this, TQT_SIGNAL(needStatusUpdate(const CVSDir&)), this, TQT_SLOT(updateStatusFor(const CVSDir&))); } /////////////////////////////////////////////////////////////////////////////// @@ -50,14 +50,14 @@ CVSFileInfoProvider::~CVSFileInfoProvider() /////////////////////////////////////////////////////////////////////////////// -const VCSFileInfoMap *CVSFileInfoProvider::status( const QString &dirPath ) +const VCSFileInfoMap *CVSFileInfoProvider::status( const TQString &dirPath ) { // Same dir: we can do with cache ... if (dirPath != m_previousDirPath) { // ... different dir: flush old cache and cache new dir delete m_cachedDirEntries; - CVSDir cvsdir( projectDirectory() + QDir::separator() + dirPath ); + CVSDir cvsdir( projectDirectory() + TQDir::separator() + dirPath ); m_previousDirPath = dirPath; m_cachedDirEntries = cvsdir.cacheableDirStatus(); } @@ -66,7 +66,7 @@ const VCSFileInfoMap *CVSFileInfoProvider::status( const QString &dirPath ) /////////////////////////////////////////////////////////////////////////////// -bool CVSFileInfoProvider::requestStatus( const QString &dirPath, void *callerData, bool recursive, bool checkRepos ) +bool CVSFileInfoProvider::requestStatus( const TQString &dirPath, void *callerData, bool recursive, bool checkRepos ) { m_savedCallerData = callerData; if (m_requestStatusJob) @@ -85,7 +85,7 @@ bool CVSFileInfoProvider::requestStatus( const QString &dirPath, void *callerDat if (!checkRepos) { kdDebug(9006) << "No repo check reqested; Just read CVS/Entries from: " << dirPath << endl; - QDir qd(projectDirectory()+QDir::separator()+dirPath); + TQDir qd(projectDirectory()+TQDir::separator()+dirPath); CVSDir cdir(qd); if (cdir.isValid()) { @@ -100,7 +100,7 @@ bool CVSFileInfoProvider::requestStatus( const QString &dirPath, void *callerDat // When "cvs status" get's called nonrecursiv for a directory, it will // not print anything if the path ends with a slash. So we need to ensure // this here. - QString newPath = dirPath; + TQString newPath = dirPath; if (newPath.endsWith("/")) newPath.truncate( newPath.length()-1 ); @@ -111,11 +111,11 @@ bool CVSFileInfoProvider::requestStatus( const QString &dirPath, void *callerDat kdDebug(9006) << "Running command : " << m_requestStatusJob->cvsCommand() << endl; connectDCOPSignal( job.app(), job.obj(), "jobExited(bool, int)", "slotJobExited(bool, int)", true ); - connectDCOPSignal( job.app(), job.obj(), "receivedStdout(QString)", "slotReceivedOutput(QString)", true ); + connectDCOPSignal( job.app(), job.obj(), "receivedStdout(TQString)", "slotReceivedOutput(TQString)", true ); return m_requestStatusJob->execute(); /* kdDebug(9006) << k_funcinfo << "Attempting to parse " << dirPath << " using CVS/Entries" << endl; - QDir qd(dirPath); + TQDir qd(dirPath); CVSDir cdir(qd); if (cdir.isValid()) { @@ -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. */ - QTimer::singleShot( 1000, this, SLOT(propagateUpdate()) ); + TQTimer::singleShot( 1000, this, TQT_SLOT(propagateUpdate()) ); } /////////////////////////////////////////////////////////////////////////////// @@ -167,9 +167,9 @@ void CVSFileInfoProvider::slotJobExited( bool normalExit, int /*exitStatus*/ ) /////////////////////////////////////////////////////////////////////////////// -void CVSFileInfoProvider::slotReceivedOutput( QString someOutput ) +void CVSFileInfoProvider::slotReceivedOutput( TQString someOutput ) { - QStringList strings = m_bufferedReader.process( someOutput ); + TQStringList strings = m_bufferedReader.process( someOutput ); if (strings.count() > 0) { m_statusLines += strings; @@ -178,32 +178,32 @@ void CVSFileInfoProvider::slotReceivedOutput( QString someOutput ) /////////////////////////////////////////////////////////////////////////////// -void CVSFileInfoProvider::slotReceivedErrors( QString /*someErrors*/ ) +void CVSFileInfoProvider::slotReceivedErrors( TQString /*someErrors*/ ) { /* Nothing to do */ } /////////////////////////////////////////////////////////////////////////////// -QString CVSFileInfoProvider::projectDirectory() const +TQString CVSFileInfoProvider::projectDirectory() const { return owner()->project()->projectDirectory(); } /////////////////////////////////////////////////////////////////////////////// -VCSFileInfoMap *CVSFileInfoProvider::parse( QStringList stringStream ) +VCSFileInfoMap *CVSFileInfoProvider::parse( TQStringList stringStream ) { - QRegExp rx_recordStart( "^=+$" ); - QRegExp rx_fileName( "^File: (\\.|\\-|\\w)+" ); - QRegExp rx_fileStatus( "Status: (\\.|-|\\s|\\w)+" ); - QRegExp rx_fileWorkRev( "\\bWorking revision:" ); - QRegExp rx_fileRepoRev( "\\bRepository revision:" ); - //QRegExp rx_stickyTag( "\\s+(Sticky Tag:\\W+(w+|\\(none\\)))" ); - //QRegExp rx_stickyDate( "" ); // @todo but are they useful?? :-/ - //QRegExp rx_stickyOptions( "" ); //@todo - - QString fileName, + TQRegExp rx_recordStart( "^=+$" ); + TQRegExp rx_fileName( "^File: (\\.|\\-|\\w)+" ); + TQRegExp rx_fileStatus( "Status: (\\.|-|\\s|\\w)+" ); + TQRegExp rx_fileWorkRev( "\\bWorking revision:" ); + TQRegExp rx_fileRepoRev( "\\bRepository revision:" ); + //TQRegExp rx_stickyTag( "\\s+(Sticky Tag:\\W+(w+|\\(none\\)))" ); + //TQRegExp rx_stickyDate( "" ); // @todo but are they useful?? :-/ + //TQRegExp rx_stickyOptions( "" ); //@todo + + TQString fileName, fileStatus, workingRevision, repositoryRevision, @@ -217,9 +217,9 @@ VCSFileInfoMap *CVSFileInfoProvider::parse( QStringList stringStream ) const int lastAcceptableState = 4; // This is where the dirty parsing is done: from a string stream representing the // 'cvs log' output we build a map with more useful strunctured data ;-) - for (QStringList::const_iterator it=stringStream.begin(); it != stringStream.end(); ++it) + for (TQStringList::const_iterator it=stringStream.begin(); it != stringStream.end(); ++it) { - QString s = (*it).stripWhiteSpace(); + TQString s = (*it).stripWhiteSpace(); kdDebug(9006) << ">> Parsing: " << s << endl; if (rx_recordStart.exactMatch( s )) @@ -235,7 +235,7 @@ VCSFileInfoMap *CVSFileInfoProvider::parse( QStringList stringStream ) { workingRevision = s.replace( "Working revision:", "" ).stripWhiteSpace(); - QRegExp rx_revision( "\\b(((\\d)+\\.?)*|New file!)" ); + TQRegExp rx_revision( "\\b(((\\d)+\\.?)*|New file!)" ); if (rx_revision.search( workingRevision ) >= 0) { workingRevision = rx_revision.cap(); @@ -247,7 +247,7 @@ VCSFileInfoMap *CVSFileInfoProvider::parse( QStringList stringStream ) { repositoryRevision = s.replace( "Repository revision:", "" ).stripWhiteSpace(); - QRegExp rx_revision( "\\b(((\\d)+\\.?)*|No revision control file)" ); + TQRegExp rx_revision( "\\b(((\\d)+\\.?)*|No revision control file)" ); if (rx_revision.search( s ) >= 0) { repositoryRevision = rx_revision.cap(); @@ -276,11 +276,11 @@ VCSFileInfoMap *CVSFileInfoProvider::parse( QStringList stringStream ) /////////////////////////////////////////////////////////////////////////////// -VCSFileInfo::FileState CVSFileInfoProvider::String2EnumState( QString stateAsString ) +VCSFileInfo::FileState CVSFileInfoProvider::String2EnumState( TQString stateAsString ) { // @todo add more status as "Conflict" and "Sticky" (but I dunno how CVS writes it so I'm going // to await until I have a conflict or somebody else fix it ;-) - // @todo use QRegExp for better matching since it seems strings have changed between CVS releases :-( + // @todo use TQRegExp for better matching since it seems strings have changed between CVS releases :-( // @todo a new state for 'Needs patch' if (stateAsString == "Up-to-date") return VCSFileInfo::Uptodate; diff --git a/vcs/cvsservice/cvsfileinfoprovider.h b/vcs/cvsservice/cvsfileinfoprovider.h index 2c0b5cf1..9b80dc8e 100644 --- a/vcs/cvsservice/cvsfileinfoprovider.h +++ b/vcs/cvsservice/cvsfileinfoprovider.h @@ -12,7 +12,7 @@ #ifndef CVSFILEINFOPROVIDER_H #define CVSFILEINFOPROVIDER_H -#include <qmap.h> +#include <tqmap.h> #include <kdevversioncontrol.h> #include "cvsservicedcopIface.h" @@ -36,10 +36,10 @@ public: virtual ~CVSFileInfoProvider(); // -- Sync interface - virtual const VCSFileInfoMap *status( const QString &dirPath ) ; + virtual const VCSFileInfoMap *status( const TQString &dirPath ) ; // -- Async interface for requesting data - virtual bool requestStatus( const QString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true ); + virtual bool requestStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true ); public slots: void updateStatusFor( const CVSDir& ); @@ -52,26 +52,26 @@ signals: private: // DCOP Iface virtual void slotJobExited( bool normalExit, int exitStatus ); - virtual void slotReceivedOutput( QString someOutput ); - virtual void slotReceivedErrors( QString someErrors ); + virtual void slotReceivedOutput( TQString someOutput ); + virtual void slotReceivedErrors( TQString someErrors ); - QString projectDirectory() const; + TQString projectDirectory() const; - static VCSFileInfoMap *parse( QStringList stringStream ); + static VCSFileInfoMap *parse( TQStringList stringStream ); - static VCSFileInfo::FileState String2EnumState( QString stateAsString ); + static VCSFileInfo::FileState String2EnumState( TQString stateAsString ); static void printOutFileInfoMap( const VCSFileInfoMap &map ); BufferedStringReader m_bufferedReader; - QStringList m_statusLines; + TQStringList m_statusLines; mutable void *m_savedCallerData; mutable CvsJob_stub *m_requestStatusJob; CvsService_stub *m_cvsService; //! Caching - mutable QString m_previousDirPath; + mutable TQString m_previousDirPath; mutable VCSFileInfoMap *m_cachedDirEntries; }; diff --git a/vcs/cvsservice/cvsform.cpp b/vcs/cvsservice/cvsform.cpp index a23a1df2..ef0521c8 100644 --- a/vcs/cvsservice/cvsform.cpp +++ b/vcs/cvsservice/cvsform.cpp @@ -10,8 +10,8 @@ ***************************************************************************/ #include <klineedit.h> -#include <qcombobox.h> -#include <qcheckbox.h> +#include <tqcombobox.h> +#include <tqcheckbox.h> #include "cvsform.h" @@ -19,7 +19,7 @@ // class CvsForm /////////////////////////////////////////////////////////////////////////////// -CvsForm::CvsForm( QWidget *parent, const char *name, WFlags f ) +CvsForm::CvsForm( TQWidget *parent, const char *name, WFlags f ) : CvsFormBase( parent, name, f ) { setWFlags( getWFlags() | WDestructiveClose ); @@ -33,42 +33,42 @@ CvsForm::~CvsForm() /////////////////////////////////////////////////////////////////////////////// -QString CvsForm::module() const +TQString CvsForm::module() const { return module_edit->text(); } /////////////////////////////////////////////////////////////////////////////// -QString CvsForm::vendor() const +TQString CvsForm::vendor() const { return vendor_edit->text(); } /////////////////////////////////////////////////////////////////////////////// -QString CvsForm::message() const +TQString CvsForm::message() const { return message_edit->text(); } /////////////////////////////////////////////////////////////////////////////// -QString CvsForm::release() const +TQString CvsForm::release() const { return release_edit->text(); } /////////////////////////////////////////////////////////////////////////////// -QString CvsForm::location() const +TQString CvsForm::location() const { return serverPathEdit->text(); } /////////////////////////////////////////////////////////////////////////////// -QString CvsForm::cvsRsh() const +TQString CvsForm::cvsRsh() const { return cvsRshComboBox->currentText(); } diff --git a/vcs/cvsservice/cvsform.h b/vcs/cvsservice/cvsform.h index 471e10d6..a61e8473 100644 --- a/vcs/cvsservice/cvsform.h +++ b/vcs/cvsservice/cvsform.h @@ -22,15 +22,15 @@ class CvsForm : public CvsFormBase { Q_OBJECT public: - CvsForm( QWidget *parent = 0, const char *name = 0, WFlags f = 0 ); + CvsForm( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 ); virtual ~CvsForm(); - QString module() const; - QString vendor() const; - QString message() const; - QString release() const; - QString location() const; - QString cvsRsh() const; + TQString module() const; + TQString vendor() const; + TQString message() const; + TQString release() const; + TQString location() const; + TQString cvsRsh() const; bool mustInitRoot() const; }; diff --git a/vcs/cvsservice/cvslogdialog.cpp b/vcs/cvsservice/cvslogdialog.cpp index ac6fd97c..ff36c19d 100644 --- a/vcs/cvsservice/cvslogdialog.cpp +++ b/vcs/cvsservice/cvslogdialog.cpp @@ -9,10 +9,10 @@ * * ***************************************************************************/ -#include <qvbox.h> -#include <qregexp.h> -#include <qdir.h> -#include <qstringlist.h> +#include <tqvbox.h> +#include <tqregexp.h> +#include <tqdir.h> +#include <tqstringlist.h> #include <kmessagebox.h> #include <kcursor.h> @@ -32,18 +32,18 @@ // class CVSLogDialog /////////////////////////////////////////////////////////////////////////////// -CVSLogDialog::CVSLogDialog( CvsService_stub *cvsService, QWidget *parent, const char *name, int ) +CVSLogDialog::CVSLogDialog( CvsService_stub *cvsService, TQWidget *parent, const char *name, int ) : KDialogBase( Tabbed, i18n("CVS Log & Diff Dialog"), Close, Close, parent, name? name : "logformdialog", false /*modal*/, true /*separator*/ ), m_cvsLogPage( 0 ), m_cvsService( cvsService ) { setWFlags( getWFlags() | WDestructiveClose ); - QVBox *vbox = addVBoxPage( i18n("Log From CVS") ); + TQVBox *vbox = addVBoxPage( i18n("Log From CVS") ); m_cvsLogPage = new CVSLogPage( m_cvsService, vbox ); - connect( m_cvsLogPage, SIGNAL(diffRequested(const QString&, const QString&, const QString&)), - this, SLOT(slotDiffRequested(const QString&, const QString&, const QString&)) ); + connect( m_cvsLogPage, TQT_SIGNAL(diffRequested(const TQString&, const TQString&, const TQString&)), + this, TQT_SLOT(slotDiffRequested(const TQString&, const TQString&, const TQString&)) ); } /////////////////////////////////////////////////////////////////////////////// @@ -55,32 +55,32 @@ CVSLogDialog::~CVSLogDialog() /////////////////////////////////////////////////////////////////////////////// -void CVSLogDialog::startLog( const QString &workDir, const QString &pathName ) +void CVSLogDialog::startLog( const TQString &workDir, const TQString &pathName ) { kdDebug(9006) << "CVSLogDialog::start() here! workDir = " << workDir << ", pathName = " << pathName << endl; // displayActionFeedback( true ); /* - QVBox *vbox = addVBoxPage( i18n("Log From CVS: ") + pathName ); + TQVBox *vbox = addVBoxPage( i18n("Log From CVS: ") + pathName ); m_cvsLogPage = new CVSLogPage( m_cvsService, vbox ); this->resize( m_cvsLogPage->size() ); - connect( m_cvsLogPage, SIGNAL(linkClicked(const QString&, const QString&)), - this, SLOT(slotDiffRequested(const QString&, const QString&)) ); + connect( m_cvsLogPage, TQT_SIGNAL(linkClicked(const TQString&, const TQString&)), + this, TQT_SLOT(slotDiffRequested(const TQString&, const TQString&)) ); */ m_cvsLogPage->startLog( workDir, pathName ); } /////////////////////////////////////////////////////////////////////////////// -void CVSLogDialog::slotDiffRequested( const QString &pathName, const QString &revA, const QString &revB ) +void CVSLogDialog::slotDiffRequested( const TQString &pathName, const TQString &revA, const TQString &revB ) { kdDebug(9006) << "CVSLogDialog::slotDiffRequested()" << endl; // Create a new CVSDiffPage and start diffing process - QString diffTitle = i18n("Diff between %1 and %2").arg( revA ).arg( revB ); - QVBox *vbox = addVBoxPage( diffTitle ); + TQString diffTitle = i18n("Diff between %1 and %2").arg( revA ).arg( revB ); + TQVBox *vbox = addVBoxPage( diffTitle ); CVSDiffPage *diffPage = new CVSDiffPage( m_cvsService, vbox ); diffPage->startDiff( pathName, revA, revB ); } diff --git a/vcs/cvsservice/cvslogdialog.h b/vcs/cvsservice/cvslogdialog.h index 12a7a2eb..315fea40 100644 --- a/vcs/cvsservice/cvslogdialog.h +++ b/vcs/cvsservice/cvslogdialog.h @@ -27,21 +27,21 @@ class CVSLogDialog : public KDialogBase { Q_OBJECT public: - CVSLogDialog( CvsService_stub *cvsService, QWidget *parent=0, const char *name=0, int flags=0 ); + CVSLogDialog( CvsService_stub *cvsService, TQWidget *parent=0, const char *name=0, int flags=0 ); virtual ~CVSLogDialog(); - void startLog( const QString &workDir, const QString &pathName ); + void startLog( const TQString &workDir, const TQString &pathName ); private slots: - void slotDiffRequested( const QString &pathName, const QString &revA, const QString &revB ); + void slotDiffRequested( const TQString &pathName, const TQString &revA, const TQString &revB ); virtual void slotCancel(); private: -// void parseLogContent( const QString& text ); +// void parseLogContent( const TQString& text ); void displayActionFeedback( bool working ); private: - QString m_pathName; + TQString m_pathName; CVSLogPage *m_cvsLogPage; CvsService_stub *m_cvsService; diff --git a/vcs/cvsservice/cvslogpage.cpp b/vcs/cvsservice/cvslogpage.cpp index cf8645e9..c0ade68e 100644 --- a/vcs/cvsservice/cvslogpage.cpp +++ b/vcs/cvsservice/cvslogpage.cpp @@ -9,11 +9,11 @@ * * ***************************************************************************/ -#include <qtextbrowser.h> -#include <qlayout.h> -#include <qregexp.h> -#include <qdir.h> -#include <qstringlist.h> +#include <tqtextbrowser.h> +#include <tqlayout.h> +#include <tqregexp.h> +#include <tqdir.h> +#include <tqstringlist.h> #include <kmessagebox.h> #include <kcursor.h> @@ -32,21 +32,21 @@ // class CVSLogPage /////////////////////////////////////////////////////////////////////////////// -CVSLogPage::CVSLogPage( CvsService_stub *cvsService, QWidget *parent, const char *name, int ) +CVSLogPage::CVSLogPage( CvsService_stub *cvsService, TQWidget *parent, const char *name, int ) : DCOPObject( "CvsLogPageDCOPIface" ), - QWidget( parent, name? name : "logformpage" ), + TQWidget( parent, name? name : "logformpage" ), m_cvsService( cvsService ), m_cvsLogJob( 0 ) { - QLayout *thisLayout = new QVBoxLayout( this ); + TQLayout *thisLayout = new TQVBoxLayout( this ); - m_textBrowser = new QTextBrowser( this, "logbrowser" ); + m_textBrowser = new TQTextBrowser( this, "logbrowser" ); thisLayout->add( m_textBrowser ); /// \FIXME a better way? m_textBrowser->setMinimumWidth(fontMetrics().width('X')*50); m_textBrowser->setMinimumHeight(fontMetrics().width('X')*43); - connect( m_textBrowser, SIGNAL(linkClicked( const QString& )), this, SLOT(slotLinkClicked( const QString& )) ); + connect( m_textBrowser, TQT_SIGNAL(linkClicked( const TQString& )), this, TQT_SLOT(slotLinkClicked( const TQString& )) ); } /////////////////////////////////////////////////////////////////////////////// @@ -60,7 +60,7 @@ CVSLogPage::~CVSLogPage() /////////////////////////////////////////////////////////////////////////////// -void CVSLogPage::startLog( const QString &workDir, const QString &pathName ) +void CVSLogPage::startLog( const TQString &workDir, const TQString &pathName ) { kdDebug(9006) << "CVSLogPage::start() here! workDir = " << workDir << ", pathName = " << pathName << endl; @@ -76,8 +76,8 @@ void CVSLogPage::startLog( const QString &workDir, const QString &pathName ) // establish connections to the signals of the cvs m_job connectDCOPSignal( job.app(), job.obj(), "jobExited(bool, int)", "slotJobExited(bool, int)", true ); // We'll read the ouput directly from the job ... - connectDCOPSignal( job.app(), job.obj(), "receivedStdout(QString)", "slotReceivedOutput(QString)", true ); -// connectDCOPSignal( job.app(), job.obj(), "receivedStderr(QString)", "slotReceivedErrors(QString)", true ); + connectDCOPSignal( job.app(), job.obj(), "receivedStdout(TQString)", "slotReceivedOutput(TQString)", true ); +// connectDCOPSignal( job.app(), job.obj(), "receivedStderr(TQString)", "slotReceivedErrors(TQString)", true ); kdDebug(9006) << "Running: " << m_cvsLogJob->cvsCommand() << endl; m_cvsLogJob->execute(); @@ -85,19 +85,19 @@ void CVSLogPage::startLog( const QString &workDir, const QString &pathName ) /////////////////////////////////////////////////////////////////////////////// /* -void CVSLogPage::parseLogContent( const QString& text ) +void CVSLogPage::parseLogContent( const TQString& text ) { kdDebug(9006) << "CVSLogPage::parseLogContent()" << endl; m_base->contents->clear(); - QStringList l = QStringList::split( "----------------------------", text ); - QString header = l.front(); + TQStringList l = TQStringList::split( "----------------------------", text ); + TQString header = l.front(); l.pop_front(); - for( QStringList::Iterator it=l.begin(); it!=l.end(); ++it ) + for( TQStringList::Iterator it=l.begin(); it!=l.end(); ++it ) { - const QString &s = *it; + const TQString &s = *it; if (s) { m_base->contents->append( s ); @@ -117,41 +117,41 @@ void CVSLogPage::slotJobExited( bool normalExit, int exitStatus ) return; } - static QRegExp rx_sep( "\\-+" ); - static QRegExp rx_sep2( "=+" ); - static QRegExp rx_date( "date: .* author: .* state: .* lines: .*" ); + static TQRegExp rx_sep( "\\-+" ); + static TQRegExp rx_sep2( "=+" ); + static TQRegExp rx_date( "date: .* author: .* state: .* lines: .*" ); // "revision" followed by one or more decimals followed by a optional dot - static QRegExp rx_rev( "revision ((\\d+\\.?)+)" ); - m_textBrowser->setTextFormat( QTextBrowser::PlainText ); + static TQRegExp rx_rev( "revision ((\\d+\\.?)+)" ); + m_textBrowser->setTextFormat( TQTextBrowser::PlainText ); for (size_t i=0; i<m_diffStrings.count(); ++i) { - QString s = m_diffStrings[i]; + TQString s = m_diffStrings[i]; kdDebug(9006) << "Examining line: " << s << endl; if ( rx_rev.exactMatch(s) ) { - QString ver = rx_rev.cap( 1 ); - QString dstr = "<b>" + s + "</b> "; + TQString ver = rx_rev.cap( 1 ); + TQString dstr = "<b>" + s + "</b> "; int lastVer = ver.section( '.', -1 ).toInt() - 1; if ( lastVer > 0 ) { - QString lv = ver.left( ver.findRev( "." ) + 1 ) + QString::number( lastVer ); + TQString lv = ver.left( ver.findRev( "." ) + 1 ) + TQString::number( lastVer ); dstr += " [<a href=\"diff:/" + m_pathName + "/" + lv + "_" + ver + "\">diff to " + lv + "</a>]"; } - m_textBrowser->setTextFormat( QTextBrowser::RichText ); + m_textBrowser->setTextFormat( TQTextBrowser::RichText ); m_textBrowser->append( dstr ); - m_textBrowser->setTextFormat( QTextBrowser::PlainText ); + m_textBrowser->setTextFormat( TQTextBrowser::PlainText ); } else if ( rx_date.exactMatch(s) ) { - m_textBrowser->setTextFormat( QTextBrowser::RichText ); + m_textBrowser->setTextFormat( TQTextBrowser::RichText ); m_textBrowser->append( "<i>" + s + "</i>" ); - m_textBrowser->setTextFormat( QTextBrowser::PlainText ); + m_textBrowser->setTextFormat( TQTextBrowser::PlainText ); } else if ( rx_sep.exactMatch(s) || rx_sep2.exactMatch(s) ) { m_textBrowser->append( "\n" ); - m_textBrowser->setTextFormat( QTextBrowser::RichText ); + m_textBrowser->setTextFormat( TQTextBrowser::RichText ); m_textBrowser->append( "<hr>" ); - m_textBrowser->setTextFormat( QTextBrowser::PlainText ); + m_textBrowser->setTextFormat( TQTextBrowser::PlainText ); } else { m_textBrowser->append( s ); @@ -164,7 +164,7 @@ void CVSLogPage::slotJobExited( bool normalExit, int exitStatus ) /////////////////////////////////////////////////////////////////////////////// -void CVSLogPage::slotLinkClicked( const QString &link ) +void CVSLogPage::slotLinkClicked( const TQString &link ) { kdDebug(9006) << "CVSLogPage::slotLinkClicked()" << endl; @@ -172,9 +172,9 @@ void CVSLogPage::slotLinkClicked( const QString &link ) /// \FIXME in this way I lose the source m_textBrowser->setSource( m_logTextBackup ); - QString ver = link.mid( link.findRev( "/" ) + 1 ); - QString v1 = ver.section( '_', 0, 0 ); - QString v2 = ver.section( '_', 1, 1 ); + TQString ver = link.mid( link.findRev( "/" ) + 1 ); + TQString v1 = ver.section( '_', 0, 0 ); + TQString v2 = ver.section( '_', 1, 1 ); if ( v1.isEmpty() || v2.isEmpty() ) { m_textBrowser->append( i18n( "invalid link clicked" ) ); @@ -186,9 +186,9 @@ void CVSLogPage::slotLinkClicked( const QString &link ) /////////////////////////////////////////////////////////////////////////////// -void CVSLogPage::slotReceivedOutput( QString someOutput ) +void CVSLogPage::slotReceivedOutput( TQString someOutput ) { - kdDebug(9006) << "CVSLogPage::slotReceivedOutput(QString)" << endl; + kdDebug(9006) << "CVSLogPage::slotReceivedOutput(TQString)" << endl; kdDebug(9006) << "OUTPUT: " << someOutput << endl; m_diffStrings += m_outputBuffer.process(someOutput); @@ -196,7 +196,7 @@ void CVSLogPage::slotReceivedOutput( QString someOutput ) /////////////////////////////////////////////////////////////////////////////// -void CVSLogPage::slotReceivedErrors( QString someErrors ) +void CVSLogPage::slotReceivedErrors( TQString someErrors ) { kdDebug(9006) << "ERRORS: " << someErrors << endl; } diff --git a/vcs/cvsservice/cvslogpage.h b/vcs/cvsservice/cvslogpage.h index a3480e91..d618500c 100644 --- a/vcs/cvsservice/cvslogpage.h +++ b/vcs/cvsservice/cvslogpage.h @@ -13,7 +13,7 @@ #define CVSLOGPAGE_H #include "cvsservicedcopIface.h" -#include <qwidget.h> +#include <tqwidget.h> #include "bufferedstringreader.h" class CvsJob_stub; @@ -25,36 +25,36 @@ Implementation for the form displaying 'cvs log' output. @author KDevelop Authors */ -class CVSLogPage : public QWidget, virtual public CVSServiceDCOPIface +class CVSLogPage : public TQWidget, virtual public CVSServiceDCOPIface { Q_OBJECT public: - CVSLogPage( CvsService_stub *cvsService, QWidget *parent=0, const char *name=0, int flags=0 ); + CVSLogPage( CvsService_stub *cvsService, TQWidget *parent=0, const char *name=0, int flags=0 ); virtual ~CVSLogPage(); - void startLog( const QString &workDir, const QString &pathName ); + void startLog( const TQString &workDir, const TQString &pathName ); void cancel(); signals: // Emitted when the user click upon a link - void diffRequested( const QString &pathName, const QString &revA, const QString &revB ); + void diffRequested( const TQString &pathName, const TQString &revA, const TQString &revB ); private slots: - void slotLinkClicked( const QString &link ); + void slotLinkClicked( const TQString &link ); // DCOP Iface virtual void slotJobExited( bool normalExit, int exitStatus ); - virtual void slotReceivedOutput( QString someOutput ); - virtual void slotReceivedErrors( QString someErrors ); + virtual void slotReceivedOutput( TQString someOutput ); + virtual void slotReceivedErrors( TQString someErrors ); //private: -// void parseLogContent( const QString& text ); +// void parseLogContent( const TQString& text ); private: - QString m_pathName; - QTextBrowser *m_textBrowser; - QString m_logTextBackup; + TQString m_pathName; + TQTextBrowser *m_textBrowser; + TQString m_logTextBackup; BufferedStringReader m_outputBuffer; - QStringList m_diffStrings; + TQStringList m_diffStrings; CvsService_stub *m_cvsService; CvsJob_stub *m_cvsLogJob; diff --git a/vcs/cvsservice/cvsoptions.cpp b/vcs/cvsservice/cvsoptions.cpp index 448f4761..43add3be 100644 --- a/vcs/cvsservice/cvsoptions.cpp +++ b/vcs/cvsservice/cvsoptions.cpp @@ -9,8 +9,8 @@ * * ***************************************************************************/ -#include <qfile.h> -#include <qtextstream.h> +#include <tqfile.h> +#include <tqtextstream.h> #include <kdebug.h> #include <kconfig.h> @@ -24,9 +24,9 @@ // Macros /////////////////////////////////////////////////////////////////////////////// -#define default_revert QString::fromLatin1("-C") -#define default_diff QString::fromLatin1("-p") -#define default_rsh QString::fromLatin1("") +#define default_revert TQString::fromLatin1("-C") +#define default_diff TQString::fromLatin1("-p") +#define default_rsh TQString::fromLatin1("") #define default_contextLines 3 #define default_compression 0 @@ -35,7 +35,7 @@ /////////////////////////////////////////////////////////////////////////////// CvsOptions *CvsOptions::m_instance = 0; -QString CvsOptions::invalidLocation( "ERROR-LOCATION-IS-NOT-SET-IN-PROJECT" ); +TQString CvsOptions::invalidLocation( "ERROR-LOCATION-IS-NOT-SET-IN-PROJECT" ); /////////////////////////////////////////////////////////////////////////////// // class CvsOptions @@ -85,7 +85,7 @@ void CvsOptions::save( KDevProject *project ) kdDebug( 9006 ) << " **** CvsOptions::save( KDevProject* ) here" << endl; Q_ASSERT( project ); - QDomDocument &dom = *project->projectDom(); + TQDomDocument &dom = *project->projectDom(); DomUtil::writeBoolEntry( dom, "/kdevcvsservice/recursivewhenupdate", recursiveWhenUpdate() ); DomUtil::writeBoolEntry( dom, "/kdevcvsservice/prunedirswhenupdate", pruneEmptyDirsWhenUpdate() ); @@ -95,7 +95,7 @@ void CvsOptions::save( KDevProject *project ) // DomUtil::writeEntry( dom, "/kdevcvsservice/location", location() ); // [Repository-:ext:[email protected]:/cvsroot/ogrenew] - QString groupName = "Repository-" + guessLocation( project->projectDirectory() ); + TQString groupName = "Repository-" + guessLocation( project->projectDirectory() ); m_serviceConfig->setGroup( groupName ); m_serviceConfig->writeEntry( "ContextLines", contextLines() ); @@ -109,7 +109,7 @@ void CvsOptions::load( KDevProject *project ) { kdDebug( 9006 ) << " **** CvsOptions::load( KDevProject* ) here" << endl; Q_ASSERT( project ); - QDomDocument &dom = *project->projectDom(); + TQDomDocument &dom = *project->projectDom(); m_recursiveWhenUpdate = DomUtil::readBoolEntry( dom, "/kdevcvsservice/recursivewhenupdate", true ); m_pruneEmptyDirsWhenUpdate = DomUtil::readBoolEntry( dom, "/kdevcvsservice/prunedirswhenupdate", true ); @@ -118,7 +118,7 @@ void CvsOptions::load( KDevProject *project ) m_revertOptions = DomUtil::readEntry( dom, "/kdevcvsservice/revertoptions", default_revert ); // m_location = DomUtil::readEntry( dom, "/kdevcvsservice/location", guessLocation( project->projectDirectory() ) ); - QString groupName = "Repository-" + guessLocation( project->projectDirectory() ); + TQString groupName = "Repository-" + guessLocation( project->projectDirectory() ); m_serviceConfig->setGroup( groupName ); m_contextLines = m_serviceConfig->readUnsignedNumEntry( "ContextLines", default_contextLines ); @@ -184,56 +184,56 @@ bool CvsOptions::createDirsWhenUpdate() const /////////////////////////////////////////////////////////////////////////////// -void CvsOptions::setRevertOptions( const QString &p ) +void CvsOptions::setRevertOptions( const TQString &p ) { this->m_revertOptions = p; } /////////////////////////////////////////////////////////////////////////////// -QString CvsOptions::revertOptions() +TQString CvsOptions::revertOptions() { return this->m_revertOptions; } /////////////////////////////////////////////////////////////////////////////// -void CvsOptions::setDiffOptions( const QString &p ) +void CvsOptions::setDiffOptions( const TQString &p ) { this->m_diffOptions = p; } /////////////////////////////////////////////////////////////////////////////// -QString CvsOptions::diffOptions() +TQString CvsOptions::diffOptions() { return this->m_diffOptions; } /////////////////////////////////////////////////////////////////////////////// -void CvsOptions::setCvsRshEnvVar( const QString &p ) +void CvsOptions::setCvsRshEnvVar( const TQString &p ) { this->m_cvsRshEnvVar = p; } /////////////////////////////////////////////////////////////////////////////// -QString CvsOptions::cvsRshEnvVar() +TQString CvsOptions::cvsRshEnvVar() { return this->m_cvsRshEnvVar; } /////////////////////////////////////////////////////////////////////////////// -QString CvsOptions::location() +TQString CvsOptions::location() { return m_location; } /////////////////////////////////////////////////////////////////////////////// -void CvsOptions::setLocation( const QString &p ) +void CvsOptions::setLocation( const TQString &p ) { m_location = p; } @@ -268,15 +268,15 @@ unsigned int CvsOptions::compressionLevel() const /////////////////////////////////////////////////////////////////////////////// -QString CvsOptions::guessLocation( const QString &projectDir ) const +TQString CvsOptions::guessLocation( const TQString &projectDir ) const { - QString rootFileName( projectDir + "/CVS/Root" ); + TQString rootFileName( projectDir + "/CVS/Root" ); - QFile f( rootFileName ); + TQFile f( rootFileName ); if (f.open( IO_ReadOnly )) { - QTextStream t( &f ); - QString serverLocation = t.readLine(); + TQTextStream t( &f ); + TQString serverLocation = t.readLine(); kdDebug(9000) << "===> Server location guessed: " << serverLocation << endl; return serverLocation; } diff --git a/vcs/cvsservice/cvsoptions.h b/vcs/cvsservice/cvsoptions.h index 222a34c7..857b47e4 100644 --- a/vcs/cvsservice/cvsoptions.h +++ b/vcs/cvsservice/cvsoptions.h @@ -12,8 +12,8 @@ #ifndef CVSOPTIONS_H #define CVSOPTIONS_H -#include <qstring.h> -#include <qdom.h> +#include <tqstring.h> +#include <tqdom.h> class CvsServicePart; class KConfig; @@ -28,7 +28,7 @@ class CvsOptions public: static CvsOptions *instance(); - static QString invalidLocation; + static TQString invalidLocation; virtual ~CvsOptions(); @@ -48,30 +48,30 @@ public: void setCreateDirsWhenUpdate( bool b ); bool createDirsWhenUpdate() const; - void setDiffOptions( const QString &p ); - QString diffOptions(); + void setDiffOptions( const TQString &p ); + TQString diffOptions(); - void setRevertOptions( const QString &p ); - QString revertOptions(); + void setRevertOptions( const TQString &p ); + TQString revertOptions(); - void setCvsRshEnvVar( const QString &p ); - QString cvsRshEnvVar(); + void setCvsRshEnvVar( const TQString &p ); + TQString cvsRshEnvVar(); /** * Will try to determine location by using CVS/Root file */ - QString guessLocation( const QString &projectDir ) const; + TQString guessLocation( const TQString &projectDir ) const; /** * Set server path string (this should be called by the part when a new project * is created or imported) * @param p (i.e. :pserver:[email protected]:/home/kde) */ - void setLocation( const QString &p ); + void setLocation( const TQString &p ); /** * @result remote path (i.e. :pserver:[email protected]:/home/kde) */ - QString location(); + TQString location(); void setContextLines( unsigned int contextLines ); unsigned int contextLines() const; @@ -85,10 +85,10 @@ private: bool m_pruneEmptyDirsWhenUpdate; bool m_recursiveWhenUpdate; bool m_createDirsWhenUpdate; - QString m_revertOptions; - QString m_diffOptions; - QString m_cvsRshEnvVar; - QString m_location; + TQString m_revertOptions; + TQString m_diffOptions; + TQString m_cvsRshEnvVar; + TQString m_location; unsigned int m_compressionLevel; unsigned int m_contextLines; //! So we can access cvssservice configuration (repositories first of all) diff --git a/vcs/cvsservice/cvsoptionswidget.cpp b/vcs/cvsservice/cvsoptionswidget.cpp index aa7a98c1..32044dd3 100644 --- a/vcs/cvsservice/cvsoptionswidget.cpp +++ b/vcs/cvsservice/cvsoptionswidget.cpp @@ -11,7 +11,7 @@ * * ***************************************************************************/ -#include <qcheckbox.h> +#include <tqcheckbox.h> #include <klineedit.h> #include <knuminput.h> #include <kdialog.h> @@ -24,7 +24,7 @@ // class DiffDialog /////////////////////////////////////////////////////////////////////////////// -CvsOptionsWidget::CvsOptionsWidget( QWidget *parent, const char *name ) +CvsOptionsWidget::CvsOptionsWidget( TQWidget *parent, const char *name ) : CvsOptionsWidgetBase( parent, name ) { readConfig(); @@ -112,28 +112,28 @@ void CvsOptionsWidget::setContextLines( unsigned int p ) /////////////////////////////////////////////////////////////////////////////// -void CvsOptionsWidget::setDiffOptions( const QString &p ) +void CvsOptionsWidget::setDiffOptions( const TQString &p ) { this->diffOptionsEdit->setText( p ); } /////////////////////////////////////////////////////////////////////////////// -QString CvsOptionsWidget::diffOptions() const +TQString CvsOptionsWidget::diffOptions() const { return this->diffOptionsEdit->text(); } /////////////////////////////////////////////////////////////////////////////// -void CvsOptionsWidget::setCvsRshEnvVar( const QString &p ) +void CvsOptionsWidget::setCvsRshEnvVar( const TQString &p ) { this->cvsRshEnvVarEdit->setText( p ); } /////////////////////////////////////////////////////////////////////////////// -void CvsOptionsWidget::setServerLocation( const QString &p ) +void CvsOptionsWidget::setServerLocation( const TQString &p ) { this->serverLocationEdit->setText( p ); } @@ -175,14 +175,14 @@ unsigned int CvsOptionsWidget::contextLines() const /////////////////////////////////////////////////////////////////////////////// -QString CvsOptionsWidget::cvsRshEnvVar() const +TQString CvsOptionsWidget::cvsRshEnvVar() const { return cvsRshEnvVarEdit->text(); } /////////////////////////////////////////////////////////////////////////////// -QString CvsOptionsWidget::serverLocation() const +TQString CvsOptionsWidget::serverLocation() const { return serverLocationEdit->text(); } diff --git a/vcs/cvsservice/cvsoptionswidget.h b/vcs/cvsservice/cvsoptionswidget.h index 5df98d76..caf23619 100644 --- a/vcs/cvsservice/cvsoptionswidget.h +++ b/vcs/cvsservice/cvsoptionswidget.h @@ -14,7 +14,7 @@ #ifndef _CVSOPTIONSWIDGET_H_ #define _CVSOPTIONSWIDGET_H_ -#include <qwidget.h> +#include <tqwidget.h> #include "cvsoptionswidgetbase.h" class QLabel; @@ -24,7 +24,7 @@ class CvsOptionsWidget : public CvsOptionsWidgetBase { Q_OBJECT public: - CvsOptionsWidget( QWidget *parent, const char *name=0 ); + CvsOptionsWidget( TQWidget *parent, const char *name=0 ); virtual ~CvsOptionsWidget(); bool pruneEmptyDirWhenUpdating() const; @@ -42,14 +42,14 @@ public: unsigned int contextLines() const; void setContextLines( unsigned int p ); - QString diffOptions() const; - void setDiffOptions( const QString &p ); + TQString diffOptions() const; + void setDiffOptions( const TQString &p ); - QString cvsRshEnvVar() const; - void setCvsRshEnvVar( const QString &p ); + TQString cvsRshEnvVar() const; + void setCvsRshEnvVar( const TQString &p ); - QString serverLocation() const; - void setServerLocation( const QString &p ); + TQString serverLocation() const; + void setServerLocation( const TQString &p ); public slots: void accept(); diff --git a/vcs/cvsservice/cvspart.cpp b/vcs/cvsservice/cvspart.cpp index 9d885056..30a8a700 100644 --- a/vcs/cvsservice/cvspart.cpp +++ b/vcs/cvsservice/cvspart.cpp @@ -12,10 +12,10 @@ ***************************************************************************/ #include "cvspart.h" -#include <qdir.h> -#include <qpopupmenu.h> -#include <qwhatsthis.h> -#include <qtimer.h> +#include <tqdir.h> +#include <tqpopupmenu.h> +#include <tqwhatsthis.h> +#include <tqtimer.h> #include <kpopupmenu.h> #include <kdebug.h> @@ -65,7 +65,7 @@ // Global vars /////////////////////////////////////////////////////////////////////////////// -// See createNewProject( const QString &) and slotProjectOpened() +// See createNewProject( const TQString &) and slotProjectOpened() bool g_projectWasJustCreated = false; /////////////////////////////////////////////////////////////////////////////// @@ -80,7 +80,7 @@ K_EXPORT_COMPONENT_FACTORY( libkdevcvsservice, CvsFactory( data ) ) // class CvsServicePart /////////////////////////////////////////////////////////////////////////////// -CvsServicePart::CvsServicePart( QObject *parent, const char *name, const QStringList & ) +CvsServicePart::CvsServicePart( TQObject *parent, const char *name, const TQStringList & ) : KDevVersionControl( &data, parent, name ? name : "CvsService" ), actionCommit( 0 ), actionDiff( 0 ), actionLog( 0 ), actionAnnotate(0), actionAdd( 0 ), @@ -96,10 +96,10 @@ CvsServicePart::CvsServicePart( QObject *parent, const char *name, const QString m_impl = new CvsServicePartImpl( this ); // Load / store project configuration every time project is opened/closed - connect( core(), SIGNAL(projectOpened()), this, SLOT(slotProjectOpened()) ); - connect( core(), SIGNAL(projectClosed()), this, SLOT(slotProjectClosed()) ); + connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) ); + connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(slotProjectClosed()) ); - QTimer::singleShot(0, this, SLOT(init())); + TQTimer::singleShot(0, this, TQT_SLOT(init())); } /////////////////////////////////////////////////////////////////////////////// @@ -119,18 +119,18 @@ void CvsServicePart::init() setupActions(); // Re-route our implementation signal for when check-out finishes to the standard signal - connect( m_impl, SIGNAL(checkoutFinished(QString)), SIGNAL(finishedFetching(QString)) ); + connect( m_impl, TQT_SIGNAL(checkoutFinished(TQString)), TQT_SIGNAL(finishedFetching(TQString)) ); // Context menu - connect( core(), SIGNAL(contextMenu(QPopupMenu *, const Context *)), - this, SLOT(contextMenu(QPopupMenu *, const Context *)) ); - connect( core(), SIGNAL(projectConfigWidget(KDialogBase*)), - this, SLOT(projectConfigWidget(KDialogBase*)) ); - connect( core(), SIGNAL(stopButtonClicked(KDevPlugin*)), - this, SLOT(slotStopButtonClicked(KDevPlugin*)) ); + 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*)) ); m_impl->m_widget->setIcon( UserIcon( "kdev_cvs", KIcon::DefaultState, CvsFactory::instance()) ); - QWhatsThis::add( m_impl->processWidget(), i18n("<b>CVS</b><p>Concurrent Versions System operations window. Shows output of Cervisia CVS Service.") ); + TQWhatsThis::add( m_impl->processWidget(), i18n("<b>CVS</b><p>Concurrent Versions System operations window. Shows output of Cervisia CVS Service.") ); m_impl->processWidget()->setCaption(i18n("CvsService Output")); mainWindow()->embedOutputView( m_impl->processWidget(), i18n("CvsService"), i18n("cvs output") ); @@ -144,92 +144,92 @@ void CvsServicePart::setupActions() // context at runtime. See CvsServicePart::contextMenu(). actionCommit = new KAction( i18n("&Commit to Repository"), 0, this, - SLOT(slotActionCommit()), actionCollection(), "cvsservice_commit" ); + TQT_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 KAction( i18n("&Difference Between Revisions"), 0, this, SLOT(slotActionDiff()), + actionDiff = new KAction( i18n("&Difference Between Revisions"), 0, this, TQT_SLOT(slotActionDiff()), actionCollection(), "cvsservice_diff" ); actionDiff->setToolTip( i18n("Build difference") ); actionDiff->setWhatsThis( i18n("<b>Build difference</b><p>Builds difference between releases.") ); - actionLog = new KAction( i18n("Generate &Log"), 0, this, SLOT(slotActionLog()), + actionLog = new KAction( i18n("Generate &Log"), 0, this, TQT_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 KAction( i18n("&Annotate"), 0, this, SLOT(slotActionAnnotate()), + actionAnnotate = new KAction( i18n("&Annotate"), 0, this, TQT_SLOT(slotActionAnnotate()), actionCollection(), "cvsservice_annotate" ); actionAnnotate->setToolTip( i18n("Generate annotations") ); actionAnnotate->setWhatsThis( i18n("<b>Annotate</b><p>Produces annotations for this file.") ); - actionAdd = new KAction( i18n("&Add to Repository"), 0, this, SLOT(slotActionAdd()), + actionAdd = new KAction( i18n("&Add to Repository"), 0, this, TQT_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 KAction( i18n("&Edit Files"), 0, this, SLOT(slotActionEdit()), + actionEdit = new KAction( i18n("&Edit Files"), 0, this, TQT_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 KAction( i18n("&Unedit Files"), 0, this, SLOT(slotActionUnEdit()), + actionUnEdit = new KAction( i18n("&Unedit Files"), 0, this, TQT_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 KAction( i18n("&Show Editors"), 0, this, SLOT(slotActionEditors()), + actionEditors = new KAction( i18n("&Show Editors"), 0, this, TQT_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 KAction( i18n("Add to Repository as &Binary"), 0, this, - SLOT(slotActionAddBinary()), actionCollection(), "cvsservice_add_bin" ); + TQT_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 KAction( i18n("&Remove From Repository"), 0, this, - SLOT(slotActionRemove()), actionCollection(), "cvsservice_remove" ); + TQT_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 KAction( i18n("&Update/Revert to Another Release"), 0, this, - SLOT(slotActionUpdate()), actionCollection(), "cvsservice_update" ); + TQT_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 KAction( i18n("R&emove Sticky Flag"), 0, - this, SLOT(slotActionRemoveSticky()), actionCollection(), "cvsservice_removesticky" ); + this, TQT_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 KAction( i18n("Make &Tag/Branch"), 0, - this, SLOT(slotActionTag()), actionCollection(), "cvsservice_tag" ); + this, TQT_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 KAction( i18n("&Delete Tag"), 0, - this, SLOT(slotActionUnTag()), actionCollection(), "cvsservice_untag" ); + this, TQT_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 KAction( i18n("&Ignore in CVS Operations"), 0, - this, SLOT(slotActionAddToIgnoreList()), actionCollection(), "cvsservice_ignore" ); + this, TQT_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 KAction( i18n("Do &Not Ignore in CVS Operations"), 0, - this, SLOT(slotActionRemoveFromIgnoreList()), actionCollection(), "cvsservice_donot_ignore" ); + this, TQT_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 KAction( i18n("&Log to Server"), 0, this, - SLOT(slotActionLogin()), actionCollection(), "cvsservice_login" ); + TQT_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 KAction( i18n("L&ogout From Server"), 0, this, - SLOT(slotActionLogout()), actionCollection(), "cvsservice_logout" ); + TQT_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.") ); } @@ -250,9 +250,9 @@ KDevVCSFileInfoProvider *CvsServicePart::fileInfoProvider() const /////////////////////////////////////////////////////////////////////////////// -void CvsServicePart::createNewProject( const QString &dirName ) +void CvsServicePart::createNewProject( const TQString &dirName ) { - kdDebug( 9006 ) << "====> CvsServicePart::createNewProject( const QString& )" << endl; + kdDebug( 9006 ) << "====> CvsServicePart::createNewProject( const TQString& )" << endl; if (!m_cvsConfigurationForm) return; @@ -276,14 +276,14 @@ void CvsServicePart::createNewProject( const QString &dirName ) void CvsServicePart::projectConfigWidget( KDialogBase *dlg ) { - QVBox *vbox = dlg->addVBoxPage( i18n("CvsService"), i18n("CvsService"), BarIcon( info()->icon(), KIcon::SizeMedium) ); - CvsOptionsWidget *w = new CvsOptionsWidget( (QWidget *)vbox, "cvs config widget" ); - connect( dlg, SIGNAL(okClicked()), w, SLOT(accept()) ); + TQVBox *vbox = dlg->addVBoxPage( i18n("CvsService"), i18n("CvsService"), BarIcon( info()->icon(), KIcon::SizeMedium) ); + CvsOptionsWidget *w = new CvsOptionsWidget( (TQWidget *)vbox, "cvs config widget" ); + connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); } /////////////////////////////////////////////////////////////////////////////// -QWidget* CvsServicePart::newProjectWidget( QWidget *parent ) +TQWidget* CvsServicePart::newProjectWidget( TQWidget *parent ) { m_cvsConfigurationForm = new CvsForm( parent, "cvsform" ); return m_cvsConfigurationForm; @@ -291,7 +291,7 @@ QWidget* CvsServicePart::newProjectWidget( QWidget *parent ) /////////////////////////////////////////////////////////////////////////////// -void CvsServicePart::contextMenu( QPopupMenu *popup, const Context *context ) +void CvsServicePart::contextMenu( TQPopupMenu *popup, const Context *context ) { kdDebug(9006) << "contextMenu()" << endl; if (context->hasType( Context::FileContext ) || @@ -320,45 +320,45 @@ void CvsServicePart::contextMenu( QPopupMenu *popup, const Context *context ) if (context->hasType( Context::FileContext )) popup->insertSeparator(); - int id = subMenu->insertItem( actionCommit->text(), this, SLOT(slotCommit()) ); + int id = subMenu->insertItem( actionCommit->text(), this, TQT_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, SLOT(slotDiff()) ); + id = subMenu->insertItem( actionDiff->text(), this, TQT_SLOT(slotDiff()) ); subMenu->setWhatsThis(id, i18n("<b>Build difference</b><p>Builds difference between releases.")); - id = subMenu->insertItem( actionLog->text(), this, SLOT(slotLog()) ); + id = subMenu->insertItem( actionLog->text(), this, TQT_SLOT(slotLog()) ); subMenu->setWhatsThis(id, i18n("<b>Generate log</b><p>Produces log for this file.")); - id = subMenu->insertItem( actionAnnotate->text(), this, SLOT(slotAnnotate()) ); + id = subMenu->insertItem( actionAnnotate->text(), this, TQT_SLOT(slotAnnotate()) ); subMenu->setWhatsThis(id, i18n("<b>Generate Annotate</b><p>Produces annotation output for this file.")); } - id = subMenu->insertItem( actionEditors->text(), this, SLOT(slotEditors()) ); + id = subMenu->insertItem( actionEditors->text(), this, TQT_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, SLOT(slotEdit()) ); + id = subMenu->insertItem( actionEdit->text(), this, TQT_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, SLOT(slotUnEdit()) ); + id = subMenu->insertItem( actionUnEdit->text(), this, TQT_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, SLOT(slotAdd()) ); + id = subMenu->insertItem( actionAdd->text(), this, TQT_SLOT(slotAdd()) ); subMenu->setWhatsThis(id, i18n("<b>Add to repository</b><p>Adds file to repository.")); - id = subMenu->insertItem( actionAddBinary->text(), this, SLOT(slotAddBinary()) ); + id = subMenu->insertItem( actionAddBinary->text(), this, TQT_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, SLOT(slotRemove()) ); + id = subMenu->insertItem( actionRemove->text(), this, TQT_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, SLOT(slotTag()) ); + id = subMenu->insertItem( actionTag->text(), this, TQT_SLOT(slotTag()) ); subMenu->setWhatsThis(id, i18n("<b>Make tag/branch</b><p>Tags/branches selected file(s).")); - id = subMenu->insertItem( actionUnTag->text(), this, SLOT(slotUnTag()) ); + id = subMenu->insertItem( actionUnTag->text(), this, TQT_SLOT(slotUnTag()) ); subMenu->setWhatsThis(id, i18n("<b>Delete tag</b><p>Delete tag from selected file(s).")); - id = subMenu->insertItem( actionUpdate->text(), this, SLOT(slotUpdate()) ); + id = subMenu->insertItem( actionUpdate->text(), this, TQT_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, SLOT(slotRemoveSticky()) ); + id = subMenu->insertItem( actionRemoveSticky->text(), this, TQT_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, SLOT(slotAddToIgnoreList()) ); + id = subMenu->insertItem( actionAddToIgnoreList->text(), this, TQT_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, SLOT(slotRemoveFromIgnoreList()) ); + id = subMenu->insertItem( actionRemoveFromIgnoreList->text(), this, TQT_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 @@ -396,7 +396,7 @@ bool CvsServicePart::urlFocusedDocument( KURL &url ) /////////////////////////////////////////////////////////////////////////////// -bool CvsServicePart::isValidDirectory( const QString &dirPath ) const +bool CvsServicePart::isValidDirectory( const TQString &dirPath ) const { return m_impl->isValidDirectory( dirPath ); } @@ -714,14 +714,14 @@ void CvsServicePart::slotStopButtonClicked( KDevPlugin* which ) /////////////////////////////////////////////////////////////////////////////// -void CvsServicePart::slotAddFilesToProject( const QStringList &filesToAdd ) +void CvsServicePart::slotAddFilesToProject( const TQStringList &filesToAdd ) { m_impl->addFilesToProject( filesToAdd ); } /////////////////////////////////////////////////////////////////////////////// -void CvsServicePart::slotRemovedFilesFromProject(const QStringList &fileToRemove) +void CvsServicePart::slotRemovedFilesFromProject(const TQStringList &fileToRemove) { m_impl->removedFilesFromProject( fileToRemove ); } @@ -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(), SIGNAL(addedFilesToProject(const QStringList&)), this, SLOT(slotAddFilesToProject(const QStringList &)) ); - connect( project(), SIGNAL(removedFilesFromProject(const QStringList&)), this, SLOT(slotRemovedFilesFromProject(const QStringList &)) ); + 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 &)) ); } /////////////////////////////////////////////////////////////////////////////// @@ -772,8 +772,8 @@ void CvsServicePart::slotProjectClosed() delete options; // We don't have a project anymore ... - disconnect( project(), SIGNAL(addedFilesToProject(const QStringList&)), this, SLOT(slotAddFilesToProject(const QStringList &)) ); - disconnect( project(), SIGNAL(removedFilesFromProject(const QStringList&)), this, SLOT(slotRemovedFilesFromProject(const QStringList &)) ); + 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 &)) ); } #include "cvspart.moc" diff --git a/vcs/cvsservice/cvspart.h b/vcs/cvsservice/cvspart.h index e3513a98..da15dff2 100644 --- a/vcs/cvsservice/cvspart.h +++ b/vcs/cvsservice/cvspart.h @@ -14,8 +14,8 @@ #ifndef _CVSPART_H_ #define _CVSPART_H_ -#include <qguardedptr.h> -#include <qcstring.h> +#include <tqguardedptr.h> +#include <tqcstring.h> #include <kurl.h> #include "kdevversioncontrol.h" @@ -43,7 +43,7 @@ class CvsServicePart : public KDevVersionControl public: //! Standard constructor. - CvsServicePart( QObject *parent, const char *name, const QStringList & ); + CvsServicePart( TQObject *parent, const char *name, const TQStringList & ); //! Destructor. virtual ~CvsServicePart(); @@ -51,11 +51,11 @@ public: * Returns the configuration widget (for properly configuring the project to * use CVS), child of @p parent. */ - virtual QWidget *newProjectWidget( QWidget *parent ); + virtual TQWidget *newProjectWidget( TQWidget *parent ); /** * Setup a directory tree for use with CVS. */ - virtual void createNewProject( const QString& dir ); + virtual void createNewProject( const TQString& dir ); /** * Fetch a module from remote repository, so it can be used for importing */ @@ -68,7 +68,7 @@ public: * @param dirPath absolute path of the directory * @return true if the the directory is a valid CVS sandbox */ - virtual bool isValidDirectory( const QString &dirPath ) const; + virtual bool isValidDirectory( const TQString &dirPath ) const; private slots: /** Add menu items binded to cvs operations' slots to @p popup, using @@ -76,7 +76,7 @@ private slots: * Not that @p context _must_ be FileContext-type, otherwise will do * nothing. */ - void contextMenu( QPopupMenu *popup, const Context *context ); + void contextMenu( TQPopupMenu *popup, const Context *context ); // Cvs operations (menubar) void slotActionLogin(); @@ -120,8 +120,8 @@ private slots: void slotProjectOpened(); void slotProjectClosed(); - void slotAddFilesToProject(const QStringList &); - void slotRemovedFilesFromProject(const QStringList &); + void slotAddFilesToProject(const TQStringList &); + void slotRemovedFilesFromProject(const TQStringList &); /** Adds a configuration widget (for properly configuring CVS command-line options) * and adds it to @p dlg. @@ -145,7 +145,7 @@ private: /** This is a pointer to the d->form used for collecting data about CVS project creation (used * by the ApplicationWizard in example) */ - QGuardedPtr<CvsForm> m_cvsConfigurationForm; + TQGuardedPtr<CvsForm> m_cvsConfigurationForm; // Actions KAction *actionCommit, diff --git a/vcs/cvsservice/cvspartimpl.cpp b/vcs/cvsservice/cvspartimpl.cpp index e6177739..ca66e610 100644 --- a/vcs/cvsservice/cvspartimpl.cpp +++ b/vcs/cvsservice/cvspartimpl.cpp @@ -9,10 +9,10 @@ * * ***************************************************************************/ -#include <qfile.h> -#include <qfileinfo.h> -#include <qdir.h> -#include<qcheckbox.h> +#include <tqfile.h> +#include <tqfileinfo.h> +#include <tqdir.h> +#include<tqcheckbox.h> #include <kapplication.h> #include <kmessagebox.h> @@ -61,17 +61,17 @@ /////////////////////////////////////////////////////////////////////////////// // Nice name (relative to projectDirectory()) ;-) -const QString CvsServicePartImpl::changeLogFileName( "ChangeLog" ); +const TQString CvsServicePartImpl::changeLogFileName( "ChangeLog" ); // Four spaces for every log line (except the first, which includes the // developers name) -const QString CvsServicePartImpl::changeLogPrependString( " " ); +const TQString CvsServicePartImpl::changeLogPrependString( " " ); /////////////////////////////////////////////////////////////////////////////// // class CvsServicePartImpl /////////////////////////////////////////////////////////////////////////////// CvsServicePartImpl::CvsServicePartImpl( CvsServicePart *part, const char *name ) - : QObject( this, name? name : "cvspartimpl" ), + : TQObject( this, name? name : "cvspartimpl" ), m_scheduler( 0 ), m_part( part ), m_widget( 0 ) { if (requestCvsService()) @@ -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(), SIGNAL(projectOpened()), this, SLOT(slotProjectOpened()) ); + connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) ); } else { @@ -178,7 +178,7 @@ const KURL::List &CvsServicePartImpl::urlList() const /////////////////////////////////////////////////////////////////////////////// -QStringList CvsServicePartImpl::fileList( bool relativeToProjectDir ) const +TQStringList CvsServicePartImpl::fileList( bool relativeToProjectDir ) const { if (relativeToProjectDir) return URLUtil::toRelativePaths( projectDirectory(), urlList() ); @@ -188,7 +188,7 @@ QStringList CvsServicePartImpl::fileList( bool relativeToProjectDir ) const /////////////////////////////////////////////////////////////////////////////// -bool CvsServicePartImpl::isRegisteredInRepository( const QString &projectDirectory, const KURL &url ) +bool CvsServicePartImpl::isRegisteredInRepository( const TQString &projectDirectory, const KURL &url ) { kdDebug(9006) << k_funcinfo << endl; @@ -218,7 +218,7 @@ bool CvsServicePartImpl::isRegisteredInRepository( const QString &projectDirecto /////////////////////////////////////////////////////////////////////////////// -void CvsServicePartImpl::validateURLs( const QString &projectDirectory, KURL::List &urls, CvsOperation op ) +void CvsServicePartImpl::validateURLs( const TQString &projectDirectory, KURL::List &urls, CvsOperation op ) { kdDebug(9006) << k_funcinfo << endl; @@ -229,7 +229,7 @@ void CvsServicePartImpl::validateURLs( const QString &projectDirectory, KURL::Li kdDebug(9006) << "This is a Cvs Add operation and will not be checked against repository ;-)" << endl; return; } - QValueList<KURL>::iterator it = urls.begin(); + TQValueList<KURL>::iterator it = urls.begin(); while (it != urls.end()) { if (!CvsServicePartImpl::isRegisteredInRepository( projectDirectory, (*it) )) @@ -249,7 +249,7 @@ void CvsServicePartImpl::validateURLs( const QString &projectDirectory, KURL::Li /////////////////////////////////////////////////////////////////////////////// -void CvsServicePartImpl::addToIgnoreList( const QString &projectDirectory, const KURL &url ) +void CvsServicePartImpl::addToIgnoreList( const TQString &projectDirectory, const KURL &url ) { kdDebug(9006) << k_funcinfo << endl; @@ -263,7 +263,7 @@ void CvsServicePartImpl::addToIgnoreList( const QString &projectDirectory, const cvsdir.ignoreFile( url.fileName() ); } -void CvsServicePartImpl::addToIgnoreList( const QString &projectDirectory, const KURL::List &urls ) +void CvsServicePartImpl::addToIgnoreList( const TQString &projectDirectory, const KURL::List &urls ) { for (size_t i=0; i<urls.count(); ++i) { @@ -273,17 +273,17 @@ void CvsServicePartImpl::addToIgnoreList( const QString &projectDirectory, const /////////////////////////////////////////////////////////////////////////////// -void CvsServicePartImpl::removeFromIgnoreList( const QString &/*projectDirectory*/, const KURL &url ) +void CvsServicePartImpl::removeFromIgnoreList( const TQString &/*projectDirectory*/, const KURL &url ) { kdDebug(9006) << k_funcinfo << endl; - QStringList ignoreLines; + TQStringList ignoreLines; CVSDir cvsdir( url.directory() ); cvsdir.doNotIgnoreFile( url.fileName() ); } -void CvsServicePartImpl::removeFromIgnoreList( const QString &projectDirectory, const KURL::List &urls ) +void CvsServicePartImpl::removeFromIgnoreList( const TQString &projectDirectory, const KURL::List &urls ) { for (size_t i=0; i<urls.count(); ++i) { @@ -293,7 +293,7 @@ void CvsServicePartImpl::removeFromIgnoreList( const QString &projectDirectory, /////////////////////////////////////////////////////////////////////////////// -bool CvsServicePartImpl::isValidDirectory( const QDir &dir ) const +bool CvsServicePartImpl::isValidDirectory( const TQDir &dir ) const { CVSDir cvsdir( dir ); @@ -316,9 +316,9 @@ KDevMainWindow *CvsServicePartImpl::mainWindow() const /////////////////////////////////////////////////////////////////////////////// -QString CvsServicePartImpl::projectDirectory() const +TQString CvsServicePartImpl::projectDirectory() const { - return m_part->project() ? m_part->project()->projectDirectory() : QString::null; + return m_part->project() ? m_part->project()->projectDirectory() : TQString::null; } /////////////////////////////////////////////////////////////////////////////// @@ -361,7 +361,7 @@ bool CvsServicePartImpl::checkout() CheckoutDialog dlg( m_cvsService, mainWindow()->main()->centralWidget() ); - if ( dlg.exec() == QDialog::Accepted ) + if ( dlg.exec() == TQDialog::Accepted ) { DCOPRef job = m_cvsService->checkout( dlg.workDir(), dlg.serverPath(), dlg.module(), dlg.tag(), dlg.pruneDirs(), "", false @@ -374,7 +374,7 @@ bool CvsServicePartImpl::checkout() modulePath = dlg.workDir() + dlg.module(); m_scheduler->schedule( job ); - connect( processWidget(), SIGNAL(jobFinished(bool,int)), this, SLOT(slotCheckoutFinished(bool,int)) ); + connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), this, TQT_SLOT(slotCheckoutFinished(bool,int)) ); return true; } } @@ -392,11 +392,11 @@ void CvsServicePartImpl::commit( const KURL::List& urlList ) return; CommitDialog dlg( projectDirectory() + "/ChangeLog" ); - if (dlg.exec() == QDialog::Rejected) + if (dlg.exec() == TQDialog::Rejected) return; CvsOptions *options = CvsOptions::instance(); - QString logString = dlg.logMessage().join( "\n" ); + TQString logString = dlg.logMessage().join( "\n" ); DCOPRef cvsJob = m_cvsService->commit( fileList(), logString, options->recursiveWhenCommitRemove() ); if (!m_cvsService->ok()) @@ -406,7 +406,7 @@ void CvsServicePartImpl::commit( const KURL::List& urlList ) } m_scheduler->schedule( cvsJob ); - connect( processWidget(), SIGNAL(jobFinished(bool,int)), this, SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), this, TQT_SLOT(slotJobFinished(bool,int)) ); // 2. if requested to do so, add an entry to the Changelog too if (dlg.mustAddToChangeLog()) @@ -434,10 +434,10 @@ void CvsServicePartImpl::update( const KURL::List& urlList ) CvsOptions *options = CvsOptions::instance(); ReleaseInputDialog dlg( mainWindow()->main()->centralWidget() ); - if (dlg.exec() == QDialog::Rejected) + if (dlg.exec() == TQDialog::Rejected) return; - QString additionalOptions = dlg.release(); + TQString additionalOptions = dlg.release(); if (dlg.isRevert()) additionalOptions = additionalOptions + " " + options->revertOptions(); @@ -448,7 +448,7 @@ void CvsServicePartImpl::update( const KURL::List& urlList ) additionalOptions ); m_scheduler->schedule( cvsJob ); - connect( processWidget(), SIGNAL(jobFinished(bool,int)), this, SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), this, TQT_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(), SIGNAL(jobFinished(bool,int)), this, SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), this, TQT_SLOT(slotJobFinished(bool,int)) ); doneOperation(); } @@ -480,18 +480,18 @@ void CvsServicePartImpl::annotate( const KURL::List& urlList ) return; //get the directory of the file we want to annotate - QString tagFilename = URLUtil::directory(projectDirectory()+"/"+fileList()[0]); + TQString tagFilename = URLUtil::directory(projectDirectory()+"/"+fileList()[0]); //CVS stores tag information in the ./CVS/Tag file tagFilename += "/CVS/Tag"; //Check if such a Tag file exists, and try to read the tag/branch from it - QFile fileTag(tagFilename); - QString strRev = ""; //default revision is empty ... + TQFile fileTag(tagFilename); + TQString strRev = ""; //default revision is empty ... if (fileTag.exists()) { //... but if there is a Tag file, we get the revision from there if ( fileTag.open( IO_ReadOnly ) ) { - QTextStream stream( &fileTag ); - QString line; + TQTextStream stream( &fileTag ); + TQString line; line = stream.readLine(); if (line.startsWith("T")) { //the line always starts with a "T"... strRev = line.right(line.length()-1); //...and after this there is the tag name @@ -531,7 +531,7 @@ void CvsServicePartImpl::unedit( const KURL::List& urlList) DCOPRef cvsJob = m_cvsService->unedit( fileList() ); m_scheduler->schedule( cvsJob ); - connect( processWidget(), SIGNAL(jobFinished(bool,int)), this, SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), this, TQT_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(), SIGNAL(jobFinished(bool,int)), this, SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), this, TQT_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(), SIGNAL(jobFinished(bool,int)), - this, SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), + this, TQT_SLOT(slotJobFinished(bool,int)) ); doneOperation(); } @@ -606,8 +606,8 @@ void CvsServicePartImpl::removeStickyFlag( const KURL::List& urlList ) "-A" ); m_scheduler->schedule( cvsJob ); - connect( processWidget(), SIGNAL(jobFinished(bool,int)), - this, SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), + this, TQT_SLOT(slotJobFinished(bool,int)) ); doneOperation(); } @@ -642,7 +642,7 @@ void CvsServicePartImpl::diff( const KURL::List& urlList ) CVSEntry entry = cvsdir.fileStatus( urlList[0].fileName() ); DiffDialog dlg(entry); - if (dlg.exec() != QDialog::Accepted) + if (dlg.exec() != TQDialog::Accepted) return; CvsOptions *options = CvsOptions::instance(); @@ -656,8 +656,8 @@ void CvsServicePartImpl::diff( const KURL::List& urlList ) } m_scheduler->schedule( cvsJob ); - connect( processWidget(), SIGNAL(jobFinished(bool,int)), - this, SLOT(slotDiffFinished(bool,int)) ); + connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), + this, TQT_SLOT(slotDiffFinished(bool,int)) ); doneOperation(); } @@ -673,15 +673,15 @@ void CvsServicePartImpl::tag( const KURL::List& urlList ) TagDialog dlg( i18n("Creating Tag/Branch for files ..."), mainWindow()->main()->centralWidget() ); - if (dlg.exec() != QDialog::Accepted) + if (dlg.exec() != TQDialog::Accepted) return; DCOPRef cvsJob = m_cvsService->createTag( fileList(), dlg.tagName(), dlg.isBranch(), dlg.force() ); m_scheduler->schedule( cvsJob ); - connect( processWidget(), SIGNAL(jobFinished(bool,int)), - this, SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), + this, TQT_SLOT(slotJobFinished(bool,int)) ); doneOperation(); } @@ -698,15 +698,15 @@ void CvsServicePartImpl::unTag( const KURL::List& urlList ) TagDialog dlg( i18n("Removing Tag from files ..."), mainWindow()->main()->centralWidget() ); dlg.tagAsBranchCheck->hide(); - if (dlg.exec() != QDialog::Accepted) + if (dlg.exec() != TQDialog::Accepted) return; DCOPRef cvsJob = m_cvsService->deleteTag( fileList(), dlg.tagName(), dlg.isBranch(), dlg.force() ); m_scheduler->schedule( cvsJob ); - connect( processWidget(), SIGNAL(jobFinished(bool,int)), - this, SLOT(slotJobFinished(bool,int)) ); + connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), + this, TQT_SLOT(slotJobFinished(bool,int)) ); doneOperation(); } @@ -731,34 +731,34 @@ void CvsServicePartImpl::removeFromIgnoreList( const KURL::List& urlList ) * \FIXME Current implementation doesn't use CvsService :-( I just ported the * old code which relies on buildcvs.sh script. [marios] */ -void CvsServicePartImpl::createNewProject( const QString &dirName, - const QString &cvsRsh, const QString &location, - const QString &message, const QString &module, const QString &vendor, - const QString &release, bool mustInitRoot ) +void CvsServicePartImpl::createNewProject( const TQString &dirName, + const TQString &cvsRsh, const TQString &location, + const TQString &message, const TQString &module, const TQString &vendor, + const TQString &release, bool mustInitRoot ) { - kdDebug( 9006 ) << "====> CvsServicePartImpl::createNewProject( const QString& )" << endl; + kdDebug( 9006 ) << "====> CvsServicePartImpl::createNewProject( const TQString& )" << endl; CvsOptions *options = CvsOptions::instance(); options->setCvsRshEnvVar( cvsRsh ); options->setLocation( location ); /* - //virtual DCOPRef import( const QString& workingDir, const QString& repository, const QString& module, const QString& ignoreList, const QString& comment, const - QString filesToIgnore; + //virtual DCOPRef import( const TQString& workingDir, const TQString& repository, const TQString& module, const TQString& ignoreList, const TQString& comment, const + TQString filesToIgnore; DCOPRef cvsJob = m_cvsService->import( dirName, location, module, filesToIgnore, message, vendor, release, false ); m_scheduler->schedule( cvsJob ); - connect( processWidget(), SIGNAL(jobFinished(bool,int)), this, SLOT(slotCheckoutFinished(bool,int)) ); + connect( processWidget(), TQT_SIGNAL(jobFinished(bool,int)), this, TQT_SLOT(slotCheckoutFinished(bool,int)) ); */ - QString rsh_preamble; + TQString rsh_preamble; if ( !options->cvsRshEnvVar().isEmpty() ) rsh_preamble = "CVS_RSH=" + KShellProcess::quote( options->cvsRshEnvVar() ); - QString init; + TQString init; if (mustInitRoot) { init = rsh_preamble + " cvs -d " + KShellProcess::quote( options->location() ) + " init && "; } - QString cmdLine = init + "cd " + KShellProcess::quote(dirName) + + TQString cmdLine = init + "cd " + KShellProcess::quote(dirName) + " && " + rsh_preamble + " cvs -d " + KShellProcess::quote(options->location()) + " import -m " + KShellProcess::quote(message) + " " + @@ -782,13 +782,13 @@ void CvsServicePartImpl::createNewProject( const QString &dirName, bool CvsServicePartImpl::requestCvsService() { - QCString appId; - QString error; + TQCString appId; + TQString error; if (KApplication::startServiceByDesktopName( "cvsservice", - QStringList(), &error, &appId )) + TQStringList(), &error, &appId )) { - QString msg = i18n( "Unable to find the Cervisia KPart. \n" + TQString msg = i18n( "Unable to find the Cervisia KPart. \n" "Cervisia Integration will not be available. Please check your\n" "Cervisia installation and re-try. Reason was:\n" ) + error; KMessageBox::error( processWidget(), msg, "DCOP Error" ); @@ -825,11 +825,11 @@ void CvsServicePartImpl::flushJobs() /////////////////////////////////////////////////////////////////////////////// -void CvsServicePartImpl::addFilesToProject( const QStringList &filesToAdd ) +void CvsServicePartImpl::addFilesToProject( const TQStringList &filesToAdd ) { kdDebug( 9006 ) << k_funcinfo << " " << filesToAdd << endl; - QStringList filesInCVS = checkFileListAgainstCVS( filesToAdd ); + TQStringList filesInCVS = checkFileListAgainstCVS( filesToAdd ); if (filesInCVS.isEmpty()) return; @@ -853,11 +853,11 @@ void CvsServicePartImpl::addFilesToProject( const QStringList &filesToAdd ) /////////////////////////////////////////////////////////////////////////////// -void CvsServicePartImpl::removedFilesFromProject(const QStringList &filesToRemove) +void CvsServicePartImpl::removedFilesFromProject(const TQStringList &filesToRemove) { kdDebug( 9006 ) << k_funcinfo << endl; - QStringList filesInCVS = checkFileListAgainstCVS( filesToRemove ); + TQStringList filesInCVS = checkFileListAgainstCVS( filesToRemove ); if (filesInCVS.isEmpty()) return; @@ -878,15 +878,15 @@ void CvsServicePartImpl::removedFilesFromProject(const QStringList &filesToRemov /////////////////////////////////////////////////////////////////////////////// -QStringList CvsServicePartImpl::checkFileListAgainstCVS( const QStringList &filesToCheck ) const +TQStringList CvsServicePartImpl::checkFileListAgainstCVS( const TQStringList &filesToCheck ) const { - QStringList filesInCVS; - for (QStringList::const_iterator it = filesToCheck.begin(); it != filesToCheck.end(); ++it ) + TQStringList filesInCVS; + for (TQStringList::const_iterator it = filesToCheck.begin(); it != filesToCheck.end(); ++it ) { - const QString &fn = (*it); - QFileInfo fi( fn ); + const TQString &fn = (*it); + TQFileInfo fi( fn ); if (fi.isRelative()) - fi = projectDirectory() + QDir::separator() + fn; + fi = projectDirectory() + TQDir::separator() + fn; if (isValidDirectory( fi.dirPath( true ) )) filesInCVS += ( fi.filePath() ); } @@ -915,7 +915,7 @@ void CvsServicePartImpl::slotDiffFinished( bool normalExit, int exitStatus ) { core()->running( m_part, false ); - QString diff = processWidget()->output().join("\n"), + TQString diff = processWidget()->output().join("\n"), err = processWidget()->errors().join("\n"); kdDebug( 9006 ) << "diff = " << diff << endl; @@ -946,7 +946,7 @@ void CvsServicePartImpl::slotDiffFinished( bool normalExit, int exitStatus ) { int s = KMessageBox::warningContinueCancelList( 0, i18n("CVS output errors during diff. Do you still want to continue?"), - QStringList::split( "\n", err, false ), i18n("Errors During Diff") + TQStringList::split( "\n", err, false ), i18n("Errors During Diff") ); if ( s != KMessageBox::Continue ) return; @@ -971,7 +971,7 @@ void CvsServicePartImpl::slotCheckoutFinished( bool exitStatus, int ) << exitStatus << endl; // Return a null string if the operation was not succesfull if (!exitStatus) - modulePath = QString::null; + modulePath = TQString::null; kdDebug(9006) << " I'll emit modulePath == " << modulePath << endl; diff --git a/vcs/cvsservice/cvspartimpl.h b/vcs/cvsservice/cvspartimpl.h index e5087f68..638e4907 100644 --- a/vcs/cvsservice/cvspartimpl.h +++ b/vcs/cvsservice/cvspartimpl.h @@ -12,9 +12,9 @@ #ifndef CVSPARTIMPL_H #define CVSPARTIMPL_H -#include <qobject.h> -#include <qstringlist.h> -#include <qguardedptr.h> +#include <tqobject.h> +#include <tqstringlist.h> +#include <tqguardedptr.h> #include <kurl.h> #include <kdevversioncontrol.h> @@ -171,15 +171,15 @@ public: * @param release release tag * @param mustInitRoot if true will attempt to initialize $CVSROOT if not already prepared */ - virtual void createNewProject( const QString &dirName, - const QString &cvsRsh, const QString &location, - const QString &message, const QString &module, const QString &vendor, - const QString &release, bool mustInitRoot ); + virtual void createNewProject( const TQString &dirName, + const TQString &cvsRsh, const TQString &location, + const TQString &message, const TQString &module, const TQString &vendor, + const TQString &release, bool mustInitRoot ); /** * @return true if the directory is valid as CVS directory (has the /CVS/ dir inside) (FORWARDER) */ - virtual bool isValidDirectory( const QDir &dir ) const; + virtual bool isValidDirectory( const TQDir &dir ) const; /** * @return a reference to the custom FileInforProvider object (FORWARDER) */ @@ -201,13 +201,13 @@ public: CvsProcessWidget *processWidget() const; signals: - void warning( const QString &msg ); + void warning( const TQString &msg ); /** * Emitted when the component has terminated checkout operation * @param checkedDir directory where the module has been checked out * (will be empty if the operation failed) */ - void checkoutFinished( QString checkedDir ); + void checkoutFinished( TQString checkedDir ); private slots: void slotJobFinished( bool normalExit, int exitStatus ); @@ -237,7 +237,7 @@ private: /** * @return true if the @p url is present in CVS/Entry file */ - static bool isRegisteredInRepository( const QString &projectDirectory, const KURL &url ); + static bool isRegisteredInRepository( const TQString &projectDirectory, const KURL &url ); /** * Ideally this function will take a bunch of URLs and validate them (they are valid files, * are files registered in CVS, are on a supported filesystem, ...). Currently checks @@ -246,7 +246,7 @@ private: * @param urls list of KURL to check (the list can be modified during the operation) * @param op type of cvs operation, as pecified in @see CvsOperation enum */ - static void validateURLs( const QString &projectDirectory, KURL::List &urls, CvsOperation op ); + static void validateURLs( const TQString &projectDirectory, KURL::List &urls, CvsOperation op ); /** * Add file to it's respective ignore list. This means that, for example, if you @@ -255,7 +255,7 @@ private: * @param projectDirectory * @param url url to be added to the check list. */ - static void addToIgnoreList( const QString &projectDirectory, const KURL &url ); + static void addToIgnoreList( const TQString &projectDirectory, const KURL &url ); /** * Add files to their respective ignore list. This means that, for example, if you @@ -264,7 +264,7 @@ private: * @param projectDirectory * @param urls list of urls to be added to the check list. */ - static void addToIgnoreList( const QString &projectDirectory, const KURL::List &urls ); + static void addToIgnoreList( const TQString &projectDirectory, const KURL::List &urls ); /** * Remove file from it's respective .ignore files. As specified for @see addToIgnoreList @@ -275,7 +275,7 @@ private: * @param projectDirectory * @param url url to be removed from the check list. */ - static void removeFromIgnoreList( const QString &projectDirectory, const KURL &url ); + static void removeFromIgnoreList( const TQString &projectDirectory, const KURL &url ); /** * Remove files from their respective .ignore files. As specified for @see addToIgnoreList @@ -286,32 +286,32 @@ private: * @param projectDirectory * @param urls list of urls to be removed from the check list. */ - static void removeFromIgnoreList( const QString &projectDirectory, const KURL::List &urls ); + static void removeFromIgnoreList( const TQString &projectDirectory, const KURL::List &urls ); /** * Implementation for requesting user input when files are added to project */ - void addFilesToProject( const QStringList &filesToAdd ); + void addFilesToProject( const TQStringList &filesToAdd ); /** * Implementation for requesting user input when files are removed from project */ - void removedFilesFromProject(const QStringList &filesToRemove); + void removedFilesFromProject(const TQStringList &filesToRemove); /** * Check each file in the list against CVS and returns a new list with the files * currently registered in the repository: if none is registered the returned list * is (quite rightly) empty. */ - QStringList checkFileListAgainstCVS( const QStringList &filesToCheck ) const; + TQStringList checkFileListAgainstCVS( const TQStringList &filesToCheck ) const; //! Changelog filename (currently "CHANGELOG" ) - static const QString changeLogFileName; + static const TQString changeLogFileName; //! Four spaces for every log line (except the first which includes the //! developers name) - static const QString changeLogPrependString; + static const TQString changeLogPrependString; // Internal short-cuts KDevMainWindow *mainWindow() const; KDevCore *core() const; - QString projectDirectory() const; + TQString projectDirectory() const; KDevDiffFrontend *diffFrontend() const; /** Locate and setup DCOP CvsService */ @@ -323,7 +323,7 @@ private: Repository_stub *m_repository; /** Used for storing module path between start and ending of check-out */ - QString modulePath; + TQString modulePath; CVSFileInfoProvider *m_fileInfoProvider; JobScheduler *m_scheduler; @@ -332,7 +332,7 @@ private: //! Reference to widget integrated in the "bottom tabbar" (IDEAL) //! (_Must_ be initialized by derived class) - QGuardedPtr<CvsProcessWidget> m_widget; + TQGuardedPtr<CvsProcessWidget> m_widget; //! Urls which to work upon const KURL::List &urlList() const; @@ -342,7 +342,7 @@ private: * @return These are the file path contained in the urls provided for convenience * has been requested for. */ - QStringList fileList( bool relativeToProjectDir = true ) const; + TQStringList fileList( bool relativeToProjectDir = true ) const; /** Last operation type: we save it so we can retrieve and use in slot*Exited() */ CvsOperation lastOperation() const; diff --git a/vcs/cvsservice/cvsprocesswidget.cpp b/vcs/cvsservice/cvsprocesswidget.cpp index 2d41a356..d2e78da6 100644 --- a/vcs/cvsservice/cvsprocesswidget.cpp +++ b/vcs/cvsservice/cvsprocesswidget.cpp @@ -9,8 +9,8 @@ * * ***************************************************************************/ -#include <qpainter.h> -#include <qregexp.h> +#include <tqpainter.h> +#include <tqregexp.h> #include <dcopref.h> #include <kstatusbar.h> @@ -43,41 +43,41 @@ int g_dcopErrCounter = 0; #endif -CvsProcessWidget::CvsProcessWidget( CvsService_stub *service, CvsServicePart *part, QWidget *parent, const char *name ) +CvsProcessWidget::CvsProcessWidget( CvsService_stub *service, CvsServicePart *part, TQWidget *parent, const char *name ) : DCOPObject( "CvsProcessWidgetDCOPIface" ), - QTextEdit( parent, name ), + TQTextEdit( parent, name ), m_part( part ), m_service( service ), m_job( 0 ) { setReadOnly( true ); setTextFormat( Qt::LogText ); - QStyleSheetItem *style = 0; - style = new QStyleSheetItem( styleSheet(), "goodtag" ); + TQStyleSheetItem *style = 0; + style = new TQStyleSheetItem( styleSheet(), "goodtag" ); style->setColor( "black" ); - style = new QStyleSheetItem( styleSheet(), "errortag" ); + style = new TQStyleSheetItem( styleSheet(), "errortag" ); style->setColor( "red" ); - style->setFontWeight( QFont::Bold ); + style->setFontWeight( TQFont::Bold ); - style = new QStyleSheetItem( styleSheet(), "infotag" ); + style = new TQStyleSheetItem( styleSheet(), "infotag" ); style->setColor( "blue" ); - style = new QStyleSheetItem( styleSheet(), "cvs_conflict" ); + style = new TQStyleSheetItem( styleSheet(), "cvs_conflict" ); style->setColor( "red" ); - style = new QStyleSheetItem( styleSheet(), "cvs_added" ); + style = new TQStyleSheetItem( styleSheet(), "cvs_added" ); style->setColor( "green" ); - style = new QStyleSheetItem( styleSheet(), "cvs_removed" ); + style = new TQStyleSheetItem( styleSheet(), "cvs_removed" ); style->setColor( "yellow" ); - style = new QStyleSheetItem( styleSheet(), "cvs_updated" ); + style = new TQStyleSheetItem( styleSheet(), "cvs_updated" ); style->setColor( "lightblue" ); - style = new QStyleSheetItem( styleSheet(), "cvs_modified" ); + style = new TQStyleSheetItem( styleSheet(), "cvs_modified" ); style->setColor( "darkgreen" ); - style = new QStyleSheetItem( styleSheet(), "cvs_unknown" ); + style = new TQStyleSheetItem( styleSheet(), "cvs_unknown" ); style->setColor( "gray" ); } @@ -105,9 +105,9 @@ bool CvsProcessWidget::isAlreadyWorking() const void CvsProcessWidget::clear() { - QTextEdit::clear(); - this->m_errors = QString::null; - this->m_output = QString::null; + TQTextEdit::clear(); + this->m_errors = TQString::null; + this->m_output = TQString::null; } /////////////////////////////////////////////////////////////////////////////// @@ -130,17 +130,17 @@ bool CvsProcessWidget::startJob( const DCOPRef &aJob ) // establish connections to the signals of the cvs m_job connectDCOPSignal( m_job->app(), m_job->obj(), "jobExited(bool, int)", "slotJobExited(bool, int)", true ); - connectDCOPSignal( m_job->app(), m_job->obj(), "receivedStdout(QString)", "slotReceivedOutput(QString)", true ); - connectDCOPSignal( m_job->app(), m_job->obj(), "receivedStderr(QString)", "slotReceivedErrors(QString)", true ); + connectDCOPSignal( m_job->app(), m_job->obj(), "receivedStdout(TQString)", "slotReceivedOutput(TQString)", true ); + connectDCOPSignal( m_job->app(), m_job->obj(), "receivedStderr(TQString)", "slotReceivedErrors(TQString)", true ); // get command line and add it to output buffer - QString cmdLine = m_job->cvsCommand(); + TQString cmdLine = m_job->cvsCommand(); m_part->mainWindow()->statusBar()->message( cmdLine ); kdDebug(9006) << "Running: " << cmdLine << endl; // disconnect 3rd party slots from our signals - disconnect( SIGNAL(jobFinished(bool, int)) ); + disconnect( TQT_SIGNAL(jobFinished(bool, int)) ); showInfo( i18n("Started job: %1").arg( cmdLine ) ); @@ -181,12 +181,12 @@ void CvsProcessWidget::slotJobExited( bool normalExit, int exitStatus ) if (m_job) { disconnectDCOPSignal( m_job->app(), m_job->obj(), "jobExited(bool, int)", "slotJobExited(bool, int)" ); - disconnectDCOPSignal( m_job->app(), m_job->obj(), "receivedStdout(QString)", "slotReceivedOutput(QString)" ); - disconnectDCOPSignal( m_job->app(), m_job->obj(), "receivedStderr(QString)", "slotReceivedErrors(QString)" ); + disconnectDCOPSignal( m_job->app(), m_job->obj(), "receivedStdout(TQString)", "slotReceivedOutput(TQString)" ); + disconnectDCOPSignal( m_job->app(), m_job->obj(), "receivedStderr(TQString)", "slotReceivedErrors(TQString)" ); delete m_job; m_job = 0; } - QString exitMsg = i18n("Job finished with exitCode == %1"); + TQString exitMsg = i18n("Job finished with exitCode == %1"); showInfo( exitMsg.arg( exitStatus) ); m_part->core()->running( m_part, false ); @@ -197,15 +197,15 @@ void CvsProcessWidget::slotJobExited( bool normalExit, int exitStatus ) /////////////////////////////////////////////////////////////////////////////// -void CvsProcessWidget::slotReceivedOutput( QString someOutput ) +void CvsProcessWidget::slotReceivedOutput( TQString someOutput ) { - kdDebug(9006) << "CvsProcessWidget::slotReceivedOutput(QString) here!" << endl; + kdDebug(9006) << "CvsProcessWidget::slotReceivedOutput(TQString) here!" << endl; #ifdef MYDCOPDEBUG g_dcopOutCounter++; kdDebug(9006) << "MYDCOPDEBUG: dcopOutCounter == " << g_dcopOutCounter << endl; #endif - QStringList strings = m_outputBuffer.process( someOutput ); + TQStringList strings = m_outputBuffer.process( someOutput ); if (strings.count() > 0) { m_output += strings; @@ -216,15 +216,15 @@ void CvsProcessWidget::slotReceivedOutput( QString someOutput ) /////////////////////////////////////////////////////////////////////////////// -void CvsProcessWidget::slotReceivedErrors( QString someErrors ) +void CvsProcessWidget::slotReceivedErrors( TQString someErrors ) { - kdDebug(9006) << "CvsProcessWidget::slotReceivedErrors(QString) here!" << endl; + kdDebug(9006) << "CvsProcessWidget::slotReceivedErrors(TQString) here!" << endl; #ifdef MYDCOPDEBUG g_dcopErrCounter++; kdDebug(9006) << "MYDCOPDEBUG: dcopErrCounter == " << g_dcopErrCounter << endl; #endif - QStringList strings = m_errorBuffer.process( someErrors ); + TQStringList strings = m_errorBuffer.process( someErrors ); if (strings.count() > 0) { m_errors += strings; @@ -235,35 +235,35 @@ void CvsProcessWidget::slotReceivedErrors( QString someErrors ) /////////////////////////////////////////////////////////////////////////////// -void CvsProcessWidget::showInfo( const QStringList &msg ) +void CvsProcessWidget::showInfo( const TQStringList &msg ) { - for (QStringList::const_iterator it = msg.begin(); it != msg.end(); ++it) + for (TQStringList::const_iterator it = msg.begin(); it != msg.end(); ++it) append( "<infotag>" + (*it) + "</infotag>" ); } /////////////////////////////////////////////////////////////////////////////// -void CvsProcessWidget::showError( const QStringList &msg ) +void CvsProcessWidget::showError( const TQStringList &msg ) { - for (QStringList::const_iterator it = msg.begin(); it != msg.end(); ++it) + for (TQStringList::const_iterator it = msg.begin(); it != msg.end(); ++it) append( "<errortag>" + (*it) + "</errortag>" ); } /////////////////////////////////////////////////////////////////////////////// -void CvsProcessWidget::showOutput( const QStringList &msg ) +void CvsProcessWidget::showOutput( const TQStringList &msg ) { - for (QStringList::const_iterator it = msg.begin(); it != msg.end(); ++it) + for (TQStringList::const_iterator it = msg.begin(); it != msg.end(); ++it) { // @todo here we can interpret lines as [C], [M], ... - const QString &line = (*it); + const TQString &line = (*it); //If the line already contains tags we need to replace the //delimiters with the corresponding HTML code so that they are no longer //recognized as tags. - //This will prevent QTextEdit from crashing on trying to parse the tags. + //This will prevent TQTextEdit from crashing on trying to parse the tags. //This should fix BUG:99590 - QString lineNew(line); + TQString lineNew(line); lineNew.replace("<", "<"); lineNew.replace(">", ">"); lineNew.replace("&", "&"); diff --git a/vcs/cvsservice/cvsprocesswidget.h b/vcs/cvsservice/cvsprocesswidget.h index cb55205c..3a229a45 100644 --- a/vcs/cvsservice/cvsprocesswidget.h +++ b/vcs/cvsservice/cvsprocesswidget.h @@ -12,8 +12,8 @@ #ifndef _CVSPROCESSWIDGET_H_ #define _CVSPROCESSWIDGET_H_ -#include <qtextedit.h> -#include <qstringlist.h> +#include <tqtextedit.h> +#include <tqstringlist.h> #include "cvsservicedcopIface.h" #include "bufferedstringreader.h" @@ -24,12 +24,12 @@ class CvsJob_stub; class CvsService_stub; class QStyleSheetItem; -class CvsProcessWidget : public QTextEdit, virtual public CVSServiceDCOPIface +class CvsProcessWidget : public TQTextEdit, virtual public CVSServiceDCOPIface { Q_OBJECT public: CvsProcessWidget( CvsService_stub *service, CvsServicePart *part, - QWidget *parent, const char *name ); + TQWidget *parent, const char *name ); virtual ~CvsProcessWidget(); bool startJob( const DCOPRef &aJob ); @@ -43,22 +43,22 @@ public: virtual void clear(); - QStringList output() const { return m_output; } - QStringList errors() const { return m_errors; } + TQStringList output() const { return m_output; } + TQStringList errors() const { return m_errors; } //private slots: //! DCOP Iface virtual void slotJobExited( bool normalExit, int exitStatus ); - virtual void slotReceivedOutput( QString someOutput ); - virtual void slotReceivedErrors( QString someErrors ); + virtual void slotReceivedOutput( TQString someOutput ); + virtual void slotReceivedErrors( TQString someErrors ); signals: void jobFinished( bool normalExit, int exitStatus ); private: - void showInfo( const QStringList &msg ); - void showError( const QStringList &msg ); - void showOutput( const QStringList &msg ); + void showInfo( const TQStringList &msg ); + void showError( const TQStringList &msg ); + void showOutput( const TQStringList &msg ); CvsServicePart *m_part; CvsService_stub *m_service; @@ -69,7 +69,7 @@ private: BufferedStringReader m_outputBuffer, m_errorBuffer; - QStringList m_output, + TQStringList m_output, m_errors; }; diff --git a/vcs/cvsservice/cvsservicedcopIface.h b/vcs/cvsservice/cvsservicedcopIface.h index 14cd8629..2f62964b 100644 --- a/vcs/cvsservice/cvsservicedcopIface.h +++ b/vcs/cvsservice/cvsservicedcopIface.h @@ -9,7 +9,7 @@ * * ***************************************************************************/ -#include <qstring.h> +#include <tqstring.h> #include <dcopobject.h> #ifndef __CVSSERVICEDCOPIFACE_H_ @@ -22,8 +22,8 @@ class CVSServiceDCOPIface : virtual public DCOPObject K_DCOP k_dcop: virtual void slotJobExited( bool normalExit, int exitStatus ) = 0; - virtual void slotReceivedOutput( QString someOutput ) = 0; - virtual void slotReceivedErrors( QString someErrors ) = 0; + virtual void slotReceivedOutput( TQString someOutput ) = 0; + virtual void slotReceivedErrors( TQString someErrors ) = 0; }; #endif diff --git a/vcs/cvsservice/diffdialog.cpp b/vcs/cvsservice/diffdialog.cpp index 37ba79fc..9d592c8b 100644 --- a/vcs/cvsservice/diffdialog.cpp +++ b/vcs/cvsservice/diffdialog.cpp @@ -10,21 +10,21 @@ ***************************************************************************/ #include <klineedit.h> -#include <qradiobutton.h> +#include <tqradiobutton.h> #include "diffdialog.h" #include <klocale.h> -#include <qbuttongroup.h> +#include <tqbuttongroup.h> /////////////////////////////////////////////////////////////////////////////// // class DiffDialog /////////////////////////////////////////////////////////////////////////////// -DiffDialog::DiffDialog( const CVSEntry &entry, QWidget *parent, const char *name, WFlags f ) +DiffDialog::DiffDialog( const CVSEntry &entry, TQWidget *parent, const char *name, WFlags f ) : DiffDialogBase( parent, name, true, f) { m_entry = entry; - QString currentRevision = entry.revision(); + TQString currentRevision = entry.revision(); revaEdit->setText(currentRevision); revbEdit->setText(currentRevision); revOtherEdit->setText(currentRevision); @@ -53,7 +53,7 @@ DiffDialog::DiffType DiffDialog::requestedDiff() const /////////////////////////////////////////////////////////////////////////////// -QString DiffDialog::revA() const +TQString DiffDialog::revA() const { if (requestedDiff() == diffArbitrary) return revaEdit->text(); @@ -62,17 +62,17 @@ QString DiffDialog::revA() const else if (requestedDiff() == diffLocalHEAD) return "HEAD"; else - return QString::null; + return TQString::null; } /////////////////////////////////////////////////////////////////////////////// -QString DiffDialog::revB() const +TQString DiffDialog::revB() const { if (requestedDiff()) return this->revbEdit->text(); else - return QString::null; + return TQString::null; } /////////////////////////////////////////////////////////////////////////////// diff --git a/vcs/cvsservice/diffdialog.h b/vcs/cvsservice/diffdialog.h index 12bfc88a..3caa66cf 100644 --- a/vcs/cvsservice/diffdialog.h +++ b/vcs/cvsservice/diffdialog.h @@ -24,11 +24,11 @@ class DiffDialog : public DiffDialogBase { Q_OBJECT public: - DiffDialog(const CVSEntry &entry, QWidget *parent = 0, const char *name = 0, WFlags f = 0 ); + DiffDialog(const CVSEntry &entry, TQWidget *parent = 0, const char *name = 0, WFlags f = 0 ); virtual ~DiffDialog(); - QString revA() const; - QString revB() const; + TQString revA() const; + TQString revB() const; private: enum DiffType { diffLocalBASE, diffLocalHEAD, diffLocalOther, diffArbitrary }; diff --git a/vcs/cvsservice/diffwidget.cpp b/vcs/cvsservice/diffwidget.cpp index c51c16b0..87f8494f 100644 --- a/vcs/cvsservice/diffwidget.cpp +++ b/vcs/cvsservice/diffwidget.cpp @@ -9,11 +9,11 @@ * * ***************************************************************************/ -#include <qlayout.h> -#include <qtextedit.h> -#include <qpopupmenu.h> -#include <qcursor.h> -#include <qfile.h> +#include <tqlayout.h> +#include <tqtextedit.h> +#include <tqpopupmenu.h> +#include <tqcursor.h> +#include <tqfile.h> #include <kconfig.h> #include <kapplication.h> @@ -36,10 +36,10 @@ // yup, magic value for the popupmenu-id static const int POPUP_BASE = 130977; -QStringList KDiffTextEdit::extParts; -QStringList KDiffTextEdit::extPartsTranslated; +TQStringList KDiffTextEdit::extParts; +TQStringList KDiffTextEdit::extPartsTranslated; -KDiffTextEdit::KDiffTextEdit( QWidget* parent, const char* name ): QTextEdit( parent, name ) +KDiffTextEdit::KDiffTextEdit( TQWidget* parent, const char* name ): TQTextEdit( parent, name ) { KConfig* config = kapp->config(); config->setGroup( "Diff" ); @@ -56,33 +56,33 @@ KDiffTextEdit::~KDiffTextEdit() config->writeEntry( "Highlight", _highlight ); } -QPopupMenu* KDiffTextEdit::createPopupMenu() +TQPopupMenu* KDiffTextEdit::createPopupMenu() { - return createPopupMenu( QPoint() ); + return createPopupMenu( TQPoint() ); } -QPopupMenu* KDiffTextEdit::createPopupMenu( const QPoint& p ) +TQPopupMenu* KDiffTextEdit::createPopupMenu( const TQPoint& p ) { - QPopupMenu* popup = QTextEdit::createPopupMenu( p ); + TQPopupMenu* popup = TQTextEdit::createPopupMenu( p ); if ( !popup ) - popup = new QPopupMenu( this ); + popup = new TQPopupMenu( this ); int i = 0; - for ( QStringList::Iterator it = extPartsTranslated.begin(); it != extPartsTranslated.end(); ++it ) { + for ( TQStringList::Iterator it = extPartsTranslated.begin(); it != extPartsTranslated.end(); ++it ) { popup->insertItem( i18n( "Show in %1" ).arg( *it ), i + POPUP_BASE, i ); i++; } if ( !extPartsTranslated.isEmpty() ) popup->insertSeparator( i ); - connect( popup, SIGNAL(activated(int)), this, SLOT(popupActivated(int)) ); + connect( popup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(popupActivated(int)) ); - popup->insertItem( SmallIconSet( "filesaveas" ), i18n( "&Save As..." ), this, SLOT(saveAs()), CTRL + Key_S, POPUP_BASE - 2, 0 ); + popup->insertItem( SmallIconSet( "filesaveas" ), i18n( "&Save As..." ), this, TQT_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, SLOT(toggleSyntaxHighlight()), 0, POPUP_BASE - 1, 2 ); + popup->insertItem( i18n( "Highlight Syntax" ), this, TQT_SLOT(toggleSyntaxHighlight()), 0, POPUP_BASE - 1, 2 ); popup->setItemChecked( POPUP_BASE - 1, _highlight ); popup->insertSeparator( 3 ); @@ -91,13 +91,13 @@ QPopupMenu* KDiffTextEdit::createPopupMenu( const QPoint& p ) void KDiffTextEdit::saveAs() { - QString fName = KFileDialog::getSaveFileName(); + TQString fName = KFileDialog::getSaveFileName(); if ( fName.isEmpty() ) return; - QFile f( fName ); + TQFile f( fName ); if ( f.open( IO_WriteOnly ) ) { - QTextStream stream( &f ); + TQTextStream stream( &f ); int pCount = paragraphs(); for ( int i = 0; i < pCount; ++i ) stream << text( i ) << "\n"; @@ -119,15 +119,15 @@ void KDiffTextEdit::toggleSyntaxHighlight() void KDiffTextEdit::applySyntaxHighlight() { // the diff has been loaded so we apply a simple highlighting - static QColor cAdded( 190, 190, 237); - static QColor cRemoved( 190, 237, 190 ); + static TQColor cAdded( 190, 190, 237); + static TQColor cRemoved( 190, 237, 190 ); if ( !_highlight ) return; int paragCount = paragraphs(); for ( int i = 0; i < paragCount; ++i ) { - QString txt = text( i ); + TQString txt = text( i ); if ( txt.length() > 0 ) { if ( txt.startsWith( "+" ) || txt.startsWith( ">" ) ) { setParagraphBackgroundColor( i, cAdded ); @@ -174,19 +174,19 @@ void KDiffTextEdit::popupActivated( int id ) emit externalPartRequested( extParts[ id ] ); } -DiffWidget::DiffWidget( QWidget *parent, const char *name, WFlags f ): - QWidget( parent, name, f ), tempFile( 0 ) +DiffWidget::DiffWidget( TQWidget *parent, const char *name, WFlags f ): + TQWidget( parent, name, f ), tempFile( 0 ) { job = 0; extPart = 0; te = new KDiffTextEdit( this, "Main Diff Viewer" ); te->setReadOnly( true ); - te->setTextFormat( QTextEdit::PlainText ); + te->setTextFormat( TQTextEdit::PlainText ); // te->setMinimumSize( 300, 200 ); - connect( te, SIGNAL(externalPartRequested(const QString&)), this, SLOT(loadExtPart(const QString&)) ); + connect( te, TQT_SIGNAL(externalPartRequested(const TQString&)), this, TQT_SLOT(loadExtPart(const TQString&)) ); - QVBoxLayout* layout = new QVBoxLayout( this ); + TQVBoxLayout* layout = new TQVBoxLayout( this ); layout->addWidget( te ); } @@ -210,7 +210,7 @@ void DiffWidget::setExtPartVisible( bool visible ) } } -void DiffWidget::loadExtPart( const QString& partName ) +void DiffWidget::loadExtPart( const TQString& partName ) { if ( extPart ) { setExtPartVisible( false ); @@ -242,15 +242,15 @@ void DiffWidget::slotClear() } // internally for the TextEdit only! -void DiffWidget::slotAppend( const QString& str ) +void DiffWidget::slotAppend( const TQString& str ) { te->append( str ); } // internally for the TextEdit only! -void DiffWidget::slotAppend( KIO::Job*, const QByteArray& ba ) +void DiffWidget::slotAppend( KIO::Job*, const TQByteArray& ba ) { - slotAppend( QString( ba ) ); + slotAppend( TQString( ba ) ); } void DiffWidget::populateExtPart() @@ -285,7 +285,7 @@ void DiffWidget::slotFinished() populateExtPart(); } -void DiffWidget::setDiff( const QString& diff ) +void DiffWidget::setDiff( const TQString& diff ) { slotClear(); slotAppend( diff ); @@ -301,20 +301,20 @@ void DiffWidget::openURL( const KURL& url ) if ( !job ) return; - connect( job, SIGNAL(data( KIO::Job *, const QByteArray & )), - this, SLOT(slotAppend( KIO::Job*, const QByteArray& )) ); - connect( job, SIGNAL(result( KIO::Job * )), - this, SLOT(slotFinished()) ); + connect( job, TQT_SIGNAL(data( KIO::Job *, const TQByteArray & )), + this, TQT_SLOT(slotAppend( KIO::Job*, const TQByteArray& )) ); + connect( job, TQT_SIGNAL(result( KIO::Job * )), + this, TQT_SLOT(slotFinished()) ); } -void DiffWidget::contextMenuEvent( QContextMenuEvent* /* e */ ) +void DiffWidget::contextMenuEvent( TQContextMenuEvent* /* e */ ) { - QPopupMenu* popup = new QPopupMenu( this ); + TQPopupMenu* popup = new TQPopupMenu( this ); if ( !te->isVisible() ) - popup->insertItem( i18n("Display &Raw Output"), this, SLOT(showTextEdit()) ); + popup->insertItem( i18n("Display &Raw Output"), this, TQT_SLOT(showTextEdit()) ); - popup->exec( QCursor::pos() ); + popup->exec( TQCursor::pos() ); delete popup; } diff --git a/vcs/cvsservice/diffwidget.h b/vcs/cvsservice/diffwidget.h index d7aaf48c..37bed7ea 100644 --- a/vcs/cvsservice/diffwidget.h +++ b/vcs/cvsservice/diffwidget.h @@ -12,9 +12,9 @@ #ifndef _DIFFWIDGET_H_ #define _DIFFWIDGET_H_ -#include <qwidget.h> -#include <qtextedit.h> -#include <qstringlist.h> +#include <tqwidget.h> +#include <tqtextedit.h> +#include <tqstringlist.h> #include <kurl.h> @@ -33,17 +33,17 @@ class KDiffTextEdit: public QTextEdit { Q_OBJECT public: - KDiffTextEdit( QWidget* parent = 0, const char* name = 0 ); + KDiffTextEdit( TQWidget* parent = 0, const char* name = 0 ); virtual ~KDiffTextEdit(); void applySyntaxHighlight(); void clearSyntaxHighlight(); signals: - void externalPartRequested( const QString& partName ); + void externalPartRequested( const TQString& partName ); protected: - virtual QPopupMenu* createPopupMenu( const QPoint& ); - virtual QPopupMenu* createPopupMenu(); + virtual TQPopupMenu* createPopupMenu( const TQPoint& ); + virtual TQPopupMenu* createPopupMenu(); private slots: void popupActivated( int ); @@ -52,8 +52,8 @@ private slots: private: static void searchExtParts(); - static QStringList extParts; - static QStringList extPartsTranslated; + static TQStringList extParts; + static TQStringList extPartsTranslated; bool _highlight; }; @@ -62,32 +62,32 @@ class DiffWidget : public QWidget Q_OBJECT public: - DiffWidget( QWidget *parent = 0, const char *name = 0, WFlags f = 0 ); + DiffWidget( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 ); virtual ~DiffWidget(); public slots: /** The URL has to point to a diff file */ void openURL( const KURL& url ); /** Pass a diff file in here */ - void setDiff( const QString& diff ); + void setDiff( const TQString& diff ); /** clears the difference viewer */ void slotClear(); private slots: /** appends a piece of "diff" */ - void slotAppend( const QString& str ); + void slotAppend( const TQString& str ); /** overloaded for convenience */ - void slotAppend( KIO::Job*, const QByteArray& ba ); + void slotAppend( KIO::Job*, const TQByteArray& ba ); /** call this when the whole "diff" has been sent. * Don't call slotAppend afterwards! */ void slotFinished(); void showExtPart(); void showTextEdit(); - void loadExtPart( const QString& partName ); + void loadExtPart( const TQString& partName ); protected: - void contextMenuEvent( QContextMenuEvent* e ); + void contextMenuEvent( TQContextMenuEvent* e ); private: void setExtPartVisible( bool visible ); diff --git a/vcs/cvsservice/editorsdialog.cpp b/vcs/cvsservice/editorsdialog.cpp index 12319102..5f26d100 100644 --- a/vcs/cvsservice/editorsdialog.cpp +++ b/vcs/cvsservice/editorsdialog.cpp @@ -15,8 +15,8 @@ #include <kdebug.h> #include <dcopref.h> -#include <qtextbrowser.h> -#include <qregexp.h> +#include <tqtextbrowser.h> +#include <tqregexp.h> #include "editorsdialog.h" @@ -24,7 +24,7 @@ #include <cvsjob_stub.h> #include <cvsservice_stub.h> -EditorsDialog::EditorsDialog(CvsService_stub *cvsService, QWidget *parent, const char *name) +EditorsDialog::EditorsDialog(CvsService_stub *cvsService, TQWidget *parent, const char *name) : DCOPObject( "CvsEditorsDCOPIface"), EditorsDialogBase(parent, name, TRUE, Qt::WDestructiveClose), m_cvsService(cvsService), m_cvsJob(0) { @@ -41,7 +41,7 @@ EditorsDialog::~EditorsDialog() delete m_cvsJob; } -void EditorsDialog::startjob(QString strDir) +void EditorsDialog::startjob(TQString strDir) { kdDebug(9006) << "EditorsDialog::start() workDir = " << strDir << endl; @@ -51,7 +51,7 @@ void EditorsDialog::startjob(QString strDir) // establish connections to the signals of the cvs m_job connectDCOPSignal( job.app(), job.obj(), "jobExited(bool, int)", "slotJobExited(bool, int)", true ); // We'll read the ouput directly from the job ... - connectDCOPSignal( job.app(), job.obj(), "receivedStdout(QString)", "slotReceivedOutput(QString)", true ); + connectDCOPSignal( job.app(), job.obj(), "receivedStdout(TQString)", "slotReceivedOutput(TQString)", true ); kdDebug(9006) << "Running: " << m_cvsJob->cvsCommand() << endl; m_cvsJob->execute(); @@ -65,23 +65,23 @@ void EditorsDialog::slotJobExited( bool normalExit, int exitStatus ) return; } - static QRegExp re("([^\\s]+)\\s([^\\s]+)\\s([^\\s]+)\\s([^\\s]+)\\s([^\\s]+)\\s" + static TQRegExp re("([^\\s]+)\\s([^\\s]+)\\s([^\\s]+)\\s([^\\s]+)\\s([^\\s]+)\\s" "([^\\s]+)\\s([^\\s]+)\\s([^\\s]+)\\s([^\\s]+)\\s(.*)"); - static QRegExp subre("([^\\s]+)\\s([^\\s]+)\\s([^\\s]+)\\s([^\\s]+)\\s" + static TQRegExp subre("([^\\s]+)\\s([^\\s]+)\\s([^\\s]+)\\s([^\\s]+)\\s" "([^\\s]+)\\s([^\\s]+)\\s([^\\s]+)\\s([^\\s]+)\\s(.*)"); - QString lastfilename; + TQString lastfilename; - QStringList lines = QStringList::split( "\n", m_output ); + TQStringList lines = TQStringList::split( "\n", m_output ); int found = 0; for (size_t i=0; i<lines.count(); ++i) { - QString s = lines[i].simplifyWhiteSpace(); + TQString s = lines[i].simplifyWhiteSpace(); kdDebug(9006) << "editors:---" << s << "---" << endl; kdDebug(9006) << " : lastfile was " << lastfilename << endl; if (re.exactMatch(s)) { - QString file = re.cap( 1 ); - QString locker = re.cap( 2 ); - QString date = re.cap(5)+" "+re.cap(4)+" "+re.cap(7)+" "+re.cap(6); + TQString file = re.cap( 1 ); + TQString locker = re.cap( 2 ); + TQString date = re.cap(5)+" "+re.cap(4)+" "+re.cap(7)+" "+re.cap(6); m_textBrowser->append( "<b>"+i18n("File")+": <code>"+file+"</code></b>" ); m_textBrowser->append( "<b>"+i18n("User")+":</b> "+locker ); @@ -92,9 +92,9 @@ void EditorsDialog::slotJobExited( bool normalExit, int exitStatus ) lastfilename = file; } else { if (subre.exactMatch(s)) { - QString file = lastfilename; - QString locker = subre.cap( 1 ); - QString date = subre.cap(4)+" "+subre.cap(3)+" "+subre.cap(6)+" "+subre.cap(5); + TQString file = lastfilename; + TQString locker = subre.cap( 1 ); + TQString date = subre.cap(4)+" "+subre.cap(3)+" "+subre.cap(6)+" "+subre.cap(5); m_textBrowser->append( "<b>"+i18n("File")+": <code>"+file+"</code></b>" ); m_textBrowser->append( "<b>"+i18n("User")+":</b> "+locker ); @@ -117,7 +117,7 @@ void EditorsDialog::slotJobExited( bool normalExit, int exitStatus ) } } -void EditorsDialog::slotReceivedOutput( QString someOutput ) +void EditorsDialog::slotReceivedOutput( TQString someOutput ) { kdDebug(9006) << "OUTPUT: " << someOutput << endl; @@ -126,7 +126,7 @@ void EditorsDialog::slotReceivedOutput( QString someOutput ) /////////////////////////////////////////////////////////////////////////////// -void EditorsDialog::slotReceivedErrors( QString someErrors ) +void EditorsDialog::slotReceivedErrors( TQString someErrors ) { kdDebug(9006) << "ERRORS: " << someErrors << endl; } diff --git a/vcs/cvsservice/editorsdialog.h b/vcs/cvsservice/editorsdialog.h index 1aedbc64..8feecfaf 100644 --- a/vcs/cvsservice/editorsdialog.h +++ b/vcs/cvsservice/editorsdialog.h @@ -23,21 +23,21 @@ class EditorsDialog: public EditorsDialogBase, virtual public CVSServiceDCOPIfac { Q_OBJECT public: - EditorsDialog(CvsService_stub *cvsService, QWidget *parent = 0, const char *name = 0); + EditorsDialog(CvsService_stub *cvsService, TQWidget *parent = 0, const char *name = 0); virtual ~EditorsDialog(); - void startjob(QString strDir); + void startjob(TQString strDir); private slots: // DCOP Iface virtual void slotJobExited( bool normalExit, int exitStatus ); - virtual void slotReceivedOutput( QString someOutput ); - virtual void slotReceivedErrors( QString someErrors ); + virtual void slotReceivedOutput( TQString someOutput ); + virtual void slotReceivedErrors( TQString someErrors ); private: CvsService_stub *m_cvsService; CvsJob_stub *m_cvsJob; - QString m_output; + TQString m_output; }; #endif diff --git a/vcs/cvsservice/integrator/cvsserviceintegrator.cpp b/vcs/cvsservice/integrator/cvsserviceintegrator.cpp index 617e66a3..1bbc3b11 100644 --- a/vcs/cvsservice/integrator/cvsserviceintegrator.cpp +++ b/vcs/cvsservice/integrator/cvsserviceintegrator.cpp @@ -28,8 +28,8 @@ static const KDevPluginInfo data("kdevcvsserviceintegrator"); typedef KDevGenericFactory<CVSServiceIntegrator> CVSIntegratorFactory; K_EXPORT_COMPONENT_FACTORY( libcvsserviceintegrator, CVSIntegratorFactory(data) ) -CVSServiceIntegrator::CVSServiceIntegrator(QObject* parent, const char* name, - const QStringList args) +CVSServiceIntegrator::CVSServiceIntegrator(TQObject* parent, const char* name, + const TQStringList args) :KDevVCSIntegrator(parent, name) { } @@ -38,12 +38,12 @@ CVSServiceIntegrator::~CVSServiceIntegrator( ) { } -VCSDialog* CVSServiceIntegrator::fetcher(QWidget* parent) +VCSDialog* CVSServiceIntegrator::fetcher(TQWidget* parent) { return 0; } -VCSDialog* CVSServiceIntegrator::integrator(QWidget* parent) +VCSDialog* CVSServiceIntegrator::integrator(TQWidget* parent) { IntegratorDlg *dlg = new IntegratorDlg(this, parent); return dlg; diff --git a/vcs/cvsservice/integrator/cvsserviceintegrator.h b/vcs/cvsservice/integrator/cvsserviceintegrator.h index 12ba8ef8..c02547a4 100644 --- a/vcs/cvsservice/integrator/cvsserviceintegrator.h +++ b/vcs/cvsservice/integrator/cvsserviceintegrator.h @@ -22,16 +22,16 @@ #include <kdevvcsintegrator.h> -#include <qstringlist.h> +#include <tqstringlist.h> class CVSServiceIntegrator: public KDevVCSIntegrator { Q_OBJECT public: - CVSServiceIntegrator(QObject* parent, const char* name, const QStringList args = QStringList()); + CVSServiceIntegrator(TQObject* parent, const char* name, const TQStringList args = TQStringList()); virtual ~CVSServiceIntegrator(); - virtual VCSDialog* fetcher(QWidget* parent); - virtual VCSDialog* integrator(QWidget* parent); + virtual VCSDialog* fetcher(TQWidget* parent); + virtual VCSDialog* integrator(TQWidget* parent); }; diff --git a/vcs/cvsservice/integrator/integratordlg.cpp b/vcs/cvsservice/integrator/integratordlg.cpp index b85b9984..32184c45 100644 --- a/vcs/cvsservice/integrator/integratordlg.cpp +++ b/vcs/cvsservice/integrator/integratordlg.cpp @@ -19,13 +19,13 @@ ***************************************************************************/ #include "integratordlg.h" -#include <qfile.h> -#include <qdir.h> -#include <qlayout.h> -#include <qcombobox.h> -#include <qregexp.h> -#include <qtextstream.h> -#include <qcheckbox.h> +#include <tqfile.h> +#include <tqdir.h> +#include <tqlayout.h> +#include <tqcombobox.h> +#include <tqregexp.h> +#include <tqtextstream.h> +#include <tqcheckbox.h> #include <kapplication.h> #include <kdialogbase.h> @@ -40,17 +40,17 @@ #include "initdlg.h" -IntegratorDlg::IntegratorDlg(CVSServiceIntegrator *integrator, QWidget *parent, const char *name) +IntegratorDlg::IntegratorDlg(CVSServiceIntegrator *integrator, TQWidget *parent, const char *name) :IntegratorDlgBase(parent, name), m_integrator(integrator) { - QFile cvspass(QDir::homeDirPath() + "/.cvspass"); + TQFile cvspass(TQDir::homeDirPath() + "/.cvspass"); if (cvspass.open(IO_ReadOnly)) { - QTextStream stream(&cvspass); + TQTextStream stream(&cvspass); while (!stream.atEnd()) { - QString line = stream.readLine(); - QStringList recs = QStringList::split(" ", line, false); + TQString line = stream.readLine(); + TQStringList recs = TQStringList::split(" ", line, false); repository->insertItem(recs[1]); } cvspass.close(); @@ -61,19 +61,19 @@ void IntegratorDlg::init_clicked() { KDialogBase dlg(KDialogBase::Plain, i18n("Init CVS Repository"), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok); dlg.plainPage()->setMargin(0); - (new QVBoxLayout(dlg.plainPage(), 0, 0))->setAutoAdd(true); + (new TQVBoxLayout(dlg.plainPage(), 0, 0))->setAutoAdd(true); InitDlg *initDlg = new InitDlg(dlg.plainPage()); initDlg->show(); initDlg->location->setFocus(); initDlg->location->setMode(KFile::Directory); - QRegExp localrep(":local:(.*)"); + TQRegExp localrep(":local:(.*)"); if (localrep.search(repository->currentText()) != -1) initDlg->location->setURL(localrep.cap(1)); - if (dlg.exec() == QDialog::Accepted) + if (dlg.exec() == TQDialog::Accepted) { - QString url = initDlg->location->url(); + TQString url = initDlg->location->url(); KProcess *proc = new KProcess(); *proc << "cvs"; *proc << "-d" << url << "init"; @@ -84,21 +84,21 @@ void IntegratorDlg::init_clicked() KMessageBox::error(this, i18n("cvs init exited with status %1. Please check if the cvs location is correct.").arg(proc->exitStatus()), i18n("Init CVS Repository")); else { - repository->insertItem(QString(":local:%1").arg(url)); - repository->setCurrentText(QString(":local:%1").arg(url)); + repository->insertItem(TQString(":local:%1").arg(url)); + repository->setCurrentText(TQString(":local:%1").arg(url)); } } } void IntegratorDlg::login_clicked() { - QCString appId; - QString error; + TQCString appId; + TQString error; if (KApplication::startServiceByDesktopName("cvsservice", - QStringList(), &error, &appId)) + TQStringList(), &error, &appId)) { - QString msg = i18n("Unable to find the Cervisia KPart. \n" + TQString msg = i18n("Unable to find the Cervisia KPart. \n" "Cervisia Integration will not be available. Please check your\n" "Cervisia installation and re-try. Reason was:\n") + error; KMessageBox::error(this, msg, "DCOP Error"); @@ -122,7 +122,7 @@ void IntegratorDlg::accept() proc->setWorkingDirectory(m_projectLocation); *proc << "cvs"; *proc << "-d" << repository->currentText() << "import" - << "-m" << QString("\"%1\"").arg(comment->text()) << module->text() + << "-m" << TQString("\"%1\"").arg(comment->text()) << module->text() << vendorTag->text() << releaseTag->text(); proc->start(KProcess::Block); if (!proc->normalExit()) @@ -134,7 +134,7 @@ void IntegratorDlg::accept() kdDebug() << "Project is in: " << m_projectLocation << endl; KURL url = KURL::fromPathOrURL(m_projectLocation); - QString up = url.upURL().path(); + TQString up = url.upURL().path(); kdDebug() << "Up is: " << up << endl; //delete sources in project dir @@ -151,13 +151,13 @@ void IntegratorDlg::accept() coproc->start(KProcess::Block); } -/* QCString appId; - QString error; +/* TQCString appId; + TQString error; if (KApplication::startServiceByDesktopName("cvsservice", - QStringList(), &error, &appId)) + TQStringList(), &error, &appId)) { - QString msg = i18n("Unable to find the Cervisia KPart. \n" + TQString msg = i18n("Unable to find the Cervisia KPart. \n" "Cervisia Integration will not be available. Please check your\n" "Cervisia installation and re-try. Reason was:\n") + error; KMessageBox::error(this, msg, "DCOP Error"); @@ -175,12 +175,12 @@ void IntegratorDlg::createModule_clicked() { } -QWidget *IntegratorDlg::self() +TQWidget *IntegratorDlg::self() { return const_cast<IntegratorDlg*>(this); } -void IntegratorDlg::init(const QString &projectName, const QString &projectLocation) +void IntegratorDlg::init(const TQString &projectName, const TQString &projectLocation) { if( m_projectName != projectName ) module->setText(projectName); diff --git a/vcs/cvsservice/integrator/integratordlg.h b/vcs/cvsservice/integrator/integratordlg.h index f262be18..a69a7a91 100644 --- a/vcs/cvsservice/integrator/integratordlg.h +++ b/vcs/cvsservice/integrator/integratordlg.h @@ -28,10 +28,10 @@ class QDomDocument; class IntegratorDlg: public IntegratorDlgBase, public VCSDialog { Q_OBJECT public: - IntegratorDlg(CVSServiceIntegrator *integrator, QWidget *parent = 0, const char *name = 0); + IntegratorDlg(CVSServiceIntegrator *integrator, TQWidget *parent = 0, const char *name = 0); - virtual QWidget *self(); - virtual void init(const QString &projectName, const QString &projectLocation); + virtual TQWidget *self(); + virtual void init(const TQString &projectName, const TQString &projectLocation); public slots: virtual void login_clicked(); @@ -41,8 +41,8 @@ public slots: private: CVSServiceIntegrator *m_integrator; - QString m_projectLocation; - QString m_projectName; + TQString m_projectLocation; + TQString m_projectName; }; #endif diff --git a/vcs/cvsservice/releaseinputdialog.cpp b/vcs/cvsservice/releaseinputdialog.cpp index 31907769..91685a29 100644 --- a/vcs/cvsservice/releaseinputdialog.cpp +++ b/vcs/cvsservice/releaseinputdialog.cpp @@ -9,10 +9,10 @@ * * ***************************************************************************/ -#include <qlabel.h> +#include <tqlabel.h> #include <klineedit.h> -#include <qcheckbox.h> -#include <qradiobutton.h> +#include <tqcheckbox.h> +#include <tqradiobutton.h> #include "releaseinputdialog.h" @@ -20,7 +20,7 @@ // class ReleaseInputDialog /////////////////////////////////////////////////////////////////////////////// -ReleaseInputDialog::ReleaseInputDialog( QWidget* parent) +ReleaseInputDialog::ReleaseInputDialog( TQWidget* parent) : ReleaseInputDialogBase( parent, "releaseinputdialog", true, 0 ) { } @@ -40,14 +40,14 @@ bool ReleaseInputDialog::isRevert() const /////////////////////////////////////////////////////////////////////////////// -QString ReleaseInputDialog::release() const +TQString ReleaseInputDialog::release() const { if (type() == byRevision) return " -r " + revisionEdit->text(); else if (type() == byDate) return " -D " + dateEdit->text(); else - return QString::null; + return TQString::null; } /////////////////////////////////////////////////////////////////////////////// diff --git a/vcs/cvsservice/releaseinputdialog.h b/vcs/cvsservice/releaseinputdialog.h index 5de2c3e6..e00b0b04 100644 --- a/vcs/cvsservice/releaseinputdialog.h +++ b/vcs/cvsservice/releaseinputdialog.h @@ -27,17 +27,17 @@ public: * C-tor * @param parent */ - ReleaseInputDialog( QWidget* parent = 0 ); + ReleaseInputDialog( TQWidget* parent = 0 ); /** * Destructor */ virtual ~ReleaseInputDialog(); /** - * @return a QString formatted as "-r <RELEASE-TAG> " or "-D <RELEASE-DATE> " + * @return a TQString formatted as "-r <RELEASE-TAG> " or "-D <RELEASE-DATE> " * so it can be embedded in the command line. */ - QString release() const; + TQString release() const; /** * @return true if the user has checked "rever": enforce operation then even diff --git a/vcs/cvsservice/tagdialog.cpp b/vcs/cvsservice/tagdialog.cpp index 846cfce9..33aca057 100644 --- a/vcs/cvsservice/tagdialog.cpp +++ b/vcs/cvsservice/tagdialog.cpp @@ -10,7 +10,7 @@ ***************************************************************************/ #include <klineedit.h> -#include <qcheckbox.h> +#include <tqcheckbox.h> #include "tagdialog.h" @@ -18,7 +18,7 @@ // class TagDialog /////////////////////////////////////////////////////////////////////////////// -TagDialog::TagDialog( const QString &caption, QWidget *parent, const char *name ) +TagDialog::TagDialog( const TQString &caption, TQWidget *parent, const char *name ) : TagDialogBase( parent, name ? name : "tagdialog", true ) { if (!caption.isEmpty()) @@ -45,14 +45,14 @@ void TagDialog::accept() /////////////////////////////////////////////////////////////////////////////// -QString TagDialog::tagName() const +TQString TagDialog::tagName() const { return tagBranchEdit->text(); } /////////////////////////////////////////////////////////////////////////////// -QString TagDialog::branchName() const +TQString TagDialog::branchName() const { return tagName(); } diff --git a/vcs/cvsservice/tagdialog.h b/vcs/cvsservice/tagdialog.h index 86b63010..6c34cfe9 100644 --- a/vcs/cvsservice/tagdialog.h +++ b/vcs/cvsservice/tagdialog.h @@ -24,17 +24,17 @@ class TagDialog : public TagDialogBase { Q_OBJECT public: - TagDialog( const QString &caption, QWidget *parent = 0, const char *name = 0 ); + TagDialog( const TQString &caption, TQWidget *parent = 0, const char *name = 0 ); virtual ~TagDialog(); /** * @return the tag name selected by the user */ - QString tagName() const; + TQString tagName() const; /** * @return the branch name selected by the user */ - QString branchName() const; + TQString branchName() const; /** * @return true if the user want to branch the selected files */ diff --git a/vcs/perforce/commitdlg.cpp b/vcs/perforce/commitdlg.cpp index 8a9be561..a6aa98b9 100644 --- a/vcs/perforce/commitdlg.cpp +++ b/vcs/perforce/commitdlg.cpp @@ -12,11 +12,11 @@ #include "commitdlg.h" -#include <qlayout.h> -#include <qlabel.h> -#include <qtextedit.h> -#include <qpushbutton.h> -#include <qregexp.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqtextedit.h> +#include <tqpushbutton.h> +#include <tqregexp.h> #include <kprocess.h> #include <kapplication.h> #include <klocale.h> @@ -28,38 +28,38 @@ #include "execcommand.h" -CommitDialog::CommitDialog( QWidget *parent, const char *name ) +CommitDialog::CommitDialog( TQWidget *parent, const char *name ) : KDialogBase( parent, name, true, i18n("Perforce Submit"), Ok|Cancel|Details ) { - QWidget *w = new QWidget( this, "main widget" ); + TQWidget *w = new TQWidget( this, "main widget" ); setMainWidget( w ); - edit = new QTextEdit( w ); - QFontMetrics fm(edit->fontMetrics()); + edit = new TQTextEdit( w ); + TQFontMetrics fm(edit->fontMetrics()); edit->setMinimumSize(fm.width("0")*40, fm.lineSpacing()*3); - QVBoxLayout *layout = new QVBoxLayout( w, 0, spacingHint() ); - QLabel *editLabel = new QLabel(i18n("&Enter description:"), w); + TQVBoxLayout *layout = new TQVBoxLayout( w, 0, spacingHint() ); + TQLabel *editLabel = new TQLabel(i18n("&Enter description:"), w); editLabel->setBuddy(edit); layout->addWidget(editLabel); layout->addWidget(edit); - w = new QWidget( this, "details widget" ); + w = new TQWidget( this, "details widget" ); clientEdit = new KLineEdit( w ); userEdit = new KLineEdit( w ); filesBox = new KListBox( w ); - layout = new QVBoxLayout( w, 0, spacingHint() ); - QLabel *clientLabel = new QLabel(i18n("C&lient:"), w); + layout = new TQVBoxLayout( w, 0, spacingHint() ); + TQLabel *clientLabel = new TQLabel(i18n("C&lient:"), w); clientLabel->setBuddy(clientEdit); layout->addWidget(clientLabel); layout->addWidget( clientEdit ); - QLabel *userLabel = new QLabel(i18n("&User:"), w); + TQLabel *userLabel = new TQLabel(i18n("&User:"), w); userLabel->setBuddy(userEdit); layout->addWidget( userLabel ); layout->addWidget( userEdit ); - QLabel *filesLabel = new QLabel(i18n("&File(s):"), w); + TQLabel *filesLabel = new TQLabel(i18n("&File(s):"), w); filesLabel->setBuddy(filesBox); layout->addWidget( filesLabel ); layout->addWidget( filesBox ); @@ -79,49 +79,49 @@ void CommitDialog::autoGuess() cenv = getenv( "P4USER" ); if ( cenv ) { - setUser( QString::fromLocal8Bit( cenv ) ); + setUser( TQString::fromLocal8Bit( cenv ) ); } cenv = getenv( "P4CLIENT" ); if ( cenv ) { - setClient( QString::fromLocal8Bit( cenv ) ); + setClient( TQString::fromLocal8Bit( cenv ) ); } } -void CommitDialog::setFiles( const QStringList& lst ) +void CommitDialog::setFiles( const TQStringList& lst ) { filesBox->clear(); setDepotFiles( lst ); } -void CommitDialog::setDepotFiles( const QStringList& lst ) +void CommitDialog::setDepotFiles( const TQStringList& lst ) { - QStringList args; + TQStringList args; args << "files"; - for ( QStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it ) { + for ( TQStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it ) { args << (*it); } - ExecCommand* cmd = new ExecCommand( "p4", args, QString::null, QStringList(), this ); - connect( cmd, SIGNAL(finished( const QString&, const QString& )), - this, SLOT(getFilesFinished( const QString&, const QString& )) ); + ExecCommand* cmd = new ExecCommand( "p4", args, TQString::null, TQStringList(), this ); + connect( cmd, TQT_SIGNAL(finished( const TQString&, const TQString& )), + this, TQT_SLOT(getFilesFinished( const TQString&, const TQString& )) ); } -void CommitDialog::getFilesFinished( const QString& out, const QString& /* err */ ) +void CommitDialog::getFilesFinished( const TQString& out, const TQString& /* err */ ) { - QStringList lst = QStringList::split( QChar('\n'), out ); - for ( QStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it ) { - int pos = (*it).find( QChar('#') ); + TQStringList lst = TQStringList::split( TQChar('\n'), out ); + for ( TQStringList::ConstIterator it = lst.begin(); it != lst.end(); ++it ) { + int pos = (*it).find( TQChar('#') ); if ( pos > 1 && (*it).startsWith( "//" ) ) { filesBox->insertItem( (*it).left( pos ) ); } } } -QString CommitDialog::changeList() const +TQString CommitDialog::changeList() const { - QString lst; + TQString lst; lst += "Change: new\n" "Client: " + client() + "\n" @@ -129,7 +129,7 @@ QString CommitDialog::changeList() const "Status: new\n" "Description:\n "; - lst += logMessage().replace(QRegExp("\n"), "\n ") + "\n\n"; + lst += logMessage().replace(TQRegExp("\n"), "\n ") + "\n\n"; lst += "Files:\n"; diff --git a/vcs/perforce/commitdlg.h b/vcs/perforce/commitdlg.h index 390681fd..09a9c72f 100644 --- a/vcs/perforce/commitdlg.h +++ b/vcs/perforce/commitdlg.h @@ -13,8 +13,8 @@ #ifndef _COMMITDIALOG_H_ #define _COMMITDIALOG_H_ -#include <qstringlist.h> -#include <qtextedit.h> +#include <tqstringlist.h> +#include <tqtextedit.h> #include <klineedit.h> #include <klistbox.h> #include <kdialogbase.h> @@ -25,17 +25,17 @@ class CommitDialog : public KDialogBase { Q_OBJECT public: - CommitDialog( QWidget *parent = 0, const char *name = 0 ); + CommitDialog( TQWidget *parent = 0, const char *name = 0 ); ~CommitDialog(); - QString logMessage() const { return edit->text(); } - QString user() const { return userEdit->text(); } - QString client() const { return clientEdit->text(); } - QString changeList() const; + TQString logMessage() const { return edit->text(); } + TQString user() const { return userEdit->text(); } + TQString client() const { return clientEdit->text(); } + TQString changeList() const; - void setUser( const QString& usr ) { userEdit->setText( usr ); } - void setClient( const QString& clnt ) { clientEdit->setText( clnt ); } - void setFiles( const QStringList& lst ); + void setUser( const TQString& usr ) { userEdit->setText( usr ); } + void setClient( const TQString& clnt ) { clientEdit->setText( clnt ); } + void setFiles( const TQStringList& lst ); /** tries to fill out user and client */ void autoGuess(); @@ -44,11 +44,11 @@ protected slots: void accept(); private slots: - void getFilesFinished( const QString& out, const QString& err ); + void getFilesFinished( const TQString& out, const TQString& err ); private: - void setDepotFiles( const QStringList& lst ); - QTextEdit *edit; + void setDepotFiles( const TQStringList& lst ); + TQTextEdit *edit; KLineEdit *clientEdit, *userEdit; KListBox *filesBox; }; diff --git a/vcs/perforce/integrator/perforceintegrator.cpp b/vcs/perforce/integrator/perforceintegrator.cpp index 74964edb..bc7c0988 100644 --- a/vcs/perforce/integrator/perforceintegrator.cpp +++ b/vcs/perforce/integrator/perforceintegrator.cpp @@ -28,8 +28,8 @@ static const KDevPluginInfo data("kdevperforceintegrator"); typedef KDevGenericFactory<PerforceIntegrator> PerforceIntegratorFactory; K_EXPORT_COMPONENT_FACTORY( libperforceintegrator, PerforceIntegratorFactory(data) ) -PerforceIntegrator::PerforceIntegrator(QObject* parent, const char* name, - const QStringList // args +PerforceIntegrator::PerforceIntegrator(TQObject* parent, const char* name, + const TQStringList // args ) :KDevVCSIntegrator(parent, name) { @@ -39,13 +39,13 @@ PerforceIntegrator::~PerforceIntegrator() { } -VCSDialog* PerforceIntegrator::fetcher(QWidget* // parent +VCSDialog* PerforceIntegrator::fetcher(TQWidget* // parent ) { return 0; } -VCSDialog* PerforceIntegrator::integrator(QWidget* parent) +VCSDialog* PerforceIntegrator::integrator(TQWidget* parent) { PFIntegratorDlg *dlg = new PFIntegratorDlg(parent); return dlg; diff --git a/vcs/perforce/integrator/perforceintegrator.h b/vcs/perforce/integrator/perforceintegrator.h index a47c7ee7..1d047826 100644 --- a/vcs/perforce/integrator/perforceintegrator.h +++ b/vcs/perforce/integrator/perforceintegrator.h @@ -22,17 +22,17 @@ #include <kdevvcsintegrator.h> -#include <qstringlist.h> +#include <tqstringlist.h> class PerforceIntegrator : public KDevVCSIntegrator { Q_OBJECT public: - PerforceIntegrator(QObject* parent, const char* name, const QStringList args = QStringList()); + PerforceIntegrator(TQObject* parent, const char* name, const TQStringList args = TQStringList()); ~PerforceIntegrator(); - virtual VCSDialog* fetcher(QWidget* parent); - virtual VCSDialog* integrator(QWidget* parent); + virtual VCSDialog* fetcher(TQWidget* parent); + virtual VCSDialog* integrator(TQWidget* parent); }; diff --git a/vcs/perforce/integrator/pfintegratordlg.cpp b/vcs/perforce/integrator/pfintegratordlg.cpp index e93e8b3e..8685b2f4 100644 --- a/vcs/perforce/integrator/pfintegratordlg.cpp +++ b/vcs/perforce/integrator/pfintegratordlg.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include "pfintegratordlg.h" -PFIntegratorDlg::PFIntegratorDlg(QWidget *parent, const char *name) +PFIntegratorDlg::PFIntegratorDlg(TQWidget *parent, const char *name) :PFIntegratorDlgBase(parent, name) { } @@ -28,11 +28,11 @@ void PFIntegratorDlg::accept() { } -void PFIntegratorDlg::init(const QString &/*projectName*/, const QString &/*projectLocation*/) +void PFIntegratorDlg::init(const TQString &/*projectName*/, const TQString &/*projectLocation*/) { } -QWidget *PFIntegratorDlg::self() +TQWidget *PFIntegratorDlg::self() { return const_cast<PFIntegratorDlg*>(this); } diff --git a/vcs/perforce/integrator/pfintegratordlg.h b/vcs/perforce/integrator/pfintegratordlg.h index 2389c826..750795b6 100644 --- a/vcs/perforce/integrator/pfintegratordlg.h +++ b/vcs/perforce/integrator/pfintegratordlg.h @@ -26,11 +26,11 @@ class PFIntegratorDlg: public PFIntegratorDlgBase, public VCSDialog { Q_OBJECT public: - PFIntegratorDlg(QWidget *parent = 0, const char *name = 0); + PFIntegratorDlg(TQWidget *parent = 0, const char *name = 0); virtual void accept(); - virtual void init(const QString &projectName, const QString &projectLocation); - virtual QWidget *self(); + virtual void init(const TQString &projectName, const TQString &projectLocation); + virtual TQWidget *self(); }; #endif diff --git a/vcs/perforce/perforcepart.cpp b/vcs/perforce/perforcepart.cpp index 9aeadc6f..cb3d7ba9 100644 --- a/vcs/perforce/perforcepart.cpp +++ b/vcs/perforce/perforcepart.cpp @@ -12,9 +12,9 @@ #include "perforcepart.h" -#include <qfileinfo.h> -#include <qpopupmenu.h> -#include <qregexp.h> +#include <tqfileinfo.h> +#include <tqpopupmenu.h> +#include <tqregexp.h> #include <kpopupmenu.h> #include <kdebug.h> #include <kdevgenericfactory.h> @@ -38,14 +38,14 @@ static const KDevPluginInfo data("kdevperforce"); typedef KDevGenericFactory<PerforcePart> PerforceFactory; K_EXPORT_COMPONENT_FACTORY( libkdevperforce, PerforceFactory( data ) ) -PerforcePart::PerforcePart( QObject *parent, const char *name, const QStringList & ) +PerforcePart::PerforcePart( TQObject *parent, const char *name, const TQStringList & ) : KDevVersionControl( &data, parent, name ? name : "PerforcePart" ) { setInstance(PerforceFactory::instance()); setupActions(); - connect( core(), SIGNAL(contextMenu(QPopupMenu *, const Context *)), - this, SLOT(contextMenu(QPopupMenu *, const Context *)) ); + connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), + this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); } @@ -54,88 +54,88 @@ PerforcePart::~PerforcePart() void PerforcePart::setupActions() { - actionEdit = new KAction( i18n("Edit"), 0, this, SLOT(slotActionEdit()), + actionEdit = new KAction( i18n("Edit"), 0, this, TQT_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 KAction( i18n("Revert"), 0, this, SLOT(slotActionRevert()), + actionRevert = new KAction( i18n("Revert"), 0, this, TQT_SLOT(slotActionRevert()), actionCollection(), "perforce_revert" ); actionRevert->setToolTip(i18n("Revert")); actionRevert->setWhatsThis(i18n("<b>Revert</b><p>Discards changes made to open files.")); - actionSubmit = new KAction( i18n("Submit"), 0, this, SLOT(slotActionCommit()), + actionSubmit = new KAction( i18n("Submit"), 0, this, TQT_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 KAction( i18n("Sync"), 0, this, SLOT(slotActionUpdate()), + actionSync = new KAction( i18n("Sync"), 0, this, TQT_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 KAction( i18n("Diff Against Repository"), 0, this, SLOT(slotActionDiff()), + actionDiff = new KAction( i18n("Diff Against Repository"), 0, this, TQT_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 KAction( i18n("Add to Repository"), 0, this, SLOT(slotActionAdd()), + actionAdd = new KAction( i18n("Add to Repository"), 0, this, TQT_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 KAction( i18n("Remove From Repository"), 0, this, SLOT(slotActionRemove()), + actionRemove = new KAction( i18n("Remove From Repository"), 0, this, TQT_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.")); } -void PerforcePart::contextMenu(QPopupMenu *popup, const Context *context) +void PerforcePart::contextMenu(TQPopupMenu *popup, const Context *context) { if (context->hasType( Context::FileContext )) { const FileContext *fcontext = static_cast<const FileContext*>(context); popupfile = fcontext->urls().first().path(); - QFileInfo fi( popupfile ); + TQFileInfo fi( popupfile ); popup->insertSeparator(); KPopupMenu *sub = new KPopupMenu(popup); - QString name = fi.fileName(); + TQString name = fi.fileName(); sub->insertTitle( i18n("Actions for %1").arg(name) ); int id = sub->insertItem( i18n("Edit"), - this, SLOT(slotEdit()) ); + this, TQT_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, SLOT(slotRevert()) ); + this, TQT_SLOT(slotRevert()) ); sub->setWhatsThis(id, i18n("<b>Revert</b><p>Discards changes made to open files.")); id = sub->insertItem( i18n("Submit"), - this, SLOT(slotCommit()) ); + this, TQT_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, SLOT(slotUpdate()) ); + this, TQT_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, SLOT(slotDiff()) ); + this, TQT_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, SLOT(slotAdd()) ); + this, TQT_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, SLOT(slotRemove()) ); + this, TQT_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); } } -void PerforcePart::execCommand( const QString& cmd, const QString& filename ) +void PerforcePart::execCommand( const TQString& cmd, const TQString& filename ) { if ( filename.isEmpty() ) return; - QFileInfo fi( filename ); + TQFileInfo fi( filename ); if (fi.isDir()) { KMessageBox::error( 0, i18n("Cannot handle directories, please select single files") ); return; } - QString dir = fi.dirPath(); - QString name = fi.fileName(); + TQString dir = fi.dirPath(); + TQString name = fi.fileName(); - QString command("cd "); + TQString command("cd "); command += KProcess::quote(dir); command += " && p4 " + cmd + " "; command += name; @@ -144,43 +144,43 @@ void PerforcePart::execCommand( const QString& cmd, const QString& filename ) makeFrontend->queueCommand(dir, command); } -void PerforcePart::edit( const QString& filename ) +void PerforcePart::edit( const TQString& filename ) { execCommand( "edit", filename ); } -void PerforcePart::revert( const QString& filename ) +void PerforcePart::revert( const TQString& filename ) { if ( KMessageBox::questionYesNo( 0, i18n("Do you really want to revert " - "the file %1 and lose all your changes?").arg( filename ), QString::null, i18n("Revert"), i18n("Do Not Revert") ) == KMessageBox::Yes ) { + "the file %1 and lose all your changes?").arg( filename ), TQString::null, i18n("Revert"), i18n("Do Not Revert") ) == KMessageBox::Yes ) { execCommand( "revert", filename ); } } -void PerforcePart::commit( const QString& filename ) +void PerforcePart::commit( const TQString& filename ) { if ( filename.isEmpty() ) return; - QFileInfo fi( filename ); + TQFileInfo fi( filename ); if ( fi.isDir() ) { KMessageBox::error( 0, i18n("Submitting of subdirectories is not supported") ); return; } CommitDialog d; - QStringList lst; + TQStringList lst; lst << filename; d.setFiles( lst ); - if (d.exec() == QDialog::Rejected) + if (d.exec() == TQDialog::Rejected) return; - QString message = d.changeList(); + TQString message = d.changeList(); if (!message.isEmpty()) message = KShellProcess::quote(message); - QString command("echo " + message); + TQString command("echo " + message); command += " | p4 submit -i"; if (KDevMakeFrontend *makeFrontend = extension<KDevMakeFrontend>("KDevelop/MakeFrontend")) @@ -188,13 +188,13 @@ void PerforcePart::commit( const QString& filename ) } -void PerforcePart::update( const QString& filename ) +void PerforcePart::update( const TQString& filename ) { if ( filename.isEmpty() ) return; - QString dir, name; - QFileInfo fi( filename ); + TQString dir, name; + TQFileInfo fi( filename ); if (fi.isDir()) { dir = fi.absFilePath(); name = "..."; // three dots means "recoursive" @@ -203,7 +203,7 @@ void PerforcePart::update( const QString& filename ) name = fi.fileName(); } - QString command("cd "); + TQString command("cd "); command += KProcess::quote(dir); command += " && p4 sync "; command += name; @@ -213,41 +213,41 @@ void PerforcePart::update( const QString& filename ) } -void PerforcePart::add( const QString& filename ) +void PerforcePart::add( const TQString& filename ) { execCommand( "add", filename ); } -void PerforcePart::remove( const QString& filename ) +void PerforcePart::remove( const TQString& filename ) { execCommand( "delete", filename ); } -void PerforcePart::diff( const QString& filename ) +void PerforcePart::diff( const TQString& filename ) { if ( filename.isEmpty() ) return; - QString name; - QFileInfo fi( filename ); + TQString name; + TQFileInfo fi( filename ); if ( fi.isDir() ) { name = fi.absFilePath() + "..."; } else { name = filename; } - QStringList args; + TQStringList args; args << "diff"; args << "-du"; args << name; - ExecCommand* cmv = new ExecCommand( "p4", args, QString::null, QStringList(), this ); - connect( cmv, SIGNAL(finished( const QString&, const QString& )), - this, SLOT(slotDiffFinished( const QString&, const QString& )) ); + ExecCommand* cmv = new ExecCommand( "p4", args, TQString::null, TQStringList(), this ); + connect( cmv, TQT_SIGNAL(finished( const TQString&, const TQString& )), + this, TQT_SLOT(slotDiffFinished( const TQString&, const TQString& )) ); } -void PerforcePart::slotDiffFinished( const QString& diff, const QString& err ) +void PerforcePart::slotDiffFinished( const TQString& diff, const TQString& err ) { if ( diff.isNull() && err.isNull() ) { kdDebug(9000) << "p4 diff cancelled" << endl; @@ -261,7 +261,7 @@ void PerforcePart::slotDiffFinished( const QString& diff, const QString& err ) if ( !err.isEmpty() ) { int s = KMessageBox::warningContinueCancelList( 0, i18n("P4 output errors during diff. Do you still want to continue?"), - QStringList::split( "\n", err, false ), i18n("Errors During Diff") ); + TQStringList::split( "\n", err, false ), i18n("Errors During Diff") ); if ( s != KMessageBox::Continue ) return; } @@ -272,16 +272,16 @@ void PerforcePart::slotDiffFinished( const QString& diff, const QString& err ) } // strip the ==== headers - static QRegExp rx( "(^|\\n)==== ([^ ]+) -.*====\\n" ); + static TQRegExp rx( "(^|\\n)==== ([^ ]+) -.*====\\n" ); rx.setMinimal( true ); - QString strippedDiff = diff; + TQString strippedDiff = diff; strippedDiff.replace( rx, "--- \\2\n+++ \\2\n" ); if (KDevDiffFrontend *diffFrontend = extension<KDevDiffFrontend>("KDevelop/DiffFrontend")) diffFrontend->showDiff( strippedDiff ); } -QString PerforcePart::currentFile() +TQString PerforcePart::currentFile() { KParts::ReadOnlyPart *part = dynamic_cast<KParts::ReadOnlyPart*>( partController()->activePart() ); if ( part ) { @@ -289,7 +289,7 @@ QString PerforcePart::currentFile() if ( url.isLocalFile() ) return url.path(); } - return QString::null; + return TQString::null; } void PerforcePart::slotActionCommit() diff --git a/vcs/perforce/perforcepart.h b/vcs/perforce/perforcepart.h index 5a50871c..073a14ce 100644 --- a/vcs/perforce/perforcepart.h +++ b/vcs/perforce/perforcepart.h @@ -25,20 +25,20 @@ class PerforcePart : public KDevVersionControl Q_OBJECT public: - PerforcePart( QObject *parent, const char *name, const QStringList & ); + PerforcePart( TQObject *parent, const char *name, const TQStringList & ); ~PerforcePart(); - virtual QString shortDescription() const + virtual TQString shortDescription() const { return i18n( "Perforce is a version control system" ); } - virtual void createNewProject(const QString& /* dir */) {} + virtual void createNewProject(const TQString& /* dir */) {} virtual bool fetchFromRepository() { return true; } virtual KDevVCSFileInfoProvider *fileInfoProvider() const { return 0; } - virtual bool isValidDirectory(const QString& /* dirPath*/) const + virtual bool isValidDirectory(const TQString& /* dirPath*/) const { return true; } private slots: - void contextMenu(QPopupMenu *popup, const Context *context); + void contextMenu(TQPopupMenu *popup, const Context *context); void slotCommit(); void slotUpdate(); void slotAdd(); @@ -55,22 +55,22 @@ private slots: void slotActionRevert(); void slotActionDiff(); - void slotDiffFinished( const QString&, const QString& ); + void slotDiffFinished( const TQString&, const TQString& ); private: - void commit( const QString& filename ); - void update( const QString& filename ); - void add( const QString& filename ); - void remove( const QString& filename ); - void edit( const QString& filename ); - void revert( const QString& filename ); - void diff( const QString& filename ); - QString currentFile(); + void commit( const TQString& filename ); + void update( const TQString& filename ); + void add( const TQString& filename ); + void remove( const TQString& filename ); + void edit( const TQString& filename ); + void revert( const TQString& filename ); + void diff( const TQString& filename ); + TQString currentFile(); /** calls p4 with the command cmd and appends the filename */ - void execCommand( const QString& cmd, const QString& filename ); + void execCommand( const TQString& cmd, const TQString& filename ); void setupActions(); - QString popupfile; + TQString popupfile; KAction *actionEdit, *actionRevert, *actionSubmit, *actionSync, *actionDiff, *actionAdd, *actionRemove; diff --git a/vcs/subversion/commitdlg.cpp b/vcs/subversion/commitdlg.cpp index e227dd67..c456f7c2 100644 --- a/vcs/subversion/commitdlg.cpp +++ b/vcs/subversion/commitdlg.cpp @@ -19,20 +19,20 @@ ***************************************************************************/ #include "commitdlg.h" -#include <qevent.h> +#include <tqevent.h> #include <ktextedit.h> -CommitDlg::CommitDlg( QWidget* parent ) +CommitDlg::CommitDlg( TQWidget* parent ) : CommitDlgBase( parent ) { textMessage->installEventFilter(this); } -bool CommitDlg::eventFilter( QObject* obj, QEvent* ev ) +bool CommitDlg::eventFilter( TQObject* obj, TQEvent* ev ) { - if( ev->type() == QEvent::KeyPress ) + if( ev->type() == TQEvent::KeyPress ) { - QKeyEvent* k = static_cast<QKeyEvent*>(ev); + TQKeyEvent* k = static_cast<TQKeyEvent*>(ev); if( ( k->key() == Qt::Key_Return || k->key() == Qt::Key_Enter ) && k->state() == Qt::ControlButton ) { accept(); diff --git a/vcs/subversion/commitdlg.h b/vcs/subversion/commitdlg.h index 4ac54054..da63e2f5 100644 --- a/vcs/subversion/commitdlg.h +++ b/vcs/subversion/commitdlg.h @@ -27,9 +27,9 @@ class CommitDlg : public CommitDlgBase { Q_OBJECT public: - CommitDlg( QWidget* = 0 ); + CommitDlg( TQWidget* = 0 ); protected: - bool eventFilter( QObject* o, QEvent* e ); + bool eventFilter( TQObject* o, TQEvent* e ); }; #endif diff --git a/vcs/subversion/integrator/subversionintegrator.cpp b/vcs/subversion/integrator/subversionintegrator.cpp index a620deaf..32d28d27 100644 --- a/vcs/subversion/integrator/subversionintegrator.cpp +++ b/vcs/subversion/integrator/subversionintegrator.cpp @@ -28,8 +28,8 @@ static const KDevPluginInfo data("kdevsubversionintegrator"); typedef KDevGenericFactory<SubversionIntegrator> SubversionIntegratorFactory; K_EXPORT_COMPONENT_FACTORY( libsubversionintegrator, SubversionIntegratorFactory(data) ) -SubversionIntegrator::SubversionIntegrator(QObject* parent, const char* name, - const QStringList // args +SubversionIntegrator::SubversionIntegrator(TQObject* parent, const char* name, + const TQStringList // args ) :KDevVCSIntegrator(parent, name) { @@ -39,13 +39,13 @@ SubversionIntegrator::~SubversionIntegrator() { } -VCSDialog* SubversionIntegrator::fetcher(QWidget* // parent +VCSDialog* SubversionIntegrator::fetcher(TQWidget* // parent ) { return 0; } -VCSDialog* SubversionIntegrator::integrator(QWidget* parent) +VCSDialog* SubversionIntegrator::integrator(TQWidget* parent) { SvnIntegratorDlg *dlg = new SvnIntegratorDlg(parent); return dlg; diff --git a/vcs/subversion/integrator/subversionintegrator.h b/vcs/subversion/integrator/subversionintegrator.h index 546bdc5c..e9b62d70 100644 --- a/vcs/subversion/integrator/subversionintegrator.h +++ b/vcs/subversion/integrator/subversionintegrator.h @@ -22,17 +22,17 @@ #include <kdevvcsintegrator.h> -#include <qstringlist.h> +#include <tqstringlist.h> class SubversionIntegrator : public KDevVCSIntegrator { Q_OBJECT public: - SubversionIntegrator(QObject* parent, const char* name, const QStringList args = QStringList()); + SubversionIntegrator(TQObject* parent, const char* name, const TQStringList args = TQStringList()); ~SubversionIntegrator(); - virtual VCSDialog* fetcher(QWidget* parent); - virtual VCSDialog* integrator(QWidget* parent); + virtual VCSDialog* fetcher(TQWidget* parent); + virtual VCSDialog* integrator(TQWidget* parent); }; diff --git a/vcs/subversion/integrator/svnintegratordlg.cpp b/vcs/subversion/integrator/svnintegratordlg.cpp index afed1d3e..05572278 100644 --- a/vcs/subversion/integrator/svnintegratordlg.cpp +++ b/vcs/subversion/integrator/svnintegratordlg.cpp @@ -26,7 +26,7 @@ #include <kio/job.h> #include <kurlrequester.h> #include <kdebug.h> -#include <qradiobutton.h> +#include <tqradiobutton.h> #include <kio/scheduler.h> #include <kprocess.h> #include <kdeversion.h> @@ -38,7 +38,7 @@ using namespace KIO; -SvnIntegratorDlg::SvnIntegratorDlg( QWidget *parent, const char *name ) +SvnIntegratorDlg::SvnIntegratorDlg( TQWidget *parent, const char *name ) : SvnIntegratorDlgBase( parent, name ) { repos1->setMode( KFile::Directory ); @@ -64,8 +64,8 @@ void SvnIntegratorDlg::accept() miscURL.setPath( servURL.path() + "/trunk/" ); list << miscURL; - QByteArray parms; - QDataStream s( parms, IO_WriteOnly ); + TQByteArray parms; + TQDataStream s( parms, IO_WriteOnly ); int cmd = 10; // MKDIR(list) s << cmd << list; KIO::SimpleJob* job = KIO::special( protocolUrl, parms, true ); @@ -74,8 +74,8 @@ void SvnIntegratorDlg::accept() return; } - QByteArray parms2; - QDataStream s2( parms2, IO_WriteOnly ); + TQByteArray parms2; + TQDataStream s2( parms2, IO_WriteOnly ); cmd = 5; //IMPORT servURL.setPath( servURL.path() + "/trunk/" ); s2 << cmd << servURL << KURL::fromPathOrURL( m_projectLocation ); @@ -94,12 +94,12 @@ void SvnIntegratorDlg::accept() delete rmproc; rmproc = NULL; - QByteArray parms3; - QDataStream s3( parms3, IO_WriteOnly ); + TQByteArray parms3; + TQDataStream s3( parms3, IO_WriteOnly ); int cmd2 = 1; //CHECKOUT int rev = -1; - s3 << cmd2 << servURL << KURL::fromPathOrURL( m_projectLocation ) << rev << QString( "HEAD" ); + s3 << cmd2 << servURL << KURL::fromPathOrURL( m_projectLocation ) << rev << TQString( "HEAD" ); SimpleJob *job2 = KIO::special( protocolUrl, parms3, true ); if( ! NetAccess::synchronousRun( job2, 0 ) ){ // Checkout failed @@ -108,13 +108,13 @@ void SvnIntegratorDlg::accept() } } -void SvnIntegratorDlg::init( const QString &projectName, const QString &projectLocation ) +void SvnIntegratorDlg::init( const TQString &projectName, const TQString &projectLocation ) { m_name = projectName; m_projectLocation = projectLocation; } -QWidget *SvnIntegratorDlg::self() +TQWidget *SvnIntegratorDlg::self() { return const_cast<SvnIntegratorDlg*>( this ); } diff --git a/vcs/subversion/integrator/svnintegratordlg.h b/vcs/subversion/integrator/svnintegratordlg.h index 96736023..f76cf95f 100644 --- a/vcs/subversion/integrator/svnintegratordlg.h +++ b/vcs/subversion/integrator/svnintegratordlg.h @@ -26,14 +26,14 @@ class SvnIntegratorDlg: public SvnIntegratorDlgBase, public VCSDialog { Q_OBJECT public: - SvnIntegratorDlg(QWidget *parent = 0, const char *name = 0); + SvnIntegratorDlg(TQWidget *parent = 0, const char *name = 0); virtual void accept(); - virtual void init(const QString &projectName, const QString &projectLocation); - virtual QWidget *self(); + virtual void init(const TQString &projectName, const TQString &projectLocation); + virtual TQWidget *self(); private: - QString m_name; - QString m_projectLocation; + TQString m_name; + TQString m_projectLocation; }; #endif diff --git a/vcs/subversion/kdevsvnd.cpp b/vcs/subversion/kdevsvnd.cpp index 9195c24c..7b4a42d3 100644 --- a/vcs/subversion/kdevsvnd.cpp +++ b/vcs/subversion/kdevsvnd.cpp @@ -25,8 +25,8 @@ #include <kfiledialog.h> #include <ktextedit.h> #include <kpassdlg.h> -#include <qdir.h> -#include <qfile.h> +#include <tqdir.h> +#include <tqfile.h> #include "config.h" @@ -36,71 +36,71 @@ #include "commitdlg.h" extern "C" { - KDE_EXPORT KDEDModule *create_kdevsvnd(const QCString &name) { + KDE_EXPORT KDEDModule *create_kdevsvnd(const TQCString &name) { return new KDevSvnd(name); } } -KDevSvnd::KDevSvnd(const QCString &name) +KDevSvnd::KDevSvnd(const TQCString &name) : KDEDModule(name) { } KDevSvnd::~KDevSvnd() {} -QString KDevSvnd::commitDialog(QString modifiedFiles) { +TQString KDevSvnd::commitDialog(TQString modifiedFiles) { CommitDlg commitDlg; commitDlg.setCaption(i18n("Enter Commit Log Message:")); commitDlg.listMessage->setText( modifiedFiles ); int result = commitDlg.exec(); - if ( result == QDialog::Accepted ) { + if ( result == TQDialog::Accepted ) { return commitDlg.textMessage->text(); } else - return QString::null; + return TQString::null; } -int KDevSvnd::sslServerTrustPrompt( QString errmsg, QString hostname, QString fingerPrint, QString validfrom, QString validuntil, QString issuerName, QString ascii_cert ) +int KDevSvnd::sslServerTrustPrompt( TQString errmsg, TQString hostname, TQString fingerPrint, TQString validfrom, TQString validuntil, TQString issuerName, TQString ascii_cert ) { SvnSSLTrustPrompt dlg; dlg.setupCertInfo( hostname, fingerPrint, validfrom, validuntil, issuerName, ascii_cert ); dlg.setupFailedReasonMsg( errmsg ); int result = dlg.exec(); - if ( result == QDialog::Accepted ){ + if ( result == TQDialog::Accepted ){ return dlg.code(); } else{ return -1; } } -QString KDevSvnd::sslCertFile() +TQString KDevSvnd::sslCertFile() { - QString fileName = KFileDialog::getOpenFileName(QString::null,QString::null,0, i18n("Open SSL certificate file")); + TQString fileName = KFileDialog::getOpenFileName(TQString::null,TQString::null,0, i18n("Open SSL certificate file")); return fileName; } -QCString KDevSvnd::sslPasswdDlg(QString promptMsg) +TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg) { - QCString passwd; + TQCString passwd; int ret = KPasswordDialog::getPassword( passwd,promptMsg ); if( ret == KPasswordDialog::Accepted ){ - QCString retstr; + TQCString retstr; retstr.setNum(1); return retstr + passwd; } else{ - QCString nullstr; + TQCString nullstr; nullstr.setNum(-1); return nullstr; } } -// void KDevSvnd::registerMe(const QCString &app) +// void KDevSvnd::registerMe(const TQCString &app) // { // insert(app, "test", new TestObject(app)); // // When 'app' unregisters with DCOP, the TestObject will get deleted. // } // bool KSvnd::AreAnyFilesInSvn( const KURL::List& wclist ) { -// for ( QValueListConstIterator<KURL> it = wclist.begin(); it != wclist.end() ; ++it ) { +// for ( TQValueListConstIterator<KURL> it = wclist.begin(); it != wclist.end() ; ++it ) { // kdDebug( 9036 ) << "Checking file " << ( *it ) << endl; -// QDir bdir ( ( *it ).path() ); -// if ( bdir.exists() && QFile::exists( ( *it ).path() + "/.svn/entries" ) ) { +// TQDir bdir ( ( *it ).path() ); +// if ( bdir.exists() && TQFile::exists( ( *it ).path() + "/.svn/entries" ) ) { // return true; // } else if ( !bdir.exists() ) { // if ( isFileInSvnEntries( ( *it ).fileName(), ( *it ).directory() + "/.svn/entries" ) || isFileInExternals ( ( *it ).fileName(), ( *it ).directory()+"/.svn/dir-props" ) ) @@ -111,10 +111,10 @@ QCString KDevSvnd::sslPasswdDlg(QString promptMsg) // } // // bool KSvnd::AreAnyFilesNotInSvn( const KURL::List& wclist ) { -// for ( QValueListConstIterator<KURL> it = wclist.begin(); it != wclist.end() ; ++it ) { +// for ( TQValueListConstIterator<KURL> it = wclist.begin(); it != wclist.end() ; ++it ) { // kdDebug( 9036 ) << "Checking file " << ( *it ) << endl; -// QDir bdir ( ( *it ).path() ); -// if ( bdir.exists() && !QFile::exists( ( *it ).path() + "/.svn/entries" ) ) { +// TQDir bdir ( ( *it ).path() ); +// if ( bdir.exists() && !TQFile::exists( ( *it ).path() + "/.svn/entries" ) ) { // return true; // } else if ( !bdir.exists() ) { // if ( !isFileInSvnEntries( ( *it ).fileName(),( *it ).directory() + "/.svn/entries" ) && !isFileInExternals ( ( *it ).fileName(), ( *it ).directory()+"/.svn/dir-props" ) ) @@ -125,10 +125,10 @@ QCString KDevSvnd::sslPasswdDlg(QString promptMsg) // } // // bool KSvnd::AreAllFilesInSvn( const KURL::List& wclist ) { -// for ( QValueListConstIterator<KURL> it = wclist.begin(); it != wclist.end() ; ++it ) { +// for ( TQValueListConstIterator<KURL> it = wclist.begin(); it != wclist.end() ; ++it ) { // kdDebug( 9036 ) << "Checking file " << ( *it ) << endl; -// QDir bdir ( ( *it ).path() ); -// if ( bdir.exists() && !QFile::exists( ( *it ).path() + "/.svn/entries" ) ) { +// TQDir bdir ( ( *it ).path() ); +// if ( bdir.exists() && !TQFile::exists( ( *it ).path() + "/.svn/entries" ) ) { // return false; // } else if ( !bdir.exists() ) { // if ( !isFileInSvnEntries( ( *it ).fileName(),( *it ).directory() + "/.svn/entries" ) && !isFileInExternals ( ( *it ).fileName(), ( *it ).directory()+"/.svn/dir-props" ) ) @@ -139,10 +139,10 @@ QCString KDevSvnd::sslPasswdDlg(QString promptMsg) // } // // bool KSvnd::AreAllFilesNotInSvn( const KURL::List& wclist ) { -// for ( QValueListConstIterator<KURL> it = wclist.begin(); it != wclist.end() ; ++it ) { +// for ( TQValueListConstIterator<KURL> it = wclist.begin(); it != wclist.end() ; ++it ) { // kdDebug( 9036 ) << "Checking file " << ( *it ) << endl; -// QDir bdir ( ( *it ).path() ); -// if ( bdir.exists() && QFile::exists( ( *it ).path() + "/.svn/entries" ) ) { +// TQDir bdir ( ( *it ).path() ); +// if ( bdir.exists() && TQFile::exists( ( *it ).path() + "/.svn/entries" ) ) { // return false; // } else if ( !bdir.exists() ) { // if ( isFileInSvnEntries( ( *it ).fileName(),( *it ).directory() + "/.svn/entries" ) || isFileInExternals ( ( *it ).fileName(), ( *it ).directory()+"/.svn/dir-props" ) ) @@ -152,11 +152,11 @@ QCString KDevSvnd::sslPasswdDlg(QString promptMsg) // return true; // } // -// bool KSvnd::isFileInSvnEntries ( const QString filename, const QString entfile ) { -// QFile file( entfile ); +// bool KSvnd::isFileInSvnEntries ( const TQString filename, const TQString entfile ) { +// TQFile file( entfile ); // if ( file.open( IO_ReadOnly ) ) { -// QTextStream stream( &file ); -// QString line; +// TQTextStream stream( &file ); +// TQString line; // while ( !stream.atEnd() ) { // line = stream.readLine().simplifyWhiteSpace(); // if ( line == "name=\""+ filename + "\"" ) { @@ -169,11 +169,11 @@ QCString KDevSvnd::sslPasswdDlg(QString promptMsg) // return false; // } // -// bool KSvnd::isFileInExternals ( const QString filename, const QString propfile ) { -// QFile file( propfile ); +// bool KSvnd::isFileInExternals ( const TQString filename, const TQString propfile ) { +// TQFile file( propfile ); // if ( file.open( IO_ReadOnly ) ) { -// QTextStream stream( &file ); -// QStringList line; +// TQTextStream stream( &file ); +// TQStringList line; // while ( !stream.atEnd() ) // line << stream.readLine().simplifyWhiteSpace(); // for ( uint i = 0 ; i < line.count(); i++ ) { @@ -202,38 +202,38 @@ QCString KDevSvnd::sslPasswdDlg(QString promptMsg) // // bool KSvnd::anyNotValidWorkingCopy( const KURL::List& wclist ) { // bool result = true; //one negative match is enough -// for ( QValueListConstIterator<KURL> it = wclist.begin(); it != wclist.end() ; ++it ) { +// for ( TQValueListConstIterator<KURL> it = wclist.begin(); it != wclist.end() ; ++it ) { // //exception for .svn dirs // if ( ( *it ).path(-1).endsWith( "/.svn" ) ) // return true; // //if is a directory check whether it contains a .svn/entries file -// QDir dir( ( *it ).path() ); +// TQDir dir( ( *it ).path() ); // if ( dir.exists() ) { //it's a dir -// if ( !QFile::exists( ( *it ).path() + "/.svn/entries" ) ) +// if ( !TQFile::exists( ( *it ).path() + "/.svn/entries" ) ) // result = false; // } // // //else check if ./.svn/entries exists -// if ( !QFile::exists( ( *it ).directory() + "/.svn/entries" ) ) +// if ( !TQFile::exists( ( *it ).directory() + "/.svn/entries" ) ) // result = false; // } // return result; // } // // bool KSvnd::anyValidWorkingCopy( const KURL::List& wclist ) { -// for ( QValueListConstIterator<KURL> it = wclist.begin(); it != wclist.end() ; ++it ) { +// for ( TQValueListConstIterator<KURL> it = wclist.begin(); it != wclist.end() ; ++it ) { // //skip .svn dirs // if ( ( *it ).path(-1).endsWith( "/.svn" ) ) // continue; // //if is a directory check whether it contains a .svn/entries file -// QDir dir( ( *it ).path() ); +// TQDir dir( ( *it ).path() ); // if ( dir.exists() ) { //it's a dir -// if ( QFile::exists( ( *it ).path() + "/.svn/entries" ) ) +// if ( TQFile::exists( ( *it ).path() + "/.svn/entries" ) ) // return true; // } // // //else check if ./.svn/entries exists -// if ( QFile::exists( ( *it ).directory() + "/.svn/entries" ) ) +// if ( TQFile::exists( ( *it ).directory() + "/.svn/entries" ) ) // return true; // } // return false; @@ -242,7 +242,7 @@ QCString KDevSvnd::sslPasswdDlg(QString promptMsg) // int KSvnd::getStatus( const KURL::List& list ) { // int result = 0; // uint files = 0, folders = 0, parentsentries = 0, parentshavesvn = 0, subdirhavesvn = 0, external = 0; -// for ( QValueListConstIterator<KURL> it = list.begin(); it != list.end() ; ++it ) { +// for ( TQValueListConstIterator<KURL> it = list.begin(); it != list.end() ; ++it ) { // if ( isFolder ( ( *it ) ) ) { // folders++; // } else { @@ -251,13 +251,13 @@ QCString KDevSvnd::sslPasswdDlg(QString promptMsg) // if ( isFileInSvnEntries ( (*it).filename(),( *it ).directory() + "/.svn/entries" ) ) { // normal subdir known in the working copy // parentsentries++; // } else if ( isFolder( *it ) ) { // other subfolders (either another module checkouted or an external, or something not known at all) -// if ( QFile::exists( ( *it ).path() + "/.svn/entries" ) ) +// if ( TQFile::exists( ( *it ).path() + "/.svn/entries" ) ) // subdirhavesvn++; // if ( isFileInExternals( (*it).filename(), ( *it ).directory() + "/.svn/dir-props" ) ) { // external++; // } // } -// if ( ( isFolder( ( *it ) ) && QFile::exists( ( *it ).directory() + "../.svn/entries" ) ) || QFile::exists( ( *it ).directory() + "/.svn/entries" ) ) //parent has a .svn ? +// if ( ( isFolder( ( *it ) ) && TQFile::exists( ( *it ).directory() + "../.svn/entries" ) ) || TQFile::exists( ( *it ).directory() + "/.svn/entries" ) ) //parent has a .svn ? // parentshavesvn++; // } // if ( files > 0 ) @@ -293,12 +293,12 @@ QCString KDevSvnd::sslPasswdDlg(QString promptMsg) // } // // bool KSvnd::isFolder( const KURL& url ) { -// QDir d( url.path() ); +// TQDir d( url.path() ); // return d.exists(); // } // -// QStringList KSvnd::getActionMenu ( const KURL::List &list ) { -// QStringList result; +// TQStringList KSvnd::getActionMenu ( const KURL::List &list ) { +// TQStringList result; // int listStatus = getStatus( list ); // // if ( !(listStatus & SomeAreInParentsEntries) && @@ -347,8 +347,8 @@ QCString KDevSvnd::sslPasswdDlg(QString promptMsg) // return result; // } // -// QStringList KSvnd::getTopLevelActionMenu ( const KURL::List &list ) { -// QStringList result; +// TQStringList KSvnd::getTopLevelActionMenu ( const KURL::List &list ) { +// TQStringList result; // int listStatus = getStatus( list ); // // @@ -364,28 +364,28 @@ QCString KDevSvnd::sslPasswdDlg(QString promptMsg) // } // // #if 0 -// void KSvnd::notify(const QString& path, int action, int kind, const QString& mime_type, int content_state, int prop_state, long int revision, const QString& userstring) { +// void KSvnd::notify(const TQString& path, int action, int kind, const TQString& mime_type, int content_state, int prop_state, long int revision, const TQString& userstring) { // kdDebug(9036) << "KDED/Subversion : notify " << path << " action : " << action << " mime_type : " << mime_type << " content_state : " << content_state << " prop_state : " << prop_state << " revision : " << revision << " userstring : " << userstring << endl; -// QByteArray params; +// TQByteArray params; // -// QDataStream stream(params, IO_WriteOnly); +// TQDataStream stream(params, IO_WriteOnly); // stream << path << action << kind << mime_type << content_state << prop_state << revision << userstring; // -// emitDCOPSignal( "subversionNotify(QString,int,int,QString,int,int,long int,QString)", params ); +// emitDCOPSignal( "subversionNotify(TQString,int,int,TQString,int,int,long int,TQString)", params ); // } // -// void KSvnd::status(const QString& path, int text_status, int prop_status, int repos_text_status, int repos_prop_status, long int rev ) { +// void KSvnd::status(const TQString& path, int text_status, int prop_status, int repos_text_status, int repos_prop_status, long int rev ) { // kdDebug(9036) << "KDED/Subversion : status " << path << " " << text_status << " " << prop_status << " " // << repos_text_status << " " << repos_prop_status << " " << rev << endl; -// QByteArray params; +// TQByteArray params; // -// QDataStream stream(params, IO_WriteOnly); +// TQDataStream stream(params, IO_WriteOnly); // stream << path << text_status << prop_status << repos_text_status << repos_prop_status << rev; // -// emitDCOPSignal( "subversionStatus(QString,int,int,int,int,long int)", params ); +// emitDCOPSignal( "subversionStatus(TQString,int,int,int,int,long int)", params ); // } // -// void KSvnd::popupMessage( const QString& message ) { +// void KSvnd::popupMessage( const TQString& message ) { // kdDebug(9036) << "KDED/Subversion : popupMessage" << message << endl; // KMessageBox::information(0, message, i18n( "Subversion" ) ); // } diff --git a/vcs/subversion/kdevsvnd.h b/vcs/subversion/kdevsvnd.h index 831ebfdb..07943c18 100644 --- a/vcs/subversion/kdevsvnd.h +++ b/vcs/subversion/kdevsvnd.h @@ -24,7 +24,7 @@ #include <dcopclient.h> #include <kdedmodule.h> #include <kurl.h> -#include <qstringlist.h> +#include <tqstringlist.h> class KDevSvnd : public KDEDModule { @@ -35,15 +35,15 @@ K_DCOP //note: InSVN means parent is added. InRepos means itself is added enum { SomeAreFiles = 1, SomeAreFolders = 2, SomeAreInParentsEntries = 4, SomeParentsHaveSvn = 8, SomeHaveSvn = 16, SomeAreExternalToParent = 32, AllAreInParentsEntries = 64, AllParentsHaveSvn = 128, AllHaveSvn = 256, AllAreExternalToParent = 512, AllAreFolders = 1024 }; public: - KDevSvnd(const QCString &); + KDevSvnd(const TQCString &); ~KDevSvnd(); k_dcop: // void addAuthInfo(KIO::AuthInfo, long); - QString commitDialog(QString); - int sslServerTrustPrompt(QString certFailMsg, QString hostname, QString fingerPrint, QString validfrom, QString validuntil, QString issuerName, QString ascii_cert ); - QString sslCertFile(); - QCString sslPasswdDlg(QString promptMsg); + TQString commitDialog(TQString); + int sslServerTrustPrompt(TQString certFailMsg, TQString hostname, TQString fingerPrint, TQString validfrom, TQString validuntil, TQString issuerName, TQString ascii_cert ); + TQString sslCertFile(); + TQCString sslPasswdDlg(TQString promptMsg); }; diff --git a/vcs/subversion/kdevsvnd_widgets.cpp b/vcs/subversion/kdevsvnd_widgets.cpp index 16e35ce3..8fd05950 100644 --- a/vcs/subversion/kdevsvnd_widgets.cpp +++ b/vcs/subversion/kdevsvnd_widgets.cpp @@ -13,12 +13,12 @@ */ #include "kdevsvnd_widgets.h" -#include <qpushbutton.h> -#include <qlistview.h> -#include <qlabel.h> +#include <tqpushbutton.h> +#include <tqlistview.h> +#include <tqlabel.h> #include <klocale.h> -SvnSSLTrustPrompt::SvnSSLTrustPrompt( QWidget* parent, const char* name, bool modal, WFlags f ) +SvnSSLTrustPrompt::SvnSSLTrustPrompt( TQWidget* parent, const char* name, bool modal, WFlags f ) :SvnSSLTrustPromptBase( parent, name, modal, f ) , m_code(-1) { @@ -27,24 +27,24 @@ SvnSSLTrustPrompt::SvnSSLTrustPrompt( QWidget* parent, const char* name, bool mo btnPermanent->setText(i18n("Accept Permanently")); btnTemporary->setText(i18n("Accept Temporarily")); btnReject->setText(i18n("Reject")); - connect( btnPermanent, SIGNAL(clicked()), this, SLOT(setPermanent()) ); - connect( btnTemporary, SIGNAL(clicked()), this, SLOT(setTemporary()) ); - connect( btnReject, SIGNAL(clicked()), this, SLOT(setRejected ()) ); + 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 ()) ); } SvnSSLTrustPrompt::~SvnSSLTrustPrompt() {} -void SvnSSLTrustPrompt::setupCertInfo( QString hostname, QString fingerPrint, QString validfrom, QString validuntil, QString issuerName, QString ascii_cert ) +void SvnSSLTrustPrompt::setupCertInfo( TQString hostname, TQString fingerPrint, TQString validfrom, TQString validuntil, TQString issuerName, TQString ascii_cert ) { // setup texts - QListViewItem *host= new QListViewItem(listView1, i18n("Hostname"), hostname ); - QListViewItem *finger = new QListViewItem(listView1, i18n("FingerPrint"), fingerPrint ); - QListViewItem *validFrom = new QListViewItem(listView1, i18n("Valid From"), validfrom ); - QListViewItem *validUntil = new QListViewItem(listView1, i18n("Valid Until"), validuntil ); - QListViewItem *issName = new QListViewItem(listView1, i18n("Issuer"), issuerName ); - QListViewItem *cert = new QListViewItem(listView1, i18n("Cert"), ascii_cert ); + TQListViewItem *host= new TQListViewItem(listView1, i18n("Hostname"), hostname ); + TQListViewItem *finger = new TQListViewItem(listView1, i18n("FingerPrint"), fingerPrint ); + TQListViewItem *validFrom = new TQListViewItem(listView1, i18n("Valid From"), validfrom ); + TQListViewItem *validUntil = new TQListViewItem(listView1, i18n("Valid Until"), validuntil ); + TQListViewItem *issName = new TQListViewItem(listView1, i18n("Issuer"), issuerName ); + TQListViewItem *cert = new TQListViewItem(listView1, i18n("Cert"), ascii_cert ); } -void SvnSSLTrustPrompt::setupFailedReasonMsg( QString msg ) +void SvnSSLTrustPrompt::setupFailedReasonMsg( TQString msg ) { errMsgLabel->setText( msg ); } diff --git a/vcs/subversion/kdevsvnd_widgets.h b/vcs/subversion/kdevsvnd_widgets.h index c69fdb14..b0a2bec1 100644 --- a/vcs/subversion/kdevsvnd_widgets.h +++ b/vcs/subversion/kdevsvnd_widgets.h @@ -20,10 +20,10 @@ class SvnSSLTrustPrompt : public SvnSSLTrustPromptBase{ Q_OBJECT public: - SvnSSLTrustPrompt( QWidget* parent=0, const char* name=0, bool modal=true, WFlags f=0 ); + SvnSSLTrustPrompt( TQWidget* parent=0, const char* name=0, bool modal=true, WFlags f=0 ); ~SvnSSLTrustPrompt(); - void setupCertInfo( QString hostname, QString fingerPrint, QString validfrom, QString validuntil, QString issuerName, QString ascii_cert ); - void setupFailedReasonMsg( QString msg ); + void setupCertInfo( TQString hostname, TQString fingerPrint, TQString validfrom, TQString validuntil, TQString issuerName, TQString ascii_cert ); + void setupFailedReasonMsg( TQString msg ); int code(); public slots: diff --git a/vcs/subversion/subversion_core.cpp b/vcs/subversion/subversion_core.cpp index 85dcd883..4b16e68f 100644 --- a/vcs/subversion/subversion_core.cpp +++ b/vcs/subversion/subversion_core.cpp @@ -40,12 +40,12 @@ #include <ktempfile.h> #include <kprocess.h> #include <kstandarddirs.h> -#include <qtextcodec.h> -#include <qtextstream.h> -#include <qtextbrowser.h> +#include <tqtextcodec.h> +#include <tqtextstream.h> +#include <tqtextbrowser.h> #include <kmessagebox.h> #include <klocale.h> -#include <qregexp.h> +#include <tqregexp.h> #include <kapplication.h> #include <kinstance.h> @@ -55,13 +55,13 @@ using namespace KIO; using namespace SvnGlobal; subversionCore::subversionCore(subversionPart *part) -// : QObject(NULL, "subversion core"), DCOPObject("subversion") { - : QObject(NULL, "subversion core") { +// : TQObject(NULL, "subversion core"), DCOPObject("subversion") { + : TQObject(NULL, "subversion core") { m_part = part; m_widget = new subversionWidget(part, 0 , "subversionprocesswidget"); // m_logViewWidget = new SvnLogViewWidget( part, 0 ); // m_part->mainWindow()->embedOutputView( m_logViewWidget, i18n( "Subversion Log" ), i18n( "Subversion Log" ) ); -// if ( ! connectDCOPSignal("kded", "ksvnd", "subversionNotify(QString,int,int,QString,int,int,long int,QString)", "notification(QString,int,int,QString,int,int,long int,QString)", false ) ) +// if ( ! connectDCOPSignal("kded", "ksvnd", "subversionNotify(TQString,int,int,TQString,int,int,long int,TQString)", "notification(TQString,int,int,TQString,int,int,long int,TQString)", false ) ) // kdWarning() << "Failed to connect to kded dcop signal ! Notifications won't work..." << endl; m_fileInfoProvider = new SVNFileInfoProvider( part ); @@ -87,7 +87,7 @@ KDevVCSFileInfoProvider *subversionCore::fileInfoProvider() const { } //not used anymore -// void subversionCore::notification( const QString& path, int action, int kind, const QString& mime_type, int content_state ,int prop_state ,long int revision, const QString& userstring ) { +// void subversionCore::notification( const TQString& path, int action, int kind, const TQString& mime_type, int content_state ,int prop_state ,long int revision, const TQString& userstring ) { // kdDebug(9036) << "Subversion Notification : " // << "path : " << path // << "action: " << action @@ -118,16 +118,16 @@ void subversionCore::resolve( const KURL::List& list ) { servURL.setProtocol( "kdevsvn+" + servURL.protocol() ); //make sure it starts with "svn" } kdDebug(9036) << "servURL : " << servURL.prettyURL() << endl; - for ( QValueListConstIterator<KURL> it = list.begin(); it != list.end() ; ++it ) { + for ( TQValueListConstIterator<KURL> it = list.begin(); it != list.end() ; ++it ) { kdDebug(9036) << "resolving: " << (*it).prettyURL() << endl; - QByteArray parms; - QDataStream s( parms, IO_WriteOnly ); + TQByteArray parms; + TQDataStream s( parms, IO_WriteOnly ); int cmd = 11; bool recurse = true; s << cmd << *it << recurse; SimpleJob * job = KIO::special(servURL, parms, true); job->setWindow( m_part->mainWindow()->main() ); - connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) ); } } @@ -135,32 +135,32 @@ void subversionCore::update( const KURL::List& list ) { KURL servURL = "kdevsvn+svn://blah/"; kdDebug(9036) << "Updating. servURL : " << servURL.prettyURL() << endl; - QByteArray parms; - QDataStream s( parms, IO_WriteOnly ); + TQByteArray parms; + TQDataStream s( parms, IO_WriteOnly ); int cmd = 2; int rev = -1; - s << cmd << list << rev << QString( "HEAD" ); + s << cmd << list << rev << TQString( "HEAD" ); SimpleJob * job = KIO::special(servURL, parms, false); - connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) ); initProcessDlg( (KIO::Job*)job, i18n("Subversion Update") , i18n("Subversion Update") ); } -void subversionCore::diff( const KURL::List& list, const QString& where){ +void subversionCore::diff( const KURL::List& list, const TQString& where){ kdDebug(9036) << "diff " << list << endl; KURL servURL = "kdevsvn+svn://this_is_a_fake_URL_and_this_is_normal/"; - for ( QValueListConstIterator<KURL> it = list.begin(); it != list.end() ; ++it ) { - QByteArray parms; - QDataStream s( parms, IO_WriteOnly ); + for ( TQValueListConstIterator<KURL> it = list.begin(); it != list.end() ; ++it ) { + TQByteArray parms; + TQDataStream s( parms, IO_WriteOnly ); int cmd = 13; kdDebug(9036) << "diffing : " << (*it).prettyURL() << endl; int rev1=-1; int rev2=-1; - QString revkind1 = where; - QString revkind2 = "WORKING"; + TQString revkind1 = where; + TQString revkind2 = "WORKING"; s << cmd << *it << *it << rev1 << revkind1 << rev2 << revkind2 << true ; KIO::SimpleJob * job = KIO::special(servURL, parms, true); - connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) ); KIO::NetAccess::synchronousRun( job, 0 ); if ( diffresult.count() > 0 ) { //check kompare is available @@ -171,14 +171,14 @@ void subversionCore::diff( const KURL::List& list, const QString& where){ KTempFile tmpPatch = KTempFile(tmpDir.name()); // write the patch - QTextStream *stream = tmpPatch.textStream(); - stream->setCodec( QTextCodec::codecForName( "utf8" ) ); - for ( QStringList::Iterator it2 = diffresult.begin();it2 != diffresult.end() ; ++it2 ) { + TQTextStream *stream = tmpPatch.textStream(); + stream->setCodec( TQTextCodec::codecForName( "utf8" ) ); + for ( TQStringList::Iterator it2 = diffresult.begin();it2 != diffresult.end() ; ++it2 ) { ( *stream ) << ( *it2 ) << "\n"; } tmpPatch.close(); - QString ourCopy = tmpDir.name()+(*it).fileName(); + TQString ourCopy = tmpDir.name()+(*it).fileName(); KProcess copy; copy << "cp" << (*it).prettyURL(0,KURL::StripFileProtocol) << tmpDir.name(); @@ -197,9 +197,9 @@ void subversionCore::diff( const KURL::List& list, const QString& where){ // only diff KTempFile *tmp = new KTempFile; tmp->setAutoDelete(true); - QTextStream *stream = tmp->textStream(); - stream->setCodec( QTextCodec::codecForName( "utf8" ) ); - for ( QStringList::Iterator it2 = diffresult.begin();it2 != diffresult.end() ; ++it2 ) { + TQTextStream *stream = tmp->textStream(); + stream->setCodec( TQTextCodec::codecForName( "utf8" ) ); + for ( TQStringList::Iterator it2 = diffresult.begin();it2 != diffresult.end() ; ++it2 ) { ( *stream ) << ( *it2 ) << "\n"; } tmp->close(); @@ -209,17 +209,17 @@ void subversionCore::diff( const KURL::List& list, const QString& where){ } } else { //else do it with message box Subversion_Diff df; - for ( QStringList::Iterator it2 = diffresult.begin();it2 != diffresult.end() ; ++it2 ) { + for ( TQStringList::Iterator it2 = diffresult.begin();it2 != diffresult.end() ; ++it2 ) { df.text->append( *it2 ); } - QFont f = df.font(); + TQFont f = df.font(); f.setFixedPitch( true ); df.text->setFont( f ); df.exec(); } } else{ - QString diffTo = i18n("the local disk checked out copy."); + TQString diffTo = i18n("the local disk checked out copy."); if ( where=="HEAD"){ diffTo=i18n("the current svn HEAD version."); } @@ -230,18 +230,18 @@ void subversionCore::diff( const KURL::List& list, const QString& where){ } void subversionCore::diffAsync( const KURL &pathOrUrl1, const KURL &pathOrUrl2, - int rev1, QString revKind1, int rev2, QString revKind2, + int rev1, TQString revKind1, int rev2, TQString revKind2, bool recurse, bool pegdiff ) { KURL servURL = "kdevsvn+svn://blah/"; - QByteArray parms; - QDataStream s( parms, IO_WriteOnly ); + TQByteArray parms; + TQDataStream s( parms, IO_WriteOnly ); int cmd = 13; kdDebug(9036) << "diffing async : " << pathOrUrl1 << " and " << pathOrUrl2 << endl; s << cmd << pathOrUrl1 << pathOrUrl2 << rev1 << revKind1 << rev2 << revKind2 << recurse; s << pegdiff; KIO::SimpleJob * job = KIO::special(servURL, parms, false); - connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotDiffResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotDiffResult( KIO::Job * ) ) ); initProcessDlg( (KIO::Job*)job, pathOrUrl1.prettyURL(), pathOrUrl2.prettyURL() ); } @@ -252,16 +252,16 @@ void subversionCore::commit( const KURL::List& list, bool recurse, bool keeplock servURL.setProtocol( "kdevsvn+" + servURL.protocol() ); //make sure it starts with "svn" } kdDebug(9036) << "servURL : " << servURL.prettyURL() << endl; - QByteArray parms; - QDataStream s( parms, IO_WriteOnly ); + TQByteArray parms; + TQDataStream s( parms, IO_WriteOnly ); int cmd = 103; s << cmd << recurse << keeplocks; - for ( QValueListConstIterator<KURL> it = list.begin(); it != list.end() ; ++it ) { + for ( TQValueListConstIterator<KURL> it = list.begin(); it != list.end() ; ++it ) { kdDebug(9036) << "adding to list: " << (*it).prettyURL() << endl; s << *it; } SimpleJob * job = KIO::special(servURL, parms, false); - connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) ); if( list.count() == 1 ) initProcessDlg( (KIO::Job*)job, (*(list.begin())).prettyURL() , i18n("Commit to remote repository") ); else if( list.count() > 1 ) @@ -269,7 +269,7 @@ void subversionCore::commit( const KURL::List& list, bool recurse, bool keeplock } // Right now, only one item for each action. void subversionCore::svnLog( const KURL::List& list, - int revstart, QString revKindStart, int revend, QString revKindEnd, + int revstart, TQString revKindStart, int revend, TQString revKindEnd, bool discorverChangedPath, bool strictNodeHistory ) { // ensure that part has repository information. This info is used to retrieve root repository URL @@ -281,26 +281,26 @@ void subversionCore::svnLog( const KURL::List& list, servURL.setProtocol( "kdevsvn+" + servURL.protocol() ); //make sure it starts with "svn" } kdDebug(9036) << "servURL : " << servURL.prettyURL() << endl; - QByteArray parms; - QDataStream s( parms, IO_WriteOnly ); + TQByteArray parms; + TQDataStream s( parms, IO_WriteOnly ); // prepare arguments int cmd = 4; // int revstart = -1, revend = 0; -// QString revKindStart = "HEAD", revKindEnd = ""; +// TQString revKindStart = "HEAD", revKindEnd = ""; // bool repositLog = true, discorverChangedPath = true, strictNodeHistory = true; s << cmd << revstart << revKindStart << revend << revKindEnd; s << discorverChangedPath << strictNodeHistory; - for ( QValueListConstIterator<KURL> it = list.begin(); it != list.end() ; ++it ) { + for ( TQValueListConstIterator<KURL> it = list.begin(); it != list.end() ; ++it ) { kdDebug(9036) << "svnCore: adding to list: " << (*it).prettyURL() << endl; s << *it; } SimpleJob * job = KIO::special(servURL, parms, false); - connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotLogResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotLogResult( KIO::Job * ) ) ); // progress info. LogView is allowed and meaninful only for one url in KDev3.4 initProcessDlg( (KIO::Job*)job, (*(list.begin())).prettyURL() , i18n("Subversion Log View") ); } -void subversionCore::blame( const KURL &url, UrlMode mode, int revstart, QString revKindStart, int revend, QString revKindEnd ) +void subversionCore::blame( const KURL &url, UrlMode mode, int revstart, TQString revKindStart, int revend, TQString revKindEnd ) { KURL servURL = m_part->baseURL(); if ( servURL.isEmpty() ) servURL="kdevsvn+svn://blah/"; @@ -308,15 +308,15 @@ void subversionCore::blame( const KURL &url, UrlMode mode, int revstart, QString servURL.setProtocol( "kdevsvn+" + servURL.protocol() ); //make sure it starts with "svn" } kdDebug(9036) << "servURL : " << servURL.prettyURL() << endl; - QByteArray parms; - QDataStream s( parms, IO_WriteOnly ); + TQByteArray parms; + TQDataStream s( parms, IO_WriteOnly ); // prepare arguments int cmd = 14; s << cmd << url << (int)mode ; s << revstart << revKindStart << revend << revKindEnd ; SimpleJob * job = KIO::special(servURL, parms, false); - connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotBlameResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotBlameResult( KIO::Job * ) ) ); initProcessDlg( (KIO::Job*)job, url.prettyURL() , i18n("Subversion Blame") ); } @@ -325,75 +325,75 @@ void subversionCore::add( const KURL::List& list ) { KURL servURL = "kdevsvn+svn://blah/"; kdDebug(9036) << "Deleting servURL : " << servURL.prettyURL() << endl; - QByteArray parms; - QDataStream s( parms, IO_WriteOnly ); + TQByteArray parms; + TQDataStream s( parms, IO_WriteOnly ); int cmd = 6; s << cmd << list; // add/delete/revert works on local copy. Don't need to show progress dialog SimpleJob * job = KIO::special(servURL, parms, false); job->setWindow( m_part->mainWindow()->main() ); - connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) ); } void subversionCore::del( const KURL::List& list ) { KURL servURL = "kdevsvn+svn://blah/"; kdDebug(9036) << "Deleting servURL : " << servURL.prettyURL() << endl; - QByteArray parms; - QDataStream s( parms, IO_WriteOnly ); + TQByteArray parms; + TQDataStream s( parms, IO_WriteOnly ); int cmd = 7; s << cmd << list; // add/delete/revert works on local copy. Don't need to show progress dialog SimpleJob * job = KIO::special(servURL, parms, false); job->setWindow( m_part->mainWindow()->main() ); - connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) ); } void subversionCore::revert( const KURL::List& list ) { KURL servURL = "kdevsvn+svn://blah/"; kdDebug(9036) << "Reverting servURL : " << servURL.prettyURL() << endl; - QByteArray parms; - QDataStream s( parms, IO_WriteOnly ); + TQByteArray parms; + TQDataStream s( parms, IO_WriteOnly ); int cmd = 8; s << cmd << list; SimpleJob * job = KIO::special(servURL, parms, false); job->setWindow( m_part->mainWindow()->main() ); - connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) ); } void subversionCore::checkout() { svn_co checkoutDlg; - if ( checkoutDlg.exec() == QDialog::Accepted ) { + if ( checkoutDlg.exec() == TQDialog::Accepted ) { //checkout :) - QByteArray parms; - QDataStream s( parms, IO_WriteOnly ); + TQByteArray parms; + TQDataStream s( parms, IO_WriteOnly ); KURL servURL ( checkoutDlg.serverURL->url() ); wcPath = checkoutDlg.localDir->url() + "/" + checkoutDlg.newDir->text(); int cmd = 1; int rev = -1; - s << cmd << servURL << KURL( wcPath ) << rev << QString( "HEAD" ); + s << cmd << servURL << KURL( wcPath ) << rev << TQString( "HEAD" ); servURL.setProtocol( "kdevsvn+" + servURL.protocol() ); //make sure it starts with "svn" SimpleJob * job = KIO::special(servURL,parms, true); job->setWindow( m_part->mainWindow()->main() ); - connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotEndCheckout( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotEndCheckout( KIO::Job * ) ) ); } } void subversionCore::switchTree( const KURL &path, const KURL &repositUrl, - int revNum, const QString &revKind, bool recurse ) + int revNum, const TQString &revKind, bool recurse ) { KURL servURL = "kdevsvn+svn://blah/"; - QByteArray parms; - QDataStream s( parms, IO_WriteOnly ); + TQByteArray parms; + TQDataStream s( parms, IO_WriteOnly ); // prepare arguments int cmd = 12; s << cmd << path << repositUrl ; s << recurse << revNum << revKind; SimpleJob * job = KIO::special(servURL, parms, false); - connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) ); initProcessDlg( (KIO::Job*)job, repositUrl.prettyURL() , path.prettyURL() ); } @@ -401,66 +401,66 @@ void subversionCore::switchRelocate( const KURL &path, const KURL ¤tUrl, const KURL &newUrl, bool recurse ) { KURL servURL = "kdevsvn+svn://blah/"; - QByteArray parms; - QDataStream s( parms, IO_WriteOnly ); + TQByteArray parms; + TQDataStream s( parms, IO_WriteOnly ); // prepare arguments int cmd = 16; s << cmd << path << currentUrl << newUrl << recurse; SimpleJob * job = KIO::special(servURL, parms, false); - connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) ); // this doesn't contact repository } -void subversionCore::svnCopy( const KURL &src, int srcRev, const QString &srcRevKind, +void subversionCore::svnCopy( const KURL &src, int srcRev, const TQString &srcRevKind, const KURL &dest ) { KURL servURL = "kdevsvn+svn://blah/"; - QByteArray parms; - QDataStream s( parms, IO_WriteOnly ); + TQByteArray parms; + TQDataStream s( parms, IO_WriteOnly ); // prepare arguments int cmd = 17; s << cmd << src << srcRev << srcRevKind << dest; SimpleJob * job = KIO::special(servURL, parms, false); - connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) ); initProcessDlg( (KIO::Job*)job, src.prettyURL(), dest.prettyURL() ); } -void subversionCore::merge( const KURL &src1, int rev1, QString revKind1, - const KURL &src2, int rev2, QString revKind2, const KURL &wc_path, +void subversionCore::merge( const KURL &src1, int rev1, TQString revKind1, + const KURL &src2, int rev2, TQString revKind2, const KURL &wc_path, bool recurse, bool ignore_ancestry, bool force, bool dry_run ) { KURL servURL = "kdevsvn+svn://blah/"; - QByteArray parms; - QDataStream s( parms, IO_WriteOnly ); + TQByteArray parms; + TQDataStream s( parms, IO_WriteOnly ); // prepare arguments int cmd = 18; s << cmd << src1 << rev1 << revKind1 << src2 << rev2 << revKind2 << wc_path; s << recurse << ignore_ancestry << force << dry_run; SimpleJob * job = KIO::special(servURL, parms, false); - connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) ); initProcessDlg( (KIO::Job*)job, src1.prettyURL() + "\n" + src2.prettyURL() , wc_path.prettyURL() ); } -bool subversionCore::clientInfo( KURL path_or_url, bool recurse, QMap< KURL, SvnInfoHolder> &holderMap ) +bool subversionCore::clientInfo( KURL path_or_url, bool recurse, TQMap< KURL, SvnInfoHolder> &holderMap ) { KURL servURL = "kdevsvn+svn://blah/"; - QByteArray parms; - QDataStream s( parms, IO_WriteOnly ); + TQByteArray parms; + TQDataStream s( parms, IO_WriteOnly ); int cmd = 15; - s << cmd << path_or_url << -1 << QString("UNSPECIFIED") << -1 << QString("UNSPECIFIED") << recurse; + s << cmd << path_or_url << -1 << TQString("UNSPECIFIED") << -1 << TQString("UNSPECIFIED") << recurse; SimpleJob *job = KIO::special( servURL, parms, false ); - QMap<QString,QString> ma; + TQMap<TQString,TQString> ma; KIO::NetAccess::synchronousRun(job, 0, 0, 0, &ma ); // synchronize - QValueList<QString> keys = ma.keys(); - QValueList<QString>::Iterator begin = keys.begin(), end = keys.end(), it; + TQValueList<TQString> keys = ma.keys(); + TQValueList<TQString>::Iterator begin = keys.begin(), end = keys.end(), it; int curIdx, lastIdx; - QRegExp rx( "([0-9]*)(.*)" ); + TQRegExp rx( "([0-9]*)(.*)" ); for ( it = begin; it != end; /*++it*/) { kdDebug(9036) << "METADATA key: " << *it << " value: " << ma[ *it ] << endl; @@ -496,7 +496,7 @@ bool subversionCore::clientInfo( KURL path_or_url, bool recurse, QMap< KURL, Svn void subversionCore::slotEndCheckout( KIO::Job * job ) { if ( job->error() ) { job->showErrorDialog( m_part->mainWindow()->main() ); - emit checkoutFinished( QString::null ); + emit checkoutFinished( TQString::null ); } else emit checkoutFinished(wcPath); } @@ -513,9 +513,9 @@ void subversionCore::slotResult( KIO::Job * job ) { return; } KIO::MetaData ma = job->metaData(); - QValueList<QString> keys = ma.keys(); + TQValueList<TQString> keys = ma.keys(); qHeapSort( keys ); - QValueList<QString>::Iterator begin = keys.begin(), end = keys.end(), it; + TQValueList<TQString>::Iterator begin = keys.begin(), end = keys.end(), it; for ( it = begin; it != end; ++it ) { // kdDebug(9036) << "METADATA : " << *it << ":" << ma[ *it ] << endl; @@ -542,15 +542,15 @@ void subversionCore::slotLogResult( KIO::Job * job ) return; } - QValueList<SvnLogHolder> holderList; + TQValueList<SvnLogHolder> holderList; KIO::MetaData ma = job->metaData(); - QValueList<QString> keys = ma.keys(); - QRegExp rx( "([0-9]*)(.*)" ); + TQValueList<TQString> keys = ma.keys(); + TQRegExp rx( "([0-9]*)(.*)" ); int curIdx, lastIdx; - QString requestedUrl; + TQString requestedUrl; - for (QValueList<QString>::Iterator it = keys.begin(); it != keys.end(); /*++it*/ ){ + for (TQValueList<TQString>::Iterator it = keys.begin(); it != keys.end(); /*++it*/ ){ if ( rx.search( *it ) == -1 ){ kdDebug(9036) << " Exiting loop at line " << __LINE__ <<endl; return; // something is wrong ! :) @@ -601,14 +601,14 @@ void subversionCore::slotBlameResult( KIO::Job * job ) ) ); return; } - QValueList<SvnBlameHolder> blameList; + TQValueList<SvnBlameHolder> blameList; KIO::MetaData ma = job->metaData(); - QValueList<QString> keys = ma.keys(); - QRegExp rx( "([0-9]*)(.*)" ); + TQValueList<TQString> keys = ma.keys(); + TQRegExp rx( "([0-9]*)(.*)" ); int curIdx, lastIdx; - for (QValueList<QString>::Iterator it = keys.begin(); it != keys.end(); /*++it*/ ){ + for (TQValueList<TQString>::Iterator it = keys.begin(); it != keys.end(); /*++it*/ ){ if ( rx.search( *it ) == -1 ){ kdDebug(9036) << " Exiting loop at line " << __LINE__ <<endl; return; // something is wrong ! :) @@ -672,10 +672,10 @@ void subversionCore::slotDiffResult( KIO::Job * job ) return; } KIO::MetaData ma = job->metaData(); - QValueList<QString> keys = ma.keys(); + TQValueList<TQString> keys = ma.keys(); qHeapSort( keys ); - QValueList<QString>::Iterator begin = keys.begin(), end = keys.end(), it; - QStringList diffList; + TQValueList<TQString>::Iterator begin = keys.begin(), end = keys.end(), it; + TQStringList diffList; for ( it = begin; it != end; ++it ) { // kdDebug(9036) << "METADATA : " << *it << ":" << ma[ *it ] << endl; @@ -689,9 +689,9 @@ void subversionCore::slotDiffResult( KIO::Job * job ) if ( !KStandardDirs::findExe( "kompare" ).isNull() ) { KTempFile *tmp = new KTempFile; tmp->setAutoDelete(true); - QTextStream *stream = tmp->textStream(); - stream->setCodec( QTextCodec::codecForName( "utf8" ) ); - for ( QStringList::Iterator it2 = diffList.begin();it2 != diffList.end() ; ++it2 ) { + TQTextStream *stream = tmp->textStream(); + stream->setCodec( TQTextCodec::codecForName( "utf8" ) ); + for ( TQStringList::Iterator it2 = diffList.begin();it2 != diffList.end() ; ++it2 ) { ( *stream ) << ( *it2 ) << "\n"; } tmp->close(); @@ -700,12 +700,12 @@ void subversionCore::slotDiffResult( KIO::Job * job ) p->start(); } else { //else do it with message box - KMessageBox::information( NULL, i18n("You do not have kompare installed. We recommend you install kompare to view differences graphically.") + "\nhttp://www.caffeinated.me.uk/kompare/" , QString::null , "userDoesNotWantKompare" ); + KMessageBox::information( NULL, i18n("You do not have kompare installed. We recommend you install kompare to view differences graphically.") + "\nhttp://www.caffeinated.me.uk/kompare/" , TQString::null , "userDoesNotWantKompare" ); Subversion_Diff df; - for ( QStringList::Iterator it2 = diffList.begin();it2 != diffList.end() ; ++it2 ) { + for ( TQStringList::Iterator it2 = diffList.begin();it2 != diffList.end() ; ++it2 ) { df.text->append( *it2 ); } - QFont f = df.font(); + TQFont f = df.font(); f.setFixedPitch( true ); df.text->setFont( f ); df.exec(); @@ -716,19 +716,19 @@ void subversionCore::slotDiffResult( KIO::Job * job ) } } -void subversionCore::initProcessDlg( KIO::Job *job, const QString &src, const QString &dest ) +void subversionCore::initProcessDlg( KIO::Job *job, const TQString &src, const TQString &dest ) { SvnProgressDlg *progress = new SvnProgressDlg( true ); progress->setSourceUrl( src ); progress->setDestUrl( dest ); progress->setJob( job ); - connect( job, SIGNAL( totalSize(KIO::Job*, KIO::filesize_t) ), - progress, SLOT( slotTotalSize (KIO::Job*, KIO::filesize_t) ) ); - connect( job, SIGNAL( processedSize(KIO::Job*, KIO::filesize_t) ), - progress, SLOT( slotProcessedSize(KIO::Job*, KIO::filesize_t) ) ); + connect( job, TQT_SIGNAL( totalSize(KIO::Job*, KIO::filesize_t) ), + progress, TQT_SLOT( slotTotalSize (KIO::Job*, KIO::filesize_t) ) ); + connect( job, TQT_SIGNAL( processedSize(KIO::Job*, KIO::filesize_t) ), + progress, TQT_SLOT( slotProcessedSize(KIO::Job*, KIO::filesize_t) ) ); } -void subversionCore::createNewProject( const QString& // dirName +void subversionCore::createNewProject( const TQString& // dirName , const KURL& // importURL , bool // init ) { diff --git a/vcs/subversion/subversion_core.h b/vcs/subversion/subversion_core.h index 7cf86a28..1c9611c8 100644 --- a/vcs/subversion/subversion_core.h +++ b/vcs/subversion/subversion_core.h @@ -21,8 +21,8 @@ #ifndef __SUBVERSION_CORE_H__ #define __SUBVERSION_CORE_H__ -#include <qobject.h> -#include <qwidget.h> +#include <tqobject.h> +#include <tqwidget.h> #include <kio/job.h> #include <kurl.h> #include <ktempdir.h> @@ -37,8 +37,8 @@ class SvnBlameHolder; class SvnLogHolder; class SvnLogViewWidget; -// class subversionCore : public QObject, public DCOPObject -class subversionCore : public QObject { +// class subversionCore : public TQObject, public DCOPObject +class subversionCore : public TQObject { Q_OBJECT // K_DCOP @@ -51,35 +51,35 @@ public: void update( const KURL::List&); void commit( const KURL::List&, bool recurse, bool keeplocks ); void svnLog( const KURL::List& list, - int revstart, QString revKindStart, int revend, QString revKindEnd, + int revstart, TQString revKindStart, int revend, TQString revKindEnd, bool discorverChangedPath, bool strictNodeHistory ); - void blame( const KURL &url, SvnGlobal::UrlMode mode, int revstart, QString revKindStart, int revend, QString revKindEnd ); + void blame( const KURL &url, SvnGlobal::UrlMode mode, int revstart, TQString revKindStart, int revend, TQString revKindEnd ); void add( const KURL::List&); void del( const KURL::List&); - void diff( const KURL::List&, const QString& where); + void diff( const KURL::List&, const TQString& where); void diffAsync( const KURL &pathOrUrl1, const KURL &pathOrUrl2, - int rev1, QString revKind1, int rev2, QString revKind2, + int rev1, TQString revKind1, int rev2, TQString revKind2, bool recurse, bool pegdiff = false ); void revert( const KURL::List&); void resolve( const KURL::List&); void checkout(); void switchTree( const KURL &path, const KURL &repositUrl, - int revNum, const QString &revKind, bool recurse ); + int revNum, const TQString &revKind, bool recurse ); void switchRelocate( const KURL &path, const KURL ¤tUrl, const KURL &newUrl, bool recurse ); - void svnCopy( const KURL &src, int srcRev, const QString &srcRevKind, const KURL &dest ); - void merge( const KURL &src1, int rev1, QString revKind1, const KURL &src2, int rev2, QString revKind2, const KURL &wc_path, + void svnCopy( const KURL &src, int srcRev, const TQString &srcRevKind, const KURL &dest ); + void merge( const KURL &src1, int rev1, TQString revKind1, const KURL &src2, int rev2, TQString revKind2, const KURL &wc_path, bool recurse, bool ignore_ancestry, bool force, bool dry_run ); // This is blocking function. But the GUI is not blocked. // Information will be pulled solely from the working copy.Thus no network connections will be made. // Parameter holderMap is the map to be filled out by this method. Callers should preallocate this object. // Return true on success. Otherwise return false. - bool clientInfo( KURL path_or_url, bool recurse, QMap< KURL, SvnGlobal::SvnInfoHolder> &holderMap ); - void createNewProject( const QString& dirName, const KURL& importURL, bool init ); + bool clientInfo( KURL path_or_url, bool recurse, TQMap< KURL, SvnGlobal::SvnInfoHolder> &holderMap ); + void createNewProject( const TQString& dirName, const KURL& importURL, bool init ); KDevVCSFileInfoProvider *fileInfoProvider() const; - void initProcessDlg( KIO::Job *job, const QString &src, const QString &dest ); + void initProcessDlg( KIO::Job *job, const TQString &src, const TQString &dest ); // k_dcop: -// void notification( const QString&, int,int, const QString&, int,int ,long int, const QString& ); +// void notification( const TQString&, int,int, const TQString&, int,int ,long int, const TQString& ); private slots: void slotEndCheckout( KIO::Job * job ); @@ -89,14 +89,14 @@ private slots: void slotDiffResult( KIO::Job * job ); signals: - void checkoutFinished( QString dir ); + void checkoutFinished( TQString dir ); private: - QGuardedPtr<subversionWidget> m_widget; + TQGuardedPtr<subversionWidget> m_widget; subversionPart *m_part; - QString wcPath; + TQString wcPath; SVNFileInfoProvider *m_fileInfoProvider; - QStringList diffresult; //for diff commands ;) + TQStringList diffresult; //for diff commands ;) // be nice about tmp diff files: delete all of them when exiting. KTempDir* diffTmpDir; diff --git a/vcs/subversion/subversion_fileinfo.cpp b/vcs/subversion/subversion_fileinfo.cpp index ee68575c..be0a4411 100644 --- a/vcs/subversion/subversion_fileinfo.cpp +++ b/vcs/subversion/subversion_fileinfo.cpp @@ -20,14 +20,14 @@ #include "subversion_fileinfo.h" #include "subversion_core.h" #include <kdebug.h> -#include <qfileinfo.h> -#include <qdir.h> +#include <tqfileinfo.h> +#include <tqdir.h> #include <kdevproject.h> #include <unistd.h> #include <kapplication.h> #include <kdevmainwindow.h> #include <kmainwindow.h> -#include <qregexp.h> +#include <tqregexp.h> #include <kio/netaccess.h> #include <klocale.h> @@ -47,7 +47,7 @@ SVNFileInfoProvider::~SVNFileInfoProvider() { } //synchronous -const VCSFileInfoMap *SVNFileInfoProvider::status( const QString &dirPath ) { +const VCSFileInfoMap *SVNFileInfoProvider::status( const TQString &dirPath ) { if ( !m_cachedDirEntries ) m_cachedDirEntries = new VCSFileInfoMap; // return m_cachedDirEntries; @@ -57,38 +57,38 @@ const VCSFileInfoMap *SVNFileInfoProvider::status( const QString &dirPath ) { if ( dirPath != m_previousDirPath ) { m_previousDirPath = dirPath; KURL servURL = "kdevsvn+http://fakeserver_this_is_normal_behavior/"; - QByteArray parms; - QDataStream s( parms, IO_WriteOnly ); + TQByteArray parms; + TQDataStream s( parms, IO_WriteOnly ); int cmd = 9; - QString rPath = projectDirectory( ); - rPath += QDir::separator() + dirPath; - kdDebug(9036) << "DIR : " << rPath << " " << KURL( QFileInfo( rPath ).absFilePath() ) << endl; + TQString rPath = projectDirectory( ); + rPath += TQDir::separator() + dirPath; + kdDebug(9036) << "DIR : " << rPath << " " << KURL( TQFileInfo( rPath ).absFilePath() ) << endl; -// s << cmd << KURL( QFileInfo( rPath ).absFilePath() ) << true << true; //original line +// s << cmd << KURL( TQFileInfo( rPath ).absFilePath() ) << true << true; //original line // Dukju Ahn: if checkRepos is set, status() accesses remote repository, // which causes significant delaym_owner especially when network speed is not fast enough. // Of course, the user cannot get information about the out-of-dateness of his local copy. - s << cmd << KURL( QFileInfo( rPath ).absFilePath() ) << false/*checkRepos*/ << false /*fullRecurse*/; + s << cmd << KURL( TQFileInfo( rPath ).absFilePath() ) << false/*checkRepos*/ << false /*fullRecurse*/; KIO::SimpleJob *job2 = KIO::special(servURL, parms, false); job2->setWindow( m_part->mainWindow()->main() ); - QMap<QString,QString> ma; + TQMap<TQString,TQString> ma; KIO::NetAccess::synchronousRun(job2, m_part->mainWindow()->main(), 0, 0, &ma ); - QValueList<QString> keys = ma.keys(); + TQValueList<TQString> keys = ma.keys(); qHeapSort( keys ); - QValueList<QString>::Iterator begin = keys.begin(), end = keys.end(), it; + TQValueList<TQString>::Iterator begin = keys.begin(), end = keys.end(), it; - QString path; + TQString path; int text_status = 0, prop_status = 0, repos_text_status = 0, repos_prop_status = 0; long int rev = 0; int curIdx, lastIdx; - QRegExp rx( "([0-9]*)(.*)" ); + TQRegExp rx( "([0-9]*)(.*)" ); for ( it = begin; it != end; ) { kdDebug(9036) << "METADATA : " << *it << ":" << ma[ *it ] << endl; if ( rx.search( *it ) == -1 ) return m_cachedDirEntries; // something is wrong ! :) @@ -130,7 +130,7 @@ const VCSFileInfoMap *SVNFileInfoProvider::status( const QString &dirPath ) { return m_cachedDirEntries; } -bool SVNFileInfoProvider::requestStatus( const QString &dirPath, void *callerData, bool recursive, bool checkRepos ) { +bool SVNFileInfoProvider::requestStatus( const TQString &dirPath, void *callerData, bool recursive, bool checkRepos ) { kdDebug(9036) << "##################################################################################### svn provider : request status" << endl; m_savedCallerData = callerData; // Flush old cache @@ -141,21 +141,21 @@ bool SVNFileInfoProvider::requestStatus( const QString &dirPath, void *callerDat m_previousDirPath = dirPath; } - QByteArray parms; - QDataStream s( parms, IO_WriteOnly ); + TQByteArray parms; + TQDataStream s( parms, IO_WriteOnly ); int cmd = 9; - QString rPath = projectDirectory( ); - rPath += QDir::separator() + dirPath; + TQString rPath = projectDirectory( ); + rPath += TQDir::separator() + dirPath; if( ! m_part->isValidDirectory( rPath ) ){ return false; } - kdDebug(9036) << "DIR : " << rPath << " " << QFileInfo( rPath ).absFilePath() << endl; - s << cmd << KURL( QFileInfo( rPath ).absFilePath() ) << checkRepos << recursive; + kdDebug(9036) << "DIR : " << rPath << " " << TQFileInfo( rPath ).absFilePath() << endl; + s << cmd << KURL( TQFileInfo( rPath ).absFilePath() ) << checkRepos << recursive; KURL servURL = "kdevsvn+http://fakeserver_this_is_normal_behavior/"; job = KIO::special(servURL, parms, false); - connect( job, SIGNAL( result( KIO::Job * ) ), this, SLOT( slotResult( KIO::Job * ) ) ); + connect( job, TQT_SIGNAL( result( KIO::Job * ) ), this, TQT_SLOT( slotResult( KIO::Job * ) ) ); if( checkRepos ) m_part->svncore()->initProcessDlg( job, dirPath, i18n("Subversion File/Directory Status") ); return true; @@ -166,16 +166,16 @@ void SVNFileInfoProvider::slotResult( KIO::Job *j ) { j->showErrorDialog( m_part->mainWindow()->main() ); KIO::MetaData ma = j->metaData(); - QValueList<QString> keys = ma.keys(); + TQValueList<TQString> keys = ma.keys(); qHeapSort( keys ); - QValueList<QString>::Iterator begin = keys.begin(), end = keys.end(), it; + TQValueList<TQString>::Iterator begin = keys.begin(), end = keys.end(), it; - QString path; + TQString path; int text_status = 0, prop_status = 0, repos_text_status = 0, repos_prop_status = 0; long int rev = 0; int curIdx, lastIdx; - QRegExp rx( "([0-9]*)(.*)" ); + TQRegExp rx( "([0-9]*)(.*)" ); for ( it = begin; it != end; ) { kdDebug(9036) << "METADATA : " << *it << ":" << ma[ *it ] << endl; if ( rx.search( *it ) == -1 ) return; // something is wrong ! :) @@ -217,7 +217,7 @@ void SVNFileInfoProvider::slotResult( KIO::Job *j ) { emit statusReady(*m_cachedDirEntries, m_savedCallerData); } -void SVNFileInfoProvider::slotStatus( const QString& path,int text_status, int prop_status,int repos_text_status, int repos_prop_status, long int rev) { +void SVNFileInfoProvider::slotStatus( const TQString& path,int text_status, int prop_status,int repos_text_status, int repos_prop_status, long int rev) { // kdDebug(9036) << "##################################################################################### svn provider : slotstatus" // << " path " << path << " text_status " << text_status << " prop_status " << prop_status << " repos_text_status " << repos_text_status // << " repos_prop_status " << repos_prop_status << " rev " << rev @@ -226,8 +226,8 @@ void SVNFileInfoProvider::slotStatus( const QString& path,int text_status, int p if ( !m_cachedDirEntries ) m_cachedDirEntries = new VCSFileInfoMap; - QString wRev = QString::number( rev ); //work rev - QString rRev = QString::number( rev );// repo rev + TQString wRev = TQString::number( rev ); //work rev + TQString rRev = TQString::number( rev );// repo rev VCSFileInfo::FileState state = VCSFileInfo::Unknown; switch ( text_status ) { @@ -303,16 +303,16 @@ void SVNFileInfoProvider::slotStatus( const QString& path,int text_status, int p break; } - VCSFileInfo info(QFileInfo( path ).fileName(),wRev,rRev,state); + VCSFileInfo info(TQFileInfo( path ).fileName(),wRev,rRev,state); kdDebug(9036) << "Inserting " << info.toString() << endl; - m_cachedDirEntries->insert( QFileInfo( path ).fileName(), info); + m_cachedDirEntries->insert( TQFileInfo( path ).fileName(), info); } -QString SVNFileInfoProvider::projectDirectory() const { +TQString SVNFileInfoProvider::projectDirectory() const { return owner()->project()->projectDirectory(); } -const VCSFileInfoMap *SVNFileInfoProvider::statusExt( const QString &dirPath, +const VCSFileInfoMap *SVNFileInfoProvider::statusExt( const TQString &dirPath, bool checkRepos, bool fullRecurse, bool getAll, bool noIgnore ) { if ( !m_recursiveDirEntries ) @@ -322,30 +322,30 @@ const VCSFileInfoMap *SVNFileInfoProvider::statusExt( const QString &dirPath, m_recursiveDirEntries->clear(); m_recursivePreviousDirPath = dirPath; KURL servURL = "kdevsvn+http://fakeserver_this_is_normal_behavior/"; - QByteArray parms; - QDataStream s( parms, IO_WriteOnly ); + TQByteArray parms; + TQDataStream s( parms, IO_WriteOnly ); int cmd = 109; - QString rPath = projectDirectory( ); - rPath += QDir::separator() + dirPath; - kdDebug(9036) << "DIR : " << rPath << " " << KURL( QFileInfo( rPath ).absFilePath() ) << endl; - s << cmd << checkRepos << fullRecurse << getAll << noIgnore << -1 << "WORKING" << KURL( QFileInfo( rPath ).absFilePath() ); + TQString rPath = projectDirectory( ); + rPath += TQDir::separator() + dirPath; + kdDebug(9036) << "DIR : " << rPath << " " << KURL( TQFileInfo( rPath ).absFilePath() ) << endl; + s << cmd << checkRepos << fullRecurse << getAll << noIgnore << -1 << "WORKING" << KURL( TQFileInfo( rPath ).absFilePath() ); KIO::SimpleJob *job2 = KIO::special(servURL, parms, false); job2->setWindow( m_part->mainWindow()->main() ); - QMap<QString,QString> ma; + TQMap<TQString,TQString> ma; KIO::NetAccess::synchronousRun(job2, m_part->mainWindow()->main(), 0, 0, &ma ); - QValueList<QString> keys = ma.keys(); + TQValueList<TQString> keys = ma.keys(); qHeapSort( keys ); - QValueList<QString>::Iterator begin = keys.begin(), end = keys.end(), it; + TQValueList<TQString>::Iterator begin = keys.begin(), end = keys.end(), it; - QString path; + TQString path; int text_status = 0, prop_status = 0, repos_text_status = 0, repos_prop_status = 0; long int rev = 0; int curIdx, lastIdx; - QRegExp rx( "([0-9]*)(.*)" ); + TQRegExp rx( "([0-9]*)(.*)" ); for ( it = begin; it != end; ) { kdDebug(9036) << "METADATA : " << *it << ":" << ma[ *it ] << endl; if ( rx.search( *it ) == -1 ) return m_recursiveDirEntries; // something is wrong ! :) @@ -389,14 +389,14 @@ const VCSFileInfoMap *SVNFileInfoProvider::statusExt( const QString &dirPath, } void SVNFileInfoProvider::slotStatusExt( - const QString& reqPath, const QString& path,int text_status, int prop_status,int repos_text_status, int repos_prop_status, long int rev) + const TQString& reqPath, const TQString& path,int text_status, int prop_status,int repos_text_status, int repos_prop_status, long int rev) { if ( !m_recursiveDirEntries ) m_recursiveDirEntries = new VCSFileInfoMap; - QString wRev = QString::number( rev ); //work rev - QString rRev = QString::number( rev );// repo rev + TQString wRev = TQString::number( rev ); //work rev + TQString rRev = TQString::number( rev );// repo rev VCSFileInfo::FileState state = VCSFileInfo::Unknown; switch ( text_status ) { @@ -472,10 +472,10 @@ void SVNFileInfoProvider::slotStatusExt( break; } - QString relativeReqPath; + TQString relativeReqPath; if (reqPath == "./"){ // case of project top directory - QString reqAbsPath = projectDirectory(); + TQString reqAbsPath = projectDirectory(); if( path == reqAbsPath ){ //key of VCSInfo is project directory itself. So it is set to . @@ -486,7 +486,7 @@ void SVNFileInfoProvider::slotStatusExt( } } else { - QString reqAbsPath = projectDirectory() + QDir::separator() + reqPath; + TQString reqAbsPath = projectDirectory() + TQDir::separator() + reqPath; relativeReqPath = path.right( path.length() - reqAbsPath.length() - 1 ); if (relativeReqPath == reqAbsPath){ @@ -498,9 +498,9 @@ void SVNFileInfoProvider::slotStatusExt( VCSFileInfo info(relativeReqPath, wRev, rRev, state); m_recursiveDirEntries->insert( relativeReqPath, info ); -// VCSFileInfo info(QFileInfo( path ).fileName(),wRev,rRev,state); +// VCSFileInfo info(TQFileInfo( path ).fileName(),wRev,rRev,state); kdDebug(9036) << "Inserting " << info.toString() << endl; -// m_recursiveDirEntries->insert( QFileInfo( path ).fileName(), info); +// m_recursiveDirEntries->insert( TQFileInfo( path ).fileName(), info); } #include "subversion_fileinfo.moc" diff --git a/vcs/subversion/subversion_fileinfo.h b/vcs/subversion/subversion_fileinfo.h index 791d5e65..c78dfed6 100644 --- a/vcs/subversion/subversion_fileinfo.h +++ b/vcs/subversion/subversion_fileinfo.h @@ -21,7 +21,7 @@ #ifndef SVNFILEINFOPROVIDER_H #define SVNFILEINFOPROVIDER_H -#include <qmap.h> +#include <tqmap.h> #include <kdevversioncontrol.h> #include <kio/job.h> @@ -44,26 +44,26 @@ public: virtual ~SVNFileInfoProvider(); // -- Sync interface - virtual const VCSFileInfoMap *status( const QString &dirPath ); + virtual const VCSFileInfoMap *status( const TQString &dirPath ); // -- These two are used for subversionPart and subversionCore. Of couruse, others can use it. - const VCSFileInfoMap* statusExt( const QString &dirPath, bool checkRepos, bool fullRecurse, bool getAll, bool noIgnore ); - void slotStatusExt( const QString&, const QString& , int, int, int, int, long int ) ; + const VCSFileInfoMap* statusExt( const TQString &dirPath, bool checkRepos, bool fullRecurse, bool getAll, bool noIgnore ); + void slotStatusExt( const TQString&, const TQString& , int, int, int, int, long int ) ; // -- Async interface for requesting data - virtual bool requestStatus( const QString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true ); + virtual bool requestStatus( const TQString &dirPath, void *callerData, bool recursive = true, bool checkRepos = true ); - QString projectDirectory() const; + TQString projectDirectory() const; k_dcop: - void slotStatus( const QString& , int, int, int, int, long int ) ; + void slotStatus( const TQString& , int, int, int, int, long int ) ; public slots: void slotResult( KIO::Job * ); private: mutable void *m_savedCallerData; - mutable QString m_previousDirPath; - mutable QString m_recursivePreviousDirPath; + mutable TQString m_previousDirPath; + mutable TQString m_recursivePreviousDirPath; mutable VCSFileInfoMap *m_cachedDirEntries; mutable VCSFileInfoMap *m_recursiveDirEntries; KIO::SimpleJob *job; diff --git a/vcs/subversion/subversion_global.h b/vcs/subversion/subversion_global.h index 062d7fe9..620ed8df 100644 --- a/vcs/subversion/subversion_global.h +++ b/vcs/subversion/subversion_global.h @@ -16,7 +16,7 @@ #define SUBVERSION_GLOBAL_H #include <kurl.h> -#include <qdatetime.h> +#include <tqdatetime.h> namespace SvnGlobal { @@ -42,14 +42,14 @@ public: int kind; /* The root URL of the repository. */ KURL reposRootUrl; - QString reposUuid; + TQString reposUuid; }; class SvnRevision{ public: int revNum; - QString revKind; - QDateTime revDate; + TQString revKind; + TQDateTime revDate; }; } // end of namespace SvnGlobal diff --git a/vcs/subversion/subversion_part.cpp b/vcs/subversion/subversion_part.cpp index b5201b16..af58f7c8 100644 --- a/vcs/subversion/subversion_part.cpp +++ b/vcs/subversion/subversion_part.cpp @@ -18,7 +18,7 @@ */ #include "subversion_part.h" -#include <qwhatsthis.h> +#include <tqwhatsthis.h> #include <kiconloader.h> #include <klocale.h> #include <kdevgenericfactory.h> @@ -40,16 +40,16 @@ #include "svn_mergewidget.h" #include "urlutil.h" -#include <qvbox.h> +#include <tqvbox.h> #include <kdialogbase.h> #include <kparts/part.h> #include <kdevpartcontroller.h> #include <kdevproject.h> #include <domutil.h> #include <kurlrequester.h> -#include <qradiobutton.h> +#include <tqradiobutton.h> #include <kdebug.h> -#include <qwidget.h> +#include <tqwidget.h> #include <kdevplugininfo.h> #include <kmessagebox.h> @@ -63,7 +63,7 @@ K_EXPORT_COMPONENT_FACTORY( libkdevsubversion, subversionFactory( data ) ) //bool g_projectWasJustCreated = false; -subversionPart::subversionPart(QObject *parent, const char *name, const QStringList& ) +subversionPart::subversionPart(TQObject *parent, const char *name, const TQStringList& ) : KDevVersionControl(&data, parent, name ? name : "Subversion" ) { setInstance(subversionFactory::instance()); m_projWidget = 0; @@ -74,18 +74,18 @@ subversionPart::subversionPart(QObject *parent, const char *name, const QStringL setupActions(); - connect( m_impl, SIGNAL(checkoutFinished(QString)), SIGNAL(finishedFetching(QString)) ); + connect( m_impl, TQT_SIGNAL(checkoutFinished(TQString)), TQT_SIGNAL(finishedFetching(TQString)) ); // Context menu - connect( core(), SIGNAL(contextMenu(QPopupMenu *, const Context *)), this, SLOT(contextMenu(QPopupMenu *, const Context *)) ); - connect( core(), SIGNAL(projectConfigWidget(KDialogBase*)), this, SLOT(projectConfigWidget(KDialogBase*)) ); - connect( core(), SIGNAL(stopButtonClicked(KDevPlugin*)), this, SLOT(slotStopButtonClicked(KDevPlugin*)) ); - connect( core(), SIGNAL(projectOpened()), this, SLOT(slotProjectOpened()) ); - connect( core(), SIGNAL(projectClosed()), this, SLOT(slotProjectClosed()) ); + 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()) ); m_impl->processWidget()->setCaption(i18n( "Subversion Output" )); - mainWindow()->embedOutputView( (QWidget*)m_impl->processWidget(), i18n( "Subversion" ), i18n( "Subversion messages" ) ); - QWhatsThis::add((QWidget*)m_impl->processWidget(), i18n("<b>Subversion</b><p>Subversion operations window.")); + mainWindow()->embedOutputView( (TQWidget*)m_impl->processWidget(), i18n( "Subversion" ), i18n( "Subversion messages" ) ); + TQWhatsThis::add((TQWidget*)m_impl->processWidget(), i18n("<b>Subversion</b><p>Subversion operations window.")); } @@ -98,74 +98,74 @@ subversionPart::~subversionPart() { } void subversionPart::setupActions() { - actionCommit = new KAction( i18n("&Commit to Repository..."), 0, this, SLOT(slotActionCommit()), actionCollection(), "subversion_commit" ); + actionCommit = new KAction( i18n("&Commit to Repository..."), 0, this, TQT_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 KAction( i18n("&Difference Between Revisions"), 0, this, SLOT(slotActionDiff()), + /* actionDiff = new KAction( i18n("&Difference Between Revisions"), 0, this, TQT_SLOT(slotActionDiff()), actionCollection(), "subversion_diff" ); actionDiff->setToolTip( i18n("Build difference") ); actionDiff->setWhatsThis( i18n("<b>Build difference</b><p>Builds difference between releases.") ); */ - actionAdd = new KAction( i18n("&Add to Repository"), 0, this, SLOT(slotActionAdd()), actionCollection(), "subversion_add" ); + actionAdd = new KAction( i18n("&Add to Repository"), 0, this, TQT_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 KAction( i18n("Show logs..."), 0, this, SLOT(slotLog()), actionCollection(), "subversion_log" ); - actionBlame = new KAction( i18n("Blame..."), 0, this, SLOT(slotBlame()), actionCollection(), "subversion_blame"); + actionLog = new KAction( i18n("Show logs..."), 0, this, TQT_SLOT(slotLog()), actionCollection(), "subversion_log" ); + actionBlame = new KAction( i18n("Blame..."), 0, this, TQT_SLOT(slotBlame()), actionCollection(), "subversion_blame"); - actionRemove = new KAction( i18n("&Remove From Repository"), 0, this, SLOT(slotActionDel()), actionCollection(), "subversion_remove" ); + actionRemove = new KAction( i18n("&Remove From Repository"), 0, this, TQT_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 KAction( i18n("&Update"), 0, this, SLOT(slotActionUpdate()), actionCollection(), "subversion_update" ); + actionUpdate = new KAction( i18n("&Update"), 0, this, TQT_SLOT(slotActionUpdate()), actionCollection(), "subversion_update" ); actionUpdate->setToolTip( i18n("Update") ); actionUpdate->setWhatsThis( i18n("<b>Update</b><p>Updates file(s) from repository.") ); - actionDiffLocal = new KAction( i18n("&Diff to BASE"), 0, this, SLOT(slotActionDiffLocal()), actionCollection(), "subversion_diff_local" ); + actionDiffLocal = new KAction( i18n("&Diff to BASE"), 0, this, TQT_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 KAction( i18n("&Diff to HEAD"), 0, this, SLOT(slotActionDiffLocal()), actionCollection(), "subversion_diff_head" ); + actionDiffHead = new KAction( i18n("&Diff to HEAD"), 0, this, TQT_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 KAction( i18n("&Revert"), 0, this, SLOT(slotActionRevert()), actionCollection(), "subversion_revert" ); + actionRevert = new KAction( i18n("&Revert"), 0, this, TQT_SLOT(slotActionRevert()), actionCollection(), "subversion_revert" ); actionRevert->setToolTip( i18n("Revert") ); actionRevert->setWhatsThis( i18n("<b>Revert</b><p>Undo local changes.") ); /* actionAddToIgnoreList = new KAction( i18n("&Ignore in Subversion Operations"), 0, - this, SLOT(slotActionAddToIgnoreList()), actionCollection(), "subversion_ignore" ); + this, TQT_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 KAction( i18n("Do &Not Ignore in Subversion Operations"), 0, - this, SLOT(slotActionRemoveFromIgnoreList()), actionCollection(), "subversion_donot_ignore" ); + this, TQT_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 KAction( i18n("Re&solve Conflicting State"), 0, - this, SLOT(slotActionResolve()), actionCollection(), "subversion_resolve" ); + this, TQT_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 KAction( i18n("Switch this working copy to URL.."), 0, - this, SLOT(slotSwitch()), actionCollection(), "subversion_switch" ); + this, TQT_SLOT(slotSwitch()), actionCollection(), "subversion_switch" ); // warn slogCopy(), slotMerge only works on context menu. There is no main-menu action actionCopy = new KAction( i18n("Copy this working copy to URL.."), 0, - this, SLOT(slotCopy()), actionCollection(), "subversion_copy" ); + this, TQT_SLOT(slotCopy()), actionCollection(), "subversion_copy" ); actionMerge = new KAction( i18n("Merge difference to working copy"), 0, - this, SLOT(slotMerge()), actionCollection(), "subversion_merge" ); + this, TQT_SLOT(slotMerge()), actionCollection(), "subversion_merge" ); } -QWidget* subversionPart::newProjectWidget( QWidget* parent ) { +TQWidget* subversionPart::newProjectWidget( TQWidget* parent ) { if ( !m_projWidget ) m_projWidget = new subversionProjectWidget(parent,"projectwidget"); return m_projWidget; } -void subversionPart::createNewProject( const QString& dirname ) { +void subversionPart::createNewProject( const TQString& dirname ) { if ( !m_projWidget ) return; m_impl->createNewProject( dirname, KURL( m_projWidget->importURL->url() ), m_projWidget->yes->isChecked() ); @@ -181,7 +181,7 @@ KDevVCSFileInfoProvider * subversionPart::fileInfoProvider() const { return m_impl->fileInfoProvider(); } -void subversionPart::contextMenu( QPopupMenu *popup, const Context *context ) { +void subversionPart::contextMenu( TQPopupMenu *popup, const Context *context ) { //no project, no subversion. Don't test on projectDirectory() here. If the user wants this project to have subversion support //give it to him. e.g. for out of root subprojects like with qmake if(!project()) @@ -213,48 +213,48 @@ if(!project()) if (context->hasType( Context::FileContext )) popup->insertSeparator(); - int id = subMenu->insertItem( actionCommit->text(), this, SLOT(slotCommit()) ); + int id = subMenu->insertItem( actionCommit->text(), this, TQT_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, SLOT(slotDiff()) ); - subMenu->insertItem( actionLog->text(), this, SLOT(slotLog()) ); + subMenu->insertItem( actionDiff->text(), this, TQT_SLOT(slotDiff()) ); + subMenu->insertItem( actionLog->text(), this, TQT_SLOT(slotLog()) ); }*/ subMenu->setWhatsThis(id, i18n("<b>Commit file(s)</b><p>Commits file to repository if modified.")); - id = subMenu->insertItem( actionAdd->text(), this, SLOT(slotAdd()) ); + id = subMenu->insertItem( actionAdd->text(), this, TQT_SLOT(slotAdd()) ); subMenu->setWhatsThis(id, i18n("<b>Add file to repository</b><p>Adds file to repository.")); - id = subMenu->insertItem( actionRemove->text(), this, SLOT(slotDel()) ); + id = subMenu->insertItem( actionRemove->text(), this, TQT_SLOT(slotDel()) ); subMenu->setWhatsThis(id, i18n("<b>Remove from repository</b><p>Removes file(s) from repository.")); - id = subMenu->insertItem( actionLog->text(), this, SLOT(slotLog()) ); + id = subMenu->insertItem( actionLog->text(), this, TQT_SLOT(slotLog()) ); subMenu->setWhatsThis(id, i18n("<b>Show logs..</b><p>View Logs")); - id = subMenu->insertItem( actionBlame->text(), this, SLOT(slotBlame()) ); + id = subMenu->insertItem( actionBlame->text(), this, TQT_SLOT(slotBlame()) ); subMenu->setWhatsThis(id, i18n("<b>Blame 0:HEAD </b><p>Show Annotate")); subMenu->insertSeparator(); - id = subMenu->insertItem( actionDiffLocal->text(), this, SLOT(slotDiffLocal()) ); + id = subMenu->insertItem( actionDiffLocal->text(), this, TQT_SLOT(slotDiffLocal()) ); subMenu->setWhatsThis(id, i18n("<b>Diff</b><p>Diff file to local disk.")); - id = subMenu->insertItem( actionDiffHead->text(), this, SLOT(slotDiffHead()) ); + id = subMenu->insertItem( actionDiffHead->text(), this, TQT_SLOT(slotDiffHead()) ); subMenu->setWhatsThis(id, i18n("<b>Diff</b><p>Diff file to repository.")); - id = subMenu->insertItem( actionUpdate->text(), this, SLOT(slotUpdate()) ); + id = subMenu->insertItem( actionUpdate->text(), this, TQT_SLOT(slotUpdate()) ); subMenu->setWhatsThis(id, i18n("<b>Update</b><p>Updates file(s) from repository.")); - id = subMenu->insertItem( actionRevert->text(), this, SLOT(slotRevert()) ); + id = subMenu->insertItem( actionRevert->text(), this, TQT_SLOT(slotRevert()) ); subMenu->setWhatsThis(id, i18n("<b>Revert</b><p>Undo local changes.") ); - id = subMenu->insertItem( actionResolve->text(), this, SLOT(slotResolve()) ); + id = subMenu->insertItem( actionResolve->text(), this, TQT_SLOT(slotResolve()) ); subMenu->setWhatsThis(id, i18n("<b>Resolve</b><p>Resolve conflicting state.") ); - id = subMenu->insertItem( actionSwitch->text(), this, SLOT(slotSwitch()) ); + id = subMenu->insertItem( actionSwitch->text(), this, TQT_SLOT(slotSwitch()) ); subMenu->setWhatsThis(id, i18n("<b>Switch</b><p>Switch working tree.") ); - id = subMenu->insertItem( actionCopy->text(), this, SLOT(slotCopy()) ); + id = subMenu->insertItem( actionCopy->text(), this, TQT_SLOT(slotCopy()) ); subMenu->setWhatsThis(id, i18n("<b>Copy</b><p>Copy from/between path/URLs") ); - id = subMenu->insertItem( actionMerge->text(), this, SLOT(slotMerge()) ); + id = subMenu->insertItem( actionMerge->text(), this, TQT_SLOT(slotMerge()) ); subMenu->setWhatsThis(id, i18n("<b>Merge</b><p>Merge difference to working copy") ); /* subMenu->insertSeparator(); - id = subMenu->insertItem( actionAddToIgnoreList->text(), this, SLOT(slotAddToIgnoreList()) ); + id = subMenu->insertItem( actionAddToIgnoreList->text(), this, TQT_SLOT(slotAddToIgnoreList()) ); subMenu->setWhatsThis(id, i18n("<b>Ignore in Subversion operations</b><p>Ignores file(s).")); - id = subMenu->insertItem( actionRemoveFromIgnoreList->text(), this, SLOT(slotRemoveFromIgnoreList()) ); + id = subMenu->insertItem( actionRemoveFromIgnoreList->text(), this, TQT_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 @@ -300,7 +300,7 @@ void subversionPart::slotResolve() { void subversionPart::slotSwitch() { if( m_urls.count() > 1 ){ - KMessageBox::error( (QWidget*)project()->mainWindow()->main(), + KMessageBox::error( (TQWidget*)project()->mainWindow()->main(), i18n("Please select only one item for subversion switch") ); return; } @@ -308,22 +308,22 @@ void subversionPart::slotSwitch() // retrieve repository info from local-copy metadata which will be displayed in dialog box KURL wcPath = m_urls.first(); - QMap< KURL, SvnGlobal::SvnInfoHolder> holderMap; + TQMap< KURL, SvnGlobal::SvnInfoHolder> holderMap; SvnGlobal::SvnInfoHolder holder; m_impl->clientInfo( wcPath, false, holderMap ); - QValueList< SvnGlobal::SvnInfoHolder > holderList = holderMap.values(); + TQValueList< SvnGlobal::SvnInfoHolder > holderList = holderMap.values(); holder = holderList.first(); // invoke dialog box - SvnSwitchDlg dlg( &holder, wcPath.path(), (QWidget*)project()->mainWindow()->main() ); + SvnSwitchDlg dlg( &holder, wcPath.path(), (TQWidget*)project()->mainWindow()->main() ); - if( dlg.exec() != QDialog::Accepted ){ + if( dlg.exec() != TQDialog::Accepted ){ return; } // check target url's validity KURL repositUrl = KURL( dlg.destUrl() ); if( !repositUrl.isValid() ){ - KMessageBox::error( (QWidget*)project()->mainWindow()->main(), + KMessageBox::error( (TQWidget*)project()->mainWindow()->main(), i18n("The destination URL is invalid") ); return; } @@ -333,7 +333,7 @@ void subversionPart::slotSwitch() else if( dlg.relocation() ) m_impl->switchRelocate( wcPath, dlg.currentUrl(), repositUrl, dlg.recursive() ); else - KMessageBox::error( (QWidget*)project()->mainWindow()->main(), + KMessageBox::error( (TQWidget*)project()->mainWindow()->main(), i18n("Fail to conduct subversion switch. No action was selected") ); } @@ -341,7 +341,7 @@ void subversionPart::slotCopy() { // error check if( m_urls.count() > 1 ){ - KMessageBox::error( (QWidget*)project()->mainWindow()->main(), + KMessageBox::error( (TQWidget*)project()->mainWindow()->main(), i18n("Please select only one item for subversion switch") ); return; } @@ -349,22 +349,22 @@ void subversionPart::slotCopy() // retrieve repository info from local-copy metadata which will be displayed in dialog box KURL wcPath = m_urls.first(); - QMap< KURL, SvnGlobal::SvnInfoHolder> holderMap; + TQMap< KURL, SvnGlobal::SvnInfoHolder> holderMap; SvnGlobal::SvnInfoHolder holder; m_impl->clientInfo( wcPath, false, holderMap ); - QValueList< SvnGlobal::SvnInfoHolder > holderList = holderMap.values(); + TQValueList< SvnGlobal::SvnInfoHolder > holderList = holderMap.values(); holder = holderList.first(); // start input dialog SvnCopyDialog dlg( wcPath.prettyURL(), &holder, - (QWidget*)project()->mainWindow()->main()); + (TQWidget*)project()->mainWindow()->main()); - if( dlg.exec() != QDialog::Accepted ) + if( dlg.exec() != TQDialog::Accepted ) return; // retrieve user input KURL srcUrl = dlg.sourceUrl(); int rev = dlg.revision(); - QString revKind = dlg.revKind(); + TQString revKind = dlg.revKind(); KURL dest = dlg.destUrl(); kdDebug(9036) << " SRC: " << srcUrl << " DEST: " << dest << " Revnum: " << rev << " RevKind: " << revKind << endl; @@ -376,15 +376,15 @@ void subversionPart::slotMerge() { // error check if( m_urls.count() > 1 ){ - KMessageBox::error( (QWidget*)project()->mainWindow()->main(), + KMessageBox::error( (TQWidget*)project()->mainWindow()->main(), i18n("Please select only one item for subversion merge") ); return; } if( m_urls.count() < 1 ) return; KURL wcTarget= m_urls.first(); - SvnMergeDialog dlg( wcTarget, (QWidget*)project()->mainWindow()->main() ); - if( dlg.exec() != QDialog::Accepted ) return; + SvnMergeDialog dlg( wcTarget, (TQWidget*)project()->mainWindow()->main() ); + if( dlg.exec() != TQDialog::Accepted ) return; KURL src1 = dlg.source1(); SvnRevision rev1 = dlg.rev1(); @@ -444,7 +444,7 @@ void subversionPart::slotActionDiffHead() { void subversionPart::slotCommit() { SVNFileSelectDlgCommit dialog( m_urls, this, 0 ); - if( dialog.exec() == QDialog::Accepted ){ + if( dialog.exec() == TQDialog::Accepted ){ KURL::List tobeCommittedUrls = dialog.checkedUrls(); bool recursive = dialog.recursive(); bool keepLocks = dialog.keepLocks(); @@ -458,16 +458,16 @@ void subversionPart::slotAdd() { void subversionPart::slotLog() { if (m_urls.count() > 1){ - KMessageBox::error( (QWidget*)project()->mainWindow()->main(), + KMessageBox::error( (TQWidget*)project()->mainWindow()->main(), i18n("Please select only one item for subversion log") ); return; } SvnLogViewOptionDlg dlg; if( dlg.exec() ){ int revstart = dlg.revstart(); - QString revkindstart = dlg.revKindStart(); + TQString revkindstart = dlg.revKindStart(); int revend = dlg.revend(); - QString revkindend = dlg.revKindEnd(); + TQString revkindend = dlg.revKindEnd(); bool strictNode = dlg.strictNode(); m_impl->svnLog (m_urls, revstart, revkindstart, revend, revkindend, true/*changedPath*/, strictNode); } else{ @@ -477,12 +477,12 @@ void subversionPart::slotLog() void subversionPart::slotBlame() { if (m_urls.count() > 1){ - KMessageBox::error( (QWidget*)project()->mainWindow()->main(), + KMessageBox::error( (TQWidget*)project()->mainWindow()->main(), i18n("Please select only one item to see annotate") ); return; } if (m_urls.count() < 1){ - KMessageBox::error( (QWidget*)project()->mainWindow()->main(), + KMessageBox::error( (TQWidget*)project()->mainWindow()->main(), i18n("Select file to see blame") ); return; } @@ -500,7 +500,7 @@ void subversionPart::slotDiffLocal() { // m_impl->diff (m_urls, "BASE"); if( m_urls.count() < 1 ){ // Impossible to reach here but.. - KMessageBox::error( (QWidget*)project()->mainWindow()->main(), + KMessageBox::error( (TQWidget*)project()->mainWindow()->main(), i18n("Select file or directory to see diff") ); return; } @@ -510,7 +510,7 @@ void subversionPart::slotDiffHead() { // m_impl->diff (m_urls, "HEAD"); if( m_urls.count() < 1 ){ // Impossible to reach here but.. - KMessageBox::error( (QWidget*)project()->mainWindow()->main(), + KMessageBox::error( (TQWidget*)project()->mainWindow()->main(), i18n("Select file or directory to see diff") ); return; } @@ -529,41 +529,41 @@ void subversionPart::slotProjectOpened() { } */ //loadOptions(); /// \FIXME slots - //connect( project(), SIGNAL(addedFilesToProject(const QStringList&)), this, SLOT(slotAddFilesToProject(const QStringList &)) ); - //connect( project(), SIGNAL(removedFilesFromProject(const QStringList&)), this, SLOT(slotRemovedFilesFromProject(const QStringList &)) ); + //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 &)) ); } void subversionPart::slotProjectClosed() { kdDebug(9036) << "subversion :projectClosed" << endl; //saveOptions(); /// \FIXME slots - //disconnect( project(), SIGNAL(addedFilesToProject(const QStringList&)), this, SLOT(slotAddFilesToProject(const QStringList &)) ); - //disconnect( project(), SIGNAL(removedFilesFromProject(const QStringList&)), this, SLOT(slotRemovedFilesFromProject(const QStringList &)) ); + //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 &)) ); } -void subversionPart::savePartialProjectSession(QDomElement* dom) { +void subversionPart::savePartialProjectSession(TQDomElement* dom) { kdDebug(9036) << "subversion : savePartialProjectSession" << endl; - QDomDocument doc = dom->ownerDocument(); - QDomElement svn = doc.createElement( "subversion" ); + TQDomDocument doc = dom->ownerDocument(); + TQDomElement svn = doc.createElement( "subversion" ); svn.setAttribute( "base", base.url() ); dom->appendChild( svn ); } -void subversionPart::restorePartialProjectSession(const QDomElement* dom) { +void subversionPart::restorePartialProjectSession(const TQDomElement* dom) { kdDebug(9036) << "subversion : restorePartialProjectSession" << endl; - QDomElement svn = dom->namedItem("subversion").toElement(); + TQDomElement svn = dom->namedItem("subversion").toElement(); base = svn.attribute( "base", "" ); } -bool subversionPart::isValidDirectory( const QString &dirPath) const { - QString svn = "/.svn/"; - QDir svndir( dirPath + svn ); - QString entriesFileName = dirPath + svn + "entries"; +bool subversionPart::isValidDirectory( const TQString &dirPath) const { + TQString svn = "/.svn/"; + TQDir svndir( dirPath + svn ); + TQString entriesFileName = dirPath + svn + "entries"; kdDebug(9036) << "dirpath " << dirPath+"/.svn/" << " exists:" << svndir.exists() << endl; - kdDebug(9036) << "entries " << entriesFileName << " exists:" << QFile::exists( entriesFileName ) << endl; + kdDebug(9036) << "entries " << entriesFileName << " exists:" << TQFile::exists( entriesFileName ) << endl; return svndir.exists() && - QFile::exists( entriesFileName ); + TQFile::exists( entriesFileName ); } #include "subversion_part.moc" diff --git a/vcs/subversion/subversion_part.h b/vcs/subversion/subversion_part.h index a4717772..7ce9e0cd 100644 --- a/vcs/subversion/subversion_part.h +++ b/vcs/subversion/subversion_part.h @@ -20,10 +20,10 @@ #define __KDEVPART_SUBVERSION_H__ -#include <qguardedptr.h> +#include <tqguardedptr.h> #include <kdevplugin.h> #include <kurl.h> -#include <qpopupmenu.h> +#include <tqpopupmenu.h> #include <kdialogbase.h> #include "kdevversioncontrol.h" @@ -41,28 +41,28 @@ class subversionPart : public KDevVersionControl Q_OBJECT public: - subversionPart(QObject *parent, const char *name, const QStringList &); + subversionPart(TQObject *parent, const char *name, const TQStringList &); virtual ~subversionPart(); void setupActions(); - QWidget* newProjectWidget( QWidget* parent ); - void createNewProject( const QString& dirname ); + TQWidget* newProjectWidget( TQWidget* parent ); + void createNewProject( const TQString& dirname ); bool fetchFromRepository(); KDevVCSFileInfoProvider * fileInfoProvider() const; bool urlFocusedDocument( KURL &url ); - void restorePartialProjectSession(const QDomElement* ); - void savePartialProjectSession(QDomElement* ); + void restorePartialProjectSession(const TQDomElement* ); + void savePartialProjectSession(TQDomElement* ); void setBaseURL(const KURL& url ) { base = url; } KURL baseURL() { return base; } - virtual bool isValidDirectory( const QString &dirPath ) const; + virtual bool isValidDirectory( const TQString &dirPath ) const; KURL::List urls() { return m_urls; } subversionCore* svncore() { return m_impl; } signals: -// void finishedFetching( QString destinationDir ); +// void finishedFetching( TQString destinationDir ); private slots: - void contextMenu( QPopupMenu *popup, const Context *context ); + void contextMenu( TQPopupMenu *popup, const Context *context ); void slotActionUpdate(); void slotActionRevert(); void slotActionCommit(); @@ -88,7 +88,7 @@ private slots: void slotProjectOpened(); private: - QGuardedPtr<subversionCore> m_impl; + TQGuardedPtr<subversionCore> m_impl; KURL::List m_urls; KAction *actionCommit, @@ -107,11 +107,11 @@ private: *actionCopy, *actionMerge; - QGuardedPtr<subversionProjectWidget> m_projWidget; + TQGuardedPtr<subversionProjectWidget> m_projWidget; KURL base; public: - QMap< KURL, SvnGlobal::SvnInfoHolder > m_prjInfoMap; + TQMap< KURL, SvnGlobal::SvnInfoHolder > m_prjInfoMap; }; diff --git a/vcs/subversion/subversion_widget.cpp b/vcs/subversion/subversion_widget.cpp index acc2db0c..c27f845e 100644 --- a/vcs/subversion/subversion_widget.cpp +++ b/vcs/subversion/subversion_widget.cpp @@ -26,26 +26,26 @@ #include "subversion_widget.h" #include <ktextedit.h> #include <klocale.h> -#include <qtoolbutton.h> -#include <qpushbutton.h> +#include <tqtoolbutton.h> +#include <tqpushbutton.h> -subversionWidget::subversionWidget( subversionPart *part, QWidget *parent, const char* name ) +subversionWidget::subversionWidget( subversionPart *part, TQWidget *parent, const char* name ) : KTabWidget(parent) { m_part = part; m_edit = new KTextEdit( this ); m_edit->setReadOnly( TRUE ); tab()->addTab( m_edit, i18n("Notification") ); - m_closeButton = new QPushButton( tab() ); + m_closeButton = new TQPushButton( tab() ); m_closeButton->setText( i18n("Close") ); tab()->setCornerWidget(m_closeButton); - connect( m_closeButton, SIGNAL(clicked()), this, SLOT(closeCurrentTab()) ); + connect( m_closeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(closeCurrentTab()) ); } subversionWidget::~subversionWidget() {} -void subversionWidget::append( QString notifications ) +void subversionWidget::append( TQString notifications ) { if( !m_edit ){ // should not happen @@ -55,7 +55,7 @@ void subversionWidget::append( QString notifications ) showPage( m_edit ); } -void subversionWidget::showLogResult( QValueList<SvnLogHolder> *holderList, QString reqUrl ) +void subversionWidget::showLogResult( TQValueList<SvnLogHolder> *holderList, TQString reqUrl ) { SvnLogViewWidget *widget = new SvnLogViewWidget( m_part, this ); widget->setLogResult( holderList ); @@ -65,7 +65,7 @@ void subversionWidget::showLogResult( QValueList<SvnLogHolder> *holderList, QStr tab()->showPage( widget ); } -void subversionWidget::showBlameResult( QValueList<SvnBlameHolder> *blamelist ) +void subversionWidget::showBlameResult( TQValueList<SvnBlameHolder> *blamelist ) { SvnBlameWidget *widget = new SvnBlameWidget( this ); widget->copyBlameData( blamelist ); @@ -75,7 +75,7 @@ void subversionWidget::showBlameResult( QValueList<SvnBlameHolder> *blamelist ) } void subversionWidget::closeCurrentTab() { - QWidget *current = tab()->currentPage(); + TQWidget *current = tab()->currentPage(); KTextEdit *edit = static_cast<KTextEdit*>(current); if( edit ){ if( edit == m_edit ) // main notification output should not be deleted @@ -87,13 +87,13 @@ void subversionWidget::closeCurrentTab() //////////////////////////////////////////////////////////////////////// -SvnIntSortListItem::SvnIntSortListItem( QListView* parent ) - :QListViewItem(parent) +SvnIntSortListItem::SvnIntSortListItem( TQListView* parent ) + :TQListViewItem(parent) {} SvnIntSortListItem::~SvnIntSortListItem() {} -int SvnIntSortListItem::compare( QListViewItem *item, int col, bool ascending ) const +int SvnIntSortListItem::compare( TQListViewItem *item, int col, bool ascending ) const { unsigned int myVal = this->text(col).toUInt(); @@ -103,7 +103,7 @@ int SvnIntSortListItem::compare( QListViewItem *item, int col, bool ascending ) return 0; } -SvnLogViewItem::SvnLogViewItem( QListView * parent ) +SvnLogViewItem::SvnLogViewItem( TQListView * parent ) :SvnIntSortListItem( parent ) { m_pathList = ""; @@ -124,11 +124,11 @@ SvnProgressDlg::SvnProgressDlg( bool showNow ) SvnProgressDlg::~SvnProgressDlg() {} -void SvnProgressDlg::setSourceUrl( const QString &src ) +void SvnProgressDlg::setSourceUrl( const TQString &src ) { sourceEdit->setText( src ); } -void SvnProgressDlg::setDestUrl( const QString &dest ) +void SvnProgressDlg::setDestUrl( const TQString &dest ) { destEdit->setText( dest ); } diff --git a/vcs/subversion/subversion_widget.h b/vcs/subversion/subversion_widget.h index 53d806d7..c2ff7e62 100644 --- a/vcs/subversion/subversion_widget.h +++ b/vcs/subversion/subversion_widget.h @@ -20,15 +20,15 @@ #ifndef __SUBVERSION_WIDGET_H__ #define __SUBVERSION_WIDGET_H__ -#include <qlistview.h> +#include <tqlistview.h> #include "svn_blamewidget.h" #include "svn_logviewwidget.h" -#include <qvaluelist.h> +#include <tqvaluelist.h> class subversionPart; #include <ktabwidget.h> #include <kio/defaultprogress.h> -#include <qguardedptr.h> +#include <tqguardedptr.h> class KTextEdit; class SvnLogHolder; class SvnBlameHolder; @@ -42,13 +42,13 @@ class subversionWidget : public KTabWidget { Q_OBJECT public: - subversionWidget(subversionPart *part, QWidget *parent, const char* name); + subversionWidget(subversionPart *part, TQWidget *parent, const char* name); ~subversionWidget(); // append what?. Append any text status outputs - void append( QString notifications ); - void showLogResult( QValueList<SvnLogHolder> *holderList, QString reqUrl ); - void showBlameResult( QValueList<SvnBlameHolder> *blamelist ); + void append( TQString notifications ); + void showLogResult( TQValueList<SvnLogHolder> *holderList, TQString reqUrl ); + void showBlameResult( TQValueList<SvnBlameHolder> *blamelist ); protected slots: void closeCurrentTab(); @@ -57,29 +57,29 @@ private: KTabWidget* tab(){ return this; } subversionPart *m_part; - QGuardedPtr<KTextEdit> m_edit; - QPushButton *m_closeButton; + TQGuardedPtr<KTextEdit> m_edit; + TQPushButton *m_closeButton; }; /** * reimplement compare(), to be able to sort any item by integer */ -class SvnIntSortListItem : public QListViewItem { +class SvnIntSortListItem : public TQListViewItem { public: - SvnIntSortListItem ( QListView* parent=0 ); + SvnIntSortListItem ( TQListView* parent=0 ); ~SvnIntSortListItem (); /** Returns < 0 if this item is less than i, 0 if they are equal and > 0 if this item is greater than i. */ - virtual int compare( QListViewItem* i, int col, bool ascending ) const; + virtual int compare( TQListViewItem* i, int col, bool ascending ) const; }; class SvnLogViewItem : public SvnIntSortListItem { public: - SvnLogViewItem( QListView* parent ); + SvnLogViewItem( TQListView* parent ); ~SvnLogViewItem(); - QString m_pathList; - QString m_message; + TQString m_pathList; + TQString m_message; }; ///////////////////////////////////////////////////////////// @@ -88,8 +88,8 @@ class SvnProgressDlg : public KIO::DefaultProgress { public: SvnProgressDlg( bool showNow = true ); ~SvnProgressDlg(); - void setSourceUrl( const QString & ); - void setDestUrl( const QString & ); + void setSourceUrl( const TQString & ); + void setDestUrl( const TQString & ); }; #endif diff --git a/vcs/subversion/svn_blamewidget.cpp b/vcs/subversion/svn_blamewidget.cpp index 5d186177..b4095389 100644 --- a/vcs/subversion/svn_blamewidget.cpp +++ b/vcs/subversion/svn_blamewidget.cpp @@ -14,23 +14,23 @@ #include "svn_blamewidget.h" #include "subversion_widget.h" -#include <qmap.h> -#include <qlistview.h> -#include <qlayout.h> -#include <qpushbutton.h> -#include <qstringlist.h> -#include <qfont.h> +#include <tqmap.h> +#include <tqlistview.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqstringlist.h> +#include <tqfont.h> #include <klocale.h> #include <kmessagebox.h> -SvnBlameWidget::SvnBlameWidget( QWidget *parent, const char* name, bool modal, WFlags f ) - :QWidget( parent ) +SvnBlameWidget::SvnBlameWidget( TQWidget *parent, const char* name, bool modal, WFlags f ) + :TQWidget( parent ) { - m_layout = new QVBoxLayout( this, 1, 1 ); + m_layout = new TQVBoxLayout( this, 1, 1 ); m_layout->setMargin(1); - m_listView = new QListView( this ); + m_listView = new TQListView( this ); outView()->setAllColumnsShowFocus( TRUE ); outView()->addColumn( i18n("Line") ); outView()->addColumn( i18n("Rev") ); @@ -43,7 +43,7 @@ SvnBlameWidget::SvnBlameWidget( QWidget *parent, const char* name, bool modal, W SvnBlameWidget::~SvnBlameWidget() {} -void SvnBlameWidget::copyBlameData( QValueList<SvnBlameHolder> *blamelist ) +void SvnBlameWidget::copyBlameData( TQValueList<SvnBlameHolder> *blamelist ) { m_blamelist = *blamelist; } @@ -53,66 +53,66 @@ void SvnBlameWidget::show() outView()->clear(); outView()->setSortColumn(0); - QFont f = outView()->font(); + TQFont f = outView()->font(); f.setFixedPitch( true ); outView()->setFont( f ); - QValueList<SvnBlameHolder>::Iterator it; + TQValueList<SvnBlameHolder>::Iterator it; for( it = m_blamelist.begin(); it != m_blamelist.end(); ++it ){ SvnBlameHolder holder = *it; SvnIntSortListItem *item = new SvnIntSortListItem(outView()); - QString prettyDate = holder.date.left(16).replace(10, 1, ' '); + TQString prettyDate = holder.date.left(16).replace(10, 1, ' '); - item->setText(0, QString::number( holder.line+1 ) ); - item->setText(1, QString::number(holder.rev) ); + item->setText(0, TQString::number( holder.line+1 ) ); + item->setText(1, TQString::number(holder.rev) ); item->setText(2, prettyDate ); item->setText(3, holder.author ); item->setText(4, holder.content ); } outView()->sort(); - QWidget::show(); + TQWidget::show(); } -QListView* SvnBlameWidget::outView() +TQListView* SvnBlameWidget::outView() { return m_listView; } ///////////////////////////////////////////////////////////// -SvnBlameFileSelectDlg::SvnBlameFileSelectDlg( QWidget *parent ) - : QDialog( parent ) +SvnBlameFileSelectDlg::SvnBlameFileSelectDlg( TQWidget *parent ) + : TQDialog( parent ) { m_selected = ""; setCaption( i18n("Select one file to view annotation") ); - m_layout = new QGridLayout( this, 2, 2 ); - m_view = new QListView( this ); + m_layout = new TQGridLayout( this, 2, 2 ); + m_view = new TQListView( this ); m_view->addColumn( i18n("files") ); - m_okBtn = new QPushButton( i18n("OK"), this ); - m_cancelBtn = new QPushButton( i18n("Cancel"), this ); + m_okBtn = new TQPushButton( i18n("OK"), this ); + m_cancelBtn = new TQPushButton( i18n("Cancel"), this ); m_layout->addMultiCellWidget( m_view, 0, 0, 0, 1 ); m_layout->addWidget( m_okBtn, 1, 0 ); m_layout->addWidget( m_cancelBtn, 1, 1 ); - connect( m_okBtn, SIGNAL(clicked()), this, SLOT(accept()) ); - connect( m_cancelBtn, SIGNAL(clicked()), this, SLOT(reject()) ); + connect( m_okBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); + connect( m_cancelBtn, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) ); } SvnBlameFileSelectDlg::~SvnBlameFileSelectDlg() {} -void SvnBlameFileSelectDlg::setCandidate( QStringList *list ) +void SvnBlameFileSelectDlg::setCandidate( TQStringList *list ) { - for( QValueList<QString>::iterator it = list->begin(); it != list->end(); ++it ){ - QListViewItem *item = new QListViewItem( m_view, *it ); + for( TQValueList<TQString>::iterator it = list->begin(); it != list->end(); ++it ){ + TQListViewItem *item = new TQListViewItem( m_view, *it ); } } -QString SvnBlameFileSelectDlg::selected() +TQString SvnBlameFileSelectDlg::selected() { return m_selected; } @@ -120,7 +120,7 @@ QString SvnBlameFileSelectDlg::selected() void SvnBlameFileSelectDlg::accept() { while( true ){ - QListViewItem *item = m_view->currentItem(); + TQListViewItem *item = m_view->currentItem(); if( item ){ m_selected = item->text(0); break; @@ -129,7 +129,7 @@ void SvnBlameFileSelectDlg::accept() KMessageBox::error( this, i18n("Select file from list to view annotation") ); } } - QDialog::accept(); + TQDialog::accept(); } #include "svn_blamewidget.moc" diff --git a/vcs/subversion/svn_blamewidget.h b/vcs/subversion/svn_blamewidget.h index 26bd0fa2..b0d01e12 100644 --- a/vcs/subversion/svn_blamewidget.h +++ b/vcs/subversion/svn_blamewidget.h @@ -16,9 +16,9 @@ #ifndef SVN_BLAMEWIDGET_H #define SVN_BLAMEWIDGET_H -#include <qwidget.h> -#include <qdialog.h> -#include <qvaluelist.h> +#include <tqwidget.h> +#include <tqdialog.h> +#include <tqvaluelist.h> class QVBoxLayout; class QListView; class QGridLayout; @@ -31,47 +31,47 @@ public: // ~SvnBlameHolder(){}; unsigned int line; long int rev; - QString date; - QString author; - QString content; + TQString date; + TQString author; + TQString content; }; class QListView; -class SvnBlameWidget : public QWidget { +class SvnBlameWidget : public TQWidget { Q_OBJECT public: - SvnBlameWidget( QWidget * parent = 0, const char * name = 0, bool modal = FALSE, WFlags f = 0 ); + SvnBlameWidget( TQWidget * parent = 0, const char * name = 0, bool modal = FALSE, WFlags f = 0 ); virtual ~SvnBlameWidget(); - void copyBlameData( QValueList<SvnBlameHolder> *blamelist ); + void copyBlameData( TQValueList<SvnBlameHolder> *blamelist ); void show(); - QListView* outView(); + TQListView* outView(); protected: - QValueList <SvnBlameHolder> m_blamelist; + TQValueList <SvnBlameHolder> m_blamelist; - QVBoxLayout *m_layout; - QListView *m_listView; + TQVBoxLayout *m_layout; + TQListView *m_listView; }; -class SvnBlameFileSelectDlg : public QDialog { +class SvnBlameFileSelectDlg : public TQDialog { Q_OBJECT public: - SvnBlameFileSelectDlg( QWidget *parent = 0L ); + SvnBlameFileSelectDlg( TQWidget *parent = 0L ); virtual ~SvnBlameFileSelectDlg(); - void setCandidate( QStringList *modifies ); - QString selected(); + void setCandidate( TQStringList *modifies ); + TQString selected(); protected: virtual void accept(); private: - QGridLayout *m_layout; - QListView *m_view; - QPushButton *m_okBtn; - QPushButton *m_cancelBtn; + TQGridLayout *m_layout; + TQListView *m_view; + TQPushButton *m_okBtn; + TQPushButton *m_cancelBtn; - QStringList *m_candidates; - QString m_selected; + TQStringList *m_candidates; + TQString m_selected; }; #endif diff --git a/vcs/subversion/svn_copywidget.cpp b/vcs/subversion/svn_copywidget.cpp index a5d74bcb..30b25fd7 100644 --- a/vcs/subversion/svn_copywidget.cpp +++ b/vcs/subversion/svn_copywidget.cpp @@ -5,18 +5,18 @@ #include <kurlrequester.h> #include <knuminput.h> #include <kcombobox.h> -#include <qradiobutton.h> +#include <tqradiobutton.h> -SvnCopyDialog::SvnCopyDialog( const QString &reqPath, SvnGlobal::SvnInfoHolder *holder, QWidget *parent ) +SvnCopyDialog::SvnCopyDialog( const TQString &reqPath, SvnGlobal::SvnInfoHolder *holder, TQWidget *parent ) : SvnCopyDialogBase( parent ) , m_holder(holder) { reqEdit->setText( reqPath ); - connect( urlRadio, SIGNAL(clicked()), this, SLOT(setSourceAsUrl()) ); - connect( pathRadio, SIGNAL(clicked()), this, SLOT(setSourceAsLocalPath()) ); - connect( revnumRadio, SIGNAL(toggled(bool)), revnumInput, SLOT(setEnabled(bool)) ); - connect( revnumRadio, SIGNAL(toggled(bool)), revkindCombo, SLOT(setDisabled(bool)) ); + 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)) ); // 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. @@ -45,12 +45,12 @@ int SvnCopyDialog::revision() return -1; } -QString SvnCopyDialog::revKind() +TQString SvnCopyDialog::revKind() { if( revkindRadio->isChecked() ) return revkindCombo->currentText(); else - return QString(""); + return TQString(""); } KURL SvnCopyDialog::destUrl() diff --git a/vcs/subversion/svn_copywidget.h b/vcs/subversion/svn_copywidget.h index cc00636d..8b80807e 100644 --- a/vcs/subversion/svn_copywidget.h +++ b/vcs/subversion/svn_copywidget.h @@ -13,12 +13,12 @@ class SvnCopyDialog : public SvnCopyDialogBase { Q_OBJECT public: - SvnCopyDialog( const QString &reqPath, SvnGlobal::SvnInfoHolder *holder, QWidget *parent ); + SvnCopyDialog( const TQString &reqPath, SvnGlobal::SvnInfoHolder *holder, TQWidget *parent ); ~SvnCopyDialog(); KURL sourceUrl(); int revision(); - QString revKind(); + TQString revKind(); KURL destUrl(); public slots: diff --git a/vcs/subversion/svn_fileselectdlg_commit.cpp b/vcs/subversion/svn_fileselectdlg_commit.cpp index 6217db56..0c014a9d 100644 --- a/vcs/subversion/svn_fileselectdlg_commit.cpp +++ b/vcs/subversion/svn_fileselectdlg_commit.cpp @@ -23,10 +23,10 @@ #include "subversion_fileinfo.h" #include "subversion_part.h" #include <kurl.h> -#include <qstring.h> -#include <qlistview.h> -#include <qfileinfo.h> -#include <qcheckbox.h> +#include <tqstring.h> +#include <tqlistview.h> +#include <tqfileinfo.h> +#include <tqcheckbox.h> #include <kdebug.h> #include <kmessagebox.h> #include "kdevmainwindow.h" @@ -34,7 +34,7 @@ #include <kdevproject.h> -SVNFileSelectDlgCommit::SVNFileSelectDlgCommit( KURL::List &urls, subversionPart *part, QWidget* parent) +SVNFileSelectDlgCommit::SVNFileSelectDlgCommit( KURL::List &urls, subversionPart *part, TQWidget* parent) :SvnCommitDlgBase( parent, "svnfileselectcommitdlg", true ) ,m_part(part) { @@ -43,7 +43,7 @@ SVNFileSelectDlgCommit::SVNFileSelectDlgCommit( KURL::List &urls, subversionPart listView()->setColumnText(0, i18n("select") ); //col 0 listView()->addColumn( i18n("status") ); //col 1 listView()->addColumn( i18n("URL to commit") ); //col 2 - listView()->setColumnWidthMode( 2, QListView::Maximum ); + listView()->setColumnWidthMode( 2, TQListView::Maximum ); listView()->setSorting( 2, true ); recursiveChk->setChecked(false); keepLocksChk->setChecked(false); @@ -53,14 +53,14 @@ SVNFileSelectDlgCommit::SVNFileSelectDlgCommit( KURL::List &urls, subversionPart VCSFileInfo vcsInfo; KURL::List tobeCommittedUrls; - for( QValueListConstIterator<KURL> it = urls.begin(); it != urls.end(); ++it ){ + for( TQValueListConstIterator<KURL> it = urls.begin(); it != urls.end(); ++it ){ KURL oneUrl(*it); - QFileInfo fileInfo(oneUrl.path()); + TQFileInfo fileInfo(oneUrl.path()); //fileInfo.convertToAbs(); if (fileInfo.isFile()){ KURL base_url( part->project()->projectDirectory()+"/" ); - QString dirPath = KURL::relativeURL( base_url, fileInfo.dirPath(TRUE) ); + TQString dirPath = KURL::relativeURL( base_url, fileInfo.dirPath(TRUE) ); vcsMap = ((SVNFileInfoProvider*)part->fileInfoProvider()) -> statusExt(dirPath, false/*repository access*/, true/*recurse*/, false/*getall*/, true/*noIgnore*/); vcsInfo = (*vcsMap)[fileInfo.fileName()]; @@ -78,14 +78,14 @@ SVNFileSelectDlgCommit::SVNFileSelectDlgCommit( KURL::List &urls, subversionPart } else if (fileInfo.isDir()){ KURL base_url( part->project()->projectDirectory()+"/" ); - QString dirPath = KURL::relativeURL( base_url, fileInfo.absFilePath() ); + TQString dirPath = KURL::relativeURL( base_url, fileInfo.absFilePath() ); vcsMap = ((SVNFileInfoProvider*)part->fileInfoProvider()) -> statusExt(dirPath, false/*repository access*/, true/*recurse*/, false/*getall*/, true/*noIgnore*/); for (VCSFileInfoMap::ConstIterator it=vcsMap->begin(); it!=vcsMap->end(); ++it){ vcsInfo = it.data(); -// QString absPathStr( fileInfo.absFilePath() + "/" + it.key() ); - QString absPathStr( fileInfo.filePath() + "/" + it.key() ); +// TQString absPathStr( fileInfo.absFilePath() + "/" + it.key() ); + TQString absPathStr( fileInfo.filePath() + "/" + it.key() ); KURL urlFromStatus( absPathStr ); if( vcsInfo.state == VCSFileInfo::Added || vcsInfo.state == VCSFileInfo::Modified || vcsInfo.state == VCSFileInfo::Deleted || vcsInfo.state == VCSFileInfo::Replaced){ @@ -116,28 +116,28 @@ int SVNFileSelectDlgCommit::exec() { if (listView()->childCount() <= 0){ //TODO if klauncher fails, this spot is also reached. We should show correct error message to user - KMessageBox::information( (QWidget*)m_part->project()->mainWindow()->main(), i18n("No added/modified/deleted file(s) to commit") ); - return QDialog::Rejected; + KMessageBox::information( (TQWidget*)m_part->project()->mainWindow()->main(), i18n("No added/modified/deleted file(s) to commit") ); + return TQDialog::Rejected; } else{ return SvnCommitDlgBase::exec(); } } -void SVNFileSelectDlgCommit::insertItem( QString status, KURL url ) +void SVNFileSelectDlgCommit::insertItem( TQString status, KURL url ) { - QCheckListItem *item = new QCheckListItem( listView(), "", QCheckListItem::CheckBox ); + TQCheckListItem *item = new TQCheckListItem( listView(), "", TQCheckListItem::CheckBox ); item->setText( 1, status ); item->setText( 2, url.path() ); item->setOn(true); } KURL::List SVNFileSelectDlgCommit::checkedUrls() { - QPtrList<QListViewItem> lst; - QListViewItemIterator it( listView() ); + TQPtrList<TQListViewItem> lst; + TQListViewItemIterator it( listView() ); KURL::List tobeCommittedUrls; for ( ; it.current() ; ++it ) { - if ( ((QCheckListItem*)(it.current()))->isOn() ){ + if ( ((TQCheckListItem*)(it.current()))->isOn() ){ KURL tmpurl( it.current()->text(2) ); tobeCommittedUrls.push_back( tmpurl ); } @@ -145,7 +145,7 @@ KURL::List SVNFileSelectDlgCommit::checkedUrls() return tobeCommittedUrls; } -QListView* SVNFileSelectDlgCommit::listView() +TQListView* SVNFileSelectDlgCommit::listView() { return listView1; } diff --git a/vcs/subversion/svn_fileselectdlg_commit.h b/vcs/subversion/svn_fileselectdlg_commit.h index 1ce53e48..5789d15d 100644 --- a/vcs/subversion/svn_fileselectdlg_commit.h +++ b/vcs/subversion/svn_fileselectdlg_commit.h @@ -22,7 +22,7 @@ #define _svnfileselectdlgcommit_ #include "svn_commitdlgbase.h" -#include <qdialog.h> +#include <tqdialog.h> #include <kurl.h> class QString; @@ -35,9 +35,9 @@ class SVNFileSelectDlgCommit : public SvnCommitDlgBase{ Q_OBJECT public: - SVNFileSelectDlgCommit( KURL::List&, subversionPart* part, QWidget* parent = 0 ); + SVNFileSelectDlgCommit( KURL::List&, subversionPart* part, TQWidget* parent = 0 ); ~SVNFileSelectDlgCommit(); - void insertItem( QString status, KURL url ); + void insertItem( TQString status, KURL url ); KURL::List checkedUrls(); bool recursive(); bool keepLocks(); @@ -45,7 +45,7 @@ public: public slots: int exec(); protected: - QListView* listView(); + TQListView* listView(); subversionPart *m_part; }; diff --git a/vcs/subversion/svn_kio.cpp b/vcs/subversion/svn_kio.cpp index 16eccd14..3a39d33c 100644 --- a/vcs/subversion/svn_kio.cpp +++ b/vcs/subversion/svn_kio.cpp @@ -17,10 +17,10 @@ Boston, MA 02110-1301, USA. */ -#include <qcstring.h> -#include <qsocket.h> -#include <qdatetime.h> -#include <qbitarray.h> +#include <tqcstring.h> +#include <tqsocket.h> +#include <tqdatetime.h> +#include <tqbitarray.h> #include <stdlib.h> #include <math.h> @@ -39,7 +39,7 @@ #include <kurl.h> #include <ksock.h> #include <dcopclient.h> -#include <qcstring.h> +#include <tqcstring.h> #include <subversion-1/svn_sorts.h> #include <subversion-1/svn_path.h> @@ -49,7 +49,7 @@ #include <subversion-1/svn_cmdline.h> #include <kmimetype.h> -#include <qfile.h> +#include <tqfile.h> #include "svn_kio.h" #include <apr_portable.h> @@ -115,7 +115,7 @@ compare_items_as_paths (const svn_sort__item_t*a, const svn_sort__item_t*b) { return svn_path_compare_paths ((const char *)a->key, (const char *)b->key); } -kio_svnProtocol::kio_svnProtocol(const QCString &pool_socket, const QCString &app_socket) +kio_svnProtocol::kio_svnProtocol(const TQCString &pool_socket, const TQCString &app_socket) : SlaveBase("kio_svn", pool_socket, app_socket) { kdDebug(9036) << "kio_svnProtocol::kio_svnProtocol()" << endl; @@ -245,7 +245,7 @@ void kio_svnProtocol::recordCurrentURL(const KURL& url) { void kio_svnProtocol::get(const KURL& url ){ kdDebug(9036) << "kio_svn::get(const KURL& url)" << endl ; - QString remoteServer = url.host(); + TQString remoteServer = url.host(); infoMessage(i18n("Looking for %1...").arg( remoteServer ) ); apr_pool_t *subpool = svn_pool_create (pool); @@ -254,7 +254,7 @@ void kio_svnProtocol::get(const KURL& url ){ bt->string_stream = svn_stream_create(bt,subpool); svn_stream_set_write(bt->string_stream,write_to_string); - QString target = makeSvnURL( url ); + TQString target = makeSvnURL( url ); kdDebug(9036) << "SvnURL: " << target << endl; recordCurrentURL( KURL( target ) ); @@ -263,7 +263,7 @@ void kio_svnProtocol::get(const KURL& url ){ svn_opt_revision_t endrev; int idx = target.findRev( "?rev=" ); if ( idx != -1 ) { - QString revstr = target.mid( idx+5 ); + TQString revstr = target.mid( idx+5 ); #if 0 kdDebug(9036) << "revision string found " << revstr << endl; if ( revstr == "HEAD" ) { @@ -292,7 +292,7 @@ void kio_svnProtocol::get(const KURL& url ){ } // Send the mimeType as soon as it is known - QByteArray *cp = new QByteArray(); + TQByteArray *cp = new TQByteArray(); cp->setRawData( bt->target_string->data, bt->target_string->len ); KMimeType::Ptr mt = KMimeType::findByContent(*cp); kdDebug(9036) << "KMimeType returned : " << mt->name() << endl; @@ -303,7 +303,7 @@ void kio_svnProtocol::get(const KURL& url ){ //send data data(*cp); - data(QByteArray()); // empty array means we're done sending the data + data(TQByteArray()); // empty array means we're done sending the data finished(); svn_pool_destroy (subpool); } @@ -316,7 +316,7 @@ void kio_svnProtocol::stat(const KURL & url){ svn_node_kind_t kind; apr_pool_t *subpool = svn_pool_create (pool); - QString target = makeSvnURL( url); + TQString target = makeSvnURL( url); kdDebug(9036) << "SvnURL: " << target << endl; recordCurrentURL( KURL( target ) ); @@ -325,7 +325,7 @@ void kio_svnProtocol::stat(const KURL & url){ svn_opt_revision_t endrev; int idx = target.findRev( "?rev=" ); if ( idx != -1 ) { - QString revstr = target.mid( idx+5 ); + TQString revstr = target.mid( idx+5 ); #if 0 kdDebug(9036) << "revision string found " << revstr << endl; if ( revstr == "HEAD" ) { @@ -421,7 +421,7 @@ void kio_svnProtocol::listDir(const KURL& url){ apr_pool_t *subpool = svn_pool_create (pool); apr_hash_t *dirents; - QString target = makeSvnURL( url); + TQString target = makeSvnURL( url); kdDebug(9036) << "SvnURL: " << target << endl; recordCurrentURL( KURL( target ) ); @@ -430,7 +430,7 @@ void kio_svnProtocol::listDir(const KURL& url){ svn_opt_revision_t endrev; int idx = target.findRev( "?rev=" ); if ( idx != -1 ) { - QString revstr = target.mid( idx+5 ); + TQString revstr = target.mid( idx+5 ); svn_opt_parse_revision( &rev, &endrev, revstr.utf8(), subpool ); #if 0 kdDebug(9036) << "revision string found " << revstr << endl; @@ -490,7 +490,7 @@ void kio_svnProtocol::listDir(const KURL& url){ if (dirent->last_author) svn_utf_cstring_from_utf8 (&native_author, dirent->last_author, subpool); - if ( createUDSEntry(QString( native_entryname ), QString( native_author ), dirent->size, + if ( createUDSEntry(TQString( native_entryname ), TQString( native_author ), dirent->size, dirent->kind==svn_node_dir ? true : false, 0, entry) ) listEntry( entry, false ); } @@ -500,7 +500,7 @@ void kio_svnProtocol::listDir(const KURL& url){ svn_pool_destroy (subpool); } -bool kio_svnProtocol::createUDSEntry( const QString& filename, const QString& user, long long int size, bool isdir, time_t mtime, UDSEntry& entry) { +bool kio_svnProtocol::createUDSEntry( const TQString& filename, const TQString& user, long long int size, bool isdir, time_t mtime, UDSEntry& entry) { kdDebug(9036) << "MTime : " << ( long )mtime << endl; kdDebug(9036) << "UDS filename : " << filename << endl; UDSAtom atom; @@ -538,8 +538,8 @@ bool kio_svnProtocol::createUDSEntry( const QString& filename, const QString& us // KURL ndest = dest; // nsrc.setProtocol( chooseProtocol( src.protocol() ) ); // ndest.setProtocol( chooseProtocol( dest.protocol() ) ); -// QString srcsvn = nsrc.url(); -// QString destsvn = ndest.url(); +// TQString srcsvn = nsrc.url(); +// TQString destsvn = ndest.url(); // // recordCurrentURL( nsrc ); // @@ -547,7 +547,7 @@ bool kio_svnProtocol::createUDSEntry( const QString& filename, const QString& us // svn_opt_revision_t rev; // int idx = srcsvn.findRev( "?rev=" ); // if ( idx != -1 ) { -// QString revstr = srcsvn.mid( idx+5 ); +// TQString revstr = srcsvn.mid( idx+5 ); // kdDebug(9036) << "revision string found " << revstr << endl; // if ( revstr == "HEAD" ) { // rev.kind = svn_opt_revision_head; @@ -587,7 +587,7 @@ void kio_svnProtocol::mkdir( const KURL::List& list, int /*permissions*/ ) { KURL::List::const_iterator it = list.begin(), end = list.end(); for ( ; it != end; ++it ) { - QString cur = makeSvnURL( *it ); + TQString cur = makeSvnURL( *it ); kdDebug( 9036 ) << "kio_svnProtocol::mkdir raw url for subversion : " << cur << endl; const char *_target = apr_pstrdup( subpool, svn_path_canonicalize( apr_pstrdup( subpool, cur.utf8() ), subpool ) ); (*(( const char ** )apr_array_push(( apr_array_header_t* )targets)) ) = _target; @@ -596,7 +596,7 @@ void kio_svnProtocol::mkdir( const KURL::List& list, int /*permissions*/ ) { initNotifier(false, false, false, subpool); svn_error_t *err = svn_client_mkdir(&commit_info,targets,ctx,subpool); if ( err ) { - error( KIO::ERR_COULD_NOT_MKDIR, QString::fromLocal8Bit(err->message) ); + error( KIO::ERR_COULD_NOT_MKDIR, TQString::fromLocal8Bit(err->message) ); svn_pool_destroy (subpool); return; } @@ -611,7 +611,7 @@ void kio_svnProtocol::mkdir( const KURL& url, int /*permissions*/ ) { apr_pool_t *subpool = svn_pool_create (pool); svn_client_commit_info_t *commit_info = NULL; - QString target = makeSvnURL( url); + TQString target = makeSvnURL( url); kdDebug(9036) << "SvnURL: " << target << endl; recordCurrentURL( KURL( target ) ); @@ -636,7 +636,7 @@ void kio_svnProtocol::del( const KURL& url, bool /*isfile*/ ) { apr_pool_t *subpool = svn_pool_create (pool); svn_client_commit_info_t *commit_info = NULL; - QString target = makeSvnURL(url); + TQString target = makeSvnURL(url); kdDebug(9036) << "SvnURL: " << target << endl; recordCurrentURL( KURL( target ) ); @@ -665,8 +665,8 @@ void kio_svnProtocol::rename(const KURL& src, const KURL& dest, bool /*overwrite KURL ndest = dest; nsrc.setProtocol( chooseProtocol( src.protocol() ) ); ndest.setProtocol( chooseProtocol( dest.protocol() ) ); - QString srcsvn = nsrc.url(); - QString destsvn = ndest.url(); + TQString srcsvn = nsrc.url(); + TQString destsvn = ndest.url(); recordCurrentURL( nsrc ); @@ -674,7 +674,7 @@ void kio_svnProtocol::rename(const KURL& src, const KURL& dest, bool /*overwrite svn_opt_revision_t rev; int idx = srcsvn.findRev( "?rev=" ); if ( idx != -1 ) { - QString revstr = srcsvn.mid( idx+5 ); + TQString revstr = srcsvn.mid( idx+5 ); kdDebug(9036) << "revision string found " << revstr << endl; if ( revstr == "HEAD" ) { rev.kind = svn_opt_revision_head; @@ -703,10 +703,10 @@ void kio_svnProtocol::rename(const KURL& src, const KURL& dest, bool /*overwrite svn_pool_destroy (subpool); } -void kio_svnProtocol::special( const QByteArray& data ) { +void kio_svnProtocol::special( const TQByteArray& data ) { // kdDebug(9036) << "kio_svnProtocol::special" << endl; - QDataStream stream(data, IO_ReadOnly); + TQDataStream stream(data, IO_ReadOnly); int tmp; stream >> tmp; @@ -717,7 +717,7 @@ void kio_svnProtocol::special( const QByteArray& data ) { { KURL repository, wc; int revnumber; - QString revkind; + TQString revkind; stream >> repository; stream >> wc; stream >> revnumber; @@ -730,7 +730,7 @@ void kio_svnProtocol::special( const QByteArray& data ) { { KURL::List list; int revnumber; - QString revkind; + TQString revkind; stream >> list; stream >> revnumber; stream >> revkind; @@ -769,7 +769,7 @@ void kio_svnProtocol::special( const QByteArray& data ) { { kdDebug(9036) << "kio_svnProtocol LOG" << endl; int revstart, revend; - QString revkindstart, revkindend; + TQString revkindstart, revkindend; bool discorverChangedPath, strictNodeHistory; KURL::List targets; @@ -835,7 +835,7 @@ void kio_svnProtocol::special( const QByteArray& data ) { case SVN_STATUS_2: { KURL wc; - QString revkind; + TQString revkind; int revnumber; bool checkRepos, fullRecurse, getAll, noIgnore; stream >> checkRepos; @@ -871,7 +871,7 @@ void kio_svnProtocol::special( const QByteArray& data ) { KURL wc,url; bool recurse; int revnumber; - QString revkind; + TQString revkind; stream >> wc; stream >> url; stream >> recurse; @@ -897,7 +897,7 @@ void kio_svnProtocol::special( const QByteArray& data ) { KURL url1,url2; int rev1, rev2; bool recurse, pegdiff; - QString revkind1, revkind2; + TQString revkind1, revkind2; stream >> url1; stream >> url2; stream >> rev1; @@ -914,7 +914,7 @@ void kio_svnProtocol::special( const QByteArray& data ) { KURL url; int urlMode; int pegRev, startRev, endRev; - QString pegRevKind, startRevKind, endRevKind; + TQString pegRevKind, startRevKind, endRevKind; stream >> url; stream >> urlMode; // stream >> pegRev; @@ -931,7 +931,7 @@ void kio_svnProtocol::special( const QByteArray& data ) { { KURL pathOrUrl; int pegRev, rev; - QString pegRevKind, revKind; + TQString pegRevKind, revKind; bool recurse = false; stream >> pathOrUrl; stream >> pegRev; @@ -946,7 +946,7 @@ void kio_svnProtocol::special( const QByteArray& data ) { { KURL src, dest; int srcRev; - QString srcRevKind; + TQString srcRevKind; stream >> src; stream >> srcRev; stream >> srcRevKind; @@ -958,7 +958,7 @@ void kio_svnProtocol::special( const QByteArray& data ) { { KURL src1, src2, wc_target; int rev1, rev2; - QString revKind1, revKind2; + TQString revKind1, revKind2; bool recurse, ignore_ancestry, force, dry_run; stream >> src1 >> rev1 >> revKind1; stream >> src2 >> rev2 >> revKind2; @@ -978,16 +978,16 @@ void kio_svnProtocol::special( const QByteArray& data ) { /** * not used anywhere, anymore */ -void kio_svnProtocol::popupMessage( const QString& message ) { -// QByteArray params; -// QDataStream stream(params, IO_WriteOnly); +void kio_svnProtocol::popupMessage( const TQString& message ) { +// TQByteArray params; +// TQDataStream stream(params, IO_WriteOnly); // stream << message; // -// if ( !dcopClient()->send( "kded","ksvnd","popupMessage(QString)", params ) ) +// if ( !dcopClient()->send( "kded","ksvnd","popupMessage(TQString)", params ) ) // kdWarning() << "Communication with KDED:KSvnd failed" << endl; } -void kio_svnProtocol::blame( KURL url, UrlMode /*mode*/,/* int pegRev, QString pegRevKind,*/ int startRev, QString startRevKind, int endRev, QString endRevKind ) +void kio_svnProtocol::blame( KURL url, UrlMode /*mode*/,/* int pegRev, TQString pegRevKind,*/ int startRev, TQString startRevKind, int endRev, TQString endRevKind ) { kdDebug(9036) << " __TIME__ " << __TIME__ << endl; // kdDebug(9036) << " PegRev " << pegRev << pegRevKind << endl; @@ -1005,7 +1005,7 @@ void kio_svnProtocol::blame( KURL url, UrlMode /*mode*/,/* int pegRev, QString p svn_client_blame_receiver_t receiver = kio_svnProtocol::blameReceiver; svn_error_t *err = svn_client_blame( path_or_url, &rev1, &rev2, receiver, (void*)this, ctx, subpool ); if ( err ) - error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit(err->message) ); + error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) ); finished(); svn_pool_destroy (subpool); @@ -1014,11 +1014,11 @@ void kio_svnProtocol::blame( KURL url, UrlMode /*mode*/,/* int pegRev, QString p svn_error_t* kio_svnProtocol::blameReceiver( void *baton, apr_int64_t line_no, svn_revnum_t rev, const char *author, const char *date, const char *line, apr_pool_t *pool ) { kio_svnProtocol *p = (kio_svnProtocol*)baton; - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "LINE", QString::number(line_no) ); - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "REV", QString::number(rev) ); - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "AUTHOR", author ); - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "DATE", date ); - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "CONTENT", QString::fromLocal8Bit(line) ); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "LINE", TQString::number(line_no) ); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "REV", TQString::number(rev) ); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "AUTHOR", author ); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "DATE", date ); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "CONTENT", TQString::fromLocal8Bit(line) ); p->incCounter(); return SVN_NO_ERROR; @@ -1029,7 +1029,7 @@ svn_error_t* kio_svnProtocol::blameReceiver( void *baton, apr_int64_t line_no, s Thus retreiving URL from WC should be done here, using subversion native API. Thus, svn_log should get another flag (bool repositHistory )specifying between file:/// or URL */ -void kio_svnProtocol::svn_log( int revstart, const QString& revkindstart, int revend, const QString& revkindend, +void kio_svnProtocol::svn_log( int revstart, const TQString& revkindstart, int revend, const TQString& revkindend, bool discorverChangedPaths, bool strictNodeHistory, const KURL::List& urls ) { @@ -1045,21 +1045,21 @@ void kio_svnProtocol::svn_log( int revstart, const QString& revkindstart, int re m_counter = 0; apr_array_header_t *targets = apr_array_make(subpool, 1+urls.count(), sizeof(const char *)); - for ( QValueListConstIterator<KURL> it = urls.begin(); it != urls.end() ; ++it ) { + for ( TQValueListConstIterator<KURL> it = urls.begin(); it != urls.end() ; ++it ) { KURL nurl = *it; const char *path = apr_pstrdup( subpool, svn_path_canonicalize( nurl.pathOrURL().utf8(), subpool ) ); kdDebug(9036) << path << endl; *(( const char ** )apr_array_push(( apr_array_header_t* )targets)) = path; - setMetaData(QString::number( counter() ).rightJustify( 10,'0' )+ "requrl", nurl.pathOrURL() ); + setMetaData(TQString::number( counter() ).rightJustify( 10,'0' )+ "requrl", nurl.pathOrURL() ); incCounter(); } svn_log_message_receiver_t receiver = kio_svnProtocol::receiveLogMessage; svn_error_t *err = svn_client_log2(targets, &rev1, &rev2, 0, discorverChangedPaths, strictNodeHistory, receiver, this, ctx, subpool); if ( err ){ - error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit(err->message) ); + error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) ); svn_pool_destroy (subpool); return; } @@ -1073,12 +1073,12 @@ svn_error_t* kio_svnProtocol::receiveLogMessage(void *baton, apr_hash_t *changed const char *author, const char *date, const char *message, apr_pool_t *pool ) { kio_svnProtocol *p = (kio_svnProtocol*)baton; - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "rev", QString::number(revision) ); - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "author", author ); - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "date", date ); - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "logmsg", QString::fromLocal8Bit(message) ); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "rev", TQString::number(revision) ); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "author", author ); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "date", date ); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "logmsg", TQString::fromLocal8Bit(message) ); if( changed_paths != NULL ){ - QString pathlist; + TQString pathlist; void *onePath; const char *pathkey; apr_hash_index_t *hi; @@ -1093,13 +1093,13 @@ svn_error_t* kio_svnProtocol::receiveLogMessage(void *baton, apr_hash_t *changed pathlist += "\n"; } kdDebug(9036) << "pathlist: " << pathlist <<endl; - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "pathlist", pathlist ); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "pathlist", pathlist ); } p->incCounter(); return SVN_NO_ERROR; } -svn_opt_revision_t kio_svnProtocol::createRevision( int revision, const QString& revkind, apr_pool_t *pool ) { +svn_opt_revision_t kio_svnProtocol::createRevision( int revision, const TQString& revkind, apr_pool_t *pool ) { svn_opt_revision_t result;//,endrev; // TODO support svn_opt_revision_date if ( revision != -1 ) { @@ -1127,7 +1127,7 @@ svn_opt_revision_t kio_svnProtocol::createRevision( int revision, const QString& return result; } -void kio_svnProtocol::svn_diff(const KURL & url1, const KURL& url2,int rev1, int rev2,const QString& revkind1,const QString& revkind2,bool recurse, bool pegdiff ) +void kio_svnProtocol::svn_diff(const KURL & url1, const KURL& url2,int rev1, int rev2,const TQString& revkind1,const TQString& revkind2,bool recurse, bool pegdiff ) { kdDebug(9036) << "kio_svn::diff : " << url1.path() << " at revision " << rev1 << " or " << revkind1 << " with " << url2.path() << " at revision " << rev2 << " or " << revkind2 @@ -1141,8 +1141,8 @@ void kio_svnProtocol::svn_diff(const KURL & url1, const KURL& url2,int rev1, int // nurl1.setProtocol( chooseProtocol( url1.protocol() ) ); //svn+https -> https for eg // nurl2.setProtocol( chooseProtocol( url2.protocol() ) ); // recordCurrentURL( nurl1 ); -// QString source = makeSvnURL( nurl1 ); -// QString target = makeSvnURL( nurl2 ); +// TQString source = makeSvnURL( nurl1 ); +// TQString target = makeSvnURL( nurl2 ); // const char *path1 = svn_path_canonicalize( apr_pstrdup( subpool, source.utf8() ), subpool ); // const char *path2 = svn_path_canonicalize( apr_pstrdup( subpool, target.utf8() ), subpool ); @@ -1183,25 +1183,25 @@ void kio_svnProtocol::svn_diff(const KURL & url1, const KURL& url2,int rev1, int } if ( err ){ - error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit(err->message) ); + error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) ); svn_pool_destroy (subpool); return; } //read the content of the outfile now - QStringList tmp; + TQStringList tmp; apr_file_close(outfile); - QFile file(templ); + TQFile file(templ); if ( file.open( IO_ReadOnly ) ) { - QTextStream stream( &file ); - QString line; + TQTextStream stream( &file ); + TQString line; while ( !stream.atEnd() ) { line = stream.readLine(); tmp << line; } file.close(); } - for ( QStringList::Iterator itt = tmp.begin(); itt != tmp.end(); itt++ ) { - setMetaData(QString::number( m_counter ).rightJustify( 10,'0' )+ "diffresult", ( *itt ) ); + for ( TQStringList::Iterator itt = tmp.begin(); itt != tmp.end(); itt++ ) { + setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "diffresult", ( *itt ) ); m_counter++; } //delete temp file @@ -1211,7 +1211,7 @@ void kio_svnProtocol::svn_diff(const KURL & url1, const KURL& url2,int rev1, int svn_pool_destroy (subpool); } -void kio_svnProtocol::svn_switch( const KURL& wc, const KURL& repos, int revnumber, const QString& revkind, bool recurse) { +void kio_svnProtocol::svn_switch( const KURL& wc, const KURL& repos, int revnumber, const TQString& revkind, bool recurse) { kdDebug(9036) << "kio_svn::switch : " << wc.path() << " at revision " << revnumber << " or " << revkind << endl ; apr_pool_t *subpool = svn_pool_create (pool); @@ -1221,8 +1221,8 @@ void kio_svnProtocol::svn_switch( const KURL& wc, const KURL& repos, int revnumb nurl.setProtocol( chooseProtocol( repos.protocol() ) ); dest.setProtocol( "file" ); // recordCurrentURL( nurl ); -// QString source = dest.path(); -// QString target = makeSvnURL( repos ); +// TQString source = dest.path(); +// TQString target = makeSvnURL( repos ); const char *path = svn_path_canonicalize( apr_pstrdup( subpool, dest.path().utf8() ), subpool ); const char *url = svn_path_canonicalize( apr_pstrdup( subpool, nurl.url().utf8() ), subpool ); @@ -1233,7 +1233,7 @@ void kio_svnProtocol::svn_switch( const KURL& wc, const KURL& repos, int revnumb initNotifier(false, false, false, subpool); svn_error_t *err = svn_client_switch (NULL/*result revision*/, path, url, &rev, recurse, ctx, subpool); if ( err ){ - error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit( err->message ) ); + error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit( err->message ) ); svn_pool_destroy (subpool); return; } @@ -1255,18 +1255,18 @@ void kio_svnProtocol::svn_switch_relocate( const KURL &wc, const KURL &origUrl, svn_error_t *err = svn_client_relocate( wcPath, fromUrl, toUrl, recurse, ctx, pool ); if ( err ){ - error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit( err->message ) ); + error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit( err->message ) ); svn_pool_destroy (subpool); return; } m_counter = 0L; - setMetaData(QString::number( counter() ).rightJustify( 10,'0' )+ "string", - QString("switched to %1").arg( toUrl ) ); + setMetaData(TQString::number( counter() ).rightJustify( 10,'0' )+ "string", + TQString("switched to %1").arg( toUrl ) ); finished(); svn_pool_destroy( subpool ); } -void kio_svnProtocol::update( const KURL::List &list, int revnumber, const QString& revkind ) { +void kio_svnProtocol::update( const KURL::List &list, int revnumber, const TQString& revkind ) { kdDebug(9036) << "kio_svn::update : __TIME__" << __TIME__ << endl; apr_pool_t *subpool = svn_pool_create (pool); @@ -1274,7 +1274,7 @@ void kio_svnProtocol::update( const KURL::List &list, int revnumber, const QStri apr_array_header_t *targets = apr_array_make(subpool, 1+list.count(), sizeof(const char *)); svn_opt_revision_t rev = createRevision( revnumber, revkind, subpool ); - for( QValueList<KURL>::ConstIterator it = list.begin(); it != list.end(); ++it ){ + for( TQValueList<KURL>::ConstIterator it = list.begin(); it != list.end(); ++it ){ KURL nurl = *it; *( const char ** )apr_array_push(targets) = svn_path_canonicalize( nurl.path().utf8(), subpool ); } @@ -1284,7 +1284,7 @@ void kio_svnProtocol::update( const KURL::List &list, int revnumber, const QStri true/*recurse*/, false/*ignore_external*/, ctx, subpool); if ( err ){ - error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit(err->message) ); + error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) ); svn_pool_destroy (subpool); return; } @@ -1310,7 +1310,7 @@ void kio_svnProtocol::import( const KURL& repos, const KURL& wc ) { svn_error_t *err = svn_client_import2(&commit_info, path, url, nonrecursive, false, ctx, subpool); if ( err ){ - error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit(err->message) ); + error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) ); svn_pool_destroy (subpool); return; } @@ -1319,7 +1319,7 @@ void kio_svnProtocol::import( const KURL& repos, const KURL& wc ) { finished(); } -void kio_svnProtocol::checkout( const KURL& repos, const KURL& wc, int revnumber, const QString& revkind ) { +void kio_svnProtocol::checkout( const KURL& repos, const KURL& wc, int revnumber, const TQString& revkind ) { kdDebug(9036) << "kio_svn::checkout : " << repos.url() << " into " << wc.path() << " at revision " << revnumber << " or " << revkind << endl ; apr_pool_t *subpool = svn_pool_create (pool); @@ -1327,9 +1327,9 @@ void kio_svnProtocol::checkout( const KURL& repos, const KURL& wc, int revnumber KURL dest = wc; nurl.setProtocol( chooseProtocol( repos.protocol() ) ); dest.setProtocol( "file" ); - QString target = makeSvnURL( repos ); + TQString target = makeSvnURL( repos ); recordCurrentURL( nurl ); - QString dpath = dest.path(); + TQString dpath = dest.path(); //find the requested revision svn_opt_revision_t rev = createRevision( revnumber, revkind, subpool ); @@ -1358,7 +1358,7 @@ void kio_svnProtocol::commit2(bool recurse, bool keeplocks, const KURL::List& wc apr_array_header_t *targets = apr_array_make(subpool, 1+wc.count(), sizeof(const char *)); - for ( QValueListConstIterator<KURL> it = wc.begin(); it != wc.end() ; ++it ) { + for ( TQValueListConstIterator<KURL> it = wc.begin(); it != wc.end() ; ++it ) { KURL nurl = *it; nurl.setProtocol( "file" ); recordCurrentURL( nurl ); @@ -1372,27 +1372,27 @@ void kio_svnProtocol::commit2(bool recurse, bool keeplocks, const KURL::List& wc if ( err ){ char errbuf[512]; svn_strerror(err->apr_err, errbuf, 512); - error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit(err->message) + "\n: " + QString::fromLocal8Bit(errbuf) ); + error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) + "\n: " + TQString::fromLocal8Bit(errbuf) ); svn_pool_destroy (subpool); return; } if ( commit_info ) { - for ( QValueListConstIterator<KURL> it = wc.begin(); it != wc.end() ; ++it ) { + for ( TQValueListConstIterator<KURL> it = wc.begin(); it != wc.end() ; ++it ) { KURL nurl = *it; nurl.setProtocol( "file" ); - QString userstring = i18n ( "Nothing to commit." ); + TQString userstring = i18n ( "Nothing to commit." ); if ( SVN_IS_VALID_REVNUM( commit_info->revision ) ) userstring = i18n( "Committed revision %1." ).arg(commit_info->revision); - setMetaData(QString::number( m_counter ).rightJustify( 10,'0' )+ "path", nurl.path() ); - setMetaData(QString::number( m_counter ).rightJustify( 10,'0' )+ "action", "0" ); - setMetaData(QString::number( m_counter ).rightJustify( 10,'0' )+ "kind", "0" ); - setMetaData(QString::number( m_counter ).rightJustify( 10,'0' )+ "mime_t", "" ); - setMetaData(QString::number( m_counter ).rightJustify( 10,'0' )+ "content", "0" ); - setMetaData(QString::number( m_counter ).rightJustify( 10,'0' )+ "prop", "0" ); - setMetaData(QString::number( m_counter ).rightJustify( 10,'0' )+ "rev" , QString::number( commit_info->revision ) ); - setMetaData(QString::number( m_counter ).rightJustify( 10,'0' )+ "string", userstring ); + setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "path", nurl.path() ); + setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "action", "0" ); + setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "kind", "0" ); + setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "mime_t", "" ); + setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "content", "0" ); + setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "prop", "0" ); + setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "rev" , TQString::number( commit_info->revision ) ); + setMetaData(TQString::number( m_counter ).rightJustify( 10,'0' )+ "string", userstring ); m_counter++; } } @@ -1409,7 +1409,7 @@ void kio_svnProtocol::add(const KURL::List& list) { initNotifier(false, false, false, subpool); svn_error_t *err = NULL; - for( QValueList<KURL>::ConstIterator it = list.begin(); it != list.end(); ++it ){ + for( TQValueList<KURL>::ConstIterator it = list.begin(); it != list.end(); ++it ){ KURL nurl = (*it); nurl.setProtocol( "file" ); @@ -1420,7 +1420,7 @@ void kio_svnProtocol::add(const KURL::List& list) { if( err ) break; } if ( err ){ - error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit(err->message) ); + error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) ); svn_pool_destroy (subpool); return; } @@ -1438,7 +1438,7 @@ void kio_svnProtocol::wc_delete(const KURL::List& wc) { apr_array_header_t *targets = apr_array_make(subpool, 1+wc.count(), sizeof(const char *)); - for ( QValueListConstIterator<KURL> it = wc.begin(); it != wc.end() ; ++it ) { + for ( TQValueListConstIterator<KURL> it = wc.begin(); it != wc.end() ; ++it ) { KURL nurl = *it; nurl.setProtocol( "file" ); recordCurrentURL( nurl ); @@ -1449,7 +1449,7 @@ void kio_svnProtocol::wc_delete(const KURL::List& wc) { svn_error_t *err = svn_client_delete(&commit_info,targets,force,ctx,subpool); if ( err ) - error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit(err->message) ); + error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) ); finished(); svn_pool_destroy (subpool); @@ -1463,7 +1463,7 @@ void kio_svnProtocol::wc_revert(const KURL::List& wc) { apr_array_header_t *targets = apr_array_make(subpool, 1 + wc.count(), sizeof(const char *)); - for ( QValueListConstIterator<KURL> it = wc.begin(); it != wc.end() ; ++it ) { + for ( TQValueListConstIterator<KURL> it = wc.begin(); it != wc.end() ; ++it ) { KURL nurl = *it; nurl.setProtocol( "file" ); recordCurrentURL( nurl ); @@ -1473,7 +1473,7 @@ void kio_svnProtocol::wc_revert(const KURL::List& wc) { initNotifier(false, false, false, subpool); svn_error_t *err = svn_client_revert(targets,nonrecursive,ctx,subpool); if ( err ){ - error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit( err->message ) ); + error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit( err->message ) ); svn_pool_destroy (subpool); return; } @@ -1482,13 +1482,13 @@ void kio_svnProtocol::wc_revert(const KURL::List& wc) { svn_pool_destroy (subpool); } -void kio_svnProtocol::wc_status(const KURL& wc, bool checkRepos, bool fullRecurse, bool getAll, int revnumber, const QString& revkind) { +void kio_svnProtocol::wc_status(const KURL& wc, bool checkRepos, bool fullRecurse, bool getAll, int revnumber, const TQString& revkind) { kdDebug(9036) << "kio_svnProtocol::wc_status() : " << wc.url() << " checkRepos " << checkRepos << " fullRecurse " << fullRecurse << " getAll " << getAll << endl; wc_status2( wc, checkRepos, fullRecurse, getAll, false, revnumber, revkind ); } -void kio_svnProtocol::wc_status2(const KURL& wc, bool checkRepos, bool fullRecurse, bool getAll, bool noIgnore, int revnumber, const QString& revkind) { +void kio_svnProtocol::wc_status2(const KURL& wc, bool checkRepos, bool fullRecurse, bool getAll, bool noIgnore, int revnumber, const TQString& revkind) { kdDebug(9036) << "kio_svnProtocol::wc_status2() : " << wc.url() << " checkRepos " << checkRepos << " fullRecurse " << fullRecurse << " getAll " << getAll << " noIgnore " << noIgnore << " revnumber " << revnumber << " revkind " << revkind << endl; kdDebug(9036) << " __TIME__ " << __TIME__ << endl; @@ -1506,7 +1506,7 @@ void kio_svnProtocol::wc_status2(const KURL& wc, bool checkRepos, bool fullRecur svn_error_t *err = svn_client_status(&result_rev, svn_path_canonicalize( nurl.path().utf8(), subpool ), &rev, kio_svnProtocol::status, this, fullRecurse, getAll, checkRepos, noIgnore, ctx, subpool); if ( err ){ - error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit(err->message) ); + error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) ); svn_pool_destroy (subpool); return; } @@ -1515,7 +1515,7 @@ void kio_svnProtocol::wc_status2(const KURL& wc, bool checkRepos, bool fullRecur svn_pool_destroy (subpool); } -void kio_svnProtocol::svn_info( KURL pathOrUrl, int pegRev, QString pegRevKind, int rev, QString revKind, bool recurse ) +void kio_svnProtocol::svn_info( KURL pathOrUrl, int pegRev, TQString pegRevKind, int rev, TQString revKind, bool recurse ) { kdDebug(9036) << " kio_svnProtocol::svn_info(): pegRev " << pegRev << " pegKind " << pegRevKind << " rev " << rev << " revKind " << revKind << " recurse " << recurse << endl; @@ -1531,7 +1531,7 @@ void kio_svnProtocol::svn_info( KURL pathOrUrl, int pegRev, QString pegRevKind, ctx, pool ); if ( err ){ - error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit(err->message) ); + error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(err->message) ); svn_pool_destroy (subpool); return; } @@ -1546,18 +1546,18 @@ svn_error_t* kio_svnProtocol::infoReceiver( void *baton, const char *path, if( !p ) return SVN_NO_ERROR; - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "PATH", QString::fromUtf8( path )); - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "URL", QString( info->URL ) ); - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "REV", QString::number( info->rev )); - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "KIND", QString::number( info->kind )); - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "REPOS_ROOT_URL", QString( info->repos_root_URL ) ); - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "REPOS_UUID", QString(info->repos_UUID) ); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "PATH", TQString::fromUtf8( path )); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "URL", TQString( info->URL ) ); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "REV", TQString::number( info->rev )); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "KIND", TQString::number( info->kind )); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "REPOS_ROOT_URL", TQString( info->repos_root_URL ) ); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "REPOS_UUID", TQString(info->repos_UUID) ); p->incCounter(); return SVN_NO_ERROR; } -void kio_svnProtocol::svn_copy( const KURL &srcUrl, int srcRev, const QString &srcRevKind, +void kio_svnProtocol::svn_copy( const KURL &srcUrl, int srcRev, const TQString &srcRevKind, const KURL &destUrl ) { kdDebug(9036) << " kio: svn_copy src: " << srcUrl << " Dest Url: " << destUrl << " revnum: " << srcRev << " revKind: " << srcRevKind << endl; @@ -1577,16 +1577,16 @@ void kio_svnProtocol::svn_copy( const KURL &srcUrl, int srcRev, const QString &s apr_status_t errcode = err->apr_err; char buf[512]; svn_strerror(errcode, buf, 512); - error( KIO::ERR_SLAVE_DEFINED, QString::fromLocal8Bit(buf) ); + error( KIO::ERR_SLAVE_DEFINED, TQString::fromLocal8Bit(buf) ); svn_pool_destroy (subpool); return; } if( commit_info ){ - setMetaData(QString::number( counter() ).rightJustify( 10,'0' )+ "string", + setMetaData(TQString::number( counter() ).rightJustify( 10,'0' )+ "string", i18n("Copied Revision %1").arg( commit_info->revision) ); } else { - setMetaData(QString::number( counter() ).rightJustify( 10,'0' )+ "string", + setMetaData(TQString::number( counter() ).rightJustify( 10,'0' )+ "string", i18n("Copied") ); } @@ -1594,8 +1594,8 @@ void kio_svnProtocol::svn_copy( const KURL &srcUrl, int srcRev, const QString &s svn_pool_destroy (subpool); } -void kio_svnProtocol::svn_merge(const KURL &src1, int revNum1, QString revKind1, - const KURL &src2, int revNum2, QString revKind2, +void kio_svnProtocol::svn_merge(const KURL &src1, int revNum1, TQString revKind1, + const KURL &src2, int revNum2, TQString revKind2, const KURL &target_wc, bool recurse, bool ignore_ancestry, bool force, bool dry_run ) { @@ -1616,7 +1616,7 @@ void kio_svnProtocol::svn_merge(const KURL &src1, int revNum1, QString revKind1, char buf[512]; svn_strerror(errcode, buf, 512); error( KIO::ERR_SLAVE_DEFINED, - QString::fromLocal8Bit(err->message) + "\n "+ QString::fromLocal8Bit(buf) ); + TQString::fromLocal8Bit(err->message) + "\n "+ TQString::fromLocal8Bit(buf) ); svn_pool_destroy (subpool); return; } @@ -1627,11 +1627,11 @@ void kio_svnProtocol::svn_merge(const KURL &src1, int revNum1, QString revKind1, //change the proto and remove trailing / //remove double / also -QString kio_svnProtocol::makeSvnURL ( const KURL& url ) const { - QString kproto = url.protocol(); +TQString kio_svnProtocol::makeSvnURL ( const KURL& url ) const { + TQString kproto = url.protocol(); KURL tpURL = url; tpURL.cleanPath( true ); - QString svnUrl; + TQString svnUrl; if ( kproto == "kdevsvn+http" ) { kdDebug(9036) << "http:/ " << url.url() << endl; tpURL.setProtocol("http"); @@ -1668,12 +1668,12 @@ QString kio_svnProtocol::makeSvnURL ( const KURL& url ) const { return tpURL.url(-1); } -QString kio_svnProtocol::chooseProtocol ( const QString& kproto ) const { - if ( kproto == "svn+http" ) return QString( "http" ); - else if ( kproto == "svn+https" ) return QString( "https" ); - else if ( kproto == "svn+ssh" ) return QString( "svn+ssh" ); - else if ( kproto == "svn" ) return QString( "svn" ); - else if ( kproto == "svn+file" ) return QString( "file" ); +TQString kio_svnProtocol::chooseProtocol ( const TQString& kproto ) const { + if ( kproto == "svn+http" ) return TQString( "http" ); + else if ( kproto == "svn+https" ) return TQString( "https" ); + else if ( kproto == "svn+ssh" ) return TQString( "svn+ssh" ); + else if ( kproto == "svn" ) return TQString( "svn" ); + else if ( kproto == "svn+file" ) return TQString( "file" ); return kproto; } /** Certificate is not yet valid. */ @@ -1691,18 +1691,18 @@ svn_error_t *kio_svnProtocol::trustSSLPrompt(svn_auth_cred_ssl_server_trust_t ** { kio_svnProtocol *p = (kio_svnProtocol*)baton; // prepare params. - QByteArray params, replyData; - QCString replyType; - QDataStream arg(params, IO_WriteOnly); + TQByteArray params, replyData; + TQCString replyType; + TQDataStream arg(params, IO_WriteOnly); arg << i18n( "The certificate from the server could not be trusted automatically. Do you want to trust this certificate? " ); - arg << QString::fromLocal8Bit(ci->hostname); - arg << QString::fromLocal8Bit(ci->fingerprint); - arg << QString::fromLocal8Bit(ci->valid_from) << QString::fromLocal8Bit(ci->valid_until); - arg << QString::fromLocal8Bit(ci->issuer_dname) << QString::fromLocal8Bit(ci->ascii_cert) ; + arg << TQString::fromLocal8Bit(ci->hostname); + arg << TQString::fromLocal8Bit(ci->fingerprint); + arg << TQString::fromLocal8Bit(ci->valid_from) << TQString::fromLocal8Bit(ci->valid_until); + arg << TQString::fromLocal8Bit(ci->issuer_dname) << TQString::fromLocal8Bit(ci->ascii_cert) ; // call dcop int ret = p->dcopClient()->call( "kded", "kdevsvnd", - "sslServerTrustPrompt(QString, QString, QString, QString, QString, QString, QString)", + "sslServerTrustPrompt(TQString, TQString, TQString, TQString, TQString, TQString, TQString)", params, replyType, replyData ); if (!ret){ kdWarning() << " failed to prompt SSL_Server_Trust_Prompt " << endl; @@ -1713,7 +1713,7 @@ svn_error_t *kio_svnProtocol::trustSSLPrompt(svn_auth_cred_ssl_server_trust_t ** return SVN_NO_ERROR; } int resultCode; - QDataStream replyStream( replyData, IO_ReadOnly ); + TQDataStream replyStream( replyData, IO_ReadOnly ); replyStream >> resultCode; if( resultCode == -1 ){ @@ -1742,21 +1742,21 @@ svn_error_t *kio_svnProtocol::clientCertSSLPrompt( { kdDebug(9036) << " clientCertSSLPrompt " << endl; // kio_svnProtocol *p = (kio_svnProtocol*)baton; -// QByteArray reply; -// QByteArray params; -// QCString replyType; +// TQByteArray reply; +// TQByteArray params; +// TQCString replyType; // call dcop // if (!p->dcopClient()->call("kded","kdevsvnd", "sslCertFile()",params,replyType,reply)) { // kdWarning()<<" Communication with dcop failed - fail to get certfile "<<endl; // return SVN_NO_ERROR; // } -// if (replyType != "QString") { +// if (replyType != "TQString") { // kdWarning()<<" unexpected reply type "<<endl; // return SVN_NO_ERROR; // } // save reply data -// QString fileName; -// QDataStream replyStream( reply, IO_ReadOnly ); +// TQString fileName; +// TQDataStream replyStream( reply, IO_ReadOnly ); // replyStream >> fileName; // allocate memory // *cred_p = (svn_auth_cred_ssl_client_cert_t*) apr_palloc (pool, sizeof(svn_auth_cred_ssl_client_cert_t)); @@ -1773,23 +1773,23 @@ svn_error_t *kio_svnProtocol::clientCertPasswdPrompt( kdDebug(9036) << " realm " << realm << " <--realm " << endl; // kio_svnProtocol *p = ( kio_svnProtocol* )baton; // // prepare dcop -// QByteArray reply; -// QByteArray params; -// QCString replyType; -// QDataStream arg( params, IO_WriteOnly ); -// arg << i18n( "Enter password for subversion repository access" ) + "\n" + QString(realm); +// TQByteArray reply; +// TQByteArray params; +// TQCString replyType; +// TQDataStream arg( params, IO_WriteOnly ); +// arg << i18n( "Enter password for subversion repository access" ) + "\n" + TQString(realm); // // call dcop -// if (!p->dcopClient()->call("kded","kdevsvnd", "sslPasswdDlg(QString)",params,replyType,reply)) { +// if (!p->dcopClient()->call("kded","kdevsvnd", "sslPasswdDlg(TQString)",params,replyType,reply)) { // kdWarning()<<" Communication with dcop failed - fail to show passwd dlg"<<endl; // return SVN_NO_ERROR; // } -// if (replyType != "QCString") { +// if (replyType != "TQCString") { // kdWarning()<<" unexpected reply type "<<endl; // return SVN_NO_ERROR; // } // // save reply data -// QCString retstr, passwd; -// QDataStream replyStream( reply, IO_ReadOnly ); +// TQCString retstr, passwd; +// TQDataStream replyStream( reply, IO_ReadOnly ); // replyStream >> retstr; // // if( retstr.left(1) == "-1" ){ @@ -1813,16 +1813,16 @@ svn_error_t *kio_svnProtocol::commitLogPrompt( const char **log_msg, const char apr_array_header_t *commit_items, void *baton, apr_pool_t *pool ) { *file = NULL; // if omitting this, it will segfault at import operation. - QCString replyType; - QByteArray params; - QByteArray reply; - QString result;// slist; - QStringList slist; + TQCString replyType; + TQByteArray params; + TQByteArray reply; + TQString result;// slist; + TQStringList slist; kio_svnProtocol *p = ( kio_svnProtocol* )baton; svn_stringbuf_t *message = NULL; for (int i = 0; i < commit_items->nelts; i++) { - QString list; + TQString list; svn_client_commit_item_t *item = ((svn_client_commit_item_t **) commit_items->elts)[i]; const char *path = item->path; char text_mod = '_', prop_mod = ' '; @@ -1856,25 +1856,25 @@ svn_error_t *kio_svnProtocol::commitLogPrompt( const char **log_msg, const char // slist += list; } - QDataStream stream(params, IO_WriteOnly); + TQDataStream stream(params, IO_WriteOnly); stream << slist.join("\n"); kdDebug(9036) << " __TIME__ " << __TIME__ << endl; - if ( !p->dcopClient()->call( "kded","kdevsvnd","commitDialog(QString)", params, replyType, reply ) ) { + if ( !p->dcopClient()->call( "kded","kdevsvnd","commitDialog(TQString)", params, replyType, reply ) ) { kdWarning() << "Communication with KDED:KDevSvnd failed" << endl; svn_error_t *err = svn_error_create( SVN_ERR_EXTERNAL_PROGRAM, NULL, apr_pstrdup( pool, "Fail to call kded_kdevsvnd via DCOP. If this is your first problem, try to restart KDE" ) ); return err; } - if ( replyType != "QString" ) { + 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." ) ); return err; } - QDataStream stream2 ( reply, IO_ReadOnly ); + TQDataStream stream2 ( reply, IO_ReadOnly ); stream2 >> result; if ( result.isNull() ) { //cancelled @@ -1893,7 +1893,7 @@ svn_error_t *kio_svnProtocol::commitLogPrompt( const char **log_msg, const char void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action_t action, svn_node_kind_t kind, const char *mime_type, svn_wc_notify_state_t content_state, svn_wc_notify_state_t prop_state, svn_revnum_t revision) { kdDebug(9036) << "NOTIFY : " << path << " updated at revision " << revision << " action : " << action << ", kind : " << kind << " , content_state : " << content_state << ", prop_state : " << prop_state << endl; - QString userstring; + TQString userstring; struct notify_baton *nb = ( struct notify_baton* ) baton; //// Convert notification to a user readable string @@ -1970,7 +1970,7 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action || content_state == svn_wc_notify_state_unknown) && (prop_state == svn_wc_notify_state_unchanged || prop_state == svn_wc_notify_state_unknown))) - userstring += QString( " " ) + path; + userstring += TQString( " " ) + path; } break; } @@ -2071,14 +2071,14 @@ void kio_svnProtocol::notify(void *baton, const char *path, svn_wc_notify_action kio_svnProtocol *p = ( kio_svnProtocol* )nb->master; if (!p) kdDebug(9036) << " Null Pointer at Line " << __LINE__ << endl; - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "path" , QString::fromUtf8( path )); - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "action", QString::number( action )); - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "kind", QString::number( kind )); - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "mime_t", QString::fromUtf8( mime_type )); - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "content", QString::number( content_state )); - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "prop", QString::number( prop_state )); - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "rev", QString::number( revision )); - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "string", userstring ); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "path" , TQString::fromUtf8( path )); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "action", TQString::number( action )); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "kind", TQString::number( kind )); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "mime_t", TQString::fromUtf8( mime_type )); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "content", TQString::number( content_state )); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "prop", TQString::number( prop_state )); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "rev", TQString::number( revision )); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "string", userstring ); kdDebug(9036) << " kio_svnProtocol::notify() userstring " << userstring << endl; p->incCounter(); } @@ -2090,19 +2090,19 @@ void kio_svnProtocol::status(void *baton, const char *path, svn_wc_status_t *sta << ", repos prop status : " << status->repos_prop_status << endl; - QByteArray params; + TQByteArray params; kio_svnProtocol *p = ( kio_svnProtocol* )baton; - QDataStream stream(params, IO_WriteOnly); + TQDataStream stream(params, IO_WriteOnly); long int rev = status->entry ? status->entry->revision : 0; - stream << QString::fromUtf8( path ) << status->text_status << status->prop_status << status->repos_text_status << status->repos_prop_status << rev; - - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "path", QString::fromUtf8( path )); - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "text", QString::number( status->text_status )); - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "prop", QString::number( status->prop_status )); - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "reptxt", QString::number( status->repos_text_status )); - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "repprop", QString::number( status->repos_prop_status )); - p->setMetaData(QString::number( p->counter() ).rightJustify( 10,'0' )+ "rev", QString::number( rev )); + stream << TQString::fromUtf8( path ) << status->text_status << status->prop_status << status->repos_text_status << status->repos_prop_status << rev; + + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "path", TQString::fromUtf8( path )); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "text", TQString::number( status->text_status )); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "prop", TQString::number( status->prop_status )); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "reptxt", TQString::number( status->repos_text_status )); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "repprop", TQString::number( status->repos_prop_status )); + p->setMetaData(TQString::number( p->counter() ).rightJustify( 10,'0' )+ "rev", TQString::number( rev )); p->incCounter(); } diff --git a/vcs/subversion/svn_kio.h b/vcs/subversion/svn_kio.h index 332a11a9..a66064d0 100644 --- a/vcs/subversion/svn_kio.h +++ b/vcs/subversion/svn_kio.h @@ -20,8 +20,8 @@ #ifndef _svn_H_ #define _svn_H_ -#include <qstring.h> -#include <qcstring.h> +#include <tqstring.h> +#include <tqcstring.h> #include <kurl.h> #include <kio/global.h> @@ -31,7 +31,7 @@ #include <subversion-1/svn_client.h> #include <subversion-1/svn_config.h> #include <sys/stat.h> -#include <qvaluelist.h> +#include <tqvaluelist.h> #include <subversion-1/svn_wc.h> #include "subversion_global.h" @@ -68,9 +68,9 @@ typedef struct notify_baton { class kio_svnProtocol : public KIO::SlaveBase { public: - kio_svnProtocol(const QCString &pool_socket, const QCString &app_socket); + kio_svnProtocol(const TQCString &pool_socket, const TQCString &app_socket); virtual ~kio_svnProtocol(); - virtual void special( const QByteArray& data ); + virtual void special( const TQByteArray& data ); virtual void get(const KURL& url); virtual void listDir(const KURL& url); virtual void stat(const KURL& url); @@ -79,31 +79,31 @@ class kio_svnProtocol : public KIO::SlaveBase virtual void del( const KURL& url, bool isfile ); // virtual void copy(const KURL & src, const KURL& dest, int permissions, bool overwrite); virtual void rename(const KURL& src, const KURL& dest, bool overwrite); - void checkout( const KURL& repos, const KURL& wc, int revnumber, const QString& revkind ); + void checkout( const KURL& repos, const KURL& wc, int revnumber, const TQString& revkind ); void import( const KURL& repos, const KURL& wc ); - void svn_switch( const KURL& wc, const KURL& url, int revnumber, const QString& revkind, bool recurse); + void svn_switch( const KURL& wc, const KURL& url, int revnumber, const TQString& revkind, bool recurse); void svn_switch_relocate( const KURL &wc, const KURL &origUrl, const KURL &newUrl, bool recurse ); - void svn_diff( const KURL& url1, const KURL& url2, int rev1, int rev2, const QString& revkind1, const QString& revkind2, bool recurse, bool pegdiff); + void svn_diff( const KURL& url1, const KURL& url2, int rev1, int rev2, const TQString& revkind1, const TQString& revkind2, bool recurse, bool pegdiff); //TODO fix with svn 1.2 : support a KURL::List -> svn_client_update2() - void update( const KURL::List &list, int revnumber, const QString& revkind ); + void update( const KURL::List &list, int revnumber, const TQString& revkind ); void commit( const KURL::List& wc ); void commit2( bool recurse, bool keeplocks, const KURL::List& wc ); - void blame( KURL url, SvnGlobal::UrlMode mode, /*int pegRev, QString pegRevKind,*/ int startRev, QString startRevKind, int endRev, QString endRevKind ); + void blame( KURL url, SvnGlobal::UrlMode mode, /*int pegRev, TQString pegRevKind,*/ int startRev, TQString startRevKind, int endRev, TQString endRevKind ); static svn_error_t* blameReceiver( void *baton, apr_int64_t line_no, svn_revnum_t rev, const char *author, const char *date, const char *line, apr_pool_t *pool ); - void svn_log( int revstart, const QString &revkindstart, int revend, const QString &revkindend, bool discorverChangedPath, bool strictNodeHistory, const KURL::List& targets ); + void svn_log( int revstart, const TQString &revkindstart, int revend, const TQString &revkindend, bool discorverChangedPath, bool strictNodeHistory, const KURL::List& targets ); static svn_error_t* receiveLogMessage(void *baton, apr_hash_t *changed_paths, svn_revnum_t revision, const char *author, const char *date, const char *message, apr_pool_t *pool ); void add( const KURL::List& wcList ); //these work using the working copy void wc_resolve( const KURL& wc, bool recurse = true ); void wc_delete( const KURL::List& wc ); void wc_revert( const KURL::List& wc ); - void wc_status(const KURL& wc, bool checkRepos=false, bool fullRecurse=true, bool getAll=true, int revnumber=-1, const QString& revkind="HEAD"); - void wc_status2(const KURL& wc, bool checkRepos=false, bool fullRecurse=true, bool getAll=true, bool noIgnore=false, int revnumber=-1, const QString& revkind="WORKING"); - void svn_info( KURL pathOrUrl, int pegRev, QString pegRevKind, int rev, QString revKind, bool recurse ); + void wc_status(const KURL& wc, bool checkRepos=false, bool fullRecurse=true, bool getAll=true, int revnumber=-1, const TQString& revkind="HEAD"); + void wc_status2(const KURL& wc, bool checkRepos=false, bool fullRecurse=true, bool getAll=true, bool noIgnore=false, int revnumber=-1, const TQString& revkind="WORKING"); + void svn_info( KURL pathOrUrl, int pegRev, TQString pegRevKind, int rev, TQString revKind, bool recurse ); static svn_error_t* infoReceiver( void *baton, const char *path, const svn_info_t *info, apr_pool_t *pool); - void svn_copy( const KURL &srcUrl, int srcRev, const QString &srcRevKind, const KURL &destUrl ); - void svn_merge( const KURL &src1, int rev1, QString revKind1, const KURL &src2, int rev2, QString revKind2, + void svn_copy( const KURL &srcUrl, int srcRev, const TQString &srcRevKind, const KURL &destUrl ); + void svn_merge( const KURL &src1, int rev1, TQString revKind1, const KURL &src2, int rev2, TQString revKind2, const KURL &target_wc, bool recurse, bool ignore_ancestry, bool force, bool dry_run ); @@ -116,23 +116,23 @@ class kio_svnProtocol : public KIO::SlaveBase static void status(void *baton, const char *path, svn_wc_status_t *status); static void progressCallback( apr_off_t progress, apr_off_t total, void *baton, apr_pool_t *pool); - QString chooseProtocol ( const QString& kproto ) const; - QString makeSvnURL ( const KURL& url ) const; + TQString chooseProtocol ( const TQString& kproto ) const; + TQString makeSvnURL ( const KURL& url ) const; void initNotifier(bool is_checkout, bool is_export, bool suppress_final_line, apr_pool_t *spool); void recordCurrentURL(const KURL& url); - void popupMessage( const QString& message ); + void popupMessage( const TQString& message ); int counter() { return m_counter; } void incCounter() { m_counter++; } - svn_opt_revision_t createRevision( int revision, const QString& revkind, apr_pool_t *pool ); + svn_opt_revision_t createRevision( int revision, const TQString& revkind, apr_pool_t *pool ); KURL myURL; svn_client_ctx_t *ctx; KIO::AuthInfo info; enum SVN_METHOD { - SVN_CHECKOUT=1, //KURL repository, KURL workingcopy, int revnumber=-1, QString revkind(HEAD, ...) //revnumber==-1 => use of revkind - SVN_UPDATE=2, // KURL wc (svn:///tmp/test, int revnumber=-1, QString revkind(HEAD, ...) // revnumber==-1 => use of revkind + SVN_CHECKOUT=1, //KURL repository, KURL workingcopy, int revnumber=-1, TQString revkind(HEAD, ...) //revnumber==-1 => use of revkind + SVN_UPDATE=2, // KURL wc (svn:///tmp/test, int revnumber=-1, TQString revkind(HEAD, ...) // revnumber==-1 => use of revkind SVN_COMMIT=3, SVN_LOG=4, SVN_IMPORT=5, @@ -155,7 +155,7 @@ class kio_svnProtocol : public KIO::SlaveBase }; private: - bool createUDSEntry( const QString& filename, const QString& user, long long int size, bool isdir, time_t mtime, KIO::UDSEntry& entry); + bool createUDSEntry( const TQString& filename, const TQString& user, long long int size, bool isdir, time_t mtime, KIO::UDSEntry& entry); apr_pool_t *pool; unsigned long int m_counter; }; diff --git a/vcs/subversion/svn_logviewwidget.cpp b/vcs/subversion/svn_logviewwidget.cpp index ec35200e..e098eab0 100644 --- a/vcs/subversion/svn_logviewwidget.cpp +++ b/vcs/subversion/svn_logviewwidget.cpp @@ -27,72 +27,72 @@ #include <kmessagebox.h> #include <kdebug.h> #include <klocale.h> -#include <qradiobutton.h> -#include <qcombobox.h> +#include <tqradiobutton.h> +#include <tqcombobox.h> #include <knuminput.h> -#include <qcheckbox.h> +#include <tqcheckbox.h> -#include <qsplitter.h> -#include <qheader.h> -#include <qlistview.h> -#include <qlayout.h> -#include <qstringlist.h> +#include <tqsplitter.h> +#include <tqheader.h> +#include <tqlistview.h> +#include <tqlayout.h> +#include <tqstringlist.h> -SvnLogViewWidget::SvnLogViewWidget(subversionPart *part, QWidget *parent) - :QWidget(parent), m_part(part) +SvnLogViewWidget::SvnLogViewWidget(subversionPart *part, TQWidget *parent) + :TQWidget(parent), m_part(part) { - m_layout = new QGridLayout( this, 1, 1, 11, 6, "SvnLogViewWidgetBaseLayout"); + m_layout = new TQGridLayout( this, 1, 1, 11, 6, "SvnLogViewWidgetBaseLayout"); - splitter1 = new QSplitter( this, "splitter1" ); - splitter1->setOrientation( QSplitter::Horizontal ); + splitter1 = new TQSplitter( this, "splitter1" ); + splitter1->setOrientation( TQSplitter::Horizontal ); splitter1->setMargin(1); - listView1 = new QListView( splitter1, "listView1" ); + listView1 = new TQListView( splitter1, "listView1" ); listView1->addColumn( i18n( "Rev" ) ); listView1->addColumn( i18n( "Date" ) ); listView1->addColumn( i18n( "Author" ) ); listView1->addColumn( i18n( "Comment" ) ); - listView1->resize( QSize(1, 1).expandedTo(minimumSizeHint()) ); - QFont listView1_font( listView1->font() ); + listView1->resize( TQSize(1, 1).expandedTo(minimumSizeHint()) ); + TQFont listView1_font( listView1->font() ); listView1_font.setPointSize( 9 ); listView1->setFont( listView1_font ); listView1->setAllColumnsShowFocus( TRUE ); listView1->setShowSortIndicator( TRUE ); textEdit1 = new KTextEdit( splitter1, "textEdit1" ); - textEdit1->resize( QSize(1, 1).expandedTo(minimumSizeHint()) ); - QFont textEdit1_font( textEdit1->font() ); + textEdit1->resize( TQSize(1, 1).expandedTo(minimumSizeHint()) ); + TQFont textEdit1_font( textEdit1->font() ); textEdit1_font.setPointSize( 9 ); textEdit1->setFont( textEdit1_font ); - textEdit1->setFocusPolicy( QTextEdit::WheelFocus ); + textEdit1->setFocusPolicy( TQTextEdit::WheelFocus ); textEdit1->setReadOnly( TRUE ); m_layout->addWidget( splitter1, 0, 0 ); m_layout->setMargin(1); - resize( QSize(692, 343).expandedTo(minimumSizeHint()) ); + resize( TQSize(692, 343).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); - connect( listView1, SIGNAL(clicked( QListViewItem *)), this, SLOT(slotClicked(QListViewItem*)) ); - connect( listView1, SIGNAL(contextMenuRequested( QListViewItem*, const QPoint&, int )), - this, SLOT(contextMenuRequested(QListViewItem*, const QPoint&, int)) ); + 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)) ); } SvnLogViewWidget::~SvnLogViewWidget() { } -void SvnLogViewWidget::setLogResult( QValueList<SvnLogHolder> *loglist ) +void SvnLogViewWidget::setLogResult( TQValueList<SvnLogHolder> *loglist ) { this->listView1->clear(); this->textEdit1->clear(); this->listView1->setSorting( 1, false ); - for( QValueList<SvnLogHolder>::Iterator it=loglist->begin(); it!=loglist->end(); ++it ){ + for( TQValueList<SvnLogHolder>::Iterator it=loglist->begin(); it!=loglist->end(); ++it ){ SvnLogHolder holder = *it; SvnLogViewItem *item = new SvnLogViewItem(this->listView1); - QString prettyDate = holder.date.left(16).replace(10, 1, ' '); + TQString prettyDate = holder.date.left(16).replace(10, 1, ' '); item->setText(0, holder.rev ); item->setText(1, prettyDate ); @@ -105,12 +105,12 @@ void SvnLogViewWidget::setLogResult( QValueList<SvnLogHolder> *loglist ) // this->listView1->show(); } -void SvnLogViewWidget::setRequestedUrl( QString reqUrl ) +void SvnLogViewWidget::setRequestedUrl( TQString reqUrl ) { m_reqUrl = reqUrl; } -void SvnLogViewWidget::slotClicked( QListViewItem *oneItem ) +void SvnLogViewWidget::slotClicked( TQListViewItem *oneItem ) { if( !oneItem ) return; SvnLogViewItem *item = dynamic_cast<SvnLogViewItem*>( oneItem ); @@ -120,16 +120,16 @@ void SvnLogViewWidget::slotClicked( QListViewItem *oneItem ) textEdit1->append( "\n\n" ); textEdit1->append( item->m_message + "\n" ); } -void SvnLogViewWidget::contextMenuRequested( QListViewItem *item, const QPoint & pos, int col ) +void SvnLogViewWidget::contextMenuRequested( TQListViewItem *item, const TQPoint & pos, int col ) { if( !item || col == -1 ) return; m_ctxLogItem = dynamic_cast<SvnLogViewItem*>(item); if( !m_ctxLogItem ) return; - QPopupMenu *menu = new QPopupMenu(this); - menu->insertItem( i18n("Blame this revision"), this, SLOT(blameThis()) ); - menu->insertItem( i18n("Difference to previous revision"), this, SLOT(diffToPrevious()) ); + 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->exec( pos ); } void SvnLogViewWidget::blameThis() @@ -139,12 +139,12 @@ void SvnLogViewWidget::blameThis() return; } // note that blame is done on single file. - QStringList modifies = QStringList::split( "\n", m_ctxLogItem->m_pathList, false ); - QString selectedPath; + TQStringList modifies = TQStringList::split( "\n", m_ctxLogItem->m_pathList, false ); + TQString selectedPath; if( modifies.count() > 1 ){ SvnBlameFileSelectDlg dlg(this); dlg.setCandidate( &modifies ); - if( dlg.exec() == QDialog::Accepted ){ + if( dlg.exec() == TQDialog::Accepted ){ selectedPath = dlg.selected(); } else{ return; @@ -156,14 +156,14 @@ void SvnLogViewWidget::blameThis() return; } - QString relPath = selectedPath.section( '/', 1 ); + TQString relPath = selectedPath.section( '/', 1 ); - QValueList< SvnGlobal::SvnInfoHolder > holderList = m_part->m_prjInfoMap.values(); + TQValueList< SvnGlobal::SvnInfoHolder > holderList = m_part->m_prjInfoMap.values(); SvnGlobal::SvnInfoHolder holder; if( holderList.count() > 0 ){ // get full Url holder = holderList.first(); - QString absPath = holder.reposRootUrl.url(-1) + '/' + relPath; + TQString absPath = holder.reposRootUrl.url(-1) + '/' + relPath; kdDebug(9036) << " Blame requested on path " << absPath << endl; // get revision int revEnd = m_ctxLogItem->text(0).toInt(); @@ -188,17 +188,17 @@ void SvnLogViewWidget::diffToPrevious() true/*recurse*/, true/*peg_diff*/ ); } -SvnLogViewOptionDlg::SvnLogViewOptionDlg( QWidget *parent, const char* name, bool modal, WFlags f ) +SvnLogViewOptionDlg::SvnLogViewOptionDlg( TQWidget *parent, const char* name, bool modal, WFlags f ) : SvnLogViewOptionDlgBase( parent, name, modal,f ) { // radio1->setChecked(true); //repository log radio4->setChecked(true); //start revistion by revision keyword radio5->setChecked(true); //end revision by revision number reinstallRevisionSpecifiers(); - connect( intInput1, SIGNAL(valueChanged(int)), this, SLOT(setStartRevnumRadio()) ); - connect( comboBox1, SIGNAL(activated(const QString&)), this, SLOT(setStartRevkindRadio()) ); - connect( intInput2, SIGNAL(valueChanged(int)), this, SLOT(setEndRevnumRadio()) ); - connect( comboBox2, SIGNAL(activated(const QString&)), this, SLOT(setEndRevkindRadio()) ); + 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()) ); } SvnLogViewOptionDlg::~SvnLogViewOptionDlg() {} @@ -207,7 +207,7 @@ void SvnLogViewOptionDlg::reinstallRevisionSpecifiers() comboBox1->clear(); comboBox2->clear(); - QStringList items; + TQStringList items; items << "HEAD" << "BASE" << "PREV" << "COMMITTED"; comboBox1->insertStringList( items ); comboBox2->insertStringList( items ); @@ -220,10 +220,10 @@ int SvnLogViewOptionDlg::revstart() return intInput1->value(); } } -QString SvnLogViewOptionDlg::revKindStart() +TQString SvnLogViewOptionDlg::revKindStart() { if( !radio4->isChecked() ){ - return QString(""); + return TQString(""); } else{ return comboBox1->currentText(); } @@ -236,10 +236,10 @@ int SvnLogViewOptionDlg::revend() return intInput2->value(); } } -QString SvnLogViewOptionDlg::revKindEnd() +TQString SvnLogViewOptionDlg::revKindEnd() { if( !radio6->isChecked() ){ - return QString(""); + return TQString(""); } else{ return comboBox2->currentText(); } diff --git a/vcs/subversion/svn_logviewwidget.h b/vcs/subversion/svn_logviewwidget.h index e1738195..7f9a6d4d 100644 --- a/vcs/subversion/svn_logviewwidget.h +++ b/vcs/subversion/svn_logviewwidget.h @@ -24,11 +24,11 @@ #include "subversion_widget.h" #include "svn_logviewoptiondlgbase.h" // #include "subversion_part.h" -#include <qvaluelist.h> -#include <qlistview.h> +#include <tqvaluelist.h> +#include <tqlistview.h> class subversionPart; // class QWidget; -#include <qwidget.h> +#include <tqwidget.h> class KTextEdit; class QSplitter; class QGridLayout; @@ -38,48 +38,48 @@ class SvnLogHolder{ public: SvnLogHolder(){}; ~SvnLogHolder(){}; - QString author; - QString date; - QString logMsg; - QString pathList; - QString rev; + TQString author; + TQString date; + TQString logMsg; + TQString pathList; + TQString rev; }; -class SvnLogViewWidget : public /*SvnLogViewWidgetBase*/ QWidget { +class SvnLogViewWidget : public /*SvnLogViewWidgetBase*/ TQWidget { Q_OBJECT public: - SvnLogViewWidget(subversionPart *part, QWidget *parent); + SvnLogViewWidget(subversionPart *part, TQWidget *parent); virtual ~SvnLogViewWidget(); - void setLogResult( QValueList<SvnLogHolder> *loglist ); - void setRequestedUrl( QString url ); + void setLogResult( TQValueList<SvnLogHolder> *loglist ); + void setRequestedUrl( TQString url ); protected slots: - void slotClicked( QListViewItem* item ); - void contextMenuRequested( QListViewItem *item, const QPoint & pos, int col ); + void slotClicked( TQListViewItem* item ); + void contextMenuRequested( TQListViewItem *item, const TQPoint & pos, int col ); void blameThis(); void diffToPrevious(); private: - QString m_reqUrl; + TQString m_reqUrl; subversionPart *m_part; SvnLogViewItem* m_ctxLogItem; - QSplitter* splitter1; - QListView* listView1; + TQSplitter* splitter1; + TQListView* listView1; KTextEdit* textEdit1; - QGridLayout* m_layout; + TQGridLayout* m_layout; }; class SvnLogViewOptionDlg : public SvnLogViewOptionDlgBase { Q_OBJECT public: - SvnLogViewOptionDlg(QWidget *parent=0, const char* name=0, bool modal=TRUE, WFlags f=0); + SvnLogViewOptionDlg(TQWidget *parent=0, const char* name=0, bool modal=TRUE, WFlags f=0); ~SvnLogViewOptionDlg(); int revstart(); - QString revKindStart(); + TQString revKindStart(); int revend(); - QString revKindEnd(); + TQString revKindEnd(); bool strictNode(); public slots: void reinstallRevisionSpecifiers(); diff --git a/vcs/subversion/svn_mergewidget.cpp b/vcs/subversion/svn_mergewidget.cpp index fe9a0064..50731690 100644 --- a/vcs/subversion/svn_mergewidget.cpp +++ b/vcs/subversion/svn_mergewidget.cpp @@ -21,22 +21,22 @@ #include "svn_mergewidget.h" #include "subversion_global.h" #include <kurlrequester.h> -#include <qradiobutton.h> +#include <tqradiobutton.h> #include <knuminput.h> -#include <qcheckbox.h> +#include <tqcheckbox.h> #include <kcombobox.h> using namespace SvnGlobal; -SvnMergeDialog::SvnMergeDialog( const KURL &wcTarget, QWidget *parent ) +SvnMergeDialog::SvnMergeDialog( const KURL &wcTarget, TQWidget *parent ) : SvnMergeOptionDialogBase( parent ) { dest->setURL( wcTarget.prettyURL() ); - connect( revnumbtn1, SIGNAL(toggled(bool)), revnum1, SLOT(setEnabled(bool)) ); - connect( revnumbtn1, SIGNAL(toggled(bool)), revkind1, SLOT(setDisabled(bool)) ); - connect( revnumbtn2, SIGNAL(toggled(bool)), revnum2, SLOT(setEnabled(bool)) ); - connect( revnumbtn2, SIGNAL(toggled(bool)), revkind2, SLOT(setDisabled(bool)) ); + 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)) ); revkind1->setDisabled(true); revnum2->setDisabled(true); } diff --git a/vcs/subversion/svn_mergewidget.h b/vcs/subversion/svn_mergewidget.h index db905626..abaaea88 100644 --- a/vcs/subversion/svn_mergewidget.h +++ b/vcs/subversion/svn_mergewidget.h @@ -33,7 +33,7 @@ class SvnMergeDialog : public SvnMergeOptionDialogBase { Q_OBJECT public: - SvnMergeDialog( const KURL &wcTarget, QWidget *parent = NULL ); + SvnMergeDialog( const KURL &wcTarget, TQWidget *parent = NULL ); virtual ~SvnMergeDialog(); KURL source1(); diff --git a/vcs/subversion/svn_switchwidget.cpp b/vcs/subversion/svn_switchwidget.cpp index ec1b603c..7149cce2 100644 --- a/vcs/subversion/svn_switchwidget.cpp +++ b/vcs/subversion/svn_switchwidget.cpp @@ -1,18 +1,18 @@ #include <kurl.h> #include <klineedit.h> -#include <qcheckbox.h> -#include <qradiobutton.h> +#include <tqcheckbox.h> +#include <tqradiobutton.h> #include "svn_switchwidget.h" #include "subversion_global.h" SvnSwitchDlg::SvnSwitchDlg( const SvnGlobal::SvnInfoHolder *holder, - const QString &wcPath, QWidget *parent ) + const TQString &wcPath, TQWidget *parent ) : SvnSwitchDlgBase( parent ) , m_info( holder ) { - connect( switchOnlyRadio, SIGNAL(clicked()), this, SLOT(resetCurrentRepositoryUrlEdit()) ); - connect( relocationRadio , SIGNAL(clicked()), this, SLOT(resetCurrentRepositoryUrlEdit()) ); + connect( switchOnlyRadio, TQT_SIGNAL(clicked()), this, TQT_SLOT(resetCurrentRepositoryUrlEdit()) ); + connect( relocationRadio , TQT_SIGNAL(clicked()), this, TQT_SLOT(resetCurrentRepositoryUrlEdit()) ); // set switch only switchOnlyRadio->setChecked( true ); wcUrlEdit->setText( wcPath ); @@ -22,11 +22,11 @@ SvnSwitchDlg::SvnSwitchDlg( const SvnGlobal::SvnInfoHolder *holder, SvnSwitchDlg::~SvnSwitchDlg() {} -const QString SvnSwitchDlg::currentUrl() +const TQString SvnSwitchDlg::currentUrl() { return currentUrlEdit->text(); } -const QString SvnSwitchDlg::destUrl() +const TQString SvnSwitchDlg::destUrl() { return destUrlEdit->text(); } diff --git a/vcs/subversion/svn_switchwidget.h b/vcs/subversion/svn_switchwidget.h index 643fb4b9..a38ca0ff 100644 --- a/vcs/subversion/svn_switchwidget.h +++ b/vcs/subversion/svn_switchwidget.h @@ -13,11 +13,11 @@ class SvnSwitchDlg : public SvnSwitchDlgBase Q_OBJECT public: SvnSwitchDlg( const SvnGlobal::SvnInfoHolder *holder, - const QString &wcPath, QWidget *parent = NULL ); + const TQString &wcPath, TQWidget *parent = NULL ); virtual ~SvnSwitchDlg(); - const QString currentUrl(); - const QString destUrl(); + const TQString currentUrl(); + const TQString destUrl(); bool recursive(); bool switchOnly(); bool relocation(); |