From a1dc980408b413b3596c22d4631d18e4c348ab98 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 01:00:30 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 kttsd/kcmkttsmgr/kcmkttsd.desktop | 2 +-
 kttsd/kcmkttsmgr/kcmkttsmgr.cpp   | 4 ++--
 kttsd/kcmkttsmgr/selectevent.cpp  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'kttsd/kcmkttsmgr')

diff --git a/kttsd/kcmkttsmgr/kcmkttsd.desktop b/kttsd/kcmkttsmgr/kcmkttsd.desktop
index 20e2544..86fce6a 100644
--- a/kttsd/kcmkttsmgr/kcmkttsd.desktop
+++ b/kttsd/kcmkttsmgr/kcmkttsd.desktop
@@ -96,7 +96,7 @@ DocPath=kttsd
 NoDisplay=false
 StartupNotify=false
 StartupWMClass=
-Exec=kcmshell kcmkttsd
+Exec=tdecmshell kcmkttsd
 Icon=kttsd
 Categories=Qt;TDE;Utility;Accessibility;
 Keywords=kttsd,kcmkttsmgr,kttsmgr,tts,ttsd,ktts,text,to,speech,speak,synthesizer,synth,festival,command,freetts,proklam,via,voice
diff --git a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp
index 3b8a40c..941477a 100644
--- a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp
+++ b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp
@@ -46,12 +46,12 @@
 #include <kgenericfactory.h>
 #include <kstandarddirs.h>
 #include <kaboutdata.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <knuminput.h>
 #include <kcombobox.h>
 #include <kinputdialog.h>
 #include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 
 // KTTS includes.
 #include "talkercode.h"
diff --git a/kttsd/kcmkttsmgr/selectevent.cpp b/kttsd/kcmkttsmgr/selectevent.cpp
index 685e1f7..c8e8466 100644
--- a/kttsd/kcmkttsmgr/selectevent.cpp
+++ b/kttsd/kcmkttsmgr/selectevent.cpp
@@ -26,7 +26,7 @@
 
 // KDE includes
 #include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <klistview.h>
-- 
cgit v1.2.1