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

---
 twin/clients/b2/b2client.cpp                 | 2 +-
 twin/clients/b2/config/config.cpp            | 4 ++--
 twin/clients/default/config/config.cpp       | 4 ++--
 twin/clients/default/kdedefault.cpp          | 4 ++--
 twin/clients/keramik/config/config.cpp       | 4 ++--
 twin/clients/keramik/keramik.cpp             | 2 +-
 twin/clients/kwmtheme/cli_installer/main.cpp | 4 ++--
 twin/clients/kwmtheme/kwmthemeclient.cpp     | 4 ++--
 twin/clients/laptop/laptopclient.cpp         | 4 ++--
 twin/clients/modernsystem/config/config.cpp  | 4 ++--
 twin/clients/modernsystem/modernsys.cpp      | 4 ++--
 twin/clients/plastik/config/config.cpp       | 4 ++--
 twin/clients/plastik/plastikclient.cpp       | 2 +-
 twin/clients/quartz/config/config.cpp        | 4 ++--
 twin/clients/quartz/quartz.cpp               | 4 ++--
 twin/clients/redmond/redmond.cpp             | 2 +-
 twin/clients/test/test.cpp                   | 2 +-
 twin/clients/web/WebButton.h                 | 2 +-
 18 files changed, 30 insertions(+), 30 deletions(-)

(limited to 'twin/clients')

diff --git a/twin/clients/b2/b2client.cpp b/twin/clients/b2/b2client.cpp
index 32a1ec28a..d63d6c093 100644
--- a/twin/clients/b2/b2client.cpp
+++ b/twin/clients/b2/b2client.cpp
@@ -19,7 +19,7 @@
 #include <kicontheme.h>
 #include <kiconeffect.h>
 #include <kdrawutil.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tqbitmap.h>
 #include <tqlabel.h>
diff --git a/twin/clients/b2/config/config.cpp b/twin/clients/b2/config/config.cpp
index ca2e77c4a..77ca65338 100644
--- a/twin/clients/b2/config/config.cpp
+++ b/twin/clients/b2/config/config.cpp
@@ -7,10 +7,10 @@
  */
 
 #include "config.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqwhatsthis.h>
 #include <tqvbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 extern "C"
diff --git a/twin/clients/default/config/config.cpp b/twin/clients/default/config/config.cpp
index 8e53dcc75..f479c0c69 100644
--- a/twin/clients/default/config/config.cpp
+++ b/twin/clients/default/config/config.cpp
@@ -8,10 +8,10 @@
  */
 
 #include "config.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqwhatsthis.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpixmap.h>
 #include <tqvbox.h>
 
diff --git a/twin/clients/default/kdedefault.cpp b/twin/clients/default/kdedefault.cpp
index 938a9e06d..7892c4adc 100644
--- a/twin/clients/default/kdedefault.cpp
+++ b/twin/clients/default/kdedefault.cpp
@@ -13,11 +13,11 @@
 #include "kdedefault.h"
 
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kpixmapeffect.h>
 #include <kimageeffect.h>
 #include <kdrawutil.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 #include <tqdrawutil.h>
 #include <tqbitmap.h>
diff --git a/twin/clients/keramik/config/config.cpp b/twin/clients/keramik/config/config.cpp
index 6d4695da2..0f3be48c7 100644
--- a/twin/clients/keramik/config/config.cpp
+++ b/twin/clients/keramik/config/config.cpp
@@ -23,8 +23,8 @@
  * Boston, MA 02110-1301, USA.
  */
  
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 #include <tqcheckbox.h>
 
diff --git a/twin/clients/keramik/keramik.cpp b/twin/clients/keramik/keramik.cpp
index 638bcce35..02320d9ad 100644
--- a/twin/clients/keramik/keramik.cpp
+++ b/twin/clients/keramik/keramik.cpp
@@ -21,7 +21,7 @@
  */
 
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconeffect.h>
 
 #include <tqpainter.h>
diff --git a/twin/clients/kwmtheme/cli_installer/main.cpp b/twin/clients/kwmtheme/cli_installer/main.cpp
index 39bb6d30c..27af172e1 100644
--- a/twin/clients/kwmtheme/cli_installer/main.cpp
+++ b/twin/clients/kwmtheme/cli_installer/main.cpp
@@ -2,11 +2,11 @@
 #include <tqdir.h>
 #include <tdeapplication.h>
 #include <ksimpleconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char description[] =
         I18N_NOOP("Installs a KWM theme");
diff --git a/twin/clients/kwmtheme/kwmthemeclient.cpp b/twin/clients/kwmtheme/kwmthemeclient.cpp
index d2bf002ed..73c8feaca 100644
--- a/twin/clients/kwmtheme/kwmthemeclient.cpp
+++ b/twin/clients/kwmtheme/kwmthemeclient.cpp
@@ -1,13 +1,13 @@
 #include <tdeconfig.h>
 #include "kwmthemeclient.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqlayout.h>
 #include <tqdrawutil.h>
 #include <tqpainter.h>
 #include <kpixmapeffect.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqbitmap.h>
 #include <tqstyle.h>
 #include <tqlabel.h>
diff --git a/twin/clients/laptop/laptopclient.cpp b/twin/clients/laptop/laptopclient.cpp
index 0f91d9005..34c79b2d6 100644
--- a/twin/clients/laptop/laptopclient.cpp
+++ b/twin/clients/laptop/laptopclient.cpp
@@ -11,8 +11,8 @@
 #include <tqdrawutil.h>
 #include <kpixmapeffect.h>
 #include <kdrawutil.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tqbitmap.h>
 
 namespace Laptop {
diff --git a/twin/clients/modernsystem/config/config.cpp b/twin/clients/modernsystem/config/config.cpp
index 719362d07..18d6870f7 100644
--- a/twin/clients/modernsystem/config/config.cpp
+++ b/twin/clients/modernsystem/config/config.cpp
@@ -3,8 +3,8 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kdialog.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
 #include "config.h"
diff --git a/twin/clients/modernsystem/modernsys.cpp b/twin/clients/modernsystem/modernsys.cpp
index f58855fe3..68c8716c4 100644
--- a/twin/clients/modernsystem/modernsys.cpp
+++ b/twin/clients/modernsystem/modernsys.cpp
@@ -2,8 +2,8 @@
 // Melchior FRANZ  <a8603365@unet.univie.ac.at>   configuration options
 
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tqlayout.h>
 #include <tqdrawutil.h>
 #include <kpixmapeffect.h>
diff --git a/twin/clients/plastik/config/config.cpp b/twin/clients/plastik/config/config.cpp
index 4477fdd02..04658796c 100644
--- a/twin/clients/plastik/config/config.cpp
+++ b/twin/clients/plastik/config/config.cpp
@@ -28,8 +28,8 @@
 #include <tqwhatsthis.h>
 
 #include <tdeconfig.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 
 #include "config.h"
 #include "configdialog.h"
diff --git a/twin/clients/plastik/plastikclient.cpp b/twin/clients/plastik/plastikclient.cpp
index f48417779..31c9e2ad9 100644
--- a/twin/clients/plastik/plastikclient.cpp
+++ b/twin/clients/plastik/plastikclient.cpp
@@ -20,7 +20,7 @@
   Boston, MA 02110-1301, USA.
  */
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqbitmap.h>
 #include <tqdatetime.h>
diff --git a/twin/clients/quartz/config/config.cpp b/twin/clients/quartz/config/config.cpp
index d3364af14..3ce86239b 100644
--- a/twin/clients/quartz/config/config.cpp
+++ b/twin/clients/quartz/config/config.cpp
@@ -8,9 +8,9 @@
  */
 
 #include "config.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tqwhatsthis.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 extern "C"
diff --git a/twin/clients/quartz/quartz.cpp b/twin/clients/quartz/quartz.cpp
index 00aee9c58..511fafa6f 100644
--- a/twin/clients/quartz/quartz.cpp
+++ b/twin/clients/quartz/quartz.cpp
@@ -16,8 +16,8 @@
 
 #include <tdeconfig.h>
 #include <kdrawutil.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kpixmapeffect.h>
 #include <tqbitmap.h>
 #include <tqdrawutil.h>
diff --git a/twin/clients/redmond/redmond.cpp b/twin/clients/redmond/redmond.cpp
index 790afa461..f3689af52 100644
--- a/twin/clients/redmond/redmond.cpp
+++ b/twin/clients/redmond/redmond.cpp
@@ -19,7 +19,7 @@
 #include <kpixmapeffect.h>
 #include <kimageeffect.h>
 #include <kdrawutil.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqbitmap.h>
 #include <tqimage.h>
diff --git a/twin/clients/test/test.cpp b/twin/clients/test/test.cpp
index 2e26a7c41..e01d1d98e 100644
--- a/twin/clients/test/test.cpp
+++ b/twin/clients/test/test.cpp
@@ -1,7 +1,7 @@
 #include "test.h"
 
 #include <tqtooltip.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 namespace KWinTest
diff --git a/twin/clients/web/WebButton.h b/twin/clients/web/WebButton.h
index d86db6cc6..a5eb8867e 100644
--- a/twin/clients/web/WebButton.h
+++ b/twin/clients/web/WebButton.h
@@ -24,7 +24,7 @@
 
 #include <tqwidget.h>
 #include <tqbitmap.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "../../lib/kcommondecoration.h"
 
-- 
cgit v1.2.1