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

---
 src/fetch/amazonfetcher.cpp        | 2 +-
 src/fetch/animenfofetcher.cpp      | 2 +-
 src/fetch/arxivfetcher.cpp         | 2 +-
 src/fetch/bibsonomyfetcher.cpp     | 2 +-
 src/fetch/citebasefetcher.cpp      | 2 +-
 src/fetch/configwidget.cpp         | 2 +-
 src/fetch/crossreffetcher.cpp      | 2 +-
 src/fetch/discogsfetcher.cpp       | 2 +-
 src/fetch/entrezfetcher.cpp        | 2 +-
 src/fetch/execexternalfetcher.cpp  | 2 +-
 src/fetch/fetcher.cpp              | 2 +-
 src/fetch/fetchmanager.cpp         | 6 +++---
 src/fetch/googlescholarfetcher.cpp | 2 +-
 src/fetch/ibsfetcher.cpp           | 2 +-
 src/fetch/imdbfetcher.cpp          | 2 +-
 src/fetch/isbndbfetcher.cpp        | 2 +-
 src/fetch/messagehandler.cpp       | 2 +-
 src/fetch/srufetcher.cpp           | 2 +-
 src/fetch/yahoofetcher.cpp         | 2 +-
 src/fetch/z3950connection.cpp      | 2 +-
 src/fetch/z3950fetcher.cpp         | 2 +-
 21 files changed, 23 insertions(+), 23 deletions(-)

(limited to 'src/fetch')

diff --git a/src/fetch/amazonfetcher.cpp b/src/fetch/amazonfetcher.cpp
index 7f0bb56..9088643 100644
--- a/src/fetch/amazonfetcher.cpp
+++ b/src/fetch/amazonfetcher.cpp
@@ -27,7 +27,7 @@
 #include "../isbnvalidator.h"
 #include "../gui/combobox.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/job.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
diff --git a/src/fetch/animenfofetcher.cpp b/src/fetch/animenfofetcher.cpp
index 45396f1..9447a5f 100644
--- a/src/fetch/animenfofetcher.cpp
+++ b/src/fetch/animenfofetcher.cpp
@@ -22,7 +22,7 @@
 #include "../imagefactory.h"
 #include "../tellico_debug.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdeio/job.h>
 
diff --git a/src/fetch/arxivfetcher.cpp b/src/fetch/arxivfetcher.cpp
index e3cd776..f59d246 100644
--- a/src/fetch/arxivfetcher.cpp
+++ b/src/fetch/arxivfetcher.cpp
@@ -23,7 +23,7 @@
 #include "../imagefactory.h"
 #include "../tellico_debug.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
 
diff --git a/src/fetch/bibsonomyfetcher.cpp b/src/fetch/bibsonomyfetcher.cpp
index 81b13b7..3e80b10 100644
--- a/src/fetch/bibsonomyfetcher.cpp
+++ b/src/fetch/bibsonomyfetcher.cpp
@@ -22,7 +22,7 @@
 #include "../filehandler.h"
 #include "../tellico_debug.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlabel.h>
 #include <tqlayout.h>
diff --git a/src/fetch/citebasefetcher.cpp b/src/fetch/citebasefetcher.cpp
index 5ab886d..f5e8cd6 100644
--- a/src/fetch/citebasefetcher.cpp
+++ b/src/fetch/citebasefetcher.cpp
@@ -22,7 +22,7 @@
 #include "../filehandler.h"
 #include "../tellico_debug.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlabel.h>
 #include <tqlayout.h>
diff --git a/src/fetch/configwidget.cpp b/src/fetch/configwidget.cpp
index 78a385b..052868c 100644
--- a/src/fetch/configwidget.cpp
+++ b/src/fetch/configwidget.cpp
@@ -14,7 +14,7 @@
 #include "configwidget.h"
 
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaccelmanager.h>
 
 #include <tqvgroupbox.h>
diff --git a/src/fetch/crossreffetcher.cpp b/src/fetch/crossreffetcher.cpp
index 27579ab..5029f08 100644
--- a/src/fetch/crossreffetcher.cpp
+++ b/src/fetch/crossreffetcher.cpp
@@ -23,7 +23,7 @@
 #include "../imagefactory.h"
 #include "../tellico_debug.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
 #include <klineedit.h>
diff --git a/src/fetch/discogsfetcher.cpp b/src/fetch/discogsfetcher.cpp
index df3042d..ba4e65c 100644
--- a/src/fetch/discogsfetcher.cpp
+++ b/src/fetch/discogsfetcher.cpp
@@ -22,7 +22,7 @@
 #include "../entry.h"
 #include "../tellico_debug.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
 #include <tdeio/job.h>
diff --git a/src/fetch/entrezfetcher.cpp b/src/fetch/entrezfetcher.cpp
index 6237f7b..07066b8 100644
--- a/src/fetch/entrezfetcher.cpp
+++ b/src/fetch/entrezfetcher.cpp
@@ -21,7 +21,7 @@
 #include "../translators/tellicoimporter.h"
 #include "../tellico_debug.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
 #include <tdeio/job.h>
diff --git a/src/fetch/execexternalfetcher.cpp b/src/fetch/execexternalfetcher.cpp
index 8e87f43..d477e47 100644
--- a/src/fetch/execexternalfetcher.cpp
+++ b/src/fetch/execexternalfetcher.cpp
@@ -25,7 +25,7 @@
 #include "../tellico_utils.h"
 #include "../newstuff/manager.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kprocess.h>
 #include <kurlrequester.h>
diff --git a/src/fetch/fetcher.cpp b/src/fetch/fetcher.cpp
index 2a6fc87..4b119a9 100644
--- a/src/fetch/fetcher.cpp
+++ b/src/fetch/fetcher.cpp
@@ -15,7 +15,7 @@
 #include "messagehandler.h"
 #include "../entry.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 
 using Tellico::Fetch::Fetcher;
diff --git a/src/fetch/fetchmanager.cpp b/src/fetch/fetchmanager.cpp
index 56bea0a..f51b51a 100644
--- a/src/fetch/fetchmanager.cpp
+++ b/src/fetch/fetchmanager.cpp
@@ -46,14 +46,14 @@
 #include "googlescholarfetcher.h"
 #include "discogsfetcher.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kmimetype.h>
 #include <kstandarddirs.h>
 #include <dcopref.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeio/netaccess.h>
 
 #include <tqfileinfo.h>
diff --git a/src/fetch/googlescholarfetcher.cpp b/src/fetch/googlescholarfetcher.cpp
index ce5081c..19e69c6 100644
--- a/src/fetch/googlescholarfetcher.cpp
+++ b/src/fetch/googlescholarfetcher.cpp
@@ -20,7 +20,7 @@
 #include "../tellico_kernel.h"
 #include "../tellico_debug.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdeio/job.h>
 
diff --git a/src/fetch/ibsfetcher.cpp b/src/fetch/ibsfetcher.cpp
index f2308ef..e715e5b 100644
--- a/src/fetch/ibsfetcher.cpp
+++ b/src/fetch/ibsfetcher.cpp
@@ -22,7 +22,7 @@
 #include "../imagefactory.h"
 #include "../tellico_debug.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdeio/job.h>
 
diff --git a/src/fetch/imdbfetcher.cpp b/src/fetch/imdbfetcher.cpp
index 2198b50..a9c0dd0 100644
--- a/src/fetch/imdbfetcher.cpp
+++ b/src/fetch/imdbfetcher.cpp
@@ -23,7 +23,7 @@
 #include "../gui/listboxtext.h"
 #include "../tellico_debug.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialogbase.h>
 #include <tdeconfig.h>
 #include <klineedit.h>
diff --git a/src/fetch/isbndbfetcher.cpp b/src/fetch/isbndbfetcher.cpp
index 3ec088a..7bf8486 100644
--- a/src/fetch/isbndbfetcher.cpp
+++ b/src/fetch/isbndbfetcher.cpp
@@ -21,7 +21,7 @@
 #include "../entry.h"
 #include "../tellico_debug.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
 
diff --git a/src/fetch/messagehandler.cpp b/src/fetch/messagehandler.cpp
index 287d689..9ba0f13 100644
--- a/src/fetch/messagehandler.cpp
+++ b/src/fetch/messagehandler.cpp
@@ -15,7 +15,7 @@
 #include "fetchmanager.h"
 #include "../tellico_kernel.h"
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 using Tellico::Fetch::ManagerMessage;
 
diff --git a/src/fetch/srufetcher.cpp b/src/fetch/srufetcher.cpp
index 6cc932a..ec879b2 100644
--- a/src/fetch/srufetcher.cpp
+++ b/src/fetch/srufetcher.cpp
@@ -27,7 +27,7 @@
 #include "../tellico_utils.h"
 #include "../lccnvalidator.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/job.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
diff --git a/src/fetch/yahoofetcher.cpp b/src/fetch/yahoofetcher.cpp
index 31602e2..9e73b50 100644
--- a/src/fetch/yahoofetcher.cpp
+++ b/src/fetch/yahoofetcher.cpp
@@ -22,7 +22,7 @@
 #include "../entry.h"
 #include "../tellico_debug.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
 #include <tdeio/job.h>
diff --git a/src/fetch/z3950connection.cpp b/src/fetch/z3950connection.cpp
index 7817762..71cc6a2 100644
--- a/src/fetch/z3950connection.cpp
+++ b/src/fetch/z3950connection.cpp
@@ -29,7 +29,7 @@ extern "C" {
 }
 #endif
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqfile.h>
 
diff --git a/src/fetch/z3950fetcher.cpp b/src/fetch/z3950fetcher.cpp
index 1737b27..7e70aa4 100644
--- a/src/fetch/z3950fetcher.cpp
+++ b/src/fetch/z3950fetcher.cpp
@@ -37,7 +37,7 @@
 #include "../isbnvalidator.h"
 #include "../lccnvalidator.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdeapplication.h>
 #include <knuminput.h>
-- 
cgit v1.2.3