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

---
 kamera/kcontrol/kamera.cpp             | 4 ++--
 kamera/kcontrol/kameraconfigdialog.cpp | 2 +-
 kamera/kcontrol/kameradevice.cpp       | 4 ++--
 kamera/tdeioslave/kamera.cpp           | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'kamera')

diff --git a/kamera/kcontrol/kamera.cpp b/kamera/kcontrol/kamera.cpp
index 4ce4271c..53b17545 100644
--- a/kamera/kcontrol/kamera.cpp
+++ b/kamera/kcontrol/kamera.cpp
@@ -27,10 +27,10 @@
 #include <ksimpleconfig.h>
 #include <tdeaction.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconview.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdetoolbar.h>
 #include <tdepopupmenu.h>
 #include <kprotocolinfo.h>
diff --git a/kamera/kcontrol/kameraconfigdialog.cpp b/kamera/kcontrol/kameraconfigdialog.cpp
index bad19843..9806ff65 100644
--- a/kamera/kcontrol/kameraconfigdialog.cpp
+++ b/kamera/kcontrol/kameraconfigdialog.cpp
@@ -35,7 +35,7 @@
 #include <tqtabwidget.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kameraconfigdialog.h"
 #include "kameraconfigdialog.moc"
diff --git a/kamera/kcontrol/kameradevice.cpp b/kamera/kcontrol/kameradevice.cpp
index d5d74b99..75db64a8 100644
--- a/kamera/kcontrol/kameradevice.cpp
+++ b/kamera/kcontrol/kameradevice.cpp
@@ -31,10 +31,10 @@
 #include <tqlabel.h>
 #include <tqgrid.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <tdelistview.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 #include "config.h"
diff --git a/kamera/tdeioslave/kamera.cpp b/kamera/tdeioslave/kamera.cpp
index 234e28dc..88228418 100644
--- a/kamera/tdeioslave/kamera.cpp
+++ b/kamera/tdeioslave/kamera.cpp
@@ -37,7 +37,7 @@
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
 #include <ksimpleconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprotocolinfo.h>
 #include <tdeio/slaveconfig.h>
 
-- 
cgit v1.2.1