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/shell/main.cpp  | 2 +-
 kpdf/shell/shell.cpp | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'kpdf/shell')

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>
-- 
cgit v1.2.1