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/conf/dlgperformance.ui.h             | 2 +-
 kpdf/conf/preferencesdialog.cpp           | 2 +-
 kpdf/core/document.cpp                    | 4 ++--
 kpdf/core/generator_pdf/generator_pdf.cpp | 6 +++---
 kpdf/core/link.cpp                        | 2 +-
 kpdf/part.cpp                             | 4 ++--
 kpdf/shell/main.cpp                       | 2 +-
 kpdf/shell/shell.cpp                      | 6 +++---
 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 +-
 14 files changed, 22 insertions(+), 22 deletions(-)

(limited to 'kpdf')

diff --git a/kpdf/conf/dlgperformance.ui.h b/kpdf/conf/dlgperformance.ui.h
index 4d6062b6..402cba52 100644
--- a/kpdf/conf/dlgperformance.ui.h
+++ b/kpdf/conf/dlgperformance.ui.h
@@ -7,7 +7,7 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 // The purpose of this file is only to display a sort of descriptive text
 // when the user clicks on each memory profile.
diff --git a/kpdf/conf/preferencesdialog.cpp b/kpdf/conf/preferencesdialog.cpp
index a6e1979a..7a308b27 100644
--- a/kpdf/conf/preferencesdialog.cpp
+++ b/kpdf/conf/preferencesdialog.cpp
@@ -7,7 +7,7 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 // single config pages
 #include "dlggeneral.h"
diff --git a/kpdf/core/document.cpp b/kpdf/core/document.cpp
index d00b5d97..8b5a1d4f 100644
--- a/kpdf/core/document.cpp
+++ b/kpdf/core/document.cpp
@@ -19,9 +19,9 @@
 #include <tqmap.h>
 #include <kdebug.h>
 #include <kimageio.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kfinddialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
 #include <kuserprofile.h>
 #include <krun.h>
diff --git a/kpdf/core/generator_pdf/generator_pdf.cpp b/kpdf/core/generator_pdf/generator_pdf.cpp
index 0b29a624..a357d9ff 100644
--- a/kpdf/core/generator_pdf/generator_pdf.cpp
+++ b/kpdf/core/generator_pdf/generator_pdf.cpp
@@ -18,12 +18,12 @@
 #include <tqvariant.h>
 #include <tdeapplication.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpassdlg.h>
 #include <tdewallet.h>
 #include <kprinter.h>
-#include <ktempfile.h>
-#include <kmessagebox.h>
+#include <tdetempfile.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 // xpdf includes
diff --git a/kpdf/core/link.cpp b/kpdf/core/link.cpp
index fd4aa141..6fe65f12 100644
--- a/kpdf/core/link.cpp
+++ b/kpdf/core/link.cpp
@@ -10,7 +10,7 @@
 // local includes
 #include "link.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 KPDFLink::~KPDFLink()
 {
diff --git a/kpdf/part.cpp b/kpdf/part.cpp
index 2c600317..f7ad73c9 100644
--- a/kpdf/part.cpp
+++ b/kpdf/part.cpp
@@ -45,7 +45,7 @@
 #include <tdeparts/genericfactory.h>
 #include <kurldrag.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kfinddialog.h>
 #include <knuminput.h>
 #include <kiconloader.h>
@@ -54,7 +54,7 @@
 #include <tdepopupmenu.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <ktrader.h>
 #include <kxmlguiclient.h>
 #include <kxmlguifactory.h>
diff --git a/kpdf/shell/main.cpp b/kpdf/shell/main.cpp
index 09ba5613..b159e79e 100644
--- a/kpdf/shell/main.cpp
+++ b/kpdf/shell/main.cpp
@@ -16,7 +16,7 @@
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 static const char description[] =
 I18N_NOOP("kpdf, a kde pdf viewer based on xpdf");
diff --git a/kpdf/shell/shell.cpp b/kpdf/shell/shell.cpp
index 6e85080d..209f8760 100644
--- a/kpdf/shell/shell.cpp
+++ b/kpdf/shell/shell.cpp
@@ -25,12 +25,12 @@
 #include <kedittoolbar.h>
 #include <tdefiledialog.h>
 #include <klibloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstdaction.h>
 #include <kurl.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmenubar.h>
+#include <tdelocale.h>
+#include <tdemenubar.h>
 #include <tdeparts/componentfactory.h>
 #include <tdeio/netaccess.h>
 #include <tdemainwindowiface.h>
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.3