From da1522385e5367bae56b90fac55c4355e475905b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Jan 2013 00:38:54 -0600 Subject: Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4 --- vcs/cvsservice/diffwidget.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'vcs/cvsservice/diffwidget.cpp') diff --git a/vcs/cvsservice/diffwidget.cpp b/vcs/cvsservice/diffwidget.cpp index 8d7e9641..d4a2dc55 100644 --- a/vcs/cvsservice/diffwidget.cpp +++ b/vcs/cvsservice/diffwidget.cpp @@ -41,7 +41,7 @@ TQStringList KDiffTextEdit::extPartsTranslated; KDiffTextEdit::KDiffTextEdit( TQWidget* parent, const char* name ): TQTextEdit( parent, name ) { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup( "Diff" ); _highlight = config->readBoolEntry( "Highlight", true ); @@ -50,7 +50,7 @@ KDiffTextEdit::KDiffTextEdit( TQWidget* parent, const char* name ): TQTextEdit( KDiffTextEdit::~KDiffTextEdit() { - KConfig* config = kapp->config(); + TDEConfig* config = kapp->config(); config->setGroup( "Diff" ); config->writeEntry( "Highlight", _highlight ); @@ -248,7 +248,7 @@ void DiffWidget::slotAppend( const TQString& str ) } // internally for the TextEdit only! -void DiffWidget::slotAppend( KIO::Job*, const TQByteArray& ba ) +void DiffWidget::slotAppend( TDEIO::Job*, const TQByteArray& ba ) { slotAppend( TQString( ba ) ); } @@ -297,13 +297,13 @@ void DiffWidget::openURL( const KURL& url ) if ( job ) job->kill(); - KIO::TransferJob* job = KIO::get( url ); + TDEIO::TransferJob* job = TDEIO::get( url ); if ( !job ) return; - connect( job, TQT_SIGNAL(data( KIO::Job *, const TQByteArray & )), - this, TQT_SLOT(slotAppend( KIO::Job*, const TQByteArray& )) ); - connect( job, TQT_SIGNAL(result( KIO::Job * )), + connect( job, TQT_SIGNAL(data( TDEIO::Job *, const TQByteArray & )), + this, TQT_SLOT(slotAppend( TDEIO::Job*, const TQByteArray& )) ); + connect( job, TQT_SIGNAL(result( TDEIO::Job * )), this, TQT_SLOT(slotFinished()) ); } -- cgit v1.2.3