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

---
 kpdf/ui/pageview.cpp           | 2 +-
 kpdf/ui/presentationwidget.cpp | 4 ++--
 kpdf/ui/propertiesdialog.cpp   | 4 ++--
 kpdf/ui/searchwidget.cpp       | 2 +-
 kpdf/ui/thumbnaillist.cpp      | 2 +-
 kpdf/ui/toc.cpp                | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'kpdf/ui')

diff --git a/kpdf/ui/pageview.cpp b/kpdf/ui/pageview.cpp
index a385bf93..76a85771 100644
--- a/kpdf/ui/pageview.cpp
+++ b/kpdf/ui/pageview.cpp
@@ -33,7 +33,7 @@
 #include <tdestdaccel.h>
 #include <tdeactioncollection.h>
 #include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
 #include <kimageeffect.h>
 #include <kimageio.h>
diff --git a/kpdf/ui/presentationwidget.cpp b/kpdf/ui/presentationwidget.cpp
index 2928d387..a21bb499 100644
--- a/kpdf/ui/presentationwidget.cpp
+++ b/kpdf/ui/presentationwidget.cpp
@@ -20,10 +20,10 @@
 #include <kcursor.h>
 #include <tdetoolbar.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kimageeffect.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <twin.h>
 
 // system includes
diff --git a/kpdf/ui/propertiesdialog.cpp b/kpdf/ui/propertiesdialog.cpp
index 79203666..d63f0339 100644
--- a/kpdf/ui/propertiesdialog.cpp
+++ b/kpdf/ui/propertiesdialog.cpp
@@ -11,9 +11,9 @@
 #include <tqlayout.h>
 #include <tqlabel.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksqueezedtextlabel.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 // local includes
 #include "propertiesdialog.h"
diff --git a/kpdf/ui/searchwidget.cpp b/kpdf/ui/searchwidget.cpp
index 35f61dd3..8fcbfe22 100644
--- a/kpdf/ui/searchwidget.cpp
+++ b/kpdf/ui/searchwidget.cpp
@@ -13,7 +13,7 @@
 #include <tqtimer.h>
 #include <tdeaction.h>
 #include <tdeactioncollection.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <klineedit.h>
 #include <tdepopupmenu.h>
diff --git a/kpdf/ui/thumbnaillist.cpp b/kpdf/ui/thumbnaillist.cpp
index ab25704f..b443daa5 100644
--- a/kpdf/ui/thumbnaillist.cpp
+++ b/kpdf/ui/thumbnaillist.cpp
@@ -10,7 +10,7 @@
 // qt/kde includes
 #include <tqtimer.h>
 #include <tqpainter.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kurldrag.h>
 #include <tdeaction.h>
diff --git a/kpdf/ui/toc.cpp b/kpdf/ui/toc.cpp
index 8e2f9531..00ac8eaf 100644
--- a/kpdf/ui/toc.cpp
+++ b/kpdf/ui/toc.cpp
@@ -10,7 +10,7 @@
 // qt/kde includes
 #include <tqheader.h>
 #include <tqvariant.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 // local includes
 #include "toc.h"
-- 
cgit v1.2.1