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/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 ++--
 11 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'libksirtet/lib')

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.3