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

---
 kpat/cardmaps.cpp      |  4 ++--
 kpat/clock.cpp         |  2 +-
 kpat/computation.cpp   |  2 +-
 kpat/dealer.cpp        |  2 +-
 kpat/fortyeight.cpp    |  2 +-
 kpat/freecell.cpp      |  2 +-
 kpat/gamestatsimpl.cpp |  2 +-
 kpat/golf.cpp          |  2 +-
 kpat/grandf.cpp        |  2 +-
 kpat/gypsy.cpp         |  2 +-
 kpat/idiot.cpp         |  2 +-
 kpat/kings.cpp         |  2 +-
 kpat/klondike.cpp      |  2 +-
 kpat/mod3.cpp          |  2 +-
 kpat/napoleon.cpp      |  2 +-
 kpat/pwidget.cpp       | 10 +++++-----
 kpat/simon.cpp         |  2 +-
 kpat/spider.cpp        |  2 +-
 kpat/yukon.cpp         |  2 +-
 19 files changed, 24 insertions(+), 24 deletions(-)

(limited to 'kpat')

diff --git a/kpat/cardmaps.cpp b/kpat/cardmaps.cpp
index d00fc8cf..79a950bd 100644
--- a/kpat/cardmaps.cpp
+++ b/kpat/cardmaps.cpp
@@ -32,13 +32,13 @@
 #include <config.h>
 #include <kdebug.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "version.h"
 #include <kstaticdeleter.h>
 #include <tqimage.h>
 #include <kimageeffect.h>
 #include <kcarddialog.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <assert.h>
 
 cardMap *cardMap::_self = 0;
diff --git a/kpat/clock.cpp b/kpat/clock.cpp
index 433fa2d9..a1002d80 100644
--- a/kpat/clock.cpp
+++ b/kpat/clock.cpp
@@ -1,5 +1,5 @@
 #include "clock.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include "deck.h"
 #include <assert.h>
 #include "cardmaps.h"
diff --git a/kpat/computation.cpp b/kpat/computation.cpp
index f8475d0a..e443b57c 100644
--- a/kpat/computation.cpp
+++ b/kpat/computation.cpp
@@ -22,7 +22,7 @@
 ****************************************/
 
 #include "computation.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include "deck.h"
 #include <assert.h>
 #include "cardmaps.h"
diff --git a/kpat/dealer.cpp b/kpat/dealer.cpp
index 49395057..ff6889a1 100644
--- a/kpat/dealer.cpp
+++ b/kpat/dealer.cpp
@@ -8,7 +8,7 @@
 #include <kpixmapeffect.h>
 #include <tqtimer.h>
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "cardmaps.h"
 #include "speeds.h"
 #include <tdeconfig.h>
diff --git a/kpat/fortyeight.cpp b/kpat/fortyeight.cpp
index 05fabd74..64bd8a2f 100644
--- a/kpat/fortyeight.cpp
+++ b/kpat/fortyeight.cpp
@@ -1,5 +1,5 @@
 #include "fortyeight.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include "deck.h"
 #include <assert.h>
diff --git a/kpat/freecell.cpp b/kpat/freecell.cpp
index 7cbb9470..d222020a 100644
--- a/kpat/freecell.cpp
+++ b/kpat/freecell.cpp
@@ -20,7 +20,7 @@
 ---------------------------------------------------------------------------*/
 
 #include "freecell.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include "deck.h"
 #include <assert.h>
 #include <kdebug.h>
diff --git a/kpat/gamestatsimpl.cpp b/kpat/gamestatsimpl.cpp
index 0de9da08..2b27ee74 100644
--- a/kpat/gamestatsimpl.cpp
+++ b/kpat/gamestatsimpl.cpp
@@ -7,7 +7,7 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 GameStatsImpl::GameStatsImpl(TQWidget* aParent, const char* aname)
 	: GameStats(aParent, aname)
diff --git a/kpat/golf.cpp b/kpat/golf.cpp
index 7f21744f..0a37dae4 100644
--- a/kpat/golf.cpp
+++ b/kpat/golf.cpp
@@ -1,5 +1,5 @@
 #include "golf.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include "deck.h"
 #include <kdebug.h>
 #include "cardmaps.h"
diff --git a/kpat/grandf.cpp b/kpat/grandf.cpp
index bbd40848..d2808a27 100644
--- a/kpat/grandf.cpp
+++ b/kpat/grandf.cpp
@@ -19,7 +19,7 @@
 ****************************************/
 
 #include "grandf.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include "deck.h"
 #include <tdeaction.h>
 #include <assert.h>
diff --git a/kpat/gypsy.cpp b/kpat/gypsy.cpp
index db38aa20..ea4727fa 100644
--- a/kpat/gypsy.cpp
+++ b/kpat/gypsy.cpp
@@ -1,5 +1,5 @@
 #include "gypsy.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include "deck.h"
 #include "cardmaps.h"
 
diff --git a/kpat/idiot.cpp b/kpat/idiot.cpp
index 40fd041c..65397616 100644
--- a/kpat/idiot.cpp
+++ b/kpat/idiot.cpp
@@ -20,7 +20,7 @@
 
 
 #include "idiot.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include "deck.h"
 #include "cardmaps.h"
 
diff --git a/kpat/kings.cpp b/kpat/kings.cpp
index 739d3166..81f3c0bc 100644
--- a/kpat/kings.cpp
+++ b/kpat/kings.cpp
@@ -1,5 +1,5 @@
 #include "kings.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include "deck.h"
 #include <assert.h>
diff --git a/kpat/klondike.cpp b/kpat/klondike.cpp
index cb137c0c..b7091f37 100644
--- a/kpat/klondike.cpp
+++ b/kpat/klondike.cpp
@@ -23,7 +23,7 @@
 ****************************************/
 
 #include "klondike.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include "deck.h"
 #include <kdebug.h>
 #include <assert.h>
diff --git a/kpat/mod3.cpp b/kpat/mod3.cpp
index 96b42a5a..64687162 100644
--- a/kpat/mod3.cpp
+++ b/kpat/mod3.cpp
@@ -20,7 +20,7 @@
 
 #include "mod3.h"
 #include "cardmaps.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include "deck.h"
 #include <kdebug.h>
 
diff --git a/kpat/napoleon.cpp b/kpat/napoleon.cpp
index 289501a0..053b158e 100644
--- a/kpat/napoleon.cpp
+++ b/kpat/napoleon.cpp
@@ -18,7 +18,7 @@
  */
 
 #include "napoleon.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include "deck.h"
 #include "cardmaps.h"
 
diff --git a/kpat/pwidget.cpp b/kpat/pwidget.cpp
index dbc211ec..2eb38fc1 100644
--- a/kpat/pwidget.cpp
+++ b/kpat/pwidget.cpp
@@ -25,19 +25,19 @@
 #include <tqimage.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <kdebug.h>
 #include <kcarddialog.h>
 #include <kinputdialog.h>
 #include <kstandarddirs.h>
 #include <tdefiledialog.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeio/netaccess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstatusbar.h>
 #include <tdeaccelmanager.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 
 #include "pwidget.h"
 #include "version.h"
@@ -465,7 +465,7 @@ void pWidget::gameLost()
 {
     TQString   dontAskAgainName = "gameLostDontAskAgain";
 
-    // The following code is taken out of kmessagebox.cpp in tdeui.
+    // The following code is taken out of tdemessagebox.cpp in tdeui.
     // Is there a better way?
     TDEConfig  *config = 0;
     TQString grpNotifMsgs = TQString::fromLatin1("Notification Messages");
diff --git a/kpat/simon.cpp b/kpat/simon.cpp
index 0639ded4..5cd66f32 100644
--- a/kpat/simon.cpp
+++ b/kpat/simon.cpp
@@ -1,5 +1,5 @@
 #include "simon.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include "deck.h"
 #include <assert.h>
diff --git a/kpat/spider.cpp b/kpat/spider.cpp
index b4ac19c0..383f96a2 100644
--- a/kpat/spider.cpp
+++ b/kpat/spider.cpp
@@ -20,7 +20,7 @@
 
 #include "spider.h"
 #include "cardmaps.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include "deck.h"
 #include <kdebug.h>
 
diff --git a/kpat/yukon.cpp b/kpat/yukon.cpp
index dad4e7f8..276a488e 100644
--- a/kpat/yukon.cpp
+++ b/kpat/yukon.cpp
@@ -1,5 +1,5 @@
 #include "yukon.h"
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include "deck.h"
 #include <assert.h>
-- 
cgit v1.2.1