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/editorsdialog.cpp | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'vcs/cvsservice/editorsdialog.cpp') 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 #include -#include -#include +#include +#include #include "editorsdialog.h" @@ -24,7 +24,7 @@ #include #include -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; iappend( ""+i18n("File")+": "+file+"" ); m_textBrowser->append( ""+i18n("User")+": "+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( ""+i18n("File")+": "+file+"" ); m_textBrowser->append( ""+i18n("User")+": "+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; } -- cgit v1.2.3