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/cvsservice/integrator/cvsserviceintegrator.cpp | 8 +-- vcs/cvsservice/integrator/cvsserviceintegrator.h | 8 +-- vcs/cvsservice/integrator/integratordlg.cpp | 60 +++++++++++----------- vcs/cvsservice/integrator/integratordlg.h | 10 ++-- 4 files changed, 43 insertions(+), 43 deletions(-) (limited to 'vcs/cvsservice/integrator') 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 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 -#include +#include 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 -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -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(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 -- cgit v1.2.1