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

---
 kbattleship/kbattleship/kbattleship.cpp       | 2 +-
 kbattleship/kbattleship/kbattleship.h         | 6 +++---
 kbattleship/kbattleship/kbattleshipserver.cpp | 4 ++--
 kbattleship/kbattleship/kbattleshipview.cpp   | 2 +-
 kbattleship/kbattleship/kclientdialog.cpp     | 2 +-
 kbattleship/kbattleship/kmessage.cpp          | 2 +-
 kbattleship/kbattleship/konnectionhandling.h  | 4 ++--
 kbattleship/kbattleship/kserverdialog.cpp     | 2 +-
 kbattleship/kbattleship/kshiplist.h           | 4 ++--
 kbattleship/kbattleship/main.cpp              | 2 +-
 10 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'kbattleship')

diff --git a/kbattleship/kbattleship/kbattleship.cpp b/kbattleship/kbattleship/kbattleship.cpp
index f59e5a7a..144af63a 100644
--- a/kbattleship/kbattleship/kbattleship.cpp
+++ b/kbattleship/kbattleship/kbattleship.cpp
@@ -26,7 +26,7 @@
 #include <kstatusbar.h>
 #include <kstdgameaction.h>
 #include <tdecmdlineargs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kuser.h>
 
 #include <kscoredialog.h>
diff --git a/kbattleship/kbattleship/kbattleship.h b/kbattleship/kbattleship/kbattleship.h
index ed63623f..c834491d 100644
--- a/kbattleship/kbattleship/kbattleship.h
+++ b/kbattleship/kbattleship/kbattleship.h
@@ -22,10 +22,10 @@
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdemainwindow.h>
-#include <kmenubar.h>
-#include <kmessagebox.h>
+#include <tdemenubar.h>
+#include <tdemessagebox.h>
 #include <kstdaction.h>
 
 #include <tqstring.h>
diff --git a/kbattleship/kbattleship/kbattleshipserver.cpp b/kbattleship/kbattleship/kbattleshipserver.cpp
index 85e90ffa..a864cb61 100644
--- a/kbattleship/kbattleship/kbattleshipserver.cpp
+++ b/kbattleship/kbattleship/kbattleshipserver.cpp
@@ -26,8 +26,8 @@
 #endif
 #include <sys/ioctl.h>
 #include <tqtimer.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include "kbattleshipserver.moc"
 
 KBattleshipServer::KBattleshipServer(int port, const TQString& name) 
diff --git a/kbattleship/kbattleship/kbattleshipview.cpp b/kbattleship/kbattleship/kbattleshipview.cpp
index f746e2ab..42b699bb 100644
--- a/kbattleship/kbattleship/kbattleshipview.cpp
+++ b/kbattleship/kbattleship/kbattleshipview.cpp
@@ -17,7 +17,7 @@
 
 #include <tqlayout.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include "kbattleship.h"
 #include "kbattleshipview.moc"
diff --git a/kbattleship/kbattleship/kclientdialog.cpp b/kbattleship/kbattleship/kclientdialog.cpp
index 97015b71..e5a65cf7 100644
--- a/kbattleship/kbattleship/kclientdialog.cpp
+++ b/kbattleship/kbattleship/kclientdialog.cpp
@@ -18,7 +18,7 @@
 #include <tqstring.h>
 #include <tqglobal.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 #include <kuser.h>
 #include <tqlayout.h>
diff --git a/kbattleship/kbattleship/kmessage.cpp b/kbattleship/kbattleship/kmessage.cpp
index baf5d916..37246d40 100644
--- a/kbattleship/kbattleship/kmessage.cpp
+++ b/kbattleship/kbattleship/kmessage.cpp
@@ -17,7 +17,7 @@
 
 //#define XMLDUMP
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #ifdef XMLDUMP
 #include <kdebug.h>
diff --git a/kbattleship/kbattleship/konnectionhandling.h b/kbattleship/kbattleship/konnectionhandling.h
index b6526bed..b78895b7 100644
--- a/kbattleship/kbattleship/konnectionhandling.h
+++ b/kbattleship/kbattleship/konnectionhandling.h
@@ -18,8 +18,8 @@
 #ifndef KONNECTIONHANDLING_H
 #define KONNECTIONHANDLING_H
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <tqobject.h>
 
diff --git a/kbattleship/kbattleship/kserverdialog.cpp b/kbattleship/kbattleship/kserverdialog.cpp
index 1a045cc6..7fb8a5a1 100644
--- a/kbattleship/kbattleship/kserverdialog.cpp
+++ b/kbattleship/kbattleship/kserverdialog.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kuser.h>
 #include <tqlayout.h>
 
diff --git a/kbattleship/kbattleship/kshiplist.h b/kbattleship/kbattleship/kshiplist.h
index 7416a867..c7dcb8a6 100644
--- a/kbattleship/kbattleship/kshiplist.h
+++ b/kbattleship/kbattleship/kshiplist.h
@@ -19,8 +19,8 @@
 #ifndef KSHIPLIST_H
 #define KSHIPLIST_H
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tqptrlist.h>
 #include "kbattlefield.h"
 #include "kship.h"
diff --git a/kbattleship/kbattleship/main.cpp b/kbattleship/kbattleship/main.cpp
index 35011c08..c53a5942 100644
--- a/kbattleship/kbattleship/main.cpp
+++ b/kbattleship/kbattleship/main.cpp
@@ -17,7 +17,7 @@
 
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include "kbattleship.h"
 
-- 
cgit v1.2.1