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

---
 ksokoban/Bookmark.cpp            | 2 +-
 ksokoban/InternalCollections.cpp | 2 +-
 ksokoban/MainWindow.cpp          | 6 +++---
 ksokoban/ModalLabel.cpp          | 2 +-
 ksokoban/PlayField.cpp           | 6 +++---
 ksokoban/main.cpp                | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'ksokoban')

diff --git a/ksokoban/Bookmark.cpp b/ksokoban/Bookmark.cpp
index 693a886c..d6262f3a 100644
--- a/ksokoban/Bookmark.cpp
+++ b/ksokoban/Bookmark.cpp
@@ -25,7 +25,7 @@
 
 #include <tdeapplication.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 
 #include <stdio.h>
diff --git a/ksokoban/InternalCollections.cpp b/ksokoban/InternalCollections.cpp
index 5b019f52..e54b8959 100644
--- a/ksokoban/InternalCollections.cpp
+++ b/ksokoban/InternalCollections.cpp
@@ -1,4 +1,4 @@
-#include <klocale.h>
+#include <tdelocale.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
diff --git a/ksokoban/MainWindow.cpp b/ksokoban/MainWindow.cpp
index 7c02c1d8..8ebef3f2 100644
--- a/ksokoban/MainWindow.cpp
+++ b/ksokoban/MainWindow.cpp
@@ -21,15 +21,15 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tqpopupmenu.h>
 #include <tqkeycode.h>
 #include <assert.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqstring.h>
 #include <tdefiledialog.h>
 #include <tqframe.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdeio/netaccess.h>
 #include <kiconloader.h>
diff --git a/ksokoban/ModalLabel.cpp b/ksokoban/ModalLabel.cpp
index 4fd7b25c..8d5f43d7 100644
--- a/ksokoban/ModalLabel.cpp
+++ b/ksokoban/ModalLabel.cpp
@@ -22,7 +22,7 @@
 #include <tqlabel.h>
 #include <tqfont.h>
 #include <tdeapplication.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tqwidgetlist.h>
 #include <tqstring.h>
 
diff --git a/ksokoban/PlayField.cpp b/ksokoban/PlayField.cpp
index b5433ed9..1483aa44 100644
--- a/ksokoban/PlayField.cpp
+++ b/ksokoban/PlayField.cpp
@@ -25,10 +25,10 @@
 #include <tqkeycode.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqpainter.h>
-#include <kmessagebox.h>
-#include <kglobalsettings.h>
+#include <tdemessagebox.h>
+#include <tdeglobalsettings.h>
 
 #include "PlayField.h"
 #include "ModalLabel.h"
diff --git a/ksokoban/main.cpp b/ksokoban/main.cpp
index 5f589a8f..4dd605eb 100644
--- a/ksokoban/main.cpp
+++ b/ksokoban/main.cpp
@@ -20,7 +20,7 @@
 // #include <kuniqueapplication.h>
 #include <tdeapplication.h>
 #include <kimageio.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
 
-- 
cgit v1.2.1