Rename a number of libraries and executables to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 8a9a0d9d01
commit a1dc980408

@ -19,6 +19,6 @@ messages:
$(XGETTEXT) *.cpp *.h -o $(podir)/kbstateapplet.pot
srcdoc:
kdoc -a -p -H -d $$HOME/web/src/kbstateapplet kbstateapplet *.h -lqt -ltdecore -ltdeui -lkfile
kdoc -a -p -H -d $$HOME/web/src/kbstateapplet kbstateapplet *.h -lqt -ltdecore -ltdeui -ltdefile
SUBDIRS = images

@ -701,7 +701,7 @@ void KbStateApplet::configureKeyboard() {
// The modulename "keyboard" is ambiguous on SuSE systems
// as there is also a YaST-module called "keyboard".
TDEProcess proc;
proc << "kcmshell";
proc << "tdecmshell";
proc << "kde/keyboard";
proc.start(TDEProcess::DontCare);
proc.detach();

@ -41,16 +41,16 @@
#include <kinputdialog.h>
#include <kiconloader.h>
#include <kmessagebox.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <kmenubar.h>
#include <klocale.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kdebug.h>
#include <kstdaction.h>
#include <khelpmenu.h>
#include <kimageio.h>
#include <kio/job.h>
#include <kio/netaccess.h>
#include <tdeio/job.h>
#include <tdeio/netaccess.h>
#include <ktempfile.h>
#include <kpopupmenu.h>
#include <kedittoolbar.h>

@ -23,7 +23,7 @@
#include "Xmd_kmousetool.h"
#include "kmousetool.h"
#include "kmousetool.moc"
#include <kconfig.h>
#include <tdeconfig.h>
#include <X11/Intrinsic.h> /* Intrinsics Definitions*/
#include <X11/StringDefs.h> /* Standard Name-String definitions*/
#include <X11/extensions/xtestext1.h> /* Standard Name-String definitions*/

@ -24,7 +24,7 @@
#include <kuniqueapplication.h>
#include <dcopclient.h>
#include <tqmessagebox.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include "kmousetool.h"

@ -24,7 +24,7 @@
#include <kapplication.h>
#include <kstandarddirs.h>
#include <ksconfig.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include "texttospeechconfigurationwidget.h"
#include "phrasebook/phrasebookdialog.h"

@ -24,7 +24,7 @@
#include <kmenubar.h>
#include <kstatusbar.h>
#include <klocale.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kstdaction.h>
#include <kprinter.h>
#include <kpopupmenu.h>

@ -26,7 +26,7 @@
#include <kcombobox.h>
#include <klocale.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kglobal.h>
#include <kiconloader.h>
#include <tdecmodule.h>

@ -27,8 +27,8 @@
#include <kpopupmenu.h>
#include <ktoolbar.h>
#include <ktempfile.h>
#include <kio/netaccess.h>
#include <kfiledialog.h>
#include <tdeio/netaccess.h>
#include <tdefiledialog.h>
#include <kmessagebox.h>
#include <kglobalsettings.h>

@ -38,7 +38,7 @@
#include <kiconloader.h>
#include <kguiitem.h>
#include <kmessagebox.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <kstandarddirs.h>
#include <kdesktopfile.h>

@ -16,7 +16,7 @@
***************************************************************************/
#include <klocale.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kaction.h>
#include <kstdaccel.h>
#include <kshortcutlist.h>

@ -30,7 +30,7 @@
#include <kcursor.h>
#include <kiconloader.h>
#include <klocale.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <kcombobox.h>
#include <kmessagebox.h>

@ -17,7 +17,7 @@
#include "texttospeechconfigurationwidget.h"
#include <kconfig.h>
#include <tdeconfig.h>
#include <tqtextcodec.h>
#include <tqptrlist.h>
#include <tqlayout.h>

@ -24,7 +24,7 @@
#include <kapplication.h>
#include <dcopclient.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include "speech.h"

@ -33,7 +33,7 @@
#include <kapplication.h>
#include <kstandarddirs.h>
#include <kprogress.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include "dictionarycreationwizard.h"
#include "klanguagebutton.h"

@ -3,7 +3,7 @@
#include <kapplication.h>
#include <kstandarddirs.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include "wordcompletion.h"

@ -26,10 +26,10 @@
#include <klocale.h>
#include <kglobal.h>
#include <kstandarddirs.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <ksimpleconfig.h>
#include <kfiledialog.h>
#include <kio/netaccess.h>
#include <tdefiledialog.h>
#include <tdeio/netaccess.h>
#include <kmessagebox.h>
#include "dictionarycreationwizard.h"

@ -22,7 +22,7 @@
#include <tqwidget.h>
// KDE includes
#include <kconfig.h>
#include <tdeconfig.h>
// App specific includes
#include <freeverb_setup.h>

@ -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);

@ -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>

@ -14,7 +14,7 @@
// KDE includes
#include <arts/kmedia2.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <arts/kartsdispatcher.h>
#include <arts/kartsserver.h>

@ -21,7 +21,7 @@
// #include <tqvaluelist.h>
// KDE includes
#include <kconfig.h>
#include <tdeconfig.h>
#include <arts/kartsserver.h>
#include <arts/artsflow.h>

@ -24,7 +24,7 @@
// KDE includes
#include <kconfig.h>
#include <tdeconfig.h>
// App specific includes
#include "fx_setup.h"

@ -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);

@ -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/.

@ -23,7 +23,7 @@
// KDE includes
#include <kdialogbase.h>
#include <kconfig.h>
#include <tdeconfig.h>
// forward declaration
class FXPluginHandler;

@ -19,7 +19,7 @@ kttsjobmgr
kcmkttsd
A KControl module for configuring the KTTS System. kcmkttsd runs in the
TDE Control Center or start it with the command "kcmshell kcmkttsd".
TDE Control Center or start it with the command "tdecmshell kcmkttsd".
tdetexteditor_kttsd
A plugin for the KDE Advanced Text Editor that permits you to speak an entire
@ -158,7 +158,7 @@ plugins Plugins for KTTSD. You must have at least one plugin to use
kttsd KTTSD itself. Non-interactive deamon.
icons Icon for kttsmgr and KTTSD.
kttsjobmgr A KPart used by kcmkttsmgr for managing text jobs in KTTSD.
kcmkttsmgr A KControl module for managing KTTSD. Run using "kcmshell kcmkttsd".
kcmkttsmgr A KControl module for managing KTTSD. Run using "tdecmshell kcmkttsd".
kttsmgr Application for managing KTTSD. Wrapper for kcmkttsmgr plus a system tray icon.
app-plugins Plugins for other applications to speak text.
kate Embedded Kate plugin.

@ -32,7 +32,7 @@ using namespace std;
#include <kaboutdata.h>
#include <kapplication.h>
#include <kcmdlineargs.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <ktrader.h>
#include <tdeparts/componentfactory.h>

@ -39,12 +39,12 @@
#include <kdialog.h>
#include <kdialogbase.h>
#include <kpushbutton.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kstandarddirs.h>
#include <kregexpeditorinterface.h>
#include <ktrader.h>
#include <tdeparts/componentfactory.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
// KTTS includes.
#include "filterconf.h"

@ -28,7 +28,7 @@
#include <tqwidget.h>
// KDE includes.
#include <kconfig.h>
#include <tdeconfig.h>
#include <kdebug.h>
// KTTS includes.

@ -29,7 +29,7 @@
// KDE includes.
#include <kdebug.h>
#include <klocale.h>
#include <kconfig.h>
#include <tdeconfig.h>
// KTTS includes.
#include "utils.h"

@ -40,12 +40,12 @@
#include <kdialog.h>
#include <kdialogbase.h>
#include <kpushbutton.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kstandarddirs.h>
#include <kregexpeditorinterface.h>
#include <ktrader.h>
#include <tdeparts/componentfactory.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <kmessagebox.h>
// KTTS includes.

@ -28,7 +28,7 @@
#include <tqwidget.h>
// KDE includes.
#include <kconfig.h>
#include <tdeconfig.h>
#include <kdebug.h>
// KTTS includes.

@ -29,7 +29,7 @@
// KDE includes.
#include <kdebug.h>
#include <klocale.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kglobal.h>
#include <kstandarddirs.h>

@ -33,12 +33,12 @@
#include <kdialogbase.h>
#include <kcombobox.h>
#include <kpushbutton.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kstandarddirs.h>
#include <kregexpeditorinterface.h>
#include <ktrader.h>
#include <tdeparts/componentfactory.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
// KTTS includes.

@ -28,7 +28,7 @@
#include <tqwidget.h>
// KDE includes.
#include <kconfig.h>
#include <tdeconfig.h>
#include <kdebug.h>
// KTTS includes.

@ -26,7 +26,7 @@
// KDE includes.
#include <kdebug.h>
#include <kconfig.h>
#include <tdeconfig.h>
// KTTS includes.
#include "talkercode.h"

@ -28,7 +28,7 @@
// KDE includes.
#include <klocale.h>
#include <klineedit.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kdialog.h>
#include <kurlrequester.h>
#include <kstandarddirs.h>

@ -28,7 +28,7 @@
#include <tqwidget.h>
// KDE includes.
#include <kconfig.h>
#include <tdeconfig.h>
#include <kdebug.h>
// KTTS includes.

@ -27,7 +27,7 @@
// KDE includes.
#include <tdeversion.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <ktempfile.h>
#include <kstandarddirs.h>
#include <kprocess.h>

@ -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

@ -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"

@ -26,7 +26,7 @@
// KDE includes
#include <kstandarddirs.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <klocale.h>
#include <kdebug.h>
#include <klistview.h>

@ -25,7 +25,7 @@
// KDE includes.
#include <kdebug.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <ktrader.h>
#include <tdeparts/componentfactory.h>
#include <klocale.h>

@ -30,7 +30,7 @@
#include <kapplication.h>
#include <kmessagebox.h>
#include <klocale.h>
#include <kfiledialog.h>
#include <tdefiledialog.h>
#include <dcopclient.h>
#include <knotifyclient.h>
#include <krun.h>

@ -32,7 +32,7 @@
#include <kapplication.h>
#include <kstandarddirs.h>
#include <ktempfile.h>
//#include <kio/job.h>
//#include <tdeio/job.h>
// KTTSD includes.
#include "player.h"

@ -33,7 +33,7 @@
#include <tqmap.h>
// KDE includes.
#include <kconfig.h>
#include <tdeconfig.h>
// KTTS includes.
#include <kspeech.h>

@ -26,7 +26,7 @@
#include <tqimage.h>
// KDE includes.
#include <kconfig.h>
#include <tdeconfig.h>
#include <kuniqueapplication.h>
#include <kcmultidialog.h>
#include <kaboutdata.h>

@ -29,7 +29,7 @@
#include <tqwidget.h>
// KDE includes.
#include <kconfig.h>
#include <tdeconfig.h>
#include <kdebug.h>
#include <kdemacros.h>
#include "kdeexportfix.h"

@ -22,7 +22,7 @@
#include <tqstringlist.h>
// KDE includes.
#include <kconfig.h>
#include <tdeconfig.h>
#include <klocale.h>
#include <kstaticdeleter.h>

@ -22,7 +22,7 @@
#include <tqwidget.h>
// KDE includes.
#include <kconfig.h>
#include <tdeconfig.h>
#include <kdebug.h>
#include <kdemacros.h>
#include "kdeexportfix.h"

@ -23,7 +23,7 @@
#include <tqstring.h>
#include <kdemacros.h>
#include "kdeexportfix.h"
#include <kconfig.h>
#include <tdeconfig.h>
/**
* @interface PlugInProc

@ -36,7 +36,7 @@
#include <kpushbutton.h>
#include <klistview.h>
#include <klineedit.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kdebug.h>
// KTTS includes.

@ -45,7 +45,7 @@
// KDE includes.
#include <kdebug.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kstandarddirs.h>
#include <kmessagebox.h>
#include <klocale.h>

@ -19,7 +19,7 @@
#include "artsplayer.h"
#include <kdebug.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kstandarddirs.h>
#include <tqdir.h>

@ -17,7 +17,7 @@
// KDE includes.
#include <kapplication.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kglobal.h>
#include <kdebug.h>

@ -23,7 +23,7 @@
#include <tqstringlist.h>
// KDE includes.
#include <kconfig.h>
#include <tdeconfig.h>
// KTTS includes.
#include <pluginconf.h>

@ -26,7 +26,7 @@
// KDE includes.
#include <kdebug.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kprocess.h>
#include <ktempfile.h>
#include <kstandarddirs.h>

@ -28,7 +28,7 @@
#include <tqstring.h>
// KDE includes.
#include <kconfig.h>
#include <tdeconfig.h>
#include <kdebug.h>
#include <kprogress.h>

@ -33,7 +33,7 @@
// KDE includes.
#include <kdebug.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <ktempfile.h>
#include <kstandarddirs.h>
#include <kprocess.h>

@ -29,7 +29,7 @@
#include <tqvaluelist.h>
// KDE includes.
#include <kconfig.h>
#include <tdeconfig.h>
#include <kdebug.h>
// KTTS includes.

@ -32,7 +32,7 @@
// KDE includes.
#include <kdebug.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kstandarddirs.h>
// KTTS includes.

@ -28,7 +28,7 @@
#include <tqstring.h>
// KDE includes.
#include <kconfig.h>
#include <tdeconfig.h>
#include <kdebug.h>
// KTTS includes.

@ -27,7 +27,7 @@
// KDE includes.
#include <kdebug.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kstandarddirs.h>
#include <kprocess.h>

@ -21,7 +21,7 @@
#include <tqstringlist.h>
#include <kdebug.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <pluginconf.h>

@ -20,7 +20,7 @@
#include <tqfileinfo.h>
#include <kdebug.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kstandarddirs.h>
#include <kprocess.h>

@ -3,7 +3,7 @@
#include <tqstringlist.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <pluginconf.h>

@ -21,7 +21,7 @@
#include <tqtextcodec.h>
#include <kdebug.h>
#include <kconfig.h>
#include <tdeconfig.h>
#include <kprocess.h>
#include <kstandarddirs.h>

Loading…
Cancel
Save