summaryrefslogtreecommitdiffstats
path: root/tdednssd
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:59:01 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:59:01 -0600
commit0e88a100de93641e5aeacd8c65e8076c948a5c20 (patch)
tree54cce3e6ae07c4fc8921244b1397c75cc21a2997 /tdednssd
parent5497356b6c12e5854b297bfa0d9c2a9f20cb4ca0 (diff)
downloadtdenetwork-0e88a100de93641e5aeacd8c65e8076c948a5c20.tar.gz
tdenetwork-0e88a100de93641e5aeacd8c65e8076c948a5c20.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'tdednssd')
-rw-r--r--tdednssd/ioslave/dnssd.cpp6
-rw-r--r--tdednssd/kdedmodule/dnssdwatcher.cpp4
2 files changed, 5 insertions, 5 deletions
diff --git a/tdednssd/ioslave/dnssd.cpp b/tdednssd/ioslave/dnssd.cpp
index 65aa9cb3..a70baa9d 100644
--- a/tdednssd/ioslave/dnssd.cpp
+++ b/tdednssd/ioslave/dnssd.cpp
@@ -33,14 +33,14 @@
#include <tdeconfig.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kinstance.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#include <tdesocketaddress.h>
#include <kprotocolinfo.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kurl.h>
#include <ksock.h>
#include <tqmap.h>
diff --git a/tdednssd/kdedmodule/dnssdwatcher.cpp b/tdednssd/kdedmodule/dnssdwatcher.cpp
index 5b391423..8fd571e2 100644
--- a/tdednssd/kdedmodule/dnssdwatcher.cpp
+++ b/tdednssd/kdedmodule/dnssdwatcher.cpp
@@ -19,8 +19,8 @@
#include "dnssdwatcher.h"
#include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <dnssd/servicebrowser.h>
#include <kdirnotify_stub.h>
#include "watcher.h"