From d6f8bbb45b267065a6907e71ff9c98bb6d161241 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:56:07 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1157658 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- vcs/clearcase/clearcasefileinfoprovider.cpp | 12 +- vcs/clearcase/clearcasefileinfoprovider.h | 8 +- vcs/clearcase/clearcasemanipulator.cpp | 16 +-- vcs/clearcase/clearcasemanipulator.h | 6 +- vcs/clearcase/clearcasepart.cpp | 140 +++++++++++------------ vcs/clearcase/clearcasepart.h | 30 ++--- vcs/clearcase/commentdlg.cpp | 28 ++--- vcs/clearcase/commentdlg.h | 12 +- vcs/clearcase/integrator/ccintegratordlg.cpp | 6 +- vcs/clearcase/integrator/ccintegratordlg.h | 6 +- vcs/clearcase/integrator/clearcaseintegrator.cpp | 8 +- vcs/clearcase/integrator/clearcaseintegrator.h | 8 +- 12 files changed, 140 insertions(+), 140 deletions(-) (limited to 'vcs/clearcase') 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 -#include +#include 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 -#include -#include +#include +#include #include #include @@ -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 -#include +#include #include @@ -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 -#include +#include +#include #include #include @@ -42,7 +42,7 @@ static const KDevPluginInfo data("kdevclearcase"); typedef KDevGenericFactory 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(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 -#include -#include +#include +#include +#include #include #include #include @@ -21,33 +21,33 @@ #include 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 -#include -#include +#include +#include +#include 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(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 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 -#include +#include 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); }; -- cgit v1.2.1