summaryrefslogtreecommitdiffstats
path: root/parts/diff
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:38:54 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-25 00:38:54 -0600
commitda1522385e5367bae56b90fac55c4355e475905b (patch)
treebfa432864dbf322feb4ed3a878f1222ee8ea7727 /parts/diff
parentb9e542d0c805e9adee3a67e44532d5321032e21e (diff)
downloadtdevelop-da1522385e5367bae56b90fac55c4355e475905b.tar.gz
tdevelop-da1522385e5367bae56b90fac55c4355e475905b.zip
Rename KCModule, KConfig, KIO, KServer, and KSocket to avoid conflicts with KDE4
Diffstat (limited to 'parts/diff')
-rw-r--r--parts/diff/diffwidget.cpp14
-rw-r--r--parts/diff/diffwidget.h6
2 files changed, 10 insertions, 10 deletions
diff --git a/parts/diff/diffwidget.cpp b/parts/diff/diffwidget.cpp
index 88a716c8..681c09d1 100644
--- a/parts/diff/diffwidget.cpp
+++ b/parts/diff/diffwidget.cpp
@@ -44,7 +44,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 );
@@ -53,7 +53,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 );
@@ -256,7 +256,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 ) );
}
@@ -305,13 +305,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()) );
}
diff --git a/parts/diff/diffwidget.h b/parts/diff/diffwidget.h
index 2b159e3f..b948fae1 100644
--- a/parts/diff/diffwidget.h
+++ b/parts/diff/diffwidget.h
@@ -21,7 +21,7 @@
class KTempFile;
class DiffPart;
-namespace KIO {
+namespace TDEIO {
class Job;
}
@@ -80,7 +80,7 @@ private slots:
/** appends a piece of "diff" */
void slotAppend( const TQString& str );
/** overloaded for convenience */
- void slotAppend( KIO::Job*, const TQByteArray& ba );
+ void slotAppend( TDEIO::Job*, const TQByteArray& ba );
/** call this when the whole "diff" has been sent.
* Don't call slotAppend afterwards!
*/
@@ -100,7 +100,7 @@ private:
private:
DiffPart * m_part;
KDiffTextEdit* te;
- KIO::Job* job;
+ TDEIO::Job* job;
KParts::ReadOnlyPart* extPart;
KTempFile* tempFile;
TQString rawDiff;