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

---
 lskat/lskat/lskat.cpp     | 4 ++--
 lskat/lskat/lskatdoc.cpp  | 2 +-
 lskat/lskat/lskatview.cpp | 6 +++---
 lskat/lskat/main.cpp      | 2 +-
 lskat/lskat/msgdlg.cpp    | 2 +-
 lskat/lskat/namedlg.cpp   | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'lskat')

diff --git a/lskat/lskat/lskat.cpp b/lskat/lskat/lskat.cpp
index 236c1e5d..dab5612a 100644
--- a/lskat/lskat/lskat.cpp
+++ b/lskat/lskat/lskat.cpp
@@ -20,9 +20,9 @@
 
 // include files for TDE
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <khelpmenu.h>
 #include <kstdaction.h>
diff --git a/lskat/lskat/lskatdoc.cpp b/lskat/lskat/lskatdoc.cpp
index 6862599b..24dece6e 100644
--- a/lskat/lskat/lskatdoc.cpp
+++ b/lskat/lskat/lskatdoc.cpp
@@ -26,7 +26,7 @@
 
 
 // include files for TDE
-#include <klocale.h>
+#include <tdelocale.h>
 
 // application specific includes
 #include "lskatdoc.h"
diff --git a/lskat/lskat/lskatview.cpp b/lskat/lskat/lskatview.cpp
index 8a948b2a..ce1c7ec0 100644
--- a/lskat/lskat/lskatview.cpp
+++ b/lskat/lskat/lskatview.cpp
@@ -24,12 +24,12 @@
 #include <tqstring.h>
 #include <tqpainter.h>
 #include <tqdatetime.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <math.h>
 #include <stdio.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 
 // application specific includes
diff --git a/lskat/lskat/main.cpp b/lskat/lskat/main.cpp
index a37ded0a..77da5bfd 100644
--- a/lskat/lskat/main.cpp
+++ b/lskat/lskat/main.cpp
@@ -13,7 +13,7 @@
  *                                                                         *
  ***************************************************************************/
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include "lskat.h"
 
diff --git a/lskat/lskat/msgdlg.cpp b/lskat/lskat/msgdlg.cpp
index cb3e6334..c59109d3 100644
--- a/lskat/lskat/msgdlg.cpp
+++ b/lskat/lskat/msgdlg.cpp
@@ -29,7 +29,7 @@
 */
 
 #include <tqgroupbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
 #include "msgdlg.h"
diff --git a/lskat/lskat/namedlg.cpp b/lskat/lskat/namedlg.cpp
index 262631cd..3bd0cca6 100644
--- a/lskat/lskat/namedlg.cpp
+++ b/lskat/lskat/namedlg.cpp
@@ -14,7 +14,7 @@
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #define NAME_MAX_LEN 12
 
-- 
cgit v1.2.1