From 1623fe64102c18ab098b79656b80f28cef840756 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 10:00:25 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit b6ba5d642f3fc7d320e3d6f4650eb259a3a52b04. --- vcs/cvsservice/integrator/fetcherdlgbase.ui | 2 +- vcs/cvsservice/integrator/initdlg.ui | 2 +- vcs/cvsservice/integrator/integratordlg.cpp | 14 +++++++------- vcs/cvsservice/integrator/integratordlgbase.ui | 8 ++++---- 4 files changed, 13 insertions(+), 13 deletions(-) (limited to 'vcs/cvsservice/integrator') diff --git a/vcs/cvsservice/integrator/fetcherdlgbase.ui b/vcs/cvsservice/integrator/fetcherdlgbase.ui index 9028b325..398af4cf 100644 --- a/vcs/cvsservice/integrator/fetcherdlgbase.ui +++ b/vcs/cvsservice/integrator/fetcherdlgbase.ui @@ -134,7 +134,7 @@ Expanding - + 20 16 diff --git a/vcs/cvsservice/integrator/initdlg.ui b/vcs/cvsservice/integrator/initdlg.ui index 82e26c55..6e5b76f1 100644 --- a/vcs/cvsservice/integrator/initdlg.ui +++ b/vcs/cvsservice/integrator/initdlg.ui @@ -53,7 +53,7 @@ Expanding - + 20 16 diff --git a/vcs/cvsservice/integrator/integratordlg.cpp b/vcs/cvsservice/integrator/integratordlg.cpp index 5ae31ed1..961094fc 100644 --- a/vcs/cvsservice/integrator/integratordlg.cpp +++ b/vcs/cvsservice/integrator/integratordlg.cpp @@ -21,10 +21,10 @@ #include #include -#include +#include #include #include -#include +#include #include #include @@ -81,11 +81,11 @@ void IntegratorDlg::init_clicked() if (!proc->normalExit()) KMessageBox::error(this, i18n("cvs init did not exit normally. Please check if cvs is installed and works correctly."), i18n("Init CVS Repository")); else if (proc->exitStatus() != 0) - 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")); + KMessageBox::error(this, i18n("cvs init exited with status %1. Please check if the cvs location is correct.").tqarg(proc->exitStatus()), i18n("Init CVS Repository")); else { - repository->insertItem(TQString(":local:%1").arg(url)); - repository->setCurrentText(TQString(":local:%1").arg(url)); + repository->insertItem(TQString(":local:%1").tqarg(url)); + repository->setCurrentText(TQString(":local:%1").tqarg(url)); } } } @@ -122,13 +122,13 @@ void IntegratorDlg::accept() proc->setWorkingDirectory(m_projectLocation); *proc << "cvs"; *proc << "-d" << repository->currentText() << "import" - << "-m" << TQString("\"%1\"").arg(comment->text()) << module->text() + << "-m" << TQString("\"%1\"").tqarg(comment->text()) << module->text() << vendorTag->text() << releaseTag->text(); proc->start(KProcess::Block); if (!proc->normalExit()) KMessageBox::error(this, i18n("cvs import did not exit normally. Please check if cvs is installed and works correctly."), i18n("Init CVS Repository")); else if (proc->exitStatus() != 0) - KMessageBox::error(this, i18n("cvs import exited with status %1. Please check if the cvs location is correct.").arg(proc->exitStatus()), i18n("Init CVS Repository")); + KMessageBox::error(this, i18n("cvs import exited with status %1. Please check if the cvs location is correct.").tqarg(proc->exitStatus()), i18n("Init CVS Repository")); else { kdDebug() << "Project is in: " << m_projectLocation << endl; diff --git a/vcs/cvsservice/integrator/integratordlgbase.ui b/vcs/cvsservice/integrator/integratordlgbase.ui index 6b53c738..8e7cc979 100644 --- a/vcs/cvsservice/integrator/integratordlgbase.ui +++ b/vcs/cvsservice/integrator/integratordlgbase.ui @@ -29,7 +29,7 @@ - layout1 + tqlayout1 @@ -103,7 +103,7 @@ Expanding - + 40 20 @@ -120,7 +120,7 @@ Expanding - + 20 16 @@ -279,7 +279,7 @@ Fixed - + 16 20 -- cgit v1.2.1