Rename many classes and header files to avoid conflicts with KDE4

5 files changed, 6 insertions, 6 deletions

diff --git a/kompare/komparenavtreepart/komparenavtreepart.cpp b/kompare/komparenavtreepart/komparenavtreepart.cpp
index 31146762..6213ee2e 100644
--- a/kompare/komparenavtreepart/komparenavtreepart.cpp
+++ b/kompare/komparenavtreepart/komparenavtreepart.cpp
@@ -21,7 +21,7 @@
 #include <klocale.h>
 #include <kiconloader.h>
 #include <kmimetype.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kaboutdata.h>
 
 #include "difference.h"
diff --git a/kompare/komparepart/kompare_part.cpp b/kompare/komparepart/kompare_part.cpp
index e2e2956c..1dfac530 100644
--- a/kompare/komparepart/kompare_part.cpp
+++ b/kompare/komparepart/kompare_part.cpp
@@ -24,7 +24,7 @@
 #include <tqlayout.h>
 #include <tqwidget.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kapplication.h>
 #include <kdebug.h>
 #include <tdefiletreeview.h>
diff --git a/kompare/komparepart/komparelistview.h b/kompare/komparepart/komparelistview.h
index 6124d184..79d318cf 100644
--- a/kompare/komparepart/komparelistview.h
+++ b/kompare/komparepart/komparelistview.h
@@ -27,7 +27,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 
 namespace Diff2 {
 class DiffModel;
diff --git a/kompare/libdialogpages/viewpage.cpp b/kompare/libdialogpages/viewpage.cpp
index 9150b392..942760de 100644
--- a/kompare/libdialogpages/viewpage.cpp
+++ b/kompare/libdialogpages/viewpage.cpp
@@ -27,7 +27,7 @@
 #include <kapplication.h>
 #include <kcolorbutton.h>
 #include <kdialog.h>
-#include <kfontcombo.h>
+#include <tdefontcombo.h>
 #include <klocale.h>
 
 #include "viewpage.h"
diff --git a/kompare/libdiff2/komparemodellist.cpp b/kompare/libdiff2/komparemodellist.cpp
index 8e667800..8bb6cf83 100644
--- a/kompare/libdiff2/komparemodellist.cpp
+++ b/kompare/libdiff2/komparemodellist.cpp
@@ -25,7 +25,7 @@
 #include <tqtextcodec.h>
 #include <tqvaluelist.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kcharsets.h>
 #include <kdebug.h>
 #include <kdirwatch.h>
@@ -959,7 +959,7 @@ bool KompareModelList::blendFile( DiffModel* model, const TQString& fileContents
 	TQStringList::ConstIterator lEnd    = lines.end();
 
 	DiffHunkList* hunks = model->hunks();
-	kdDebug(8101) << "Hunks in hunklist: " << hunks->count() << endl;
+	kdDebug(8101) << "Hunks in huntdelist: " << hunks->count() << endl;
 	DiffHunkListIterator hunkIt = hunks->begin();
 
 	DiffHunk*   newHunk = 0;