summaryrefslogtreecommitdiffstats
path: root/kttsd/libkttsd
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:53:57 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:53:57 -0600
commitc96f95eaac4e5415ddb92103a5c29ab55597408d (patch)
treed6b026edcb7e58f72fed333952a22f4c45fb01f8 /kttsd/libkttsd
parent127600d4f12c1787365edc471904f9732743c771 (diff)
downloadtdeaccessibility-c96f95eaac4e5415ddb92103a5c29ab55597408d.tar.gz
tdeaccessibility-c96f95eaac4e5415ddb92103a5c29ab55597408d.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kttsd/libkttsd')
-rw-r--r--kttsd/libkttsd/filterconf.cpp4
-rw-r--r--kttsd/libkttsd/notify.cpp2
-rw-r--r--kttsd/libkttsd/player.h4
-rw-r--r--kttsd/libkttsd/pluginconf.cpp4
-rw-r--r--kttsd/libkttsd/pluginproc.cpp2
-rw-r--r--kttsd/libkttsd/selecttalkerdlg.h2
-rw-r--r--kttsd/libkttsd/talkercode.cpp4
-rw-r--r--kttsd/libkttsd/testplayer.cpp2
8 files changed, 12 insertions, 12 deletions
diff --git a/kttsd/libkttsd/filterconf.cpp b/kttsd/libkttsd/filterconf.cpp
index 00e42e1..e0a7b23 100644
--- a/kttsd/libkttsd/filterconf.cpp
+++ b/kttsd/libkttsd/filterconf.cpp
@@ -32,8 +32,8 @@
#include <tqstring.h>
// KDE includes.
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
// PluginConf includes.
#include "filterconf.h"
diff --git a/kttsd/libkttsd/notify.cpp b/kttsd/libkttsd/notify.cpp
index ad28419..90166b1 100644
--- a/kttsd/libkttsd/notify.cpp
+++ b/kttsd/libkttsd/notify.cpp
@@ -23,7 +23,7 @@
// KDE includes.
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstaticdeleter.h>
// KTTS includes.
diff --git a/kttsd/libkttsd/player.h b/kttsd/libkttsd/player.h
index fdb980f..28c2591 100644
--- a/kttsd/libkttsd/player.h
+++ b/kttsd/libkttsd/player.h
@@ -20,8 +20,8 @@
#include <tqstringlist.h>
#include <kdemacros.h>
#include "kdeexportfix.h"
-#include "kglobal.h"
-#include "klocale.h"
+#include "tdeglobal.h"
+#include "tdelocale.h"
// #include "filehandle.h"
diff --git a/kttsd/libkttsd/pluginconf.cpp b/kttsd/libkttsd/pluginconf.cpp
index b076729..03420ff 100644
--- a/kttsd/libkttsd/pluginconf.cpp
+++ b/kttsd/libkttsd/pluginconf.cpp
@@ -25,8 +25,8 @@
#include <tqstring.h>
// KDE includes.
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
// PluginConf includes.
diff --git a/kttsd/libkttsd/pluginproc.cpp b/kttsd/libkttsd/pluginproc.cpp
index d50d668..ec86a2a 100644
--- a/kttsd/libkttsd/pluginproc.cpp
+++ b/kttsd/libkttsd/pluginproc.cpp
@@ -22,7 +22,7 @@
// KDE includes.
#include <kdebug.h>
#include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
// PlugInProc includes.
#include "pluginproc.h"
diff --git a/kttsd/libkttsd/selecttalkerdlg.h b/kttsd/libkttsd/selecttalkerdlg.h
index 31c51e5..e656be5 100644
--- a/kttsd/libkttsd/selecttalkerdlg.h
+++ b/kttsd/libkttsd/selecttalkerdlg.h
@@ -32,7 +32,7 @@
// KDE includes.
#include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdemacros.h>
// KTTS includes.
diff --git a/kttsd/libkttsd/talkercode.cpp b/kttsd/libkttsd/talkercode.cpp
index 5ae1afa..f53311d 100644
--- a/kttsd/libkttsd/talkercode.cpp
+++ b/kttsd/libkttsd/talkercode.cpp
@@ -23,8 +23,8 @@
******************************************************************************/
// KDE includes.
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <ktrader.h>
#include <kdebug.h>
diff --git a/kttsd/libkttsd/testplayer.cpp b/kttsd/libkttsd/testplayer.cpp
index 948c629..80d8b90 100644
--- a/kttsd/libkttsd/testplayer.cpp
+++ b/kttsd/libkttsd/testplayer.cpp
@@ -27,7 +27,7 @@
// KDE includes.
#include <tdeapplication.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kstandarddirs.h>
#include <tdeparts/componentfactory.h>
#include <ktrader.h>