summaryrefslogtreecommitdiffstats
path: root/kcontrol/ebrowsing
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:55:37 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:55:37 -0600
commit77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (patch)
treea1cce95474892add7cb970b8e9fbdb16e12bc2d7 /kcontrol/ebrowsing
parent9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff)
downloadtdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz
tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/ebrowsing')
-rw-r--r--kcontrol/ebrowsing/filteropts.cpp2
-rw-r--r--kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp6
-rw-r--r--kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp4
-rw-r--r--kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp4
-rw-r--r--kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp6
5 files changed, 11 insertions, 11 deletions
diff --git a/kcontrol/ebrowsing/filteropts.cpp b/kcontrol/ebrowsing/filteropts.cpp
index d2f0f66f8..80916f069 100644
--- a/kcontrol/ebrowsing/filteropts.cpp
+++ b/kcontrol/ebrowsing/filteropts.cpp
@@ -25,7 +25,7 @@
#include <tqlabel.h>
#include <dcopclient.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "filteropts.h"
diff --git a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
index 121037bd9..d9930224e 100644
--- a/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/ikwsopts.cpp
@@ -28,15 +28,15 @@
#include <tqwhatsthis.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <dcopref.h>
#include <tdeapplication.h>
#include <kcombobox.h>
#include <tdeconfig.h>
#include <kiconloader.h>
#include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kservice.h>
#include <ksimpleconfig.h>
#include <kstandarddirs.h>
diff --git a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp
index e0acab4e4..f6227b90f 100644
--- a/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/kuriikwsfilter.cpp
@@ -21,10 +21,10 @@
#include <unistd.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kurl.h>
#include <kinstance.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include "ikwsopts.h"
#include "kuriikwsfiltereng.h"
diff --git a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp
index c42a6be0c..78f84780c 100644
--- a/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/kurisearchfilter.cpp
@@ -22,9 +22,9 @@
#include <unistd.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kinstance.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include "ikwsopts.h"
#include "kuriikwsfiltereng.h"
diff --git a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp
index 543c39634..a1f6ca619 100644
--- a/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp
+++ b/kcontrol/ebrowsing/plugins/ikws/searchproviderdlg.cpp
@@ -22,12 +22,12 @@
#include <tqwhatsthis.h>
#include <tdeapplication.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kcharsets.h>
#include <klineedit.h>
#include <kcombobox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include "searchproviderdlg_ui.h"
#include "searchproviderdlg.h"