summaryrefslogtreecommitdiffstats
path: root/ksayit
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-27 01:00:30 -0600
committerTimothy Pearson <[email protected]>2013-01-27 01:00:30 -0600
commita1dc980408b413b3596c22d4631d18e4c348ab98 (patch)
tree674da02d15986991970eafb46b701c1fc9b49fce /ksayit
parent8a9a0d9d01adc055db2b00aff01f945115581991 (diff)
downloadtdeaccessibility-a1dc980408b413b3596c22d4631d18e4c348ab98.tar.gz
tdeaccessibility-a1dc980408b413b3596c22d4631d18e4c348ab98.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'ksayit')
-rw-r--r--ksayit/Freeverb_plugin/freeverbsetupimpl.h2
-rw-r--r--ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp6
-rw-r--r--ksayit/src/doctreeviewimpl.cpp2
-rw-r--r--ksayit/src/effectstack.h2
-rw-r--r--ksayit/src/fxpluginhandler.h2
-rw-r--r--ksayit/src/fxsetupimpl.h2
-rw-r--r--ksayit/src/ksayit.cpp6
-rw-r--r--ksayit/src/ksayit.h2
-rw-r--r--ksayit/src/voicesetupdlg.h2
9 files changed, 13 insertions, 13 deletions
diff --git a/ksayit/Freeverb_plugin/freeverbsetupimpl.h b/ksayit/Freeverb_plugin/freeverbsetupimpl.h
index 2112af0..6e2eab3 100644
--- a/ksayit/Freeverb_plugin/freeverbsetupimpl.h
+++ b/ksayit/Freeverb_plugin/freeverbsetupimpl.h
@@ -22,7 +22,7 @@
#include <tqwidget.h>
// KDE includes
-#include <kconfig.h>
+#include <tdeconfig.h>
// App specific includes
#include <freeverb_setup.h>
diff --git a/ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp b/ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp
index b0bc36c..c176d78 100644
--- a/ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp
+++ b/ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp
@@ -42,8 +42,8 @@ void KTTSDlibSetupImpl::slotLaunchControlcenter()
FILE *fp;
char cmdresult[20];
- // if ( (fp = popen("kcmshell --list | grep kcmkttsmgr", "r")) != NULL){
- if ( (fp = popen("kcmshell --list | grep kcmkttsd", "r")) != NULL){
+ // if ( (fp = popen("tdecmshell --list | grep kcmkttsmgr", "r")) != NULL){
+ if ( (fp = popen("tdecmshell --list | grep kcmkttsd", "r")) != NULL){
fgets(cmdresult, 18, fp);
pclose(fp);
}
@@ -57,7 +57,7 @@ void KTTSDlibSetupImpl::slotLaunchControlcenter()
TDEProcess *kcmproc = new TDEProcess();
connect(kcmproc, TQT_SIGNAL(processExited(TDEProcess*)),
this, TQT_SLOT(slotKCMProcessExited(TDEProcess*)) );
- (*kcmproc) << "kcmshell";
+ (*kcmproc) << "tdecmshell";
(*kcmproc) << "kcmkttsd";
kcmproc->start(TDEProcess::NotifyOnExit);
diff --git a/ksayit/src/doctreeviewimpl.cpp b/ksayit/src/doctreeviewimpl.cpp
index 34e5f64..57e5d8b 100644
--- a/ksayit/src/doctreeviewimpl.cpp
+++ b/ksayit/src/doctreeviewimpl.cpp
@@ -25,7 +25,7 @@
#include <kdebug.h>
#include <kglobal.h>
#include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <kmessagebox.h>
#include <kinputdialog.h>
diff --git a/ksayit/src/effectstack.h b/ksayit/src/effectstack.h
index 0a2f959..e32356d 100644
--- a/ksayit/src/effectstack.h
+++ b/ksayit/src/effectstack.h
@@ -14,7 +14,7 @@
// KDE includes
#include <arts/kmedia2.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <arts/kartsdispatcher.h>
#include <arts/kartsserver.h>
diff --git a/ksayit/src/fxpluginhandler.h b/ksayit/src/fxpluginhandler.h
index 1ee84e7..92db2da 100644
--- a/ksayit/src/fxpluginhandler.h
+++ b/ksayit/src/fxpluginhandler.h
@@ -21,7 +21,7 @@
// #include <tqvaluelist.h>
// KDE includes
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <arts/kartsserver.h>
#include <arts/artsflow.h>
diff --git a/ksayit/src/fxsetupimpl.h b/ksayit/src/fxsetupimpl.h
index e062877..422368e 100644
--- a/ksayit/src/fxsetupimpl.h
+++ b/ksayit/src/fxsetupimpl.h
@@ -24,7 +24,7 @@
// KDE includes
-#include <kconfig.h>
+#include <tdeconfig.h>
// App specific includes
#include "fx_setup.h"
diff --git a/ksayit/src/ksayit.cpp b/ksayit/src/ksayit.cpp
index 101bd86..e2e931d 100644
--- a/ksayit/src/ksayit.cpp
+++ b/ksayit/src/ksayit.cpp
@@ -29,11 +29,11 @@
#include <kiconloader.h>
#include <kmessagebox.h>
#include <kdialogbase.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <kmenubar.h>
#include <kpopupmenu.h>
#include <kstatusbar.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kstdaction.h>
#include <kedittoolbar.h>
#include <kkeydialog.h>
@@ -290,7 +290,7 @@ void KSayItApp::slotChangeBookmarkFilename(const TQString &newname)
if ( newbkFile.isNull() )
return;
- // copy old bookmarkfile to new file
+ // copy old bookmartdefile to new file
if ( m_currentBookmarkFile != newbkFile ){
if ( TQFile::exists(m_currentBookmarkFile) ){
TQString command = TQString("cp %1 %2").arg(m_currentBookmarkFile).arg(newbkFile);
diff --git a/ksayit/src/ksayit.h b/ksayit/src/ksayit.h
index dd27641..d1150bf 100644
--- a/ksayit/src/ksayit.h
+++ b/ksayit/src/ksayit.h
@@ -310,7 +310,7 @@ private: // Methods
void setActions(int actions);
/**
- * Returns the absolute pathname of the given bookmarkfile.
+ * Returns the absolute pathname of the given bookmartdefile.
* This is the first KDE resource directory \p (share/apps) in which
* the user has write permissions. The relative path is
* \p ksayit/ksayit_bookmarks/.
diff --git a/ksayit/src/voicesetupdlg.h b/ksayit/src/voicesetupdlg.h
index 01d171c..f2ddc38 100644
--- a/ksayit/src/voicesetupdlg.h
+++ b/ksayit/src/voicesetupdlg.h
@@ -23,7 +23,7 @@
// KDE includes
#include <kdialogbase.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
// forward declaration
class FXPluginHandler;