From 508a49f9ef02a7b03411c8e9953ba79c99b91c0c Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:59:53 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 kbabel/common/catalog.cpp         | 8 ++++----
 kbabel/common/catalogsettings.cpp | 8 ++++----
 kbabel/common/kbmailer.cpp        | 4 ++--
 kbabel/common/kbproject.cpp       | 4 ++--
 kbabel/common/projectsettings.cpp | 4 ++--
 kbabel/common/tagextractor.cpp    | 2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'kbabel/common')

diff --git a/kbabel/common/catalog.cpp b/kbabel/common/catalog.cpp
index e58ffd87..aaf844ae 100644
--- a/kbabel/common/catalog.cpp
+++ b/kbabel/common/catalog.cpp
@@ -42,10 +42,10 @@
 
 #include <tdeconfig.h>
 #include <kdatatool.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <klibloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
 #include <tdeapplication.h>
 #include <tdeio/netaccess.h>
@@ -67,7 +67,7 @@
 #include "version.h"
 #include "stringdistance.h"
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 using namespace KBabel;
 
 Catalog::Catalog(TQObject* parent, const char* name, TQString projectFile)
diff --git a/kbabel/common/catalogsettings.cpp b/kbabel/common/catalogsettings.cpp
index b217d9c2..d7236b80 100644
--- a/kbabel/common/catalogsettings.cpp
+++ b/kbabel/common/catalogsettings.cpp
@@ -35,11 +35,11 @@
 #include "kbprojectsettings.h"
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kemailsettings.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeemailsettings.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kprocess.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <stdlib.h>
 
diff --git a/kbabel/common/kbmailer.cpp b/kbabel/common/kbmailer.cpp
index 418c1dea..a85fb990 100644
--- a/kbabel/common/kbmailer.cpp
+++ b/kbabel/common/kbmailer.cpp
@@ -41,8 +41,8 @@
 
 #include <tdeapplication.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <ktar.h>
 #include <kurl.h>
 #include <kdebug.h>
diff --git a/kbabel/common/kbproject.cpp b/kbabel/common/kbproject.cpp
index 9700c08f..35ce08a5 100644
--- a/kbabel/common/kbproject.cpp
+++ b/kbabel/common/kbproject.cpp
@@ -39,8 +39,8 @@
 #include <tqfileinfo.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kmimetype.h>
 #include <tdespell.h>
 
diff --git a/kbabel/common/projectsettings.cpp b/kbabel/common/projectsettings.cpp
index 98df4924..8ac63cd4 100644
--- a/kbabel/common/projectsettings.cpp
+++ b/kbabel/common/projectsettings.cpp
@@ -36,8 +36,8 @@
 #include "resources.h"
 
 #include <tqstring.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include <tdespell.h>
diff --git a/kbabel/common/tagextractor.cpp b/kbabel/common/tagextractor.cpp
index bbf9ee1d..ef89fa3e 100644
--- a/kbabel/common/tagextractor.cpp
+++ b/kbabel/common/tagextractor.cpp
@@ -35,7 +35,7 @@
 #include "catalogsettings.h"
 #include "tagextractor.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 
 using namespace KBabel;
-- 
cgit v1.2.1