From 508a49f9ef02a7b03411c8e9953ba79c99b91c0c Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:59:53 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 tdecachegrind/tdecachegrind/cachegrindloader.cpp  | 2 +-
 tdecachegrind/tdecachegrind/callgraphview.cpp     | 4 ++--
 tdecachegrind/tdecachegrind/callitem.cpp          | 2 +-
 tdecachegrind/tdecachegrind/callmapview.cpp       | 2 +-
 tdecachegrind/tdecachegrind/callview.cpp          | 2 +-
 tdecachegrind/tdecachegrind/configdlg.cpp         | 2 +-
 tdecachegrind/tdecachegrind/configuration.cpp     | 2 +-
 tdecachegrind/tdecachegrind/costlistitem.cpp      | 2 +-
 tdecachegrind/tdecachegrind/costtypeitem.cpp      | 2 +-
 tdecachegrind/tdecachegrind/costtypeview.cpp      | 2 +-
 tdecachegrind/tdecachegrind/coverageitem.cpp      | 2 +-
 tdecachegrind/tdecachegrind/coverageview.cpp      | 2 +-
 tdecachegrind/tdecachegrind/functionitem.cpp      | 2 +-
 tdecachegrind/tdecachegrind/functionselection.cpp | 2 +-
 tdecachegrind/tdecachegrind/instritem.cpp         | 2 +-
 tdecachegrind/tdecachegrind/instrview.cpp         | 2 +-
 tdecachegrind/tdecachegrind/main.cpp              | 2 +-
 tdecachegrind/tdecachegrind/partgraph.cpp         | 2 +-
 tdecachegrind/tdecachegrind/partlistitem.cpp      | 2 +-
 tdecachegrind/tdecachegrind/partselection.cpp     | 2 +-
 tdecachegrind/tdecachegrind/partview.cpp          | 2 +-
 tdecachegrind/tdecachegrind/sourceitem.cpp        | 2 +-
 tdecachegrind/tdecachegrind/sourceview.cpp        | 2 +-
 tdecachegrind/tdecachegrind/stackitem.cpp         | 2 +-
 tdecachegrind/tdecachegrind/tabview.cpp           | 2 +-
 tdecachegrind/tdecachegrind/toplevel.cpp          | 2 +-
 tdecachegrind/tdecachegrind/tracedata.cpp         | 2 +-
 tdecachegrind/tdecachegrind/traceitemview.cpp     | 2 +-
 tdecachegrind/tdecachegrind/treemap.cpp           | 2 +-
 29 files changed, 30 insertions(+), 30 deletions(-)

(limited to 'tdecachegrind')

diff --git a/tdecachegrind/tdecachegrind/cachegrindloader.cpp b/tdecachegrind/tdecachegrind/cachegrindloader.cpp
index 4fe57d34..9434ee36 100644
--- a/tdecachegrind/tdecachegrind/cachegrindloader.cpp
+++ b/tdecachegrind/tdecachegrind/cachegrindloader.cpp
@@ -21,7 +21,7 @@
 #include <tqfile.h>
 #include <tqcstring.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "loader.h"
diff --git a/tdecachegrind/tdecachegrind/callgraphview.cpp b/tdecachegrind/tdecachegrind/callgraphview.cpp
index 32ee92b5..9f1df421 100644
--- a/tdecachegrind/tdecachegrind/callgraphview.cpp
+++ b/tdecachegrind/tdecachegrind/callgraphview.cpp
@@ -36,9 +36,9 @@
 #include <tqprocess.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
 #include <tdefiledialog.h>
diff --git a/tdecachegrind/tdecachegrind/callitem.cpp b/tdecachegrind/tdecachegrind/callitem.cpp
index 6d984ca6..77bbc885 100644
--- a/tdecachegrind/tdecachegrind/callitem.cpp
+++ b/tdecachegrind/tdecachegrind/callitem.cpp
@@ -21,7 +21,7 @@
  */
 
 #include <tqpixmap.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
 
diff --git a/tdecachegrind/tdecachegrind/callmapview.cpp b/tdecachegrind/tdecachegrind/callmapview.cpp
index 8f3d9bff..550eb8a4 100644
--- a/tdecachegrind/tdecachegrind/callmapview.cpp
+++ b/tdecachegrind/tdecachegrind/callmapview.cpp
@@ -23,7 +23,7 @@
 #include <tqwhatsthis.h>
 #include <tqpopupmenu.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
diff --git a/tdecachegrind/tdecachegrind/callview.cpp b/tdecachegrind/tdecachegrind/callview.cpp
index 317d137b..f4be7ae7 100644
--- a/tdecachegrind/tdecachegrind/callview.cpp
+++ b/tdecachegrind/tdecachegrind/callview.cpp
@@ -22,7 +22,7 @@
 
 #include <tqwhatsthis.h>
 #include <tqpopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "configuration.h"
 #include "callitem.h"
diff --git a/tdecachegrind/tdecachegrind/configdlg.cpp b/tdecachegrind/tdecachegrind/configdlg.cpp
index 0523d976..47a3c782 100644
--- a/tdecachegrind/tdecachegrind/configdlg.cpp
+++ b/tdecachegrind/tdecachegrind/configdlg.cpp
@@ -29,7 +29,7 @@
 
 #include <kcolorbutton.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knumvalidator.h>
 
 #include "configdlg.h"
diff --git a/tdecachegrind/tdecachegrind/configuration.cpp b/tdecachegrind/tdecachegrind/configuration.cpp
index 78736b66..d02e79e3 100644
--- a/tdecachegrind/tdecachegrind/configuration.cpp
+++ b/tdecachegrind/tdecachegrind/configuration.cpp
@@ -21,7 +21,7 @@
  */
 
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "configuration.h"
diff --git a/tdecachegrind/tdecachegrind/costlistitem.cpp b/tdecachegrind/tdecachegrind/costlistitem.cpp
index d461d0d3..8d9c92d9 100644
--- a/tdecachegrind/tdecachegrind/costlistitem.cpp
+++ b/tdecachegrind/tdecachegrind/costlistitem.cpp
@@ -21,7 +21,7 @@
 #include <tqpainter.h>
 #include <tqregexp.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
 
diff --git a/tdecachegrind/tdecachegrind/costtypeitem.cpp b/tdecachegrind/tdecachegrind/costtypeitem.cpp
index dc35cb2b..ef5921d9 100644
--- a/tdecachegrind/tdecachegrind/costtypeitem.cpp
+++ b/tdecachegrind/tdecachegrind/costtypeitem.cpp
@@ -21,7 +21,7 @@
  */
 
 #include <tqpixmap.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "configuration.h"
 #include "listutils.h"
diff --git a/tdecachegrind/tdecachegrind/costtypeview.cpp b/tdecachegrind/tdecachegrind/costtypeview.cpp
index 3f5417e9..3f8780ac 100644
--- a/tdecachegrind/tdecachegrind/costtypeview.cpp
+++ b/tdecachegrind/tdecachegrind/costtypeview.cpp
@@ -22,7 +22,7 @@
 
 #include <tqwhatsthis.h>
 #include <tqpopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "configuration.h"
 #include "costtypeitem.h"
diff --git a/tdecachegrind/tdecachegrind/coverageitem.cpp b/tdecachegrind/tdecachegrind/coverageitem.cpp
index 26e5b36e..eadafc6d 100644
--- a/tdecachegrind/tdecachegrind/coverageitem.cpp
+++ b/tdecachegrind/tdecachegrind/coverageitem.cpp
@@ -21,7 +21,7 @@
  */
 
 #include <tqpixmap.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "configuration.h"
 #include "listutils.h"
diff --git a/tdecachegrind/tdecachegrind/coverageview.cpp b/tdecachegrind/tdecachegrind/coverageview.cpp
index 6657e923..b1ead5eb 100644
--- a/tdecachegrind/tdecachegrind/coverageview.cpp
+++ b/tdecachegrind/tdecachegrind/coverageview.cpp
@@ -22,7 +22,7 @@
 
 #include <tqwhatsthis.h>
 #include <tqpopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "configuration.h"
 #include "coverageitem.h"
diff --git a/tdecachegrind/tdecachegrind/functionitem.cpp b/tdecachegrind/tdecachegrind/functionitem.cpp
index 17716e14..7ac20943 100644
--- a/tdecachegrind/tdecachegrind/functionitem.cpp
+++ b/tdecachegrind/tdecachegrind/functionitem.cpp
@@ -26,7 +26,7 @@
 //#include <tqpainter.h>
 //#include <tqregexp.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
 
diff --git a/tdecachegrind/tdecachegrind/functionselection.cpp b/tdecachegrind/tdecachegrind/functionselection.cpp
index da243fdd..84bdeabd 100644
--- a/tdecachegrind/tdecachegrind/functionselection.cpp
+++ b/tdecachegrind/tdecachegrind/functionselection.cpp
@@ -29,7 +29,7 @@
 #include <tqregexp.h>
 #include <tqpopupmenu.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "traceitemview.h"
 #include "stackbrowser.h"
diff --git a/tdecachegrind/tdecachegrind/instritem.cpp b/tdecachegrind/tdecachegrind/instritem.cpp
index 3051b171..2b7258d7 100644
--- a/tdecachegrind/tdecachegrind/instritem.cpp
+++ b/tdecachegrind/tdecachegrind/instritem.cpp
@@ -23,7 +23,7 @@
 #include <tqpixmap.h>
 #include <tqpainter.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
 #include <kdebug.h>
diff --git a/tdecachegrind/tdecachegrind/instrview.cpp b/tdecachegrind/tdecachegrind/instrview.cpp
index 9413508f..bfeaccd0 100644
--- a/tdecachegrind/tdecachegrind/instrview.cpp
+++ b/tdecachegrind/tdecachegrind/instrview.cpp
@@ -24,7 +24,7 @@
 #include <tqregexp.h>
 #include <tqwhatsthis.h>
 #include <tqpopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 
diff --git a/tdecachegrind/tdecachegrind/main.cpp b/tdecachegrind/tdecachegrind/main.cpp
index 75ca0b50..95b02ea4 100644
--- a/tdecachegrind/tdecachegrind/main.cpp
+++ b/tdecachegrind/tdecachegrind/main.cpp
@@ -27,7 +27,7 @@
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "toplevel.h"
 #include "tracedata.h"
diff --git a/tdecachegrind/tdecachegrind/partgraph.cpp b/tdecachegrind/tdecachegrind/partgraph.cpp
index 9b5ecbc7..284bc4a7 100644
--- a/tdecachegrind/tdecachegrind/partgraph.cpp
+++ b/tdecachegrind/tdecachegrind/partgraph.cpp
@@ -20,7 +20,7 @@
  * TracePart as Nested Area
  */
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "partgraph.h"
 #include "configuration.h"
diff --git a/tdecachegrind/tdecachegrind/partlistitem.cpp b/tdecachegrind/tdecachegrind/partlistitem.cpp
index 339189d7..7e5f60b5 100644
--- a/tdecachegrind/tdecachegrind/partlistitem.cpp
+++ b/tdecachegrind/tdecachegrind/partlistitem.cpp
@@ -21,7 +21,7 @@
 #include <tqpainter.h>
 #include <tqregexp.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
 
diff --git a/tdecachegrind/tdecachegrind/partselection.cpp b/tdecachegrind/tdecachegrind/partselection.cpp
index 1b6ff153..9c8140f3 100644
--- a/tdecachegrind/tdecachegrind/partselection.cpp
+++ b/tdecachegrind/tdecachegrind/partselection.cpp
@@ -29,7 +29,7 @@
 #include <tqpopupmenu.h>
 #include <tqlayout.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 
diff --git a/tdecachegrind/tdecachegrind/partview.cpp b/tdecachegrind/tdecachegrind/partview.cpp
index 3f344bbc..e2dc707e 100644
--- a/tdecachegrind/tdecachegrind/partview.cpp
+++ b/tdecachegrind/tdecachegrind/partview.cpp
@@ -23,7 +23,7 @@
 #include <tqwhatsthis.h>
 #include <tqpopupmenu.h>
 #include <tqheader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "configuration.h"
 #include "partlistitem.h"
diff --git a/tdecachegrind/tdecachegrind/sourceitem.cpp b/tdecachegrind/tdecachegrind/sourceitem.cpp
index b8703e89..d6e1c1a9 100644
--- a/tdecachegrind/tdecachegrind/sourceitem.cpp
+++ b/tdecachegrind/tdecachegrind/sourceitem.cpp
@@ -24,7 +24,7 @@
 #include <tqregexp.h>
 #include <tqpainter.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdeapplication.h>
 
diff --git a/tdecachegrind/tdecachegrind/sourceview.cpp b/tdecachegrind/tdecachegrind/sourceview.cpp
index 52de5209..22e83453 100644
--- a/tdecachegrind/tdecachegrind/sourceview.cpp
+++ b/tdecachegrind/tdecachegrind/sourceview.cpp
@@ -24,7 +24,7 @@
 #include <tqfile.h>
 #include <tqwhatsthis.h>
 #include <tqpopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "configuration.h"
diff --git a/tdecachegrind/tdecachegrind/stackitem.cpp b/tdecachegrind/tdecachegrind/stackitem.cpp
index 412781de..69494f3b 100644
--- a/tdecachegrind/tdecachegrind/stackitem.cpp
+++ b/tdecachegrind/tdecachegrind/stackitem.cpp
@@ -21,7 +21,7 @@
  */
 
 #include <tqpixmap.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "configuration.h"
 #include "listutils.h"
diff --git a/tdecachegrind/tdecachegrind/tabview.cpp b/tdecachegrind/tdecachegrind/tabview.cpp
index 5a360110..f809e921 100644
--- a/tdecachegrind/tdecachegrind/tabview.cpp
+++ b/tdecachegrind/tdecachegrind/tabview.cpp
@@ -28,7 +28,7 @@
 #include <tqwhatsthis.h>
 #include <tqpopupmenu.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 
 #include "tabview.h"
diff --git a/tdecachegrind/tdecachegrind/toplevel.cpp b/tdecachegrind/tdecachegrind/toplevel.cpp
index 75598f02..8bb8d45d 100644
--- a/tdecachegrind/tdecachegrind/toplevel.cpp
+++ b/tdecachegrind/tdecachegrind/toplevel.cpp
@@ -36,7 +36,7 @@
 #include <tqeventloop.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstatusbar.h>
 #include <tdestdaccel.h>
 #include <kstdaction.h>
diff --git a/tdecachegrind/tdecachegrind/tracedata.cpp b/tdecachegrind/tdecachegrind/tracedata.cpp
index 70a8bd05..da0726bb 100644
--- a/tdecachegrind/tdecachegrind/tracedata.cpp
+++ b/tdecachegrind/tdecachegrind/tracedata.cpp
@@ -24,7 +24,7 @@
 #include <tqfileinfo.h>
 #include <tqregexp.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "tracedata.h"
diff --git a/tdecachegrind/tdecachegrind/traceitemview.cpp b/tdecachegrind/tdecachegrind/traceitemview.cpp
index 82f4e11f..672b0954 100644
--- a/tdecachegrind/tdecachegrind/traceitemview.cpp
+++ b/tdecachegrind/tdecachegrind/traceitemview.cpp
@@ -22,7 +22,7 @@
 
 #include <tqwidget.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "traceitemview.h"
diff --git a/tdecachegrind/tdecachegrind/treemap.cpp b/tdecachegrind/tdecachegrind/treemap.cpp
index 46e661f6..be85ce08 100644
--- a/tdecachegrind/tdecachegrind/treemap.cpp
+++ b/tdecachegrind/tdecachegrind/treemap.cpp
@@ -29,7 +29,7 @@
 #include <tqstyle.h>
 #include <tqpopupmenu.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 
-- 
cgit v1.2.1