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/components/csseditor/colorrequester.cpp    | 2 +-
 quanta/components/csseditor/colorslider.cpp       | 2 +-
 quanta/components/csseditor/csseditor.cpp         | 2 +-
 quanta/components/csseditor/cssselector.cpp       | 4 ++--
 quanta/components/csseditor/encodingselector.cpp  | 2 +-
 quanta/components/csseditor/fontfamilychooser.cpp | 4 ++--
 quanta/components/csseditor/propertysetter.cpp    | 2 +-
 quanta/components/csseditor/styleeditor.cpp       | 2 +-
 quanta/components/csseditor/stylesheetparser.cpp  | 2 +-
 quanta/components/csseditor/tlpeditors.cpp        | 2 +-
 10 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'quanta/components/csseditor')

diff --git a/quanta/components/csseditor/colorrequester.cpp b/quanta/components/csseditor/colorrequester.cpp
index 043e3470..2548917b 100644
--- a/quanta/components/csseditor/colorrequester.cpp
+++ b/quanta/components/csseditor/colorrequester.cpp
@@ -21,7 +21,7 @@
 #include <tqtooltip.h>
 #include <tqiconset.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaccel.h>
 
 #include "propertysetter.h"
diff --git a/quanta/components/csseditor/colorslider.cpp b/quanta/components/csseditor/colorslider.cpp
index 411f056c..d8d2b0f6 100644
--- a/quanta/components/csseditor/colorslider.cpp
+++ b/quanta/components/csseditor/colorslider.cpp
@@ -18,7 +18,7 @@
 #include <tqvbox.h>
 #include <tqlabel.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "colorslider.h"
 #include "propertysetter.h"
diff --git a/quanta/components/csseditor/csseditor.cpp b/quanta/components/csseditor/csseditor.cpp
index 9b84bd6a..c449b184 100644
--- a/quanta/components/csseditor/csseditor.cpp
+++ b/quanta/components/csseditor/csseditor.cpp
@@ -25,7 +25,7 @@
 #include <tqfileinfo.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdehtml_part.h>
 #include <tdehtmlview.h>
 #include <kstandarddirs.h>
diff --git a/quanta/components/csseditor/cssselector.cpp b/quanta/components/csseditor/cssselector.cpp
index b1da7961..1124273e 100644
--- a/quanta/components/csseditor/cssselector.cpp
+++ b/quanta/components/csseditor/cssselector.cpp
@@ -30,9 +30,9 @@
 #include <tqwhatsthis.h>
 
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurlrequester.h>
 #include <tdefiledialog.h>
 #include "project.h"
diff --git a/quanta/components/csseditor/encodingselector.cpp b/quanta/components/csseditor/encodingselector.cpp
index ad5b958b..2f1bc6f2 100644
--- a/quanta/components/csseditor/encodingselector.cpp
+++ b/quanta/components/csseditor/encodingselector.cpp
@@ -18,7 +18,7 @@
 
 
 #include "encodingselector.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kcharsets.h> 
 #include <tqtextcodec.h>
 
diff --git a/quanta/components/csseditor/fontfamilychooser.cpp b/quanta/components/csseditor/fontfamilychooser.cpp
index 6a390340..7f62599e 100644
--- a/quanta/components/csseditor/fontfamilychooser.cpp
+++ b/quanta/components/csseditor/fontfamilychooser.cpp
@@ -20,12 +20,12 @@
 #include <tqstringlist.h>
 #include <tqlistbox.h>
 #include <tqfont.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqiconset.h>
 #include <tqpixmap.h>
 #include <kiconloader.h>
 #include <kpushbutton.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tqregexp.h>
 #include <tqlineedit.h>
 #include <tqwhatsthis.h>
diff --git a/quanta/components/csseditor/propertysetter.cpp b/quanta/components/csseditor/propertysetter.cpp
index 922c7dbe..cbaabe5c 100644
--- a/quanta/components/csseditor/propertysetter.cpp
+++ b/quanta/components/csseditor/propertysetter.cpp
@@ -29,7 +29,7 @@
 #include <kdebug.h>
 #include <kdialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 
 
diff --git a/quanta/components/csseditor/styleeditor.cpp b/quanta/components/csseditor/styleeditor.cpp
index e39e5564..d40812ed 100644
--- a/quanta/components/csseditor/styleeditor.cpp
+++ b/quanta/components/csseditor/styleeditor.cpp
@@ -22,7 +22,7 @@
 //kde includes
 #include <kdialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kurl.h>
 #include <tdetexteditor/editinterface.h>
diff --git a/quanta/components/csseditor/stylesheetparser.cpp b/quanta/components/csseditor/stylesheetparser.cpp
index 0b80caa2..6ae436ff 100644
--- a/quanta/components/csseditor/stylesheetparser.cpp
+++ b/quanta/components/csseditor/stylesheetparser.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 #include "stylesheetparser.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 static const TQString msg1(i18n("has not been closed")),
diff --git a/quanta/components/csseditor/tlpeditors.cpp b/quanta/components/csseditor/tlpeditors.cpp
index ab70afd6..e5c3c2ff 100644
--- a/quanta/components/csseditor/tlpeditors.cpp
+++ b/quanta/components/csseditor/tlpeditors.cpp
@@ -25,7 +25,7 @@
 #include <kurl.h>
 #include <kdialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 #include <kimagefilepreview.h>
 
-- 
cgit v1.2.1