From 279764bab1514a051db18e14241e9bae62be14d6 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 22:00:37 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 quanta/treeviews/basetreeview.cpp      | 6 +++---
 quanta/treeviews/doctreeview.cpp       | 2 +-
 quanta/treeviews/filestreeview.cpp     | 4 ++--
 quanta/treeviews/projecttreeview.cpp   | 6 +++---
 quanta/treeviews/scripttreeview.cpp    | 6 +++---
 quanta/treeviews/servertreeview.cpp    | 4 ++--
 quanta/treeviews/structtreetag.cpp     | 2 +-
 quanta/treeviews/structtreeview.cpp    | 4 ++--
 quanta/treeviews/tagattributeitems.cpp | 2 +-
 quanta/treeviews/tagattributetree.cpp  | 2 +-
 quanta/treeviews/templatestreeview.cpp | 6 +++---
 quanta/treeviews/uploadtreeview.cpp    | 2 +-
 12 files changed, 23 insertions(+), 23 deletions(-)

(limited to 'quanta/treeviews')

diff --git a/quanta/treeviews/basetreeview.cpp b/quanta/treeviews/basetreeview.cpp
index 3fa97e81..948778e0 100644
--- a/quanta/treeviews/basetreeview.cpp
+++ b/quanta/treeviews/basetreeview.cpp
@@ -36,10 +36,10 @@
 #include <kdebug.h>
 #include <krun.h>
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kopenwith.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpropertiesdialog.h>
 #include <tdefiledialog.h>
 #include <kprogress.h>
@@ -47,7 +47,7 @@
 #include <kurldrag.h>
 #include <kurl.h>
 #include <ktar.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <ktrader.h>
 #include <tdeapplication.h>
 #include <kcursor.h>
diff --git a/quanta/treeviews/doctreeview.cpp b/quanta/treeviews/doctreeview.cpp
index b6372153..9b9e7d14 100644
--- a/quanta/treeviews/doctreeview.cpp
+++ b/quanta/treeviews/doctreeview.cpp
@@ -24,7 +24,7 @@
 // KDE clases
 #include <tdeconfig.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 #include <kiconloader.h>
diff --git a/quanta/treeviews/filestreeview.cpp b/quanta/treeviews/filestreeview.cpp
index e560b61b..1ac3f6eb 100644
--- a/quanta/treeviews/filestreeview.cpp
+++ b/quanta/treeviews/filestreeview.cpp
@@ -18,11 +18,11 @@
 
 // KDE includes
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>
 #include <kopenwith.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <tdefiledialog.h>
 #include <kprogress.h>
diff --git a/quanta/treeviews/projecttreeview.cpp b/quanta/treeviews/projecttreeview.cpp
index 9aa97c1e..a8a59a42 100644
--- a/quanta/treeviews/projecttreeview.cpp
+++ b/quanta/treeviews/projecttreeview.cpp
@@ -22,14 +22,14 @@
 #include <tqdict.h>
 
 // KDE includes
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <tdepopupmenu.h>
 #include <kpropertiesdialog.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeapplication.h>
 #include <kstringhandler.h>
 
diff --git a/quanta/treeviews/scripttreeview.cpp b/quanta/treeviews/scripttreeview.cpp
index 8c7719cf..bcc90d41 100644
--- a/quanta/treeviews/scripttreeview.cpp
+++ b/quanta/treeviews/scripttreeview.cpp
@@ -15,15 +15,15 @@
 //kde includes
 #include <tdeapplication.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <kprocess.h>
 #include <krun.h>
 #include <kstandarddirs.h>
 #include <ktar.h>
 #include <ktempdir.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kurl.h>
 #include <kdebug.h>
 
diff --git a/quanta/treeviews/servertreeview.cpp b/quanta/treeviews/servertreeview.cpp
index a0ed5238..88b4533e 100644
--- a/quanta/treeviews/servertreeview.cpp
+++ b/quanta/treeviews/servertreeview.cpp
@@ -20,10 +20,10 @@
 
 // KDE includes
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kopenwith.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <tdefiledialog.h>
 #include <kprogress.h>
diff --git a/quanta/treeviews/structtreetag.cpp b/quanta/treeviews/structtreetag.cpp
index f54cb23c..03a59ac1 100644
--- a/quanta/treeviews/structtreetag.cpp
+++ b/quanta/treeviews/structtreetag.cpp
@@ -19,7 +19,7 @@
 
 // KDE includes
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // app includes
 #include "structtreeview.h"
diff --git a/quanta/treeviews/structtreeview.cpp b/quanta/treeviews/structtreeview.cpp
index b9d12626..a46cb590 100644
--- a/quanta/treeviews/structtreeview.cpp
+++ b/quanta/treeviews/structtreeview.cpp
@@ -30,8 +30,8 @@
 #include <tdeapplication.h>
 #include <kiconloader.h>
 #include <tdepopupmenu.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdetexteditor/view.h>
diff --git a/quanta/treeviews/tagattributeitems.cpp b/quanta/treeviews/tagattributeitems.cpp
index d706dd99..556a2823 100644
--- a/quanta/treeviews/tagattributeitems.cpp
+++ b/quanta/treeviews/tagattributeitems.cpp
@@ -25,7 +25,7 @@
 #include <tdeapplication.h>
 #include <kcolorcombo.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlrequester.h>
 #include <kdebug.h>
 
diff --git a/quanta/treeviews/tagattributetree.cpp b/quanta/treeviews/tagattributetree.cpp
index 4383986b..c82de08e 100644
--- a/quanta/treeviews/tagattributetree.cpp
+++ b/quanta/treeviews/tagattributetree.cpp
@@ -23,7 +23,7 @@
 
 //kde includes
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kstringhandler.h>
 #include <kdebug.h>
diff --git a/quanta/treeviews/templatestreeview.cpp b/quanta/treeviews/templatestreeview.cpp
index 488c16b6..2fb96798 100644
--- a/quanta/treeviews/templatestreeview.cpp
+++ b/quanta/treeviews/templatestreeview.cpp
@@ -35,19 +35,19 @@
 
 // KDE includes
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
 #include <tdemainwindow.h>
 #include <kmimetype.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcombobox.h>
 #include <tdepopupmenu.h>
 #include <kpropertiesdialog.h>
 #include <kurlrequester.h>
 #include <kurlrequesterdlg.h>
 #include <ktempdir.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeio/netaccess.h>
 #include <kurldrag.h>
 #include <ktar.h>
diff --git a/quanta/treeviews/uploadtreeview.cpp b/quanta/treeviews/uploadtreeview.cpp
index f45681ad..7780f8aa 100644
--- a/quanta/treeviews/uploadtreeview.cpp
+++ b/quanta/treeviews/uploadtreeview.cpp
@@ -16,7 +16,7 @@
 #include <tqregexp.h>
 
 #include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <tdefileitem.h>
 
-- 
cgit v1.2.1