summaryrefslogtreecommitdiffstats
path: root/vcs/cvsservice/cvsprocesswidget.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-14 16:45:05 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-14 16:45:05 +0000
commit48d4a26399959121f33d2bc3bfe51c7827b654fc (patch)
tree5ae5e6e00d3ba330b7b8be9bc097154b6bc739e8 /vcs/cvsservice/cvsprocesswidget.cpp
parent7e701ace6592d09e1f2c0cf28c7d6d872d78f4f5 (diff)
downloadtdevelop-48d4a26399959121f33d2bc3bfe51c7827b654fc.tar.gz
tdevelop-48d4a26399959121f33d2bc3bfe51c7827b654fc.zip
TQt4 port kdevelop
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1236710 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'vcs/cvsservice/cvsprocesswidget.cpp')
-rw-r--r--vcs/cvsservice/cvsprocesswidget.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/vcs/cvsservice/cvsprocesswidget.cpp b/vcs/cvsservice/cvsprocesswidget.cpp
index d2e78da6..550b76b5 100644
--- a/vcs/cvsservice/cvsprocesswidget.cpp
+++ b/vcs/cvsservice/cvsprocesswidget.cpp
@@ -43,13 +43,13 @@ int g_dcopErrCounter = 0;
#endif
-CvsProcessWidget::CvsProcessWidget( CvsService_stub *service, CvsServicePart *part, TQWidget *parent, const char *name )
+CvsProcessWidget::CvsProcessWidget( CvsService_stub *service, CvsServicePart *part, TQWidget *tqparent, const char *name )
: DCOPObject( "CvsProcessWidgetDCOPIface" ),
- TQTextEdit( parent, name ),
+ TQTextEdit( tqparent, name ),
m_part( part ), m_service( service ), m_job( 0 )
{
setReadOnly( true );
- setTextFormat( Qt::LogText );
+ setTextFormat( TQt::LogText );
TQStyleSheetItem *style = 0;
style = new TQStyleSheetItem( styleSheet(), "goodtag" );
@@ -106,8 +106,8 @@ bool CvsProcessWidget::isAlreadyWorking() const
void CvsProcessWidget::clear()
{
TQTextEdit::clear();
- this->m_errors = TQString::null;
- this->m_output = TQString::null;
+ this->m_errors = TQString();
+ this->m_output = TQString();
}
///////////////////////////////////////////////////////////////////////////////
@@ -142,7 +142,7 @@ bool CvsProcessWidget::startJob( const DCOPRef &aJob )
// disconnect 3rd party slots from our signals
disconnect( TQT_SIGNAL(jobFinished(bool, int)) );
- showInfo( i18n("Started job: %1").arg( cmdLine ) );
+ showInfo( i18n("Started job: %1").tqarg( cmdLine ) );
#ifdef MYDCOPDEBUG
g_dcopExitCounter = 0;
@@ -187,7 +187,7 @@ void CvsProcessWidget::slotJobExited( bool normalExit, int exitStatus )
m_job = 0;
}
TQString exitMsg = i18n("Job finished with exitCode == %1");
- showInfo( exitMsg.arg( exitStatus) );
+ showInfo( exitMsg.tqarg( exitStatus) );
m_part->core()->running( m_part, false );
m_part->mainWindow()->statusBar()->message( i18n("Done CVS command ..."), 2000 );
@@ -264,9 +264,9 @@ void CvsProcessWidget::showOutput( const TQStringList &msg )
//This will prevent TQTextEdit from crashing on trying to parse the tags.
//This should fix BUG:99590
TQString lineNew(line);
- lineNew.replace("<", "&lt;");
- lineNew.replace(">", "&gt;");
- lineNew.replace("&", "&amp;");
+ lineNew.tqreplace("<", "&lt;");
+ lineNew.tqreplace(">", "&gt;");
+ lineNew.tqreplace("&", "&amp;");
if (line.startsWith( "C " ))
append( "<cvs_conflict>" + lineNew + "</cvs_conflict>" );