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

---
 atlantik/client/atlantik.cpp                    | 4 ++--
 atlantik/client/configdlg.cpp                   | 2 +-
 atlantik/client/eventlogwidget.cpp              | 2 +-
 atlantik/client/main.cpp                        | 4 ++--
 atlantik/client/selectconfiguration_widget.cpp  | 4 ++--
 atlantik/client/selectgame_widget.cpp           | 2 +-
 atlantik/client/selectserver_widget.cpp         | 2 +-
 atlantik/libatlantikclient/atlantik_network.cpp | 2 +-
 atlantik/libatlantikui/auction_widget.cpp       | 2 +-
 atlantik/libatlantikui/board.cpp                | 2 +-
 atlantik/libatlantikui/estatedetails.cpp        | 4 ++--
 atlantik/libatlantikui/estateview.cpp           | 4 ++--
 atlantik/libatlantikui/kwrappedlistviewitem.cpp | 2 +-
 atlantik/libatlantikui/portfolioview.cpp        | 4 ++--
 atlantik/libatlantikui/token.cpp                | 2 +-
 atlantik/libatlantikui/trade_widget.cpp         | 2 +-
 16 files changed, 22 insertions(+), 22 deletions(-)

(limited to 'atlantik')

diff --git a/atlantik/client/atlantik.cpp b/atlantik/client/atlantik.cpp
index 23e4cd4f..efbf2a0d 100644
--- a/atlantik/client/atlantik.cpp
+++ b/atlantik/client/atlantik.cpp
@@ -27,8 +27,8 @@
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <tdeconfig.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <knotifyclient.h>
 #include <knotifydialog.h>
 #include <kstatusbar.h>
diff --git a/atlantik/client/configdlg.cpp b/atlantik/client/configdlg.cpp
index 9703f676..e24244c5 100644
--- a/atlantik/client/configdlg.cpp
+++ b/atlantik/client/configdlg.cpp
@@ -33,7 +33,7 @@
 
 #include <kicondialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <kstandarddirs.h>
 
diff --git a/atlantik/client/eventlogwidget.cpp b/atlantik/client/eventlogwidget.cpp
index ae9e7f94..ea80aadc 100644
--- a/atlantik/client/eventlogwidget.cpp
+++ b/atlantik/client/eventlogwidget.cpp
@@ -20,7 +20,7 @@
 #include <tqlayout.h>
 #include <tqdatetime.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <kdialogbase.h>
 #include <tdefiledialog.h>
diff --git a/atlantik/client/main.cpp b/atlantik/client/main.cpp
index 52b5a412..3333c88e 100644
--- a/atlantik/client/main.cpp
+++ b/atlantik/client/main.cpp
@@ -16,9 +16,9 @@
 
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "main.h"
 #include "atlantik.h"
diff --git a/atlantik/client/selectconfiguration_widget.cpp b/atlantik/client/selectconfiguration_widget.cpp
index 2d500976..eb67a997 100644
--- a/atlantik/client/selectconfiguration_widget.cpp
+++ b/atlantik/client/selectconfiguration_widget.cpp
@@ -21,9 +21,9 @@
 
 #include <kdebug.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 
 #include <atlantic_core.h>
diff --git a/atlantik/client/selectgame_widget.cpp b/atlantik/client/selectgame_widget.cpp
index 0eb22877..34636afa 100644
--- a/atlantik/client/selectgame_widget.cpp
+++ b/atlantik/client/selectgame_widget.cpp
@@ -19,7 +19,7 @@
 
 #include <kdebug.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <knotifyclient.h>
 
diff --git a/atlantik/client/selectserver_widget.cpp b/atlantik/client/selectserver_widget.cpp
index def6beaf..9d8f0e3c 100644
--- a/atlantik/client/selectserver_widget.cpp
+++ b/atlantik/client/selectserver_widget.cpp
@@ -23,7 +23,7 @@
 
 #include <kdialog.h>
 #include <kextendedsocket.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 
 #include "selectserver_widget.moc"
diff --git a/atlantik/libatlantikclient/atlantik_network.cpp b/atlantik/libatlantikclient/atlantik_network.cpp
index 51347f84..3dad4bda 100644
--- a/atlantik/libatlantikclient/atlantik_network.cpp
+++ b/atlantik/libatlantikclient/atlantik_network.cpp
@@ -22,7 +22,7 @@
 #include <tqtimer.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <atlantic_core.h>
 #include <auction.h>
diff --git a/atlantik/libatlantikui/auction_widget.cpp b/atlantik/libatlantikui/auction_widget.cpp
index a7ffcc04..85e3a857 100644
--- a/atlantik/libatlantikui/auction_widget.cpp
+++ b/atlantik/libatlantikui/auction_widget.cpp
@@ -23,7 +23,7 @@
 
 #include <kdialog.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 
 #include <atlantic_core.h>
diff --git a/atlantik/libatlantikui/board.cpp b/atlantik/libatlantikui/board.cpp
index 89581a35..bc7402a1 100644
--- a/atlantik/libatlantikui/board.cpp
+++ b/atlantik/libatlantikui/board.cpp
@@ -20,7 +20,7 @@
 #include <tqstring.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <atlantic_core.h>
 #include <player.h>
diff --git a/atlantik/libatlantikui/estatedetails.cpp b/atlantik/libatlantikui/estatedetails.cpp
index 242ae778..45cc4c15 100644
--- a/atlantik/libatlantikui/estatedetails.cpp
+++ b/atlantik/libatlantikui/estatedetails.cpp
@@ -22,10 +22,10 @@
 #include <tqvgroupbox.h>
 
 #include <kdialog.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpixmap.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
diff --git a/atlantik/libatlantikui/estateview.cpp b/atlantik/libatlantikui/estateview.cpp
index 4481117c..fe53d63e 100644
--- a/atlantik/libatlantikui/estateview.cpp
+++ b/atlantik/libatlantikui/estateview.cpp
@@ -23,8 +23,8 @@
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <kdialogbase.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <kpixmapeffect.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
diff --git a/atlantik/libatlantikui/kwrappedlistviewitem.cpp b/atlantik/libatlantikui/kwrappedlistviewitem.cpp
index f437cf62..94143bca 100644
--- a/atlantik/libatlantikui/kwrappedlistviewitem.cpp
+++ b/atlantik/libatlantikui/kwrappedlistviewitem.cpp
@@ -25,7 +25,7 @@
 #include <tqheader.h>
 #include <tqstring.h>
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdelistview.h>
 #include <kwordwrap.h>
 
diff --git a/atlantik/libatlantikui/portfolioview.cpp b/atlantik/libatlantikui/portfolioview.cpp
index d0ab8e92..19424e3b 100644
--- a/atlantik/libatlantikui/portfolioview.cpp
+++ b/atlantik/libatlantikui/portfolioview.cpp
@@ -20,8 +20,8 @@
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <kiconeffect.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
 
diff --git a/atlantik/libatlantikui/token.cpp b/atlantik/libatlantikui/token.cpp
index 791062eb..d6534df5 100644
--- a/atlantik/libatlantikui/token.cpp
+++ b/atlantik/libatlantikui/token.cpp
@@ -23,7 +23,7 @@
 #include <kdebug.h>
 
 #include <kstandarddirs.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include "board.h"
 #include "estate.h"
diff --git a/atlantik/libatlantikui/trade_widget.cpp b/atlantik/libatlantikui/trade_widget.cpp
index deb56f30..e8c819aa 100644
--- a/atlantik/libatlantikui/trade_widget.cpp
+++ b/atlantik/libatlantikui/trade_widget.cpp
@@ -26,7 +26,7 @@
 #include <tqlabel.h>
 #include <tqspinbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
-- 
cgit v1.2.1