summaryrefslogtreecommitdiffstats
path: root/kdcop
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 /kdcop
parent9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff)
downloadtdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz
tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kdcop')
-rw-r--r--kdcop/kdcop.cpp2
-rw-r--r--kdcop/kdcopwindow.cpp6
2 files changed, 4 insertions, 4 deletions
diff --git a/kdcop/kdcop.cpp b/kdcop/kdcop.cpp
index 102eb4be..436a4a59 100644
--- a/kdcop/kdcop.cpp
+++ b/kdcop/kdcop.cpp
@@ -4,7 +4,7 @@
* Licensed under the Artistic License.
*/
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
diff --git a/kdcop/kdcopwindow.cpp b/kdcop/kdcopwindow.cpp
index 12bb5f0c..6cf24579 100644
--- a/kdcop/kdcopwindow.cpp
+++ b/kdcop/kdcopwindow.cpp
@@ -9,14 +9,14 @@
#include "kdcoplistview.h"
#include <dcopclient.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdatastream.h>
#include <kstdaction.h>
#include <tdeaction.h>
#include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <klineedit.h>
#include <keditlistbox.h>