summaryrefslogtreecommitdiffstats
path: root/ktalkd/ktalkdlg/ktalkdlg.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 /ktalkd/ktalkdlg/ktalkdlg.cpp
parent5497356b6c12e5854b297bfa0d9c2a9f20cb4ca0 (diff)
downloadtdenetwork-0e88a100de93641e5aeacd8c65e8076c948a5c20.tar.gz
tdenetwork-0e88a100de93641e5aeacd8c65e8076c948a5c20.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'ktalkd/ktalkdlg/ktalkdlg.cpp')
-rw-r--r--ktalkd/ktalkdlg/ktalkdlg.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/ktalkd/ktalkdlg/ktalkdlg.cpp b/ktalkd/ktalkdlg/ktalkdlg.cpp
index 1c5e89b5..1fbf43b9 100644
--- a/ktalkd/ktalkdlg/ktalkdlg.cpp
+++ b/ktalkd/ktalkdlg/ktalkdlg.cpp
@@ -36,7 +36,7 @@
#include <tdeconfig.h>
#include <kaudioplayer.h>
-#include <klocale.h>
+#include <tdelocale.h>
#define RING_WAIT 30
#define MAX_DLG_LIFE RING_WAIT