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

---
 libksirtet/base/board.cpp              | 2 +-
 libksirtet/base/factory.cpp            | 4 ++--
 libksirtet/base/field.cpp              | 2 +-
 libksirtet/base/kzoommainwindow.cpp    | 2 +-
 libksirtet/base/main.cpp               | 4 ++--
 libksirtet/base/piece.cpp              | 2 +-
 libksirtet/base/settings.cpp           | 2 +-
 libksirtet/common/ai.cpp               | 2 +-
 libksirtet/common/board.cpp            | 2 +-
 libksirtet/common/field.cpp            | 2 +-
 libksirtet/common/highscores.cpp       | 2 +-
 libksirtet/common/inter.cpp            | 2 +-
 libksirtet/common/main.cpp             | 2 +-
 libksirtet/common/settings.cpp         | 4 ++--
 libksirtet/lib/defines.cpp             | 2 +-
 libksirtet/lib/defines.h               | 2 +-
 libksirtet/lib/internal.cpp            | 2 +-
 libksirtet/lib/keys.cpp                | 2 +-
 libksirtet/lib/meeting.cpp             | 4 ++--
 libksirtet/lib/miscui.cpp              | 2 +-
 libksirtet/lib/mp_interface.cpp        | 4 ++--
 libksirtet/lib/mp_simple_interface.cpp | 4 ++--
 libksirtet/lib/pline.cpp               | 2 +-
 libksirtet/lib/types.cpp               | 2 +-
 libksirtet/lib/wizard.cpp              | 4 ++--
 25 files changed, 32 insertions(+), 32 deletions(-)

(limited to 'libksirtet')

diff --git a/libksirtet/base/board.cpp b/libksirtet/base/board.cpp
index 12193e31..f29bdb15 100644
--- a/libksirtet/base/board.cpp
+++ b/libksirtet/base/board.cpp
@@ -2,7 +2,7 @@
 #include "board.moc"
 
 #include <knotifyclient.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kzoommainwindow.h>
 
 #include "piece.h"
diff --git a/libksirtet/base/factory.cpp b/libksirtet/base/factory.cpp
index 00b8874d..d76da791 100644
--- a/libksirtet/base/factory.cpp
+++ b/libksirtet/base/factory.cpp
@@ -3,8 +3,8 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 #include "settings.h"
 
diff --git a/libksirtet/base/field.cpp b/libksirtet/base/field.cpp
index f31ec06c..f443c96c 100644
--- a/libksirtet/base/field.cpp
+++ b/libksirtet/base/field.cpp
@@ -5,7 +5,7 @@
 #include <tqlabel.h>
 #include <tqpushbutton.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcanvasrootpixmap.h>
 #include <knotifyclient.h>
 #include <kgamelcd.h>
diff --git a/libksirtet/base/kzoommainwindow.cpp b/libksirtet/base/kzoommainwindow.cpp
index 8c3fef13..758d73d6 100644
--- a/libksirtet/base/kzoommainwindow.cpp
+++ b/libksirtet/base/kzoommainwindow.cpp
@@ -22,7 +22,7 @@
 
 #include <tdeaction.h>
 #include <kstdaction.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kcmenumngr.h>
 
 KZoomMainWindow::KZoomMainWindow(uint min, uint max, uint step, const char *name)
diff --git a/libksirtet/base/main.cpp b/libksirtet/base/main.cpp
index bda4982e..8f5479f1 100644
--- a/libksirtet/base/main.cpp
+++ b/libksirtet/base/main.cpp
@@ -3,11 +3,11 @@
 
 #include <tdeaction.h>
 #include <kstdaction.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kstdgameaction.h>
 #include <kcmenumngr.h>
 #include <kkeydialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knotifyclient.h>
 #include <knotifydialog.h>
 #include <kexthighscore.h>
diff --git a/libksirtet/base/piece.cpp b/libksirtet/base/piece.cpp
index d423473c..061088fb 100644
--- a/libksirtet/base/piece.cpp
+++ b/libksirtet/base/piece.cpp
@@ -1,6 +1,6 @@
 #include "piece.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <krandomsequence.h>
 
 #include "baseprefs.h"
diff --git a/libksirtet/base/settings.cpp b/libksirtet/base/settings.cpp
index 83c1a7a6..5b2735b5 100644
--- a/libksirtet/base/settings.cpp
+++ b/libksirtet/base/settings.cpp
@@ -7,7 +7,7 @@
 #include <tqcheckbox.h>
 #include <tqhgroupbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <kcolorbutton.h>
 #include <tdeapplication.h>
diff --git a/libksirtet/common/ai.cpp b/libksirtet/common/ai.cpp
index 36e4716c..d201d9fd 100644
--- a/libksirtet/common/ai.cpp
+++ b/libksirtet/common/ai.cpp
@@ -10,7 +10,7 @@
 #include <tqgrid.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
 
diff --git a/libksirtet/common/board.cpp b/libksirtet/common/board.cpp
index 7a0802ad..05d016f2 100644
--- a/libksirtet/common/board.cpp
+++ b/libksirtet/common/board.cpp
@@ -2,7 +2,7 @@
 #include "board.moc"
 
 #include <knotifyclient.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "factory.h"
 #include "base/piece.h"
diff --git a/libksirtet/common/field.cpp b/libksirtet/common/field.cpp
index 4c00ba4e..f1b9cbc9 100644
--- a/libksirtet/common/field.cpp
+++ b/libksirtet/common/field.cpp
@@ -5,7 +5,7 @@
 #include <tqlabel.h>
 #include <tqlayout.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprogress.h>
 #include <kgameprogress.h>
 #include <kcanvasrootpixmap.h>
diff --git a/libksirtet/common/highscores.cpp b/libksirtet/common/highscores.cpp
index 9ac4a005..78eb8b2b 100644
--- a/libksirtet/common/highscores.cpp
+++ b/libksirtet/common/highscores.cpp
@@ -1,6 +1,6 @@
 #include "highscores.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
 
diff --git a/libksirtet/common/inter.cpp b/libksirtet/common/inter.cpp
index 2cd3e981..cc9a86ed 100644
--- a/libksirtet/common/inter.cpp
+++ b/libksirtet/common/inter.cpp
@@ -1,7 +1,7 @@
 #include "inter.h"
 #include "inter.moc"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <tdeapplication.h>
 
diff --git a/libksirtet/common/main.cpp b/libksirtet/common/main.cpp
index 9c4f98f4..fa3b7a91 100644
--- a/libksirtet/common/main.cpp
+++ b/libksirtet/common/main.cpp
@@ -1,7 +1,7 @@
 #include "main.h"
 #include "main.moc"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <kstdaction.h>
 #include <kkeydialog.h>
diff --git a/libksirtet/common/settings.cpp b/libksirtet/common/settings.cpp
index 058de034..27be2047 100644
--- a/libksirtet/common/settings.cpp
+++ b/libksirtet/common/settings.cpp
@@ -6,10 +6,10 @@
 #include <tqcheckbox.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 
 //-----------------------------------------------------------------------------
diff --git a/libksirtet/lib/defines.cpp b/libksirtet/lib/defines.cpp
index baf91083..a968ff88 100644
--- a/libksirtet/lib/defines.cpp
+++ b/libksirtet/lib/defines.cpp
@@ -1,6 +1,6 @@
 #include "defines.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 void errorBox(const TQString &msg1, const TQString &msg2, TQWidget *parent)
 {
diff --git a/libksirtet/lib/defines.h b/libksirtet/lib/defines.h
index a6728a38..05fd8907 100644
--- a/libksirtet/lib/defines.h
+++ b/libksirtet/lib/defines.h
@@ -1,7 +1,7 @@
 #ifndef DEFINES_H
 #define DEFINES_H
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kextsock.h>
 
 // constants
diff --git a/libksirtet/lib/internal.cpp b/libksirtet/lib/internal.cpp
index 25a19bd9..a3f07cbb 100644
--- a/libksirtet/lib/internal.cpp
+++ b/libksirtet/lib/internal.cpp
@@ -2,7 +2,7 @@
 #include "internal.moc"
 
 #include <tqptrlist.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "mp_interface.h"
 
 #define DATA_ERROR(i)  { dataError(i);  return; }
diff --git a/libksirtet/lib/keys.cpp b/libksirtet/lib/keys.cpp
index 801d46d0..5d250680 100644
--- a/libksirtet/lib/keys.cpp
+++ b/libksirtet/lib/keys.cpp
@@ -3,7 +3,7 @@
 
 #include <tqsignal.h>
 #include <kkeydialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 KeyData::KeyData(uint maxNb, uint nbActions, const ActionData *data,
diff --git a/libksirtet/lib/meeting.cpp b/libksirtet/lib/meeting.cpp
index e35a6cbc..88203601 100644
--- a/libksirtet/lib/meeting.cpp
+++ b/libksirtet/lib/meeting.cpp
@@ -3,8 +3,8 @@
 #include <tqmessagebox.h>
 #include <tqpushbutton.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "defines.h"
 #include "mp_option.h"
diff --git a/libksirtet/lib/miscui.cpp b/libksirtet/lib/miscui.cpp
index dde70adb..97a7bfa4 100644
--- a/libksirtet/lib/miscui.cpp
+++ b/libksirtet/lib/miscui.cpp
@@ -3,7 +3,7 @@
 
 #include <tqlayout.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 //-----------------------------------------------------------------------------
diff --git a/libksirtet/lib/mp_interface.cpp b/libksirtet/lib/mp_interface.cpp
index fda2c909..1ad8a572 100644
--- a/libksirtet/lib/mp_interface.cpp
+++ b/libksirtet/lib/mp_interface.cpp
@@ -4,8 +4,8 @@
 #include <tqpainter.h>
 #include <tqlayout.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
 #include <kkeydialog.h>
 
diff --git a/libksirtet/lib/mp_simple_interface.cpp b/libksirtet/lib/mp_simple_interface.cpp
index 80dfe0eb..7058b8eb 100644
--- a/libksirtet/lib/mp_simple_interface.cpp
+++ b/libksirtet/lib/mp_simple_interface.cpp
@@ -1,9 +1,9 @@
 #include "mp_simple_interface.h"
 #include "mp_simple_interface.moc"
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqtimer.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <tdemainwindow.h>
 
diff --git a/libksirtet/lib/pline.cpp b/libksirtet/lib/pline.cpp
index 86fde398..f685181a 100644
--- a/libksirtet/lib/pline.cpp
+++ b/libksirtet/lib/pline.cpp
@@ -3,7 +3,7 @@
 
 #include <tqfont.h>
 #include <tqpushbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "defines.h"
 
 #define THIN_BORDER 4
diff --git a/libksirtet/lib/types.cpp b/libksirtet/lib/types.cpp
index 9d2149d8..ae91c4d5 100644
--- a/libksirtet/lib/types.cpp
+++ b/libksirtet/lib/types.cpp
@@ -1,6 +1,6 @@
 #include "types.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include "version.h"
 
 cId::cId(const TQString &_gameName, const TQString &_gameId)
diff --git a/libksirtet/lib/wizard.cpp b/libksirtet/lib/wizard.cpp
index 073e0986..68537602 100644
--- a/libksirtet/lib/wizard.cpp
+++ b/libksirtet/lib/wizard.cpp
@@ -14,8 +14,8 @@
 #include <tqfile.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdialogbase.h>
 
 #include "types.h"
-- 
cgit v1.2.1