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

---
 knewstuff/downloaddialog.cpp   | 4 ++--
 knewstuff/engine.cpp           | 4 ++--
 knewstuff/entry.cpp            | 4 ++--
 knewstuff/ghns.cpp             | 2 +-
 knewstuff/knewstuff.cpp        | 2 +-
 knewstuff/knewstuffbutton.cpp  | 2 +-
 knewstuff/knewstuffgeneric.cpp | 4 ++--
 knewstuff/knewstuffsecure.cpp  | 6 +++---
 knewstuff/provider.cpp         | 6 +++---
 knewstuff/providerdialog.cpp   | 4 ++--
 knewstuff/security.cpp         | 4 ++--
 knewstuff/tdehotnewstuff.cpp   | 2 +-
 knewstuff/testnewstuff.cpp     | 2 +-
 knewstuff/uploaddialog.cpp     | 4 ++--
 14 files changed, 25 insertions(+), 25 deletions(-)

(limited to 'knewstuff')

diff --git a/knewstuff/downloaddialog.cpp b/knewstuff/downloaddialog.cpp
index ccbde83d6..8c31712cb 100644
--- a/knewstuff/downloaddialog.cpp
+++ b/knewstuff/downloaddialog.cpp
@@ -21,12 +21,12 @@
 #include "downloaddialog.h"
 #include "downloaddialog.moc"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <kdebug.h>
 #include <tdeio/job.h>
 #include <tdeio/netaccess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurl.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
diff --git a/knewstuff/engine.cpp b/knewstuff/engine.cpp
index a22750f8b..2b33e85f5 100644
--- a/knewstuff/engine.cpp
+++ b/knewstuff/engine.cpp
@@ -25,8 +25,8 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeio/job.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 
 #include "knewstuff.h"
diff --git a/knewstuff/entry.cpp b/knewstuff/entry.cpp
index 56dd375f4..00f7df522 100644
--- a/knewstuff/entry.cpp
+++ b/knewstuff/entry.cpp
@@ -23,8 +23,8 @@
 #include <tqptrdict.h>
 #include <tqwindowdefs.h>
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 using namespace KNS;
 
diff --git a/knewstuff/ghns.cpp b/knewstuff/ghns.cpp
index dfe86a2a4..0702f16bb 100644
--- a/knewstuff/ghns.cpp
+++ b/knewstuff/ghns.cpp
@@ -28,7 +28,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <kprocess.h>
 #include <kdialog.h>
diff --git a/knewstuff/knewstuff.cpp b/knewstuff/knewstuff.cpp
index 07034b454..b652ba4a8 100644
--- a/knewstuff/knewstuff.cpp
+++ b/knewstuff/knewstuff.cpp
@@ -21,7 +21,7 @@
 #include <tdeaction.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include "engine.h"
diff --git a/knewstuff/knewstuffbutton.cpp b/knewstuff/knewstuffbutton.cpp
index 3ad0d6ac6..3baa83397 100644
--- a/knewstuff/knewstuffbutton.cpp
+++ b/knewstuff/knewstuffbutton.cpp
@@ -18,7 +18,7 @@
 */
 
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "downloaddialog.h"
 #include "knewstuffbutton.h"
diff --git a/knewstuff/knewstuffgeneric.cpp b/knewstuff/knewstuffgeneric.cpp
index aa94559b9..ef6a37456 100644
--- a/knewstuff/knewstuffgeneric.cpp
+++ b/knewstuff/knewstuffgeneric.cpp
@@ -24,11 +24,11 @@
 #include <tqdir.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <tdeconfig.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <ktar.h>
 
 #include "entry.h"
diff --git a/knewstuff/knewstuffsecure.cpp b/knewstuff/knewstuffsecure.cpp
index b61924243..67374800e 100644
--- a/knewstuff/knewstuffsecure.cpp
+++ b/knewstuff/knewstuffsecure.cpp
@@ -18,10 +18,10 @@
 //kde includes
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <ktar.h>
 #include <ktempdir.h>
diff --git a/knewstuff/provider.cpp b/knewstuff/provider.cpp
index d5da6bdde..20f1668f7 100644
--- a/knewstuff/provider.cpp
+++ b/knewstuff/provider.cpp
@@ -21,9 +21,9 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <tdeio/job.h>
-#include <kglobal.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 #include <tqptrdict.h>
 #include <tqwindowdefs.h>
diff --git a/knewstuff/providerdialog.cpp b/knewstuff/providerdialog.cpp
index ddc0b2ef3..f71558ecd 100644
--- a/knewstuff/providerdialog.cpp
+++ b/knewstuff/providerdialog.cpp
@@ -23,8 +23,8 @@
 #include <tqlabel.h>
 
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "engine.h"
 #include "provider.h"
diff --git a/knewstuff/security.cpp b/knewstuff/security.cpp
index d9ad85a7c..d161c2969 100644
--- a/knewstuff/security.cpp
+++ b/knewstuff/security.cpp
@@ -22,9 +22,9 @@
  //kde includes
 #include <kdebug.h>
 #include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmdcodec.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpassdlg.h>
 #include <kprocio.h>
 
diff --git a/knewstuff/tdehotnewstuff.cpp b/knewstuff/tdehotnewstuff.cpp
index 87d735330..fb9e92a9b 100644
--- a/knewstuff/tdehotnewstuff.cpp
+++ b/knewstuff/tdehotnewstuff.cpp
@@ -20,7 +20,7 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
 
diff --git a/knewstuff/testnewstuff.cpp b/knewstuff/testnewstuff.cpp
index 82b6d18f7..3494c5230 100644
--- a/knewstuff/testnewstuff.cpp
+++ b/knewstuff/testnewstuff.cpp
@@ -27,7 +27,7 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <kprocess.h>
 #include <kdialog.h>
diff --git a/knewstuff/uploaddialog.cpp b/knewstuff/uploaddialog.cpp
index 98f8f60c7..f4b3dd50e 100644
--- a/knewstuff/uploaddialog.cpp
+++ b/knewstuff/uploaddialog.cpp
@@ -27,10 +27,10 @@
 #include <ktextedit.h>
 
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kurlrequester.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
 #include <kuser.h>
-- 
cgit v1.2.1