summaryrefslogtreecommitdiffstats
path: root/parts/diff/diffwidget.h
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/diffwidget.h
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/diffwidget.h')
-rw-r--r--parts/diff/diffwidget.h6
1 files changed, 3 insertions, 3 deletions
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;