summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp
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 /kopete/protocols/jabber/tdeioslave/jabberdisco.cpp
parent5497356b6c12e5854b297bfa0d9c2a9f20cb4ca0 (diff)
downloadtdenetwork-0e88a100de93641e5aeacd8c65e8076c948a5c20.tar.gz
tdenetwork-0e88a100de93641e5aeacd8c65e8076c948a5c20.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kopete/protocols/jabber/tdeioslave/jabberdisco.cpp')
-rw-r--r--kopete/protocols/jabber/tdeioslave/jabberdisco.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp b/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp
index a075bbde..c3091248 100644
--- a/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp
+++ b/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp
@@ -25,9 +25,9 @@
#include <tqcstring.h>
#include <tqthread.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <xmpp_tasks.h>
#include "jabberclient.h"