summaryrefslogtreecommitdiffstats
path: root/ktalkd/kcmktalkd
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/kcmktalkd
parent5497356b6c12e5854b297bfa0d9c2a9f20cb4ca0 (diff)
downloadtdenetwork-0e88a100de93641e5aeacd8c65e8076c948a5c20.tar.gz
tdenetwork-0e88a100de93641e5aeacd8c65e8076c948a5c20.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'ktalkd/kcmktalkd')
-rw-r--r--ktalkd/kcmktalkd/answmachpage.cpp2
-rw-r--r--ktalkd/kcmktalkd/forwmachpage.cpp2
-rw-r--r--ktalkd/kcmktalkd/main.cpp4
-rw-r--r--ktalkd/kcmktalkd/soundpage.cpp4
4 files changed, 6 insertions, 6 deletions
diff --git a/ktalkd/kcmktalkd/answmachpage.cpp b/ktalkd/kcmktalkd/answmachpage.cpp
index 3091640b..103c152c 100644
--- a/ktalkd/kcmktalkd/answmachpage.cpp
+++ b/ktalkd/kcmktalkd/answmachpage.cpp
@@ -27,7 +27,7 @@
#include <ksimpleconfig.h>
#include <stdlib.h>
-#include <klocale.h> // for getenv
+#include <tdelocale.h> // for getenv
KAnswmachPageConfig::KAnswmachPageConfig( TQWidget *parent, const char* name,
KSimpleConfig *_config)
diff --git a/ktalkd/kcmktalkd/forwmachpage.cpp b/ktalkd/kcmktalkd/forwmachpage.cpp
index 0c07c992..ea323ad6 100644
--- a/ktalkd/kcmktalkd/forwmachpage.cpp
+++ b/ktalkd/kcmktalkd/forwmachpage.cpp
@@ -24,7 +24,7 @@
#include "forwmachpage.h"
#include <ksimpleconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
KForwmachPageConfig::KForwmachPageConfig( TQWidget *parent, const char* name,
KSimpleConfig *_config)
diff --git a/ktalkd/kcmktalkd/main.cpp b/ktalkd/kcmktalkd/main.cpp
index 0975365c..89bf8db5 100644
--- a/ktalkd/kcmktalkd/main.cpp
+++ b/ktalkd/kcmktalkd/main.cpp
@@ -25,8 +25,8 @@
#include "answmachpage.h"
#include "forwmachpage.h"
#include <ksimpleconfig.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <tqtabwidget.h>
#include <tqlayout.h>
diff --git a/ktalkd/kcmktalkd/soundpage.cpp b/ktalkd/kcmktalkd/soundpage.cpp
index 0752f7d7..da298c00 100644
--- a/ktalkd/kcmktalkd/soundpage.cpp
+++ b/ktalkd/kcmktalkd/soundpage.cpp
@@ -35,9 +35,9 @@
#include <klineedit.h>
#include <ksimpleconfig.h>
#include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kaudioplayer.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kurlrequester.h>
#include <kurldrag.h>
#include <kdialog.h>