summaryrefslogtreecommitdiffstats
path: root/kamera/kcontrol
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:57:18 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:57:18 -0600
commit958d14ea303abe33fce2c259c1000f18171e4229 (patch)
tree61bc8236ab3aa4bc27ca205740322f8df50baff1 /kamera/kcontrol
parentb2de6514213d205907e8de3dd17f8eb80d868a4f (diff)
downloadtdegraphics-958d14ea303abe33fce2c259c1000f18171e4229.tar.gz
tdegraphics-958d14ea303abe33fce2c259c1000f18171e4229.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kamera/kcontrol')
-rw-r--r--kamera/kcontrol/kamera.cpp4
-rw-r--r--kamera/kcontrol/kameraconfigdialog.cpp2
-rw-r--r--kamera/kcontrol/kameradevice.cpp4
3 files changed, 5 insertions, 5 deletions
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"