From e46eba349e7029d919b213b7130086503d1e042e Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 23:22:07 -0600
Subject: Rename many classes and header files to avoid conflicts with KDE4

---
 kompare/libdiff2/komparemodellist.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'kompare/libdiff2/komparemodellist.cpp')

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;
-- 
cgit v1.2.1