TDE
/
tdeaccessibility
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdeaccessibility
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

Browse Source
pull/1/head
Timothy Pearson 11 years ago
parent 11f5b1c38c
commit 0b54abbdf8
62 changed files with 355 additions and 355 deletions
Show Stats Download Patch File Download Diff File

38
kbstateapplet/kbstate.cpp
Unescape View File

@ -52,7 +52,7 @@ extern "C"
KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
{
KGlobal::locale()->insertCatalogue("kbstateapplet");
TDEGlobal::locale()->insertCatalogue("kbstateapplet");
KbStateApplet *applet = new KbStateApplet(configFile, KPanelApplet::Normal, KPanelApplet::About, parent, "kbstateapplet");
return applet;
}
@ -700,10 +700,10 @@ void KbStateApplet::configureAccessX() {
void KbStateApplet::configureKeyboard() {
// The modulename "keyboard" is ambiguous on SuSE systems
// as there is also a YaST-module called "keyboard".
KProcess proc;
TDEProcess proc;
proc << "kcmshell";
proc << "kde/keyboard";
proc.start(KProcess::DontCare);
proc.start(TDEProcess::DontCare);
proc.detach();
}
@ -792,11 +792,11 @@ void KeyIcon::updateImages () {
unlatched = instance->iconLoader()->loadIcon(modifierKeys[keyId].icon, KIcon::NoGroup, size-4);
TQImage img = latched.convertToImage();
KIconEffect::colorize(img, KGlobalSettings::highlightedTextColor(), 1.0);
KIconEffect::colorize(img, TDEGlobalSettings::highlightedTextColor(), 1.0);
latched.convertFromImage (img);
img = unlatched.convertToImage();
KIconEffect::colorize(img, KGlobalSettings::textColor(), 1.0);
KIconEffect::colorize(img, TDEGlobalSettings::textColor(), 1.0);
unlatched.convertFromImage (img);
}
@ -811,22 +811,22 @@ void KeyIcon::drawButton (TQPainter *p) {
int o = 0;
if (isLocked || isLatched) {
qDrawShadePanel (p, 0, 0, width(), height(), colorGroup(), true, 1, NULL);
p->fillRect (1,1,width()-2,height()-2, KGlobalSettings::highlightColor());
p->fillRect (1,1,width()-2,height()-2, TDEGlobalSettings::highlightColor());
if (strcmp(modifierKeys[keyId].icon, ""))
p->drawPixmap (x+1,y+1, latched);
black = KGlobalSettings::highlightedTextColor();
black = TDEGlobalSettings::highlightedTextColor();
o = 1;
}
else {
qDrawShadePanel (p, 0, 0, width(), height(), colorGroup(), false, 1, NULL);
if (strcmp(modifierKeys[keyId].icon, ""))
p->drawPixmap (x,y, unlatched);
black = KGlobalSettings::textColor();
black = TDEGlobalSettings::textColor();
}
TQString text = i18n(modifierKeys[keyId].text);
if (!text.isEmpty() && !text.isNull()) {
TQFont font = KGlobalSettings::generalFont();
TQFont font = TDEGlobalSettings::generalFont();
font.setWeight(TQFont::Black);
TQFontMetrics metrics(font);
TQRect rect = metrics.boundingRect (text);
@ -900,8 +900,8 @@ TQPixmap loadIcon(TDEInstance *instance, int size, TQColor color, TQString name)
void MouseIcon::updateImages () {
int size = width()<height() ? width() : height();
TQColor textcolor = KGlobalSettings::textColor();
TQColor basecolor = KGlobalSettings::baseColor();
TQColor textcolor = TDEGlobalSettings::textColor();
TQColor basecolor = TDEGlobalSettings::baseColor();
mouse = loadIcon (instance, size, textcolor, "kbstate_mouse");
leftSelected = loadIcon (instance, size, textcolor,
"kbstate_mouse_left_selected");
@ -976,7 +976,7 @@ void TimeoutIcon::update () {
pixmap = instance->iconLoader()->loadIcon(iconname, KIcon::NoGroup, size);
TQImage img = pixmap.convertToImage();
KIconEffect::colorize(img, KGlobalSettings::textColor(), 1.0);
KIconEffect::colorize(img, TDEGlobalSettings::textColor(), 1.0);
pixmap.convertFromImage (img);
image = pixmap;
@ -988,7 +988,7 @@ void TimeoutIcon::setGlyth (const TQString &glyth) {
this->glyth = glyth;
TQImage img = pixmap.convertToImage();
KIconEffect::colorize(img, KGlobalSettings::textColor(), 1.0);
KIconEffect::colorize(img, TDEGlobalSettings::textColor(), 1.0);
pixmap.convertFromImage (img);
image = pixmap;
@ -1003,7 +1003,7 @@ void TimeoutIcon::setImage (const TQString &name, int timeout) {
pixmap = instance->iconLoader()->loadIcon(iconname, KIcon::NoGroup, size);
TQImage img = pixmap.convertToImage();
KIconEffect::colorize(img, KGlobalSettings::textColor(), 1.0);
KIconEffect::colorize(img, TDEGlobalSettings::textColor(), 1.0);
pixmap.convertFromImage (img);
image = pixmap;
@ -1032,7 +1032,7 @@ void TimeoutIcon::drawButton (TQPainter *p) {
factor = 64;
}
TQFont font = KGlobalSettings::generalFont();
TQFont font = TDEGlobalSettings::generalFont();
font.setWeight(TQFont::Black);
TQFontMetrics metrics(font);
TQRect rect = metrics.boundingRect (text);
@ -1045,12 +1045,12 @@ void TimeoutIcon::drawButton (TQPainter *p) {
p->setFont (font);
if (count == 1) {
p->setPen (KGlobalSettings::textColor());
p->setPen (TDEGlobalSettings::textColor());
p->drawText (0,0, width()/2, height()/2, TQt::AlignCenter, text);
}
else {
TQColor t = KGlobalSettings::textColor();
TQColor b = KGlobalSettings::baseColor();
TQColor t = TDEGlobalSettings::textColor();
TQColor b = TDEGlobalSettings::baseColor();
p->setPen (TQColor ((2*t.red()+3*b.red())/5,
(2*t.green()+3*b.green())/5,
(2*t.blue()+3*b.blue())/5));
@ -1059,7 +1059,7 @@ void TimeoutIcon::drawButton (TQPainter *p) {
(2*t.green()+b.green())/3,
(2*t.blue()+b.blue())/3));
p->drawText (0,0, width(), height(), TQt::AlignCenter, text);
p->setPen (KGlobalSettings::textColor());
p->setPen (TDEGlobalSettings::textColor());
p->drawText (0,0, width()/2, height(), TQt::AlignCenter, text);
}
}

6
kmag/kmag.cpp
Unescape View File

@ -230,7 +230,7 @@ void KmagApp::initActions()
m_pRotationBox->setWhatsThis(i18n("Select the rotation degree."));
m_pRotationBox->setToolTip(i18n("Rotation degree"));
// KHelpMenu *newHelpMenu = new KHelpMenu(this, KGlobal::instance()->aboutData());
// KHelpMenu *newHelpMenu = new KHelpMenu(this, TDEGlobal::instance()->aboutData());
m_keyConf = KStdAction::keyBindings( TQT_TQOBJECT(this), TQT_SLOT( slotConfKeys() ), actionCollection(), "key_conf");
m_toolConf = KStdAction::configureToolbars( TQT_TQOBJECT(this), TQT_SLOT( slotEditToolbars() ),
@ -933,7 +933,7 @@ void KmagApp::slotConfKeys()
void KmagApp::slotEditToolbars()
{
saveMainWindowSettings( KGlobal::config(), "MainWindow" );
saveMainWindowSettings( TDEGlobal::config(), "MainWindow" );
KEditToolbar dlg( actionCollection() );
connect( &dlg, TQT_SIGNAL( newToolbarConfig() ), TQT_TQOBJECT(this), TQT_SLOT( slotNewToolbarConfig() ) );
if ( dlg.exec() )
@ -953,6 +953,6 @@ void KmagApp::contextMenu (TQPoint pos)
void KmagApp::slotNewToolbarConfig()
{
applyMainWindowSettings( KGlobal::config(), "MainWindow" );
applyMainWindowSettings( TDEGlobal::config(), "MainWindow" );
createGUI();
}

12
kmousetool/kmousetool/kmousetool.cpp
Unescape View File

@ -102,7 +102,7 @@ void KMouseTool::init_vars()
appfilename = locate("exe", "kmousetool");
// find the user's autostart directory
autostartdirname = KGlobalSettings::autostartPath();
autostartdirname = TDEGlobalSettings::autostartPath();
// SimpleSoundServer server(Reference("global:Arts_SimpleSoundServer"));
// sound_server(Reference("global:Arts_SimpleSoundServer"));
@ -612,12 +612,12 @@ KMouseToolTray::KMouseToolTray (TQWidget *parent, const char *name) : KSystemTra
{
startStopId = contextMenu()->insertItem (i18n("&Start"), this, TQT_SIGNAL(startStopSelected()));
contextMenu()->insertSeparator();
contextMenu()->insertItem (KGlobal::iconLoader()->loadIcon("configure", KIcon::Small),
contextMenu()->insertItem (TDEGlobal::iconLoader()->loadIcon("configure", KIcon::Small),
i18n("&Configure KMouseTool..."), this, TQT_SIGNAL(configureSelected()));
contextMenu()->insertSeparator();
contextMenu()->insertItem (KGlobal::iconLoader()->loadIcon("contents", KIcon::Small),
contextMenu()->insertItem (TDEGlobal::iconLoader()->loadIcon("contents", KIcon::Small),
i18n("KMousetool &Handbook"), this, TQT_SIGNAL(helpSelected()));
contextMenu()->insertItem (KGlobal::iconLoader()->loadIcon("kmousetool", KIcon::Small),
contextMenu()->insertItem (TDEGlobal::iconLoader()->loadIcon("kmousetool", KIcon::Small),
i18n("&About KMouseTool"), this, TQT_SIGNAL(aboutSelected()));
}
@ -630,11 +630,11 @@ void KMouseToolTray::updateStartStopText(bool mousetool_is_running)
if (mousetool_is_running) {
contextMenu()->changeItem (startStopId, i18n("&Stop"));
icon = KGlobal::iconLoader()->loadIcon("kmousetool_on", KIcon::Small);
icon = TDEGlobal::iconLoader()->loadIcon("kmousetool_on", KIcon::Small);
}
else {
contextMenu()->changeItem (startStopId, i18n("&Start"));
icon = KGlobal::iconLoader()->loadIcon("kmousetool_off", KIcon::Small);
icon = TDEGlobal::iconLoader()->loadIcon("kmousetool_off", KIcon::Small);
}
setPixmap (icon);
show();

6
kmouth/optionsdialog.cpp
Unescape View File

@ -119,7 +119,7 @@ OptionsDialog::OptionsDialog (TQWidget *parent)
{
setHelp ("config-dialog");
TQPixmap iconGeneral = KGlobal::iconLoader()->loadIcon("configure", KIcon::NoGroup, KIcon::SizeMedium);
TQPixmap iconGeneral = TDEGlobal::iconLoader()->loadIcon("configure", KIcon::NoGroup, KIcon::SizeMedium);
TQGrid *pageGeneral = addGridPage (1, Qt::Horizontal, i18n("General Options"), TQString(), iconGeneral);
tabCtl = new TQTabWidget (pageGeneral, "general");
@ -132,13 +132,13 @@ OptionsDialog::OptionsDialog (TQWidget *parent)
commandWidget->layout()->setMargin(KDialog::marginHint());
tabCtl->addTab (commandWidget, i18n("&Text-to-Speech"));
TQPixmap iconCompletion = KGlobal::iconLoader()->loadIcon("keyboard", KIcon::NoGroup, KIcon::SizeMedium);
TQPixmap iconCompletion = TDEGlobal::iconLoader()->loadIcon("keyboard", KIcon::NoGroup, KIcon::SizeMedium);
TQGrid *pageCompletion = addGridPage (1, Qt::Horizontal, i18n("Word Completion"), TQString(), iconCompletion);
completionWidget = new WordCompletionWidget(pageCompletion, "Word Completion widget");
kttsd = loadKttsd();
if (kttsd != 0) {
TQPixmap iconKttsd = KGlobal::iconLoader()->loadIcon("multimedia", KIcon::NoGroup, KIcon::SizeMedium);
TQPixmap iconKttsd = TDEGlobal::iconLoader()->loadIcon("multimedia", KIcon::NoGroup, KIcon::SizeMedium);
TQGrid *pageKttsd = addGridPage (1, Qt::Horizontal, i18n("KTTSD Speech Service"),
i18n("TDE Text-to-Speech Daemon Configuration"), iconKttsd);

2
kmouth/phrasebook/phrasebook.cpp
Unescape View File

@ -102,7 +102,7 @@ void PhraseBook::print(KPrinter *pPrinter) {
int x = size.x();
int y = size.y();
int w = size.width();
printpainter.setFont (TQFont (KGlobalSettings::generalFont().family(), 12));
printpainter.setFont (TQFont (TDEGlobalSettings::generalFont().family(), 12));
TQFontMetrics metrics = printpainter.fontMetrics();
PhraseBookEntryList::iterator it;

2
kmouth/phrasebook/phrasebookdialog.cpp
Unescape View File

@ -403,7 +403,7 @@ TQString PhraseBookDialog::displayPath (TQString filename) {
}
StandardBookList PhraseBookDialog::standardPhraseBooks() {
TQStringList bookPaths = KGlobal::instance()->dirs()->findAllResources (
TQStringList bookPaths = TDEGlobal::instance()->dirs()->findAllResources (
"data", "kmouth/books/*.phrasebook", true, true);
TQStringList bookNames;
TQMap<TQString,StandardBook> bookMap;

8
kmouth/phrasebook/phrasetree.cpp
Unescape View File

@ -77,9 +77,9 @@ void PhraseTreeItem::setCut (KShortcut cut) {
PhraseTree::PhraseTree (TQWidget *parent, const char *name)
: KListView (parent, name)
{
phrasebook_open = KGlobal::iconLoader()->loadIcon("phrasebook", KIcon::Small);
phrasebook_closed = KGlobal::iconLoader()->loadIcon("phrasebook_closed", KIcon::Small);
phrase = KGlobal::iconLoader()->loadIcon("phrase", KIcon::Small);
phrasebook_open = TDEGlobal::iconLoader()->loadIcon("phrasebook", KIcon::Small);
phrasebook_closed = TDEGlobal::iconLoader()->loadIcon("phrasebook_closed", KIcon::Small);
phrase = TDEGlobal::iconLoader()->loadIcon("phrase", KIcon::Small);
connect (this, TQT_SIGNAL(expanded (TQListViewItem *)), this, TQT_SLOT(itemExpanded (TQListViewItem *)));
connect (this, TQT_SIGNAL(collapsed (TQListViewItem *)), this, TQT_SLOT(itemCollapsed (TQListViewItem *)));
@ -494,7 +494,7 @@ bool PhraseTree::isStdAccelPresent (const KShortcut& cut, bool warnUser) {
}
bool PhraseTree::isGlobalKeyPresent (const KShortcut& cut, bool warnUser) {
TQMap<TQString, TQString> mapEntry = KGlobal::config()->entryMap ("Global Shortcuts");
TQMap<TQString, TQString> mapEntry = TDEGlobal::config()->entryMap ("Global Shortcuts");
TQMap<TQString, TQString>::Iterator it;
for (it = mapEntry.begin(); it != mapEntry.end(); ++it) {
int iSeq = keyConflict (cut, KShortcut(*it));

6
kmouth/phraselist.cpp
Unescape View File

@ -75,7 +75,7 @@ PhraseList::PhraseList(TQWidget *parent, const char *name) : TQWidget(parent,nam
rowLayout->addWidget(lineEdit);
lineEdit->setFocus();
TQIconSet icon = KGlobal::iconLoader()->loadIconSet("speak", KIcon::Small);
TQIconSet icon = TDEGlobal::iconLoader()->loadIconSet("speak", KIcon::Small);
speakButton = new TQPushButton (icon, i18n("&Speak"), this);
speakButton->setFocusPolicy(TQ_NoFocus);
speakButton->setAutoDefault(false);
@ -188,8 +188,8 @@ void PhraseList::readCompletionOptions(KConfig *config) {
if (config->hasGroup ("Completion")) {
config->setGroup("Completion");
int mode = config->readNumEntry ("Mode", KGlobalSettings::completionMode());
lineEdit->setCompletionMode (static_cast<KGlobalSettings::Completion>(mode));
int mode = config->readNumEntry ("Mode", TDEGlobalSettings::completionMode());
lineEdit->setCompletionMode (static_cast<TDEGlobalSettings::Completion>(mode));
TQString current = config->readEntry ("List", TQString());
TQStringList list = completion->wordLists();

20
kmouth/speech.cpp
Unescape View File

@ -206,36 +206,36 @@ void Speech::speak(TQString command, bool stdIn, const TQString &text, const TQS
// 3. create a new process
process << command;
connect(&process, TQT_SIGNAL(processExited(KProcess *)), this, TQT_SLOT(processExited(KProcess *)));
connect(&process, TQT_SIGNAL(wroteStdin(KProcess *)), this, TQT_SLOT(wroteStdin(KProcess *)));
connect(&process, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), this, TQT_SLOT(receivedStdout(KProcess *, char *, int)));
connect(&process, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), this, TQT_SLOT(receivedStderr(KProcess *, char *, int)));
connect(&process, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(processExited(TDEProcess *)));
connect(&process, TQT_SIGNAL(wroteStdin(TDEProcess *)), this, TQT_SLOT(wroteStdin(TDEProcess *)));
connect(&process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), this, TQT_SLOT(receivedStdout(TDEProcess *, char *, int)));
connect(&process, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), this, TQT_SLOT(receivedStderr(TDEProcess *, char *, int)));
// 4. start the process
if (stdIn) {
process.start(KProcess::NotifyOnExit, KProcess::All);
process.start(TDEProcess::NotifyOnExit, TDEProcess::All);
if (encText.size() > 0)
process.writeStdin(encText, encText.size());
else
process.closeStdin();
}
else
process.start(KProcess::NotifyOnExit, KProcess::AllOutput);
process.start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput);
}
}
void Speech::receivedStdout (KProcess *, char *buffer, int buflen) {
void Speech::receivedStdout (TDEProcess *, char *buffer, int buflen) {
kdDebug() << TQString::fromLatin1(buffer, buflen) + "\n";
}
void Speech::receivedStderr (KProcess *, char *buffer, int buflen) {
void Speech::receivedStderr (TDEProcess *, char *buffer, int buflen) {
kdDebug() << TQString::fromLatin1(buffer, buflen) + "\n";
}
void Speech::wroteStdin(KProcess *) {
void Speech::wroteStdin(TDEProcess *) {
process.closeStdin();
}
void Speech::processExited(KProcess *) {
void Speech::processExited(TDEProcess *) {
delete this;
}

8
kmouth/speech.h
Unescape View File

@ -59,10 +59,10 @@ public:
const TQString &filename, const TQString &language);
public slots:
void wroteStdin (KProcess *p);
void processExited (KProcess *p);
void receivedStdout (KProcess *proc, char *buffer, int buflen);
void receivedStderr (KProcess *proc, char *buffer, int buflen);
void wroteStdin (TDEProcess *p);
void processExited (TDEProcess *p);
void receivedStdout (TDEProcess *proc, char *buffer, int buflen);
void receivedStderr (TDEProcess *proc, char *buffer, int buflen);
private:
KShellProcess process;

4
kmouth/wordcompletion/dictionarycreationwizard.cpp
Unescape View File

@ -256,8 +256,8 @@ TQString DictionaryCreationWizard::language() {
return mergeWidget->language();
}
else if (creationSource->emptyButton->isChecked()) {
if (KGlobal::locale())
return KGlobal::locale()->language();
if (TDEGlobal::locale())
return TDEGlobal::locale()->language();
else
return KLocale::defaultLanguage();
}

8
kmouth/wordcompletion/klanguagebuttonhelper.cpp
Unescape View File

@ -30,7 +30,7 @@
#include "klanguagebutton.h"
TQString languageName (TQString languageCode) {
TQString filename = KGlobal::dirs()->findResource("locale",
TQString filename = TDEGlobal::dirs()->findResource("locale",
languageCode + TQString::fromLatin1("/entry.desktop"));
KSimpleConfig entry(filename);
@ -41,7 +41,7 @@ TQString languageName (TQString languageCode) {
void loadLanguageList(KLanguageButton *combo)
// This function was taken from tdebase/kcontrol/tdm/tdm-appear.cpp
{
TQStringList langlist = KGlobal::dirs()->findAllResources("locale",
TQStringList langlist = TDEGlobal::dirs()->findAllResources("locale",
TQString::fromLatin1("*/entry.desktop"));
langlist.sort();
for ( TQStringList::ConstIterator it = langlist.begin();
@ -57,8 +57,8 @@ void loadLanguageList(KLanguageButton *combo)
combo->insertLanguage(nid, name, TQString::fromLatin1("l10n/"), TQString());
}
if (KGlobal::locale())
combo->setCurrentItem (KGlobal::locale()->language());
if (TDEGlobal::locale())
combo->setCurrentItem (TDEGlobal::locale()->language());
else
combo->setCurrentItem (KLocale::defaultLanguage());
}

8
kmouth/wordcompletion/wordcompletionwidget.cpp
Unescape View File

@ -70,7 +70,7 @@ public:
}
void setLanguage (TQString languageCode) {
TQString filename = KGlobal::dirs()->findResource("locale",
TQString filename = TDEGlobal::dirs()->findResource("locale",
languageCode + TQString::fromLatin1("/entry.desktop"));
KSimpleConfig entry(filename);
@ -141,7 +141,7 @@ void WordCompletionWidget::load() {
// Clean up disc space
for (TQStringList::Iterator it = newDictionaryFiles.begin(); it != newDictionaryFiles.end(); ++it) {
TQString filename = KGlobal::dirs()->findResource ("appdata", *it);
TQString filename = TDEGlobal::dirs()->findResource ("appdata", *it);
if (!filename.isEmpty() && !filename.isNull())
TQFile::remove (filename);
}
@ -171,7 +171,7 @@ void WordCompletionWidget::save() {
// Clean up disc space
for (TQStringList::Iterator it = removedDictionaryFiles.begin(); it != removedDictionaryFiles.end(); ++it) {
TQString filename = KGlobal::dirs()->findResource ("appdata", *it);
TQString filename = TDEGlobal::dirs()->findResource ("appdata", *it);
if (!filename.isEmpty() && !filename.isNull())
TQFile::remove (filename);
}
@ -257,7 +257,7 @@ void WordCompletionWidget::exportDictionary() {
}
}
KURL src;
src.setPath( KGlobal::dirs()->findResource ("appdata", item->filename()) );
src.setPath( TDEGlobal::dirs()->findResource ("appdata", item->filename()) );
KIO::NetAccess::copy (src, url, this);
}
}

2
ksayit/KTTSD_Lib/kttsdlib.cpp
Unescape View File

@ -30,7 +30,7 @@
KTTSDLib::KTTSDLib(TQObject *parent, const char *name, TDEApplication *Appl)
: TQObject(parent, name), m_Appl(Appl)
{
KGlobal::locale()->insertCatalogue("libKTTSD");
TDEGlobal::locale()->insertCatalogue("libKTTSD");
m_talker = new kttsdlibtalker2(static_cast<TQObject*>(this), "kttsdlibtalker");
connect(m_talker, TQT_SIGNAL(signalTextFinished(const uint)),
this, TQT_SLOT(slotTextFinished(const uint)) );

10
ksayit/KTTSD_Lib/kttsdlibsetupimpl.cpp
Unescape View File

@ -54,18 +54,18 @@ void KTTSDlibSetupImpl::slotLaunchControlcenter()
}
// invoke the Control Center Module
KProcess *kcmproc = new KProcess();
connect(kcmproc, TQT_SIGNAL(processExited(KProcess*)),
this, TQT_SLOT(slotKCMProcessExited(KProcess*)) );
TDEProcess *kcmproc = new TDEProcess();
connect(kcmproc, TQT_SIGNAL(processExited(TDEProcess*)),
this, TQT_SLOT(slotKCMProcessExited(TDEProcess*)) );
(*kcmproc) << "kcmshell";
(*kcmproc) << "kcmkttsd";
kcmproc->start(KProcess::NotifyOnExit);
kcmproc->start(TDEProcess::NotifyOnExit);
kcm_Button->setEnabled(false);
}
void KTTSDlibSetupImpl::slotKCMProcessExited(KProcess *p)
void KTTSDlibSetupImpl::slotKCMProcessExited(TDEProcess *p)
{
kdDebug(100200) << "slotKCMProcessExited()" << endl;
kcm_Button->setEnabled(true);

2
ksayit/KTTSD_Lib/kttsdlibsetupimpl.h
Unescape View File

@ -41,7 +41,7 @@ private slots:
/** Called when the Control Center Module was closed.
*/
void slotKCMProcessExited(KProcess *p);
void slotKCMProcessExited(TDEProcess *p);
};
#endif

2
ksayit/src/contextmenuhandler.cpp
Unescape View File

@ -123,7 +123,7 @@ ContextMenuHandler::ContextMenuHandler(TQObject *parent, const char *name)
m_popupmenu = NULL;
m_item = NULL;
initActions();
m_XmlFilePath = KGlobal::dirs()->findResource("data", "ksayit/ContextMenus.xml");
m_XmlFilePath = TDEGlobal::dirs()->findResource("data", "ksayit/ContextMenus.xml");
}

30
ksayit/src/docbookclasses.cpp
Unescape View File

@ -55,7 +55,7 @@ ListViewInterface::ListViewInterface(KListView *lv, TQString label)
RobDocument::RobDocument(KListView *lv, TQString label)
: ListViewInterface( lv, label )
{
TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("contents", KIcon::Small);
TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon("contents", KIcon::Small);
this->setPixmap(0, pixmap);
// new Concept (begin)
@ -119,7 +119,7 @@ TQVariant RobDocument::getValue( unsigned int index ) const
Overview::Overview(ListViewInterface *parent, ListViewInterface *after, TQString label)
: ListViewInterface(parent, after, label)
{
TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("filenew", KIcon::Small);
TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon("filenew", KIcon::Small);
this->setPixmap(0, pixmap);
this->setText(3, "0"); // upmost element
@ -174,7 +174,7 @@ TQVariant Overview::getValue( unsigned int index ) const
Date::Date(ListViewInterface *parent, ListViewInterface *after, TQString label)
: ListViewInterface(parent, after, label)
{
TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("filenew", KIcon::Small);
TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon("filenew", KIcon::Small);
this->setPixmap(0, pixmap);
this->setText(3, "00000001");
@ -241,7 +241,7 @@ TQVariant Date::getValue( unsigned int index ) const
ReleaseInfo::ReleaseInfo(ListViewInterface *parent, ListViewInterface *after, TQString label)
: ListViewInterface(parent, after, label)
{
TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("filenew", KIcon::Small);
TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon("filenew", KIcon::Small);
this->setPixmap(0, pixmap);
this->setText(3, "00000002");
@ -308,7 +308,7 @@ TQVariant ReleaseInfo::getValue( unsigned int index ) const
AuthorGroup::AuthorGroup(ListViewInterface *parent, ListViewInterface *after, TQString label)
: ListViewInterface(parent, after, label)
{
TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("tdmconfig", KIcon::Small);
TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon("tdmconfig", KIcon::Small);
this->setPixmap(0, pixmap);
this->setText(3, "00000003");
@ -364,7 +364,7 @@ TQVariant AuthorGroup::getValue( unsigned int index ) const
Author::Author(ListViewInterface *parent, ListViewInterface *after, TQString label)
: ListViewInterface(parent, after, label)
{
TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("personal", KIcon::Small);
TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon("personal", KIcon::Small);
this->setPixmap(0, pixmap);
// new Concept (begin)
@ -448,7 +448,7 @@ TQVariant Author::getValue( unsigned int index ) const
KeywordSet::KeywordSet(ListViewInterface *parent, ListViewInterface *after, TQString label)
: ListViewInterface(parent, after, label)
{
TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("txt", KIcon::Small);
TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon("txt", KIcon::Small);
this->setPixmap(0, pixmap);
this->setText(3, "00000004");
@ -569,7 +569,7 @@ TQVariant Keyword::getValue( unsigned int index ) const
Abstract::Abstract(ListViewInterface *parent, ListViewInterface *after, TQString label)
: ListViewInterface(parent, after, label)
{
TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("filenew", KIcon::Small);
TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon("filenew", KIcon::Small);
this->setPixmap(0, pixmap);
this->setText(3, "00000005");
@ -625,7 +625,7 @@ TQVariant Abstract::getValue( unsigned int index ) const
Para::Para(ListViewInterface *parent, ListViewInterface *after, TQString label)
: ListViewInterface(parent, after, label)
{
TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small);
TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small);
this->setPixmap(0, pixmap);
// new Concept (begin)
@ -699,7 +699,7 @@ TQVariant Para::getValue( unsigned int index ) const
Chapter::Chapter(ListViewInterface *parent, ListViewInterface *after, TQString label)
: ListViewInterface(parent, after, label)
{
TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small);
TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small);
this->setPixmap(0, pixmap);
// new Concept (begin)
@ -760,7 +760,7 @@ TQVariant Chapter::getValue( unsigned int index ) const
Sect1::Sect1(ListViewInterface *parent, ListViewInterface *after, TQString label)
: ListViewInterface(parent, after, label)
{
TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small);
TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small);
this->setPixmap(0, pixmap);
// new Concept (begin)
@ -820,7 +820,7 @@ TQVariant Sect1::getValue( unsigned int index ) const
Sect2::Sect2(ListViewInterface *parent, ListViewInterface *after, TQString label)
: ListViewInterface(parent, after, label)
{
TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small);
TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small);
this->setPixmap(0, pixmap);
// new Concept (begin)
@ -880,7 +880,7 @@ TQVariant Sect2::getValue( unsigned int index ) const
Sect3::Sect3(ListViewInterface *parent, ListViewInterface *after, TQString label)
: ListViewInterface(parent, after, label)
{
TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small);
TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small);
this->setPixmap(0, pixmap);
// new Concept (begin)
@ -940,7 +940,7 @@ TQVariant Sect3::getValue( unsigned int index ) const
Sect4::Sect4(ListViewInterface *parent, ListViewInterface *after, TQString label)
: ListViewInterface(parent, after, label)
{
TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small);
TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small);
this->setPixmap(0, pixmap);
// new Concept (begin)
@ -1000,7 +1000,7 @@ TQVariant Sect4::getValue( unsigned int index ) const
Sect5::Sect5(ListViewInterface *parent, ListViewInterface *after, TQString label)
: ListViewInterface(parent, after, label)
{
TQPixmap pixmap = KGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small);
TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small);
this->setPixmap(0, pixmap);
// new Concept (begin)

2
ksayit/src/doctreeviewimpl.cpp
Unescape View File

@ -927,7 +927,7 @@ void DocTreeViewImpl::slotNewDate()
date->setText(3, TQString("%1").arg(newIndex).rightJustify(8,'0') );
// get current date
TQString today;
today = KGlobal::locale()->formatDate(TQDate::currentDate(Qt::LocalTime), true);
today = TDEGlobal::locale()->formatDate(TQDate::currentDate(Qt::LocalTime), true);
date->setText( 1, today);
date->setValue( KSayItGlobal::RAWDATA, today );
date->setValue( KSayItGlobal::RTFDATA, today );

6
ksayit/src/ksayitsystemtray.cpp
Unescape View File

@ -232,7 +232,7 @@ void State::mouseReleaseEventCall(KSayItSystemTray *caller, TQMouseEvent *e)
////////////////////////////////////////////
StateWAIT::StateWAIT(){
m_traypixmap = KGlobal::iconLoader()->loadIcon("ksayit", KIcon::Toolbar);
m_traypixmap = TDEGlobal::iconLoader()->loadIcon("ksayit", KIcon::Toolbar);
}
StateWAIT::~StateWAIT(){
}
@ -273,7 +273,7 @@ void StateWAIT::mouseReleaseEvent(KSayItSystemTray *caller, TQMouseEvent *e)
////////////////////////////////////////////
StateSAY::StateSAY(){
m_traypixmap = KGlobal::iconLoader()->loadIcon("ksayit_talking", KIcon::Toolbar);
m_traypixmap = TDEGlobal::iconLoader()->loadIcon("ksayit_talking", KIcon::Toolbar);
}
StateSAY::~StateSAY(){
}
@ -315,7 +315,7 @@ void StateSAY::mouseReleaseEvent(KSayItSystemTray *caller, TQMouseEvent *e)
////////////////////////////////////////////
StateCLIPEMPTY::StateCLIPEMPTY(){
m_traypixmap = KGlobal::iconLoader()->loadIcon("ksayit_clipempty", KIcon::Toolbar);
m_traypixmap = TDEGlobal::iconLoader()->loadIcon("ksayit_clipempty", KIcon::Toolbar);
}
StateCLIPEMPTY::~StateCLIPEMPTY(){
}

4
ksayit/src/voicesetupdlg.cpp
Unescape View File

@ -66,7 +66,7 @@ VoiceSetupDlg::~VoiceSetupDlg()
void VoiceSetupDlg::initVoicePage()
{
TQPixmap icon = KGlobal::iconLoader()->loadIcon("ksayit", KIcon::Toolbar, KIcon::SizeMedium);
TQPixmap icon = TDEGlobal::iconLoader()->loadIcon("ksayit", KIcon::Toolbar, KIcon::SizeMedium);
TQFrame *voicePage = addPage( i18n( "Voice" ), i18n("Voice Settings"), icon );
TQVBoxLayout *voiceLayout = new TQVBoxLayout( voicePage, 0, spacingHint() );
@ -77,7 +77,7 @@ void VoiceSetupDlg::initVoicePage()
void VoiceSetupDlg::initFXPage()
{
TQPixmap icon = KGlobal::iconLoader()->loadIcon("ksysguard", KIcon::Toolbar, KIcon::SizeMedium);
TQPixmap icon = TDEGlobal::iconLoader()->loadIcon("ksysguard", KIcon::Toolbar, KIcon::SizeMedium);
m_fxPage = addPage( i18n( "Audio FX" ), i18n("Effect Stack"), icon );
TQVBoxLayout *fxLayout = new TQVBoxLayout( m_fxPage, 0, spacingHint() );

4
kttsd/TODO
Unescape View File

@ -33,10 +33,10 @@ _ Festival Interactive plugin:
_ EPOS plugin:
_ Command plugin:
_ Command plugin encodes text on command line using %t in user's chosen encoding, but
if this differs from user's desktop default encoding, doesn't work. KProcess always
if this differs from user's desktop default encoding, doesn't work. TDEProcess always
encodes command line stuff using user's default encoding. There is no point, therefore,
in attempting to encode it differently, just mangles the text even more. Short of modifying
KProcess, I see no way around this. But perhaps a warning to user advising to use %f instead?
TDEProcess, I see no way around this. But perhaps a warning to user advising to use %f instead?
_ Command plugin crashes when using command 'flite -t "%t"' and flite can't get write access to /dev/dsp*.
_ Hadifix plugin:
_ BUG:116151 Add options for using the new prepoc capability in Hadifix.

4
kttsd/app-plugins/kate/katekttsd.cpp
Unescape View File

@ -63,7 +63,7 @@ void KateKttsdPlugin::removeView(KTextEditor::View *view)
m_views.remove (nview);
delete nview;
}
KGlobal::locale()->removeCatalogue("kttsd");
TDEGlobal::locale()->removeCatalogue("kttsd");
}
@ -73,7 +73,7 @@ KateKttsdPluginView::KateKttsdPluginView( KTextEditor::View *view, const char *n
{
view->insertChildClient( this );
setInstance( KGenericFactory<KateKttsdPlugin>::instance() );
KGlobal::locale()->insertCatalogue("kttsd");
TDEGlobal::locale()->insertCatalogue("kttsd");
(void) new KAction( i18n("Speak Text"), "kttsd", 0, this, TQT_SLOT(slotReadOut()), actionCollection(), "tools_kttsd" );
setXMLFile( "ktexteditor_kttsdui.rc" );
}

18
kttsd/filters/sbd/sbdconf.cpp
Unescape View File

@ -132,7 +132,7 @@ void SbdConf::load(KConfig* config, const TQString& configGroup){
for ( uint ndx=0; ndx < m_languageCodeList.count(); ++ndx)
{
if (!language.isEmpty()) language += ",";
language += KGlobal::locale()->twoAlphaToLanguageName(m_languageCodeList[ndx]);
language += TDEGlobal::locale()->twoAlphaToLanguageName(m_languageCodeList[ndx]);
}
m_widget->languageLineEdit->setText(language);
m_widget->appIdLineEdit->setText(
@ -239,7 +239,7 @@ void SbdConf::slotLanguageBrowseButton_clicked()
langLView->addColumn(i18n("Language"));
langLView->addColumn(i18n("Code"));
langLView->setSelectionMode(TQListView::Extended);
TQStringList allLocales = KGlobal::locale()->allLanguagesTwoAlpha();
TQStringList allLocales = TDEGlobal::locale()->allLanguagesTwoAlpha();
TQString locale;
TQString languageCode;
TQString countryCode;
@ -252,10 +252,10 @@ void SbdConf::slotLanguageBrowseButton_clicked()
for (int ndx=0; ndx < allLocalesCount; ++ndx)
{
locale = allLocales[ndx];
KGlobal::locale()->splitLocale(locale, languageCode, countryCode, charSet);
language = KGlobal::locale()->twoAlphaToLanguageName(languageCode);
TDEGlobal::locale()->splitLocale(locale, languageCode, countryCode, charSet);
language = TDEGlobal::locale()->twoAlphaToLanguageName(languageCode);
if (!countryCode.isEmpty()) language +=
" (" + KGlobal::locale()->twoAlphaToCountryName(countryCode)+")";
" (" + TDEGlobal::locale()->twoAlphaToCountryName(countryCode)+")";
TQListViewItem* item = new KListViewItem(langLView, language, locale);
if (m_languageCodeList.contains(locale)) item->setSelected(true);
}
@ -294,7 +294,7 @@ void SbdConf::slotLanguageBrowseButton_clicked()
for ( uint ndx=0; ndx < m_languageCodeList.count(); ++ndx)
{
if (!language.isEmpty()) language += ",";
language += KGlobal::locale()->twoAlphaToLanguageName(m_languageCodeList[ndx]);
language += TDEGlobal::locale()->twoAlphaToLanguageName(m_languageCodeList[ndx]);
}
m_widget->languageLineEdit->setText(language);
configChanged();
@ -302,8 +302,8 @@ void SbdConf::slotLanguageBrowseButton_clicked()
void SbdConf::slotLoadButton_clicked()
{
// TQString dataDir = KGlobal::dirs()->resourceDirs("data").last() + "/kttsd/stringreplacer/";
TQString dataDir = KGlobal::dirs()->findAllResources("data", "kttsd/sbd/").last();
// TQString dataDir = TDEGlobal::dirs()->resourceDirs("data").last() + "/kttsd/stringreplacer/";
TQString dataDir = TDEGlobal::dirs()->findAllResources("data", "kttsd/sbd/").last();
TQString filename = KFileDialog::getOpenFileName(
dataDir,
"*rc|SBD Config (*rc)",
@ -319,7 +319,7 @@ void SbdConf::slotLoadButton_clicked()
void SbdConf::slotSaveButton_clicked()
{
TQString filename = KFileDialog::getSaveFileName(
KGlobal::dirs()->saveLocation( "data" ,"kttsd/sbd/", false ),
TDEGlobal::dirs()->saveLocation( "data" ,"kttsd/sbd/", false ),
"*rc|SBD Config (*rc)",
m_widget,
"sbd_savefile");

22
kttsd/filters/stringreplacer/stringreplacerconf.cpp
Unescape View File

@ -192,7 +192,7 @@ TQString StringReplacerConf::loadFromFile( const TQString& filename, bool clear)
for ( uint ndx=0; ndx < m_languageCodeList.count(); ++ndx )
{
if (!language.isEmpty()) language += ",";
language += KGlobal::locale()->twoAlphaToLanguageName(m_languageCodeList[ndx]);
language += TDEGlobal::locale()->twoAlphaToLanguageName(m_languageCodeList[ndx]);
}
m_widget->languageLineEdit->setText(language);
@ -260,7 +260,7 @@ TQString StringReplacerConf::loadFromFile( const TQString& filename, bool clear)
void StringReplacerConf::save(KConfig* config, const TQString& configGroup){
// kdDebug() << "StringReplacerConf::save: Running" << endl;
TQString wordsFilename =
KGlobal::dirs()->saveLocation( "data" ,"kttsd/stringreplacer/", true );
TDEGlobal::dirs()->saveLocation( "data" ,"kttsd/stringreplacer/", true );
if ( wordsFilename.isEmpty() )
{
kdDebug() << "StringReplacerConf::save: no save location" << endl;
@ -406,7 +406,7 @@ TQString StringReplacerConf::userPlugInName()
{
TQString language;
if (m_languageCodeList.count() == 1)
language = KGlobal::locale()->twoAlphaToLanguageName(m_languageCodeList[0]);
language = TDEGlobal::locale()->twoAlphaToLanguageName(m_languageCodeList[0]);
if (m_languageCodeList.count() > 1)
language = i18n("Multiple Languages");
if (!language.isEmpty())
@ -424,7 +424,7 @@ void StringReplacerConf::slotLanguageBrowseButton_clicked()
langLView->addColumn(i18n("Language"));
langLView->addColumn(i18n("Code"));
langLView->setSelectionMode(TQListView::Extended);
TQStringList allLocales = KGlobal::locale()->allLanguagesTwoAlpha();
TQStringList allLocales = TDEGlobal::locale()->allLanguagesTwoAlpha();
TQString locale;
TQString languageCode;
TQString countryCode;
@ -437,10 +437,10 @@ void StringReplacerConf::slotLanguageBrowseButton_clicked()
for (int ndx=0; ndx < allLocalesCount; ++ndx)
{
locale = allLocales[ndx];
KGlobal::locale()->splitLocale(locale, languageCode, countryCode, charSet);
language = KGlobal::locale()->twoAlphaToLanguageName(languageCode);
TDEGlobal::locale()->splitLocale(locale, languageCode, countryCode, charSet);
language = TDEGlobal::locale()->twoAlphaToLanguageName(languageCode);
if (!countryCode.isEmpty()) language +=
" (" + KGlobal::locale()->twoAlphaToCountryName(countryCode)+")";
" (" + TDEGlobal::locale()->twoAlphaToCountryName(countryCode)+")";
item = new KListViewItem(langLView, language, locale);
if (m_languageCodeList.contains(locale)) item->setSelected(true);
}
@ -479,7 +479,7 @@ void StringReplacerConf::slotLanguageBrowseButton_clicked()
for ( uint ndx=0; ndx < m_languageCodeList.count(); ++ndx)
{
if (!language.isEmpty()) language += ",";
language += KGlobal::locale()->twoAlphaToLanguageName(m_languageCodeList[ndx]);
language += TDEGlobal::locale()->twoAlphaToLanguageName(m_languageCodeList[ndx]);
}
TQString s1 = m_widget->languageLineEdit->text();
m_widget->languageLineEdit->setText(language);
@ -688,8 +688,8 @@ void StringReplacerConf::slotMatchButton_clicked()
void StringReplacerConf::slotLoadButton_clicked()
{
// TQString dataDir = KGlobal::dirs()->resourceDirs("data").last() + "/kttsd/stringreplacer/";
TQString dataDir = KGlobal::dirs()->findAllResources("data", "kttsd/stringreplacer/").last();
// TQString dataDir = TDEGlobal::dirs()->resourceDirs("data").last() + "/kttsd/stringreplacer/";
TQString dataDir = TDEGlobal::dirs()->findAllResources("data", "kttsd/stringreplacer/").last();
TQString filename = KFileDialog::getOpenFileName(
dataDir,
"*.xml|String Replacer Word List (*.xml)",
@ -707,7 +707,7 @@ void StringReplacerConf::slotLoadButton_clicked()
void StringReplacerConf::slotSaveButton_clicked()
{
TQString filename = KFileDialog::getSaveFileName(
KGlobal::dirs()->saveLocation( "data" ,"kttsd/stringreplacer/", false ),
TDEGlobal::dirs()->saveLocation( "data" ,"kttsd/stringreplacer/", false ),
"*.xml|String Replacer Word List (*.xml)",
m_widget,
"stringreplacer_savefile");

2
kttsd/filters/stringreplacer/stringreplacerproc.cpp
Unescape View File

@ -71,7 +71,7 @@ StringReplacerProc::StringReplacerProc( TQObject *parent, const char *name, cons
bool StringReplacerProc::init(KConfig* config, const TQString& configGroup){
// kdDebug() << "StringReplacerProc::init: Running" << endl;
TQString wordsFilename =
KGlobal::dirs()->saveLocation( "data" ,"kttsd/stringreplacer/", false );
TDEGlobal::dirs()->saveLocation( "data" ,"kttsd/stringreplacer/", false );
if ( wordsFilename.isEmpty() ) return false;
wordsFilename += configGroup;
config->setGroup( configGroup );

4
kttsd/filters/talkerchooser/talkerchooserconf.cpp
Unescape View File

@ -232,7 +232,7 @@ void TalkerChooserConf::slotTalkerButton_clicked()
void TalkerChooserConf::slotLoadButton_clicked()
{
TQString dataDir = KGlobal::dirs()->findAllResources("data", "kttsd/talkerchooser/").last();
TQString dataDir = TDEGlobal::dirs()->findAllResources("data", "kttsd/talkerchooser/").last();
TQString filename = KFileDialog::getOpenFileName(
dataDir,
"*rc|Talker Chooser Config (*rc)",
@ -248,7 +248,7 @@ void TalkerChooserConf::slotLoadButton_clicked()
void TalkerChooserConf::slotSaveButton_clicked()
{
TQString filename = KFileDialog::getSaveFileName(
KGlobal::dirs()->saveLocation( "data" ,"kttsd/talkerchooser/", false ),
TDEGlobal::dirs()->saveLocation( "data" ,"kttsd/talkerchooser/", false ),
"*rc|Talker Chooser Config (*rc)",
m_widget,
"talkerchooser_savefile");

24
kttsd/filters/xmltransformer/xmltransformerproc.cpp
Unescape View File

@ -241,7 +241,7 @@ bool XmlTransformerProc::init(KConfig* config, const TQString& configGroup)
// outFile.unlink(); // only activate this if necessary.
/// Spawn an xsltproc process to apply our stylesheet to input file.
m_xsltProc = new KProcess;
m_xsltProc = new TDEProcess;
*m_xsltProc << m_xsltprocPath;
*m_xsltProc << "-o" << m_outFilename << "--novalid"
<< m_xsltFilePath << m_inFilename;
@ -250,14 +250,14 @@ bool XmlTransformerProc::init(KConfig* config, const TQString& configGroup)
// m_xsltProc->args() << endl;
m_state = fsFiltering;
connect(m_xsltProc, TQT_SIGNAL(processExited(KProcess*)),
this, TQT_SLOT(slotProcessExited(KProcess*)));
connect(m_xsltProc, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),
this, TQT_SLOT(slotReceivedStdout(KProcess*, char*, int)));
connect(m_xsltProc, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)),
this, TQT_SLOT(slotReceivedStderr(KProcess*, char*, int)));
if (!m_xsltProc->start(KProcess::NotifyOnExit,
static_cast<KProcess::Communication>(KProcess::Stdout | KProcess::Stderr)))
connect(m_xsltProc, TQT_SIGNAL(processExited(TDEProcess*)),
this, TQT_SLOT(slotProcessExited(TDEProcess*)));
connect(m_xsltProc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
this, TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int)));
connect(m_xsltProc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
this, TQT_SLOT(slotReceivedStderr(TDEProcess*, char*, int)));
if (!m_xsltProc->start(TDEProcess::NotifyOnExit,
static_cast<TDEProcess::Communication>(TDEProcess::Stdout | TDEProcess::Stderr)))
{
kdDebug() << "XmlTransformerProc::convert: Error starting xsltproc" << endl;
m_state = fsIdle;
@ -365,19 +365,19 @@ void XmlTransformerProc::processOutput()
*/
/*virtual*/ bool XmlTransformerProc::wasModified() { return m_wasModified; }
void XmlTransformerProc::slotProcessExited(KProcess*)
void XmlTransformerProc::slotProcessExited(TDEProcess*)
{
// kdDebug() << "XmlTransformerProc::slotProcessExited: xsltproc has exited." << endl;
processOutput();
}
void XmlTransformerProc::slotReceivedStdout(KProcess*, char* /*buffer*/, int /*buflen*/)
void XmlTransformerProc::slotReceivedStdout(TDEProcess*, char* /*buffer*/, int /*buflen*/)
{
// TQString buf = TQString::fromLatin1(buffer, buflen);
// kdDebug() << "XmlTransformerProc::slotReceivedStdout: Received from xsltproc: " << buf << endl;
}
void XmlTransformerProc::slotReceivedStderr(KProcess*, char* buffer, int buflen)
void XmlTransformerProc::slotReceivedStderr(TDEProcess*, char* buffer, int buflen)
{
TQString buf = TQString::fromLatin1(buffer, buflen);
kdDebug() << "XmlTransformerProc::slotReceivedStderr: Received error from xsltproc: " << buf << endl;

10
kttsd/filters/xmltransformer/xmltransformerproc.h
Unescape View File

@ -31,7 +31,7 @@
// KTTS includes.
#include "filterproc.h"
class KProcess;
class TDEProcess;
class XmlTransformerProc : virtual public KttsFilterProc
{
@ -132,9 +132,9 @@ public:
virtual bool wasModified();
private slots:
void slotProcessExited(KProcess*);
void slotReceivedStdout(KProcess* proc, char* buffer, int buflen);
void slotReceivedStderr(KProcess* proc, char* buffer, int buflen);
void slotProcessExited(TDEProcess*);
void slotReceivedStdout(TDEProcess* proc, char* buffer, int buflen);
void slotReceivedStderr(TDEProcess* proc, char* buffer, int buflen);
private:
// Process output when xsltproc exits.
@ -151,7 +151,7 @@ private:
// Processing state.
int m_state;
// xsltproc process.
KProcess* m_xsltProc;
TDEProcess* m_xsltProc;
// Input and Output filenames.
TQString m_inFilename;
TQString m_outFilename;

10
kttsd/kcmkttsmgr/addtalker.cpp
Unescape View File

@ -44,14 +44,14 @@ AddTalker::AddTalker(SynthToLangMap synthToLangMap, TQWidget* parent, const char
applyFilter();
// Default to user's desktop language.
TQString languageCode = KGlobal::locale()->defaultLanguage();
TQString languageCode = TDEGlobal::locale()->defaultLanguage();
// If there is not a synth that supports the locale, try stripping country code.
if (!m_langToSynthMap.contains(languageCode))
{
TQString countryCode;
TQString charSet;
TQString twoAlpha;
KGlobal::locale()->splitLocale(languageCode, twoAlpha, countryCode, charSet);
TDEGlobal::locale()->splitLocale(languageCode, twoAlpha, countryCode, charSet);
languageCode = twoAlpha;
}
// If there is still not a synth that supports the language code, default to "other".
@ -131,11 +131,11 @@ TQString AddTalker::languageCodeToLanguage(const TQString &languageCode)
language = i18n("Other");
else
{
KGlobal::locale()->splitLocale(languageCode, twoAlpha, countryCode, charSet);
language = KGlobal::locale()->twoAlphaToLanguageName(twoAlpha);
TDEGlobal::locale()->splitLocale(languageCode, twoAlpha, countryCode, charSet);
language = TDEGlobal::locale()->twoAlphaToLanguageName(twoAlpha);
}
if (!countryCode.isEmpty())
language += " (" + KGlobal::locale()->twoAlphaToCountryName(countryCode) + ")";
language += " (" + TDEGlobal::locale()->twoAlphaToCountryName(countryCode) + ")";
return language;
}

32
kttsd/kcmkttsmgr/kcmkttsmgr.cpp
Unescape View File

@ -127,23 +127,23 @@ KCMKttsMgr::KCMKttsMgr(TQWidget *parent, const char *name, const TQStringList &)
// Give buttons icons.
// Talkers tab.
m_kttsmgrw->higherTalkerPriorityButton->setIconSet(
KGlobal::iconLoader()->loadIconSet("up", KIcon::Small));
TDEGlobal::iconLoader()->loadIconSet("up", KIcon::Small));
m_kttsmgrw->lowerTalkerPriorityButton->setIconSet(
KGlobal::iconLoader()->loadIconSet("down", KIcon::Small));
TDEGlobal::iconLoader()->loadIconSet("down", KIcon::Small));
m_kttsmgrw->removeTalkerButton->setIconSet(
KGlobal::iconLoader()->loadIconSet("edittrash", KIcon::Small));
TDEGlobal::iconLoader()->loadIconSet("edittrash", KIcon::Small));
m_kttsmgrw->configureTalkerButton->setIconSet(
KGlobal::iconLoader()->loadIconSet("configure", KIcon::Small));
TDEGlobal::iconLoader()->loadIconSet("configure", KIcon::Small));
// Filters tab.
m_kttsmgrw->higherFilterPriorityButton->setIconSet(
KGlobal::iconLoader()->loadIconSet("up", KIcon::Small));
TDEGlobal::iconLoader()->loadIconSet("up", KIcon::Small));
m_kttsmgrw->lowerFilterPriorityButton->setIconSet(
KGlobal::iconLoader()->loadIconSet("down", KIcon::Small));
TDEGlobal::iconLoader()->loadIconSet("down", KIcon::Small));
m_kttsmgrw->removeFilterButton->setIconSet(
KGlobal::iconLoader()->loadIconSet("edittrash", KIcon::Small));
TDEGlobal::iconLoader()->loadIconSet("edittrash", KIcon::Small));
m_kttsmgrw->configureFilterButton->setIconSet(
KGlobal::iconLoader()->loadIconSet("configure", KIcon::Small));
TDEGlobal::iconLoader()->loadIconSet("configure", KIcon::Small));
// Notify tab.
m_kttsmgrw->notifyActionComboBox->clear();
@ -154,9 +154,9 @@ KCMKttsMgr::KCMKttsMgr(TQWidget *parent, const char *name, const TQStringList &)
m_kttsmgrw->notifyPresentComboBox->insertItem( NotifyPresent::presentDisplayName( ndx ) );
m_kttsmgrw->notifyRemoveButton->setIconSet(
KGlobal::iconLoader()->loadIconSet("edittrash", KIcon::Small));
TDEGlobal::iconLoader()->loadIconSet("edittrash", KIcon::Small));
m_kttsmgrw->notifyTestButton->setIconSet(
KGlobal::iconLoader()->loadIconSet("speak", KIcon::Small));
TDEGlobal::iconLoader()->loadIconSet("speak", KIcon::Small));
m_kttsmgrw->sinkComboBox->setEditable(false);
m_kttsmgrw->pcmComboBox->setEditable(false);
@ -164,9 +164,9 @@ KCMKttsMgr::KCMKttsMgr(TQWidget *parent, const char *name, const TQStringList &)
// Construct a popup menu for the Sentence Boundary Detector buttons on Filter tab.
m_sbdPopmenu = new TQPopupMenu( m_kttsmgrw, "SbdPopupMenu" );
m_sbdPopmenu->insertItem( i18n("&Edit..."), this, TQT_SLOT(slot_configureSbdFilter()), 0, sbdBtnEdit );
m_sbdPopmenu->insertItem( KGlobal::iconLoader()->loadIconSet("up", KIcon::Small),
m_sbdPopmenu->insertItem( TDEGlobal::iconLoader()->loadIconSet("up", KIcon::Small),
i18n("U&p"), this, TQT_SLOT(slot_higherSbdFilterPriority()), 0, sbdBtnUp );
m_sbdPopmenu->insertItem( KGlobal::iconLoader()->loadIconSet("down", KIcon::Small),
m_sbdPopmenu->insertItem( TDEGlobal::iconLoader()->loadIconSet("down", KIcon::Small),
i18n("Do&wn"), this, TQT_SLOT(slot_lowerSbdFilterPriority()), 0, sbdBtnDown );
m_sbdPopmenu->insertItem( i18n("&Add..."), this, TQT_SLOT(slot_addSbdFilter()), 0, sbdBtnAdd );
m_sbdPopmenu->insertItem( i18n("&Remove"), this, TQT_SLOT(slot_removeSbdFilter()), 0, sbdBtnRemove );
@ -1242,7 +1242,7 @@ void KCMKttsMgr::slot_addTalker()
KListView* langLView = new KListView(hBox, "SelectLanguage_lview");
langLView->addColumn(i18n("Language"));
langLView->addColumn(i18n("Code"));
TQStringList allLocales = KGlobal::locale()->allLanguagesTwoAlpha();
TQStringList allLocales = TDEGlobal::locale()->allLanguagesTwoAlpha();
TQString locale;
TQString countryCode;
TQString charSet;
@ -2656,8 +2656,8 @@ void KCMKttsMgr::slotNotifyRemoveButton_clicked()
void KCMKttsMgr::slotNotifyLoadButton_clicked()
{
// TQString dataDir = KGlobal::dirs()->resourceDirs("data").last() + "/kttsd/stringreplacer/";
TQString dataDir = KGlobal::dirs()->findAllResources("data", "kttsd/notify/").last();
// TQString dataDir = TDEGlobal::dirs()->resourceDirs("data").last() + "/kttsd/stringreplacer/";
TQString dataDir = TDEGlobal::dirs()->findAllResources("data", "kttsd/notify/").last();
TQString filename = KFileDialog::getOpenFileName(
dataDir,
"*.xml|" + i18n("file type", "Notification Event List") + " (*.xml)",
@ -2675,7 +2675,7 @@ void KCMKttsMgr::slotNotifyLoadButton_clicked()
void KCMKttsMgr::slotNotifySaveButton_clicked()
{
TQString filename = KFileDialog::getSaveFileName(
KGlobal::dirs()->saveLocation( "data" ,"kttsd/notify/", false ),
TDEGlobal::dirs()->saveLocation( "data" ,"kttsd/notify/", false ),
"*.xml|" + i18n("file type", "Notification Event List") + " (*.xml)",
m_kttsmgrw,
"event_savefile");

2
kttsd/kcmkttsmgr/selectevent.cpp
Unescape View File

@ -41,7 +41,7 @@ SelectEvent::SelectEvent(TQWidget* parent, const char* name, WFlags fl, const TQ
{
// Load list of event sources (applications).
TQStringList fullpaths =
KGlobal::dirs()->findAllResources("data", "*/eventsrc", false, true );
TDEGlobal::dirs()->findAllResources("data", "*/eventsrc", false, true );
TQStringList::ConstIterator it = fullpaths.begin();
TQStringList relativePaths;
for ( ; it != fullpaths.end(); ++it)

2
kttsd/kttsd/kttsd.cpp
Unescape View File

@ -103,7 +103,7 @@ bool KTTSD::initializeTalkerMgr()
// desktop language, but if that fails, fallback to English.
if (load < 0)
{
TQString languageCode = KGlobal::locale()->language();
TQString languageCode = TDEGlobal::locale()->language();
if (m_talkerMgr->autoconfigureTalker(languageCode, m_speechData->config))
load = m_talkerMgr->loadPlugIns(m_speechData->config);
else

2
kttsd/kttsd/speechdata.cpp
Unescape View File

@ -74,7 +74,7 @@ SpeechData::SpeechData(){
bool SpeechData::readConfig(){
// Load configuration
delete config;
//config = KGlobal::config();
//config = TDEGlobal::config();
config = new KConfig("kttsdrc");
// Set the group general for the configuration of KTTSD itself (no plug ins)

10
kttsd/kttsd/ssmlconvert.cpp
Unescape View File

@ -231,7 +231,7 @@ bool SSMLConvert::transform(const TQString &text, const TQString &xsltFilename)
// outFile.unlink(); // only activate this if necessary.
/// Spawn an xsltproc process to apply our stylesheet to our SSML file.
m_xsltProc = new KProcess;
m_xsltProc = new TDEProcess;
*m_xsltProc << "xsltproc";
*m_xsltProc << "-o" << m_outFilename << "--novalid"
<< m_xsltFilename << m_inFilename;
@ -239,9 +239,9 @@ bool SSMLConvert::transform(const TQString &text, const TQString &xsltFilename)
// kdDebug() << "SSMLConvert::transform: executing command: " <<
// m_xsltProc->args() << endl;
connect(m_xsltProc, TQT_SIGNAL(processExited(KProcess*)),
this, TQT_SLOT(slotProcessExited(KProcess*)));
if (!m_xsltProc->start(KProcess::NotifyOnExit, KProcess::NoCommunication))
connect(m_xsltProc, TQT_SIGNAL(processExited(TDEProcess*)),
this, TQT_SLOT(slotProcessExited(TDEProcess*)));
if (!m_xsltProc->start(TDEProcess::NotifyOnExit, TDEProcess::NoCommunication))
{
kdDebug() << "SSMLConvert::transform: Error starting xsltproc" << endl;
return false;
@ -250,7 +250,7 @@ bool SSMLConvert::transform(const TQString &text, const TQString &xsltFilename)
return true;
}
void SSMLConvert::slotProcessExited(KProcess* /*proc*/)
void SSMLConvert::slotProcessExited(TDEProcess* /*proc*/)
{
m_xsltProc->deleteLater();
m_xsltProc = 0;

6
kttsd/kttsd/ssmlconvert.h
Unescape View File

@ -34,7 +34,7 @@
#include <tqobject.h>
#include <tqstringlist.h>
class KProcess;
class TDEProcess;
class TQString;
class SSMLConvert : public TQObject {
@ -110,11 +110,11 @@ signals:
void transformFinished();
private slots:
void slotProcessExited(KProcess* proc);
void slotProcessExited(TDEProcess* proc);
private:
/// The XSLT processor.
KProcess *m_xsltProc;
TDEProcess *m_xsltProc;
/// Current talkers.
TQStringList m_talkers;
// Current state.

2
kttsd/kttsd/talkermgr.cpp
Unescape View File

@ -295,7 +295,7 @@ bool TalkerMgr::supportsMarkup(const TQString& talker, const uint /*markupType*/
if (matchingTalker.isEmpty()) matchingTalker = userDefaultTalker();
PlugInProc* plugin = talkerToPlugin(matchingTalker);
return ( plugin->getSsmlXsltFilename() !=
KGlobal::dirs()->resourceDirs("data").last() + "kttsd/xslt/SSMLtoPlainText.xsl");
TDEGlobal::dirs()->resourceDirs("data").last() + "kttsd/xslt/SSMLtoPlainText.xsl");
}
bool TalkerMgr::autoconfigureTalker(const TQString& langCode, KConfig* config)

28
kttsd/kttsjobmgr/kttsjobmgr.cpp
Unescape View File

@ -98,7 +98,7 @@ KttsJobMgrPart::KttsJobMgrPart(TQWidget *parent, const char *name) :
setInstance(KttsJobMgrFactory::instance());
// All the ktts components use the same catalogue.
KGlobal::locale()->insertCatalogue("kttsd");
TDEGlobal::locale()->insertCatalogue("kttsd");
// Create a TQVBox to host everything.
TQVBox* vBox = new TQVBox(parent);
@ -172,7 +172,7 @@ KttsJobMgrPart::KttsJobMgrPart(TQWidget *parent, const char *name) :
TQPushButton* btn;
TQString wt;
btn = new TQPushButton(KGlobal::iconLoader()->loadIconSet("stop", KIcon::Small, 0, true),
btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("stop", KIcon::Small, 0, true),
i18n("Hold"), hbox1, "job_hold");
wt = i18n(
"<p>Changes a job to Paused state. If currently speaking, the job stops speaking. "
@ -181,28 +181,28 @@ KttsJobMgrPart::KttsJobMgrPart(TQWidget *parent, const char *name) :
"down in the list.</p>");
TQWhatsThis::add(btn, wt);
connect (btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_job_hold()));
btn = new TQPushButton(KGlobal::iconLoader()->loadIconSet("exec", KIcon::Small, 0, true),
btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("exec", KIcon::Small, 0, true),
i18n("Resume"), hbox1, "job_resume");
wt = i18n(
"<p>Resumes a paused job or changes a Queued job to Waiting. If the job is the "
"top speakable job in the list, it begins speaking.</p>");
TQWhatsThis::add(btn, wt);
connect (btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_job_resume()));
btn = new TQPushButton(KGlobal::iconLoader()->loadIconSet("redo", KIcon::Small, 0, true),
btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("redo", KIcon::Small, 0, true),
i18n("R&estart"), hbox1, "job_restart");
wt = i18n(
"<p>Rewinds a job to the beginning and changes its state to Waiting. If the job "
"is the top speakable job in the list, it begins speaking.</p>");
TQWhatsThis::add(btn, wt);
connect (btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_job_restart()));
btn = new TQPushButton(KGlobal::iconLoader()->loadIconSet("edittrash", KIcon::Small, 0, true),
btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("edittrash", KIcon::Small, 0, true),
i18n("Re&move"), hbox1, "job_remove");
wt = i18n(
"<p>Deletes the job. If it is currently speaking, it stops speaking. The next "
"speakable job in the list begins speaking.</p>");
TQWhatsThis::add(btn, wt);
connect (btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_job_remove()));
btn = new TQPushButton(KGlobal::iconLoader()->loadIconSet("down", KIcon::Small, 0, true),
btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("down", KIcon::Small, 0, true),
i18n("&Later"), hbox1, "job_later");
wt = i18n(
"<p>Moves a job downward in the list so that it will be spoken later. If the job "
@ -210,32 +210,32 @@ KttsJobMgrPart::KttsJobMgrPart(TQWidget *parent, const char *name) :
TQWhatsThis::add(btn, wt);
connect (btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_job_move()));
btn = new TQPushButton(KGlobal::iconLoader()->loadIconSet("2leftarrow", KIcon::Small, 0, true),
btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("2leftarrow", KIcon::Small, 0, true),
i18n("Pre&vious Part"), hbox2, "part_prevpart");
wt = i18n(
"<p>Rewinds a multi-part job to the previous part.</p>");
TQWhatsThis::add(btn, wt);
connect (btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_job_prev_par()));
btn = new TQPushButton(KGlobal::iconLoader()->loadIconSet("1leftarrow", KIcon::Small, 0, true),
btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("1leftarrow", KIcon::Small, 0, true),
i18n("&Previous Sentence"), hbox2, "job_prevsentence");
wt = i18n(
"<p>Rewinds a job to the previous sentence.</p>");
TQWhatsThis::add(btn, wt);
connect (btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_job_prev_sen()));
btn = new TQPushButton(KGlobal::iconLoader()->loadIconSet("1rightarrow", KIcon::Small, 0, true),
btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("1rightarrow", KIcon::Small, 0, true),
i18n("&Next Sentence"), hbox2, "job_nextsentence");
wt = i18n(
"<p>Advances a job to the next sentence.</p>");
TQWhatsThis::add(btn, wt);
connect (btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_job_next_sen()));
btn = new TQPushButton(KGlobal::iconLoader()->loadIconSet("2rightarrow", KIcon::Small, 0, true),
btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("2rightarrow", KIcon::Small, 0, true),
i18n("Ne&xt Part"), hbox2, "part_nextpart");
wt = i18n(
"<p>Advances a multi-part job to the next part.</p>");
TQWhatsThis::add(btn, wt);
connect (btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_job_next_par()));
btn = new TQPushButton(KGlobal::iconLoader()->loadIconSet("klipper", KIcon::Small, 0, true),
btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("klipper", KIcon::Small, 0, true),
i18n("&Speak Clipboard"), hbox3, "speak_clipboard");
wt = i18n(
"<p>Queues the current contents of the clipboard for speaking and sets its state "
@ -243,7 +243,7 @@ KttsJobMgrPart::KttsJobMgrPart(TQWidget *parent, const char *name) :
"The job will be spoken by the topmost Talker in the <b>Talkers</b> tab.</p>");
TQWhatsThis::add(btn, wt);
connect (btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_speak_clipboard()));
btn = new TQPushButton(KGlobal::iconLoader()->loadIconSet("fileopen", KIcon::Small, 0, true),
btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("fileopen", KIcon::Small, 0, true),
i18n("Spea&k File"), hbox3, "speak_file");
wt = i18n(
"<p>Prompts you for a file name and queues the contents of the file for speaking. "
@ -251,14 +251,14 @@ KttsJobMgrPart::KttsJobMgrPart(TQWidget *parent, const char *name) :
"The job will be spoken by the topmost Talker in the <b>Talkers</b> tab.</p>");
TQWhatsThis::add(btn, wt);
connect (btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_speak_file()));
btn = new TQPushButton(KGlobal::iconLoader()->loadIconSet("translate", KIcon::Small, 0, true),
btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("translate", KIcon::Small, 0, true),
i18n("Change Talker"), hbox3, "job_changetalker");
wt = i18n(
"<p>Prompts you with a list of your configured Talkers from the <b>Talkers</b> tab. "
"The job will be spoken using the selected Talker.</p>");
TQWhatsThis::add(btn, wt);
connect (btn, TQT_SIGNAL(clicked()), this, TQT_SLOT(slot_job_change_talker()));
btn = new TQPushButton(KGlobal::iconLoader()->loadIconSet("reload_page", KIcon::Small, 0, true),
btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("reload_page", KIcon::Small, 0, true),
i18n("&Refresh"), hbox3, "refresh");
wt = i18n(
"<p>Refresh the list of jobs.</p>");

18
kttsd/kttsmgr/kttsmgr.cpp
Unescape View File

@ -54,7 +54,7 @@ static const KCmdLineOptions options[] =
int main (int argc, char *argv[])
{
KGlobal::locale()->setMainCatalogue("kttsd");
TDEGlobal::locale()->setMainCatalogue("kttsd");
TDEAboutData aboutdata("kttsmgr", I18N_NOOP("KTTSMgr"),
"0.3.5.2", I18N_NOOP("Text-to-Speech Manager"),
@ -81,7 +81,7 @@ int main (int argc, char *argv[])
KUniqueApplication app;
#if TDE_VERSION >= TDE_MAKE_VERSION (3,3,90)
TQPixmap icon = KGlobal::iconLoader()->loadIcon("kttsd", KIcon::Panel);
TQPixmap icon = TDEGlobal::iconLoader()->loadIcon("kttsd", KIcon::Panel);
aboutdata.setProgramLogo(icon.convertToImage());
#endif
@ -89,7 +89,7 @@ int main (int argc, char *argv[])
KCMultiDialog dlg(KCMultiDialog::Plain, i18n("TDE Text-to-Speech Manager"), 0, "kttsmgrdlg", false);
dlg.addModule("kcmkttsd");
dlg.setIcon(KGlobal::iconLoader()->loadIcon("kttsd", KIcon::Small));
dlg.setIcon(TDEGlobal::iconLoader()->loadIcon("kttsd", KIcon::Small));
// Get SysTray and ShowMainWindow options.
KConfig* config = new KConfig("kttsdrc");
@ -168,7 +168,7 @@ KttsMgrTray::KttsMgrTray(TQWidget *parent):
DCOPObject("kkttsmgr_kspeechsink"),
KSystemTray(parent, "kttsmgrsystemtray")
{
TQPixmap icon = KGlobal::iconLoader()->loadIcon("kttsd", KIcon::Small);
TQPixmap icon = TDEGlobal::iconLoader()->loadIcon("kttsd", KIcon::Small);
setPixmap (icon);
// TQToolTip::add(this, i18n("Text-to-speech manager"));
@ -178,16 +178,16 @@ KttsMgrTray::KttsMgrTray(TQWidget *parent):
id = contextMenu()->idAt(0);
if (id != -1) contextMenu()->changeTitle(id, icon, "KTTSMgr");
id = contextMenu()->insertItem (KGlobal::iconLoader()->loadIcon("klipper", KIcon::Small),
id = contextMenu()->insertItem (TDEGlobal::iconLoader()->loadIcon("klipper", KIcon::Small),
i18n("&Speak Clipboard Contents"), this, TQT_SLOT(speakClipboardSelected()));
id = contextMenu()->insertItem (KGlobal::iconLoader()->loadIcon("stop", KIcon::Small),
id = contextMenu()->insertItem (TDEGlobal::iconLoader()->loadIcon("stop", KIcon::Small),
i18n("&Hold"), this, TQT_SLOT(holdSelected()));
id = contextMenu()->insertItem (KGlobal::iconLoader()->loadIcon("exec", KIcon::Small),
id = contextMenu()->insertItem (TDEGlobal::iconLoader()->loadIcon("exec", KIcon::Small),
i18n("Resume"), this, TQT_SLOT(resumeSelected()));
id = contextMenu()->insertSeparator();
id = contextMenu()->insertItem (KGlobal::iconLoader()->loadIcon("contents", KIcon::Small),
id = contextMenu()->insertItem (TDEGlobal::iconLoader()->loadIcon("contents", KIcon::Small),
i18n("KTTS &Handbook"), this, TQT_SLOT(helpSelected()));
id = contextMenu()->insertItem (KGlobal::iconLoader()->loadIcon("kttsd", KIcon::Small),
id = contextMenu()->insertItem (TDEGlobal::iconLoader()->loadIcon("kttsd", KIcon::Small),
i18n("&About KTTSMgr"), this, TQT_SLOT(aboutSelected()));
connect(this, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(quitSelected()));

2
kttsd/libkttsd/filterconf.cpp
Unescape View File

@ -46,7 +46,7 @@ KttsFilterConf::KttsFilterConf( TQWidget *parent, const char *name) : TQWidget(p
// kdDebug() << "KttsFilterConf::KttsFilterConf: Running" << endl;
TQString systemPath(getenv("PATH"));
// kdDebug() << "Path is " << systemPath << endl;
KGlobal::locale()->insertCatalogue("kttsd");
TDEGlobal::locale()->insertCatalogue("kttsd");
m_path = TQStringList::split(":", systemPath);
}

4
kttsd/libkttsd/pluginconf.cpp
Unescape View File

@ -38,7 +38,7 @@
*/
PlugInConf::PlugInConf( TQWidget *parent, const char *name) : TQWidget(parent, name){
kdDebug() << "PlugInConf::PlugInConf: Running" << endl;
KGlobal::locale()->insertCatalogue("kttsd");
TDEGlobal::locale()->insertCatalogue("kttsd");
TQString systemPath(getenv("PATH"));
// kdDebug() << "Path is " << systemPath << endl;
m_path = TQStringList::split(":", systemPath);
@ -187,7 +187,7 @@ TQString PlugInConf::splitLanguageCode(const TQString& languageCode, TQString& c
TQString locale = languageCode;
TQString langCode;
TQString charSet;
KGlobal::locale()->splitLocale(locale, langCode, countryCode, charSet);
TDEGlobal::locale()->splitLocale(locale, langCode, countryCode, charSet);
return langCode;
}

2
kttsd/libkttsd/pluginproc.cpp
Unescape View File

@ -135,7 +135,7 @@ bool PlugInProc::supportsSynth() { return false; }
*/
TQString PlugInProc::getSsmlXsltFilename()
{
return KGlobal::dirs()->resourceDirs("data").last() + "kttsd/xslt/SSMLtoPlainText.xsl";
return TDEGlobal::dirs()->resourceDirs("data").last() + "kttsd/xslt/SSMLtoPlainText.xsl";
}
/**

2
kttsd/libkttsd/pluginproc.h
Unescape View File

@ -112,7 +112,7 @@
* If @ref supportsAsync returns False, KTTSD will run the plugin in a separate
* TQThread. As a consequence, the plugin must not make use of the KDE Library,
* when @ref sayText or @ref synthText is called,
* with the exception of KProcess and family (KProcIO, KShellProcess).
* with the exception of TDEProcess and family (KProcIO, KShellProcess).
* This restriction comes about because the KDE Libraries make use of the
* main TQt event loop, which unfortunately, runs only in the main thread.
* This restriction will likely be lifted in TQt 4 and later.

2
kttsd/libkttsd/selecttalkerdlg.cpp
Unescape View File

@ -166,7 +166,7 @@ void SelectTalkerDlg::slotLanguageBrowseButton_clicked()
langLView->addColumn(i18n("Language"));
langLView->addColumn(i18n("Code"));
langLView->setSelectionMode(TQListView::Single);
TQStringList allLocales = KGlobal::locale()->allLanguagesTwoAlpha();
TQStringList allLocales = TDEGlobal::locale()->allLanguagesTwoAlpha();
TQString locale;
TQString language;
// Blank line so user can select no language.

10
kttsd/libkttsd/stretcher.cpp
Unescape View File

@ -60,12 +60,12 @@ bool Stretcher::stretch(const TQString &inFilename, const TQString &outFilename,
{
if (m_stretchProc) return false;
m_outFilename = outFilename;
m_stretchProc = new KProcess;
m_stretchProc = new TDEProcess;
TQString stretchStr = TQString("%1").arg(stretchFactor, 0, 'f', 3);
*m_stretchProc << "sox" << inFilename << outFilename << "stretch" << stretchStr;
connect(m_stretchProc, TQT_SIGNAL(processExited(KProcess*)),
this, TQT_SLOT(slotProcessExited(KProcess*)));
if (!m_stretchProc->start(KProcess::NotifyOnExit, KProcess::NoCommunication))
connect(m_stretchProc, TQT_SIGNAL(processExited(TDEProcess*)),
this, TQT_SLOT(slotProcessExited(TDEProcess*)));
if (!m_stretchProc->start(TDEProcess::NotifyOnExit, TDEProcess::NoCommunication))
{
kdDebug() << "Stretcher::stretch: Error starting audio stretcher process. Is sox installed?" << endl;
return false;
@ -74,7 +74,7 @@ bool Stretcher::stretch(const TQString &inFilename, const TQString &outFilename,
return true;
}
void Stretcher::slotProcessExited(KProcess*)
void Stretcher::slotProcessExited(TDEProcess*)
{
m_stretchProc->deleteLater();
m_stretchProc = 0;

6
kttsd/libkttsd/stretcher.h
Unescape View File

@ -29,7 +29,7 @@
#include <kdemacros.h>
#include "kdeexportfix.h"
class KProcess;
class TDEProcess;
class KDE_EXPORT Stretcher : public TQObject{
Q_OBJECT
@ -82,14 +82,14 @@ class KDE_EXPORT Stretcher : public TQObject{
void stretchFinished();
private slots:
void slotProcessExited(KProcess* proc);
void slotProcessExited(TDEProcess* proc);
private:
// Stretcher state.
int m_state;
// Sox process.
KProcess* m_stretchProc;
TDEProcess* m_stretchProc;
// Output file name.
TQString m_outFilename;

6
kttsd/libkttsd/talkercode.cpp
Unescape View File

@ -182,7 +182,7 @@ void TalkerCode::normalize()
TQString language = lang;
if (language.left(1) == "*") language = language.mid(1);
TQString charSet;
KGlobal::locale()->splitLocale(language, languageCode, countryCode, charSet);
TDEGlobal::locale()->splitLocale(language, languageCode, countryCode, charSet);
}
/**
@ -218,11 +218,11 @@ void TalkerCode::normalize()
else
{
splitFullLanguageCode(languageCode, twoAlpha, countryCode);
language = KGlobal::locale()->twoAlphaToLanguageName(twoAlpha);
language = TDEGlobal::locale()->twoAlphaToLanguageName(twoAlpha);
}
if (!countryCode.isEmpty())
{
TQString countryName = KGlobal::locale()->twoAlphaToCountryName(countryCode);
TQString countryName = TDEGlobal::locale()->twoAlphaToCountryName(countryCode);
// Some abbreviations to save screen space.
if (countryName == i18n("full country name", "United States of America"))
countryName = i18n("abbreviated country name", "USA");

2
kttsd/players/gstplayer/gstreamerplayer.cpp
Unescape View File

@ -206,7 +206,7 @@ void GStreamerPlayer::setSinkName(const TQString &sinkName) { m_sinkName = sinkN
void GStreamerPlayer::readConfig()
{
KConfigGroup config(KGlobal::config(), "GStreamerPlayer");
KConfigGroup config(TDEGlobal::config(), "GStreamerPlayer");
m_sinkName = config.readEntry("SinkName", TQString());
}

30
kttsd/plugins/command/commandproc.cpp
Unescape View File

@ -285,19 +285,19 @@ void CommandProc::synth(const TQString& inputText, const TQString& suggestedFile
// 3. create a new process
kdDebug() << "CommandProc::synth: running command: " << command << endl;
m_commandProc = new KProcess;
m_commandProc = new TDEProcess;
m_commandProc->setUseShell(true);
m_commandProc->setEnvironment("LANG", language + "." + codec->mimeName());
m_commandProc->setEnvironment("LC_CTYPE", language + "." + codec->mimeName());
*m_commandProc << command;
connect(m_commandProc, TQT_SIGNAL(processExited(KProcess*)),
this, TQT_SLOT(slotProcessExited(KProcess*)));
connect(m_commandProc, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),
this, TQT_SLOT(slotReceivedStdout(KProcess*, char*, int)));
connect(m_commandProc, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)),
this, TQT_SLOT(slotReceivedStderr(KProcess*, char*, int)));
connect(m_commandProc, TQT_SIGNAL(wroteStdin(KProcess*)),
this, TQT_SLOT(slotWroteStdin(KProcess* )));
connect(m_commandProc, TQT_SIGNAL(processExited(TDEProcess*)),
this, TQT_SLOT(slotProcessExited(TDEProcess*)));
connect(m_commandProc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
this, TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int)));
connect(m_commandProc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
this, TQT_SLOT(slotReceivedStderr(TDEProcess*, char*, int)));
connect(m_commandProc, TQT_SIGNAL(wroteStdin(TDEProcess*)),
this, TQT_SLOT(slotWroteStdin(TDEProcess* )));
// 4. start the process
@ -309,14 +309,14 @@ void CommandProc::synth(const TQString& inputText, const TQString& suggestedFile
m_state = psSynthing;
}
if (stdIn) {
m_commandProc->start(KProcess::NotifyOnExit, KProcess::All);
m_commandProc->start(TDEProcess::NotifyOnExit, TDEProcess::All);
if (encodedText.length() > 0)
m_commandProc->writeStdin(encodedText, encodedText.length());
else
m_commandProc->closeStdin();
}
else
m_commandProc->start(KProcess::NotifyOnExit, KProcess::AllOutput);
m_commandProc->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput);
}
/**
@ -361,7 +361,7 @@ void CommandProc::stopText(){
kdDebug() << "CommandProc::stopText: Command stopped." << endl;
}
void CommandProc::slotProcessExited(KProcess*)
void CommandProc::slotProcessExited(TDEProcess*)
{
kdDebug() << "CommandProc:slotProcessExited: Command process has exited." << endl;
pluginState prevState = m_state;
@ -380,19 +380,19 @@ void CommandProc::slotProcessExited(KProcess*)
}
}
void CommandProc::slotReceivedStdout(KProcess*, char* buffer, int buflen)
void CommandProc::slotReceivedStdout(TDEProcess*, char* buffer, int buflen)
{
TQString buf = TQString::fromLatin1(buffer, buflen);
kdDebug() << "CommandProc::slotReceivedStdout: Received output from Command: " << buf << endl;
}
void CommandProc::slotReceivedStderr(KProcess*, char* buffer, int buflen)
void CommandProc::slotReceivedStderr(TDEProcess*, char* buffer, int buflen)
{
TQString buf = TQString::fromLatin1(buffer, buflen);
kdDebug() << "CommandProc::slotReceivedStderr: Received error from Command: " << buf << endl;
}
void CommandProc::slotWroteStdin(KProcess*)
void CommandProc::slotWroteStdin(TDEProcess*)
{
kdDebug() << "CommandProc::slotWroteStdin: closing Stdin" << endl;
m_commandProc->closeStdin();

12
kttsd/plugins/command/commandproc.h
Unescape View File

@ -24,7 +24,7 @@
// KTTS includes.
#include <pluginproc.h>
class KProcess;
class TDEProcess;
class TQTextCodec;
class CommandProc : public PlugInProc{
@ -140,10 +140,10 @@ class CommandProc : public PlugInProc{
TQTextCodec *codec, TQString& language);
private slots:
void slotProcessExited(KProcess* proc);
void slotReceivedStdout(KProcess* proc, char* buffer, int buflen);
void slotReceivedStderr(KProcess* proc, char* buffer, int buflen);
void slotWroteStdin(KProcess* proc);
void slotProcessExited(TDEProcess* proc);
void slotReceivedStdout(TDEProcess* proc, char* buffer, int buflen);
void slotReceivedStderr(TDEProcess* proc, char* buffer, int buflen);
void slotWroteStdin(TDEProcess* proc);
private:
@ -175,7 +175,7 @@ class CommandProc : public PlugInProc{
/**
* Flite process
*/
KProcess* m_commandProc;
TDEProcess* m_commandProc;
/**
* Name of temporary file containing text.

52
kttsd/plugins/epos/eposproc.cpp
Unescape View File

@ -85,15 +85,15 @@ bool EposProc::init(KConfig* config, const TQString& configGroup)
// Start the Epos server if not already started.
if (!m_eposServerProc)
{
m_eposServerProc = new KProcess;
m_eposServerProc = new TDEProcess;
*m_eposServerProc << m_eposServerExePath;
if (!m_eposServerOptions.isEmpty())
*m_eposServerProc << m_eposServerOptions;
connect(m_eposServerProc, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),
this, TQT_SLOT(slotReceivedStdout(KProcess*, char*, int)));
connect(m_eposServerProc, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)),
this, TQT_SLOT(slotReceivedStderr(KProcess*, char*, int)));
m_eposServerProc->start(KProcess::DontCare, KProcess::AllOutput);
connect(m_eposServerProc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
this, TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int)));
connect(m_eposServerProc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
this, TQT_SLOT(slotReceivedStderr(TDEProcess*, char*, int)));
m_eposServerProc->start(TDEProcess::DontCare, TDEProcess::AllOutput);
}
kdDebug() << "EposProc::init: Initialized with codec: " << codecString << endl;
@ -169,15 +169,15 @@ void EposProc::synth(
// Start the Epos server if not already started.
if (!m_eposServerProc)
{
m_eposServerProc = new KProcess;
m_eposServerProc = new TDEProcess;
*m_eposServerProc << eposServerExePath;
if (!eposServerOptions.isEmpty())
*m_eposServerProc << eposServerOptions;
connect(m_eposServerProc, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),
this, TQT_SLOT(slotReceivedStdout(KProcess*, char*, int)));
connect(m_eposServerProc, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)),
this, TQT_SLOT(slotReceivedStderr(KProcess*, char*, int)));
m_eposServerProc->start(KProcess::DontCare, KProcess::AllOutput);
connect(m_eposServerProc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
this, TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int)));
connect(m_eposServerProc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
this, TQT_SLOT(slotReceivedStderr(TDEProcess*, char*, int)));
m_eposServerProc->start(TDEProcess::DontCare, TDEProcess::AllOutput);
kdDebug() << "EposProc:: Epos server process started" << endl;
}
@ -195,7 +195,7 @@ void EposProc::synth(
m_encText = text.latin1(); // Should not happen, but just in case.
// kdDebug()<< "EposProc::synth: Creating Epos object" << endl;
m_eposProc = new KProcess;
m_eposProc = new TDEProcess;
m_eposProc->setUseShell(true);
TQString languageCode;
if (eposLanguage == "czech")
@ -234,14 +234,14 @@ void EposProc::synth(
*m_eposProc << "-"; // Read from StdIn.
if (!suggestedFilename.isEmpty())
*m_eposProc << " >" + suggestedFilename;
connect(m_eposProc, TQT_SIGNAL(processExited(KProcess*)),
this, TQT_SLOT(slotProcessExited(KProcess*)));
connect(m_eposProc, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),
this, TQT_SLOT(slotReceivedStdout(KProcess*, char*, int)));
connect(m_eposProc, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)),
this, TQT_SLOT(slotReceivedStderr(KProcess*, char*, int)));
connect(m_eposProc, TQT_SIGNAL(wroteStdin(KProcess*)),
this, TQT_SLOT(slotWroteStdin(KProcess* )));
connect(m_eposProc, TQT_SIGNAL(processExited(TDEProcess*)),
this, TQT_SLOT(slotProcessExited(TDEProcess*)));
connect(m_eposProc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
this, TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int)));
connect(m_eposProc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
this, TQT_SLOT(slotReceivedStderr(TDEProcess*, char*, int)));
connect(m_eposProc, TQT_SIGNAL(wroteStdin(TDEProcess*)),
this, TQT_SLOT(slotWroteStdin(TDEProcess* )));
if (suggestedFilename.isEmpty())
m_state = psSaying;
else
@ -250,7 +250,7 @@ void EposProc::synth(
// Ok, let's rock.
m_synthFilename = suggestedFilename;
// kdDebug() << "EposProc::synth: Synthing text: '" << text << "' using Epos plug in" << endl;
if (!m_eposProc->start(KProcess::NotifyOnExit, KProcess::All))
if (!m_eposProc->start(TDEProcess::NotifyOnExit, TDEProcess::All))
{
kdDebug() << "EposProc::synth: Error starting Epos process. Is epos in the PATH?" << endl;
m_state = psIdle;
@ -305,7 +305,7 @@ void EposProc::stopText(){
kdDebug() << "EposProc::stopText: Epos stopped." << endl;
}
void EposProc::slotProcessExited(KProcess*)
void EposProc::slotProcessExited(TDEProcess*)
{
// kdDebug() << "EposProc:slotProcessExited: Epos process has exited." << endl;
pluginState prevState = m_state;
@ -324,19 +324,19 @@ void EposProc::slotProcessExited(KProcess*)
}
}
void EposProc::slotReceivedStdout(KProcess*, char* buffer, int buflen)
void EposProc::slotReceivedStdout(TDEProcess*, char* buffer, int buflen)
{
TQString buf = TQString::fromLatin1(buffer, buflen);
kdDebug() << "EposProc::slotReceivedStdout: Received output from Epos: " << buf << endl;
}
void EposProc::slotReceivedStderr(KProcess*, char* buffer, int buflen)
void EposProc::slotReceivedStderr(TDEProcess*, char* buffer, int buflen)
{
TQString buf = TQString::fromLatin1(buffer, buflen);
kdDebug() << "EposProc::slotReceivedStderr: Received error from Epos: " << buf << endl;
}
void EposProc::slotWroteStdin(KProcess*)
void EposProc::slotWroteStdin(TDEProcess*)
{
// kdDebug() << "EposProc::slotWroteStdin: closing Stdin" << endl;
m_eposProc->closeStdin();

14
kttsd/plugins/epos/eposproc.h
Unescape View File

@ -32,7 +32,7 @@
// KTTS includes.
#include <pluginproc.h>
class KProcess;
class TDEProcess;
class TQTextCodec;
class EposProc : public PlugInProc{
@ -167,10 +167,10 @@ class EposProc : public PlugInProc{
int pitch);
private slots:
void slotProcessExited(KProcess* proc);
void slotReceivedStdout(KProcess* proc, char* buffer, int buflen);
void slotReceivedStderr(KProcess* proc, char* buffer, int buflen);
void slotWroteStdin(KProcess* proc);
void slotProcessExited(TDEProcess* proc);
void slotReceivedStdout(TDEProcess* proc, char* buffer, int buflen);
void slotReceivedStderr(TDEProcess* proc, char* buffer, int buflen);
void slotWroteStdin(TDEProcess* proc);
private:
@ -189,12 +189,12 @@ class EposProc : public PlugInProc{
/**
* Epos Server process.
*/
KProcess* m_eposServerProc;
TDEProcess* m_eposServerProc;
/**
* Epos Client process
*/
KProcess* m_eposProc;
TDEProcess* m_eposProc;
/**
* Epos language setting. "czech", "slovak", or Null (use default language).

10
kttsd/plugins/festivalint/festivalintconf.cpp
Unescape View File

@ -455,15 +455,15 @@ void FestivalIntConf::scanVoices()
if (!m_supportedVoiceCodes.isEmpty())
{
// User's desktop language setting.
TQString desktopLanguageCode = KGlobal::locale()->language();
TQString desktopLanguageCode = TDEGlobal::locale()->language();
TQString twoAlpha;
TQString countryCode;
TQString charSet;
KGlobal::locale()->splitLocale(desktopLanguageCode, twoAlpha, countryCode, charSet);
TDEGlobal::locale()->splitLocale(desktopLanguageCode, twoAlpha, countryCode, charSet);
desktopLanguageCode = twoAlpha.lower();
// Festival known voices list.
TQString voicesFilename = KGlobal::dirs()->resourceDirs("data").last() + "/kttsd/festivalint/voices";
TQString voicesFilename = TDEGlobal::dirs()->resourceDirs("data").last() + "/kttsd/festivalint/voices";
TQDomDocument voicesDoc("Festival Voices");
TQFile voicesFile(voicesFilename);
if (voicesFile.open(IO_ReadOnly)) voicesDoc.setContent(&voicesFile);
@ -475,8 +475,8 @@ void FestivalIntConf::scanVoices()
// Iterate thru list of voice codes returned by Festival,
// find matching entry in voices.xml file, and add to list of supported voices.
TQPixmap maleIcon = KGlobal::iconLoader()->loadIcon("male", KIcon::Small);
TQPixmap femaleIcon = KGlobal::iconLoader()->loadIcon("female", KIcon::Small);
TQPixmap maleIcon = TDEGlobal::iconLoader()->loadIcon("male", KIcon::Small);
TQPixmap femaleIcon = TDEGlobal::iconLoader()->loadIcon("female", KIcon::Small);
TQStringList::ConstIterator itEnd = m_supportedVoiceCodes.constEnd();
for(TQStringList::ConstIterator it = m_supportedVoiceCodes.begin(); it != itEnd; ++it )
{

32
kttsd/plugins/festivalint/festivalintproc.cpp
Unescape View File

@ -178,20 +178,20 @@ void FestivalIntProc::startEngine(const TQString &festivalExePath, const TQStrin
if(!m_festProc)
{
// kdDebug()<< "FestivalIntProc::startEngine: Creating Festival object" << endl;
m_festProc = new KProcess;
m_festProc = new TDEProcess;
*m_festProc << festivalExePath;
*m_festProc << "--interactive";
m_festProc->setEnvironment("LANG", languageCode + "." + codec->mimeName());
m_festProc->setEnvironment("LC_CTYPE", languageCode + "." + codec->mimeName());
// kdDebug() << "FestivalIntProc::startEngine: setting LANG = LC_CTYPE = " << languageCode << "." << codec->mimeName() << endl;
connect(m_festProc, TQT_SIGNAL(processExited(KProcess*)),
this, TQT_SLOT(slotProcessExited(KProcess*)));
connect(m_festProc, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),
this, TQT_SLOT(slotReceivedStdout(KProcess*, char*, int)));
connect(m_festProc, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)),
this, TQT_SLOT(slotReceivedStderr(KProcess*, char*, int)));
connect(m_festProc, TQT_SIGNAL(wroteStdin(KProcess*)),
this, TQT_SLOT(slotWroteStdin(KProcess*)));
connect(m_festProc, TQT_SIGNAL(processExited(TDEProcess*)),
this, TQT_SLOT(slotProcessExited(TDEProcess*)));
connect(m_festProc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
this, TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int)));
connect(m_festProc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
this, TQT_SLOT(slotReceivedStderr(TDEProcess*, char*, int)));
connect(m_festProc, TQT_SIGNAL(wroteStdin(TDEProcess*)),
this, TQT_SLOT(slotWroteStdin(TDEProcess*)));
}
if (!m_festProc->isRunning())
{
@ -201,7 +201,7 @@ void FestivalIntProc::startEngine(const TQString &festivalExePath, const TQStrin
m_runningPitch = 100;
m_ready = false;
m_outputQueue.clear();
if (m_festProc->start(KProcess::NotifyOnExit, KProcess::All))
if (m_festProc->start(TDEProcess::NotifyOnExit, TDEProcess::All))
{
// kdDebug()<< "FestivalIntProc:startEngine: Festival initialized" << endl;
m_festivalExePath = festivalExePath;
@ -209,7 +209,7 @@ void FestivalIntProc::startEngine(const TQString &festivalExePath, const TQStrin
m_codec = codec;
// Load the SABLE to Wave module.
sendToFestival("(load \"" +
KGlobal::dirs()->resourceDirs("data").last() + "kttsd/festivalint/sabletowave.scm\")");
TDEGlobal::dirs()->resourceDirs("data").last() + "kttsd/festivalint/sabletowave.scm\")");
}
else
{
@ -460,7 +460,7 @@ void FestivalIntProc::stopText(){
} else m_state = psIdle;
}
void FestivalIntProc::slotProcessExited(KProcess*)
void FestivalIntProc::slotProcessExited(TDEProcess*)
{
// kdDebug() << "FestivalIntProc:slotProcessExited: Festival process has exited." << endl;
m_ready = true;
@ -498,7 +498,7 @@ void FestivalIntProc::slotProcessExited(KProcess*)
m_outputQueue.clear();
}
void FestivalIntProc::slotReceivedStdout(KProcess*, char* buffer, int buflen)
void FestivalIntProc::slotReceivedStdout(TDEProcess*, char* buffer, int buflen)
{
TQString buf = TQString::fromLatin1(buffer, buflen);
// kdDebug() << "FestivalIntProc::slotReceivedStdout: Received from Festival: " << buf << endl;
@ -567,13 +567,13 @@ void FestivalIntProc::slotReceivedStdout(KProcess*, char* buffer, int buflen)
}
}
void FestivalIntProc::slotReceivedStderr(KProcess*, char* buffer, int buflen)
void FestivalIntProc::slotReceivedStderr(TDEProcess*, char* buffer, int buflen)
{
TQString buf = TQString::fromLatin1(buffer, buflen);
kdDebug() << "FestivalIntProc::slotReceivedStderr: Received error from Festival: " << buf << endl;
}
void FestivalIntProc::slotWroteStdin(KProcess* /*proc*/)
void FestivalIntProc::slotWroteStdin(TDEProcess* /*proc*/)
{
// kdDebug() << "FestivalIntProc::slotWroteStdin: Running" << endl;
m_writingStdin = false;
@ -655,7 +655,7 @@ bool FestivalIntProc::supportsSynth() { return true; }
TQString FestivalIntProc::getSsmlXsltFilename()
{
if (m_supportsSSML == ssYes)
return KGlobal::dirs()->resourceDirs("data").last() + "kttsd/festivalint/xslt/SSMLtoSable.xsl";
return TDEGlobal::dirs()->resourceDirs("data").last() + "kttsd/festivalint/xslt/SSMLtoSable.xsl";
else
return PlugInProc::getSsmlXsltFilename();
}

10
kttsd/plugins/festivalint/festivalintproc.h
Unescape View File

@ -212,10 +212,10 @@ class FestivalIntProc : public PlugInProc{
void queryVoicesFinished(const TQStringList &voiceCodes);
private slots:
void slotProcessExited(KProcess* proc);
void slotReceivedStdout(KProcess* proc, char* buffer, int buflen);
void slotReceivedStderr(KProcess* proc, char* buffer, int buflen);
void slotWroteStdin(KProcess* proc);
void slotProcessExited(TDEProcess* proc);
void slotReceivedStdout(TDEProcess* proc, char* buffer, int buflen);
void slotReceivedStderr(TDEProcess* proc, char* buffer, int buflen);
void slotWroteStdin(TDEProcess* proc);
private:
/**
@ -304,7 +304,7 @@ class FestivalIntProc : public PlugInProc{
/**
* Festival process
*/
KProcess* m_festProc;
TDEProcess* m_festProc;
/**
* Synthesis filename.

28
kttsd/plugins/flite/fliteproc.cpp
Unescape View File

@ -111,15 +111,15 @@ void FliteProc::synth(
m_fliteProc = 0;
}
// kdDebug()<< "FliteProc::synth: Creating Flite object" << endl;
m_fliteProc = new KProcess;
connect(m_fliteProc, TQT_SIGNAL(processExited(KProcess*)),
this, TQT_SLOT(slotProcessExited(KProcess*)));
connect(m_fliteProc, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),
this, TQT_SLOT(slotReceivedStdout(KProcess*, char*, int)));
connect(m_fliteProc, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)),
this, TQT_SLOT(slotReceivedStderr(KProcess*, char*, int)));
connect(m_fliteProc, TQT_SIGNAL(wroteStdin(KProcess*)),
this, TQT_SLOT(slotWroteStdin(KProcess* )));
m_fliteProc = new TDEProcess;
connect(m_fliteProc, TQT_SIGNAL(processExited(TDEProcess*)),
this, TQT_SLOT(slotProcessExited(TDEProcess*)));
connect(m_fliteProc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
this, TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int)));
connect(m_fliteProc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
this, TQT_SLOT(slotReceivedStderr(TDEProcess*, char*, int)));
connect(m_fliteProc, TQT_SIGNAL(wroteStdin(TDEProcess*)),
this, TQT_SLOT(slotWroteStdin(TDEProcess* )));
if (synthFilename.isNull())
m_state = psSaying;
else
@ -145,7 +145,7 @@ void FliteProc::synth(
// Ok, let's rock.
m_synthFilename = synthFilename;
kdDebug() << "FliteProc::synth: Synthing text: '" << saidText << "' using Flite plug in" << endl;
if (!m_fliteProc->start(KProcess::NotifyOnExit, KProcess::All))
if (!m_fliteProc->start(TDEProcess::NotifyOnExit, TDEProcess::All))
{
kdDebug() << "FliteProc::synth: Error starting Flite process. Is flite in the PATH?" << endl;
m_state = psIdle;
@ -197,7 +197,7 @@ void FliteProc::stopText(){
kdDebug() << "FliteProc::stopText: Flite stopped." << endl;
}
void FliteProc::slotProcessExited(KProcess*)
void FliteProc::slotProcessExited(TDEProcess*)
{
kdDebug() << "FliteProc:slotProcessExited: Flite process has exited." << endl;
pluginState prevState = m_state;
@ -216,19 +216,19 @@ void FliteProc::slotProcessExited(KProcess*)
}
}
void FliteProc::slotReceivedStdout(KProcess*, char* buffer, int buflen)
void FliteProc::slotReceivedStdout(TDEProcess*, char* buffer, int buflen)
{
TQString buf = TQString::fromLatin1(buffer, buflen);
kdDebug() << "FliteProc::slotReceivedStdout: Received output from Flite: " << buf << endl;
}
void FliteProc::slotReceivedStderr(KProcess*, char* buffer, int buflen)
void FliteProc::slotReceivedStderr(TDEProcess*, char* buffer, int buflen)
{
TQString buf = TQString::fromLatin1(buffer, buflen);
kdDebug() << "FliteProc::slotReceivedStderr: Received error from Flite: " << buf << endl;
}
void FliteProc::slotWroteStdin(KProcess*)
void FliteProc::slotWroteStdin(TDEProcess*)
{
kdDebug() << "FliteProc::slotWroteStdin: closing Stdin" << endl;
m_fliteProc->closeStdin();

12
kttsd/plugins/flite/fliteproc.h
Unescape View File

@ -31,7 +31,7 @@
// KTTS includes.
#include <pluginproc.h>
class KProcess;
class TDEProcess;
class FliteProc : public PlugInProc{
Q_OBJECT
@ -150,10 +150,10 @@ class FliteProc : public PlugInProc{
const TQString &fliteExePath);
private slots:
void slotProcessExited(KProcess* proc);
void slotReceivedStdout(KProcess* proc, char* buffer, int buflen);
void slotReceivedStderr(KProcess* proc, char* buffer, int buflen);
void slotWroteStdin(KProcess* proc);
void slotProcessExited(TDEProcess* proc);
void slotReceivedStdout(TDEProcess* proc, char* buffer, int buflen);
void slotReceivedStderr(TDEProcess* proc, char* buffer, int buflen);
void slotWroteStdin(TDEProcess* proc);
private:
@ -165,7 +165,7 @@ class FliteProc : public PlugInProc{
/**
* Flite process
*/
KProcess* m_fliteProc;
TDEProcess* m_fliteProc;
/**
* Synthesis filename.

32
kttsd/plugins/freetts/freettsproc.cpp
Unescape View File

@ -102,15 +102,15 @@ void FreeTTSProc::synth(
}
m_freettsProc = new KProcess;
connect(m_freettsProc, TQT_SIGNAL(processExited(KProcess*)),
this, TQT_SLOT(slotProcessExited(KProcess*)));
connect(m_freettsProc, TQT_SIGNAL(receivedStdout(KProcess*, char*, int)),
this, TQT_SLOT(slotReceivedStdout(KProcess*, char*, int)));
connect(m_freettsProc, TQT_SIGNAL(receivedStderr(KProcess*, char*, int)),
this, TQT_SLOT(slotReceivedStderr(KProcess*, char*, int)));
connect(m_freettsProc, TQT_SIGNAL(wroteStdin(KProcess*)),
this, TQT_SLOT(slotWroteStdin(KProcess* )));
m_freettsProc = new TDEProcess;
connect(m_freettsProc, TQT_SIGNAL(processExited(TDEProcess*)),
this, TQT_SLOT(slotProcessExited(TDEProcess*)));
connect(m_freettsProc, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)),
this, TQT_SLOT(slotReceivedStdout(TDEProcess*, char*, int)));
connect(m_freettsProc, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)),
this, TQT_SLOT(slotReceivedStderr(TDEProcess*, char*, int)));
connect(m_freettsProc, TQT_SIGNAL(wroteStdin(TDEProcess*)),
this, TQT_SLOT(slotWroteStdin(TDEProcess* )));
if (synthFilename.isNull())
m_state = psSaying;
else
@ -122,7 +122,7 @@ void FreeTTSProc::synth(
/// As freetts.jar doesn't seem to like being called from an absolute path,
/// we need to strip off the path to freetts.jar and pass it to
/// KProcess::setWorkingDirectory()
/// TDEProcess::setWorkingDirectory()
/// We could just strip off 11 characters from the end of the path to freetts.jar, but thats
/// not exactly very portable...
TQString filename = TQFileInfo(freettsJarPath).baseName().append(TQString(".").append(TQFileInfo(freettsJarPath).extension()));
@ -140,10 +140,10 @@ void FreeTTSProc::synth(
m_synthFilename = synthFilename;
kdDebug() << "FreeTTSProc::synth: Synthing text: '" << saidText << "' using FreeTTS plug in" << endl;
if (!m_freettsProc->start(KProcess::NotifyOnExit, KProcess::All)) {
if (!m_freettsProc->start(TDEProcess::NotifyOnExit, TDEProcess::All)) {
kdDebug() << "FreeTTSProc::synth: Error starting FreeTTS process. Is freetts.jar in the PATH?" << endl;
m_state = psIdle;
kdDebug() << "KProcess args: " << argsToTQStringList(m_freettsProc->args()) << endl;
kdDebug() << "TDEProcess args: " << argsToTQStringList(m_freettsProc->args()) << endl;
return;
}
kdDebug()<< "FreeTTSProc:synth: FreeTTS initialized" << endl;
@ -188,7 +188,7 @@ void FreeTTSProc::stopText() {
kdDebug() << "FreeTTSProc::stopText: FreeTTS stopped." << endl;
}
void FreeTTSProc::slotProcessExited(KProcess*) {
void FreeTTSProc::slotProcessExited(TDEProcess*) {
kdDebug() << "FreeTTSProc:slotProcessExited: FreeTTS process has exited." << endl;
pluginState prevState = m_state;
if (m_waitingStop) {
@ -205,17 +205,17 @@ void FreeTTSProc::slotProcessExited(KProcess*) {
}
}
void FreeTTSProc::slotReceivedStdout(KProcess*, char* buffer, int buflen) {
void FreeTTSProc::slotReceivedStdout(TDEProcess*, char* buffer, int buflen) {
TQString buf = TQString::fromLatin1(buffer, buflen);
kdDebug() << "FreeTTSProc::slotReceivedStdout: Received output from FreeTTS: " << buf << endl;
}
void FreeTTSProc::slotReceivedStderr(KProcess*, char* buffer, int buflen) {
void FreeTTSProc::slotReceivedStderr(TDEProcess*, char* buffer, int buflen) {
TQString buf = TQString::fromLatin1(buffer, buflen);
kdDebug() << "FreeTTSProc::slotReceivedStderr: Received error from FreeTTS: " << buf << endl;
}
void FreeTTSProc::slotWroteStdin(KProcess*) {
void FreeTTSProc::slotWroteStdin(TDEProcess*) {
kdDebug() << "FreeTTSProc::slotWroteStdin: closing Stdin" << endl;
m_freettsProc->closeStdin();
}

12
kttsd/plugins/freetts/freettsproc.h
Unescape View File

@ -24,7 +24,7 @@
#include <pluginproc.h>
class KProcess;
class TDEProcess;
class FreeTTSProc : public PlugInProc{
Q_OBJECT
@ -143,10 +143,10 @@ public:
const TQString &freettsJarPath);
private slots:
void slotProcessExited(KProcess* proc);
void slotReceivedStdout(KProcess* proc, char* buffer, int buflen);
void slotReceivedStderr(KProcess* proc, char* buffer, int buflen);
void slotWroteStdin(KProcess* proc);
void slotProcessExited(TDEProcess* proc);
void slotReceivedStdout(TDEProcess* proc, char* buffer, int buflen);
void slotReceivedStderr(TDEProcess* proc, char* buffer, int buflen);
void slotWroteStdin(TDEProcess* proc);
private:
@ -158,7 +158,7 @@ private:
/**
* FreeTTS process
*/
KProcess* m_freettsProc;
TDEProcess* m_freettsProc;
/**
* Synthesis filename.

4
kttsd/plugins/hadifix/hadifixconfigui.ui.h
Unescape View File

@ -47,8 +47,8 @@ void HadifixConfigUI::frequencySlider_valueChanged (int sliderValue) {
}
void HadifixConfigUI::init () {
male = KGlobal::iconLoader()->loadIcon("male", KIcon::Small);
female = KGlobal::iconLoader()->loadIcon("female", KIcon::Small);
male = TDEGlobal::iconLoader()->loadIcon("male", KIcon::Small);
female = TDEGlobal::iconLoader()->loadIcon("female", KIcon::Small);
}
void HadifixConfigUI::addVoice (const TQString &filename, bool isMale) {

30
kttsd/plugins/hadifix/hadifixproc.cpp
Unescape View File

@ -197,16 +197,16 @@ void HadifixProc::synth(TQString text,
*(d->hadifixProc) << command;
// Connect signals from process.
connect(d->hadifixProc, TQT_SIGNAL(processExited(KProcess *)),
this, TQT_SLOT(slotProcessExited(KProcess *)));
connect(d->hadifixProc, TQT_SIGNAL(wroteStdin(KProcess *)),
this, TQT_SLOT(slotWroteStdin(KProcess *)));
connect(d->hadifixProc, TQT_SIGNAL(processExited(TDEProcess *)),
this, TQT_SLOT(slotProcessExited(TDEProcess *)));
connect(d->hadifixProc, TQT_SIGNAL(wroteStdin(TDEProcess *)),
this, TQT_SLOT(slotWroteStdin(TDEProcess *)));
// Store off name of wave file to be generated.
d->synthFilename = waveFilename;
// Set state, busy synthing.
d->state = psSynthing;
if (!d->hadifixProc->start(KProcess::NotifyOnExit, KProcess::Stdin))
if (!d->hadifixProc->start(TDEProcess::NotifyOnExit, TDEProcess::Stdin))
{
kdDebug() << "HadifixProc::synth: start process failed." << endl;
d->state = psIdle;
@ -316,7 +316,7 @@ bool HadifixProc::supportsAsync() { return true; }
bool HadifixProc::supportsSynth() { return true; }
void HadifixProc::slotProcessExited(KProcess*)
void HadifixProc::slotProcessExited(TDEProcess*)
{
// kdDebug() << "HadifixProc:hadifixProcExited: Hadifix process has exited." << endl;
pluginState prevState = d->state;
@ -332,7 +332,7 @@ void HadifixProc::slotProcessExited(KProcess*)
}
}
void HadifixProc::slotWroteStdin(KProcess*)
void HadifixProc::slotWroteStdin(TDEProcess*)
{
// kdDebug() << "HadifixProc::slotWroteStdin: closing Stdin" << endl;
d->hadifixProc->closeStdin();
@ -359,14 +359,14 @@ HadifixProc::VoiceGender HadifixProc::determineGender(TQString mbrola, TQString
HadifixProc speech;
KShellProcess proc;
proc << command;
connect(&proc, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)),
&speech, TQT_SLOT(receivedStdout(KProcess *, char *, int)));
connect(&proc, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)),
&speech, TQT_SLOT(receivedStderr(KProcess *, char *, int)));
connect(&proc, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
&speech, TQT_SLOT(receivedStdout(TDEProcess *, char *, int)));
connect(&proc, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
&speech, TQT_SLOT(receivedStderr(TDEProcess *, char *, int)));
speech.stdOut = TQString();
speech.stdErr = TQString();
proc.start (KProcess::Block, KProcess::AllOutput);
proc.start (TDEProcess::Block, TDEProcess::AllOutput);
VoiceGender result;
if (!speech.stdErr.isNull() && !speech.stdErr.isEmpty()) {
@ -388,11 +388,11 @@ HadifixProc::VoiceGender HadifixProc::determineGender(TQString mbrola, TQString
return result;
}
void HadifixProc::receivedStdout (KProcess *, char *buffer, int buflen) {
void HadifixProc::receivedStdout (TDEProcess *, char *buffer, int buflen) {
stdOut += TQString::fromLatin1(buffer, buflen);
}
void HadifixProc::receivedStderr (KProcess *, char *buffer, int buflen) {
void HadifixProc::receivedStderr (TDEProcess *, char *buffer, int buflen) {
stdErr += TQString::fromLatin1(buffer, buflen);
}
@ -407,5 +407,5 @@ void HadifixProc::receivedStderr (KProcess *, char *buffer, int buflen) {
*/
TQString HadifixProc::getSsmlXsltFilename()
{
return KGlobal::dirs()->resourceDirs("data").last() + "kttsd/hadifix/xslt/SSMLtoTxt2pho.xsl";
return TDEGlobal::dirs()->resourceDirs("data").last() + "kttsd/hadifix/xslt/SSMLtoTxt2pho.xsl";
}

10
kttsd/plugins/hadifix/hadifixproc.h
Unescape View File

@ -22,7 +22,7 @@
#include <pluginproc.h>
class KProcess;
class TDEProcess;
class HadifixProcPrivate;
class HadifixProc : public PlugInProc{
@ -188,11 +188,11 @@ class HadifixProc : public PlugInProc{
virtual TQString getSsmlXsltFilename();
private slots:
void slotProcessExited(KProcess*);
void slotWroteStdin(KProcess*);
void slotProcessExited(TDEProcess*);
void slotWroteStdin(TDEProcess*);
void receivedStdout (KProcess *, char *buffer, int buflen);
void receivedStderr (KProcess *, char *buffer, int buflen);
void receivedStdout (TDEProcess *, char *buffer, int buflen);
void receivedStderr (TDEProcess *, char *buffer, int buflen);
private:
HadifixProcPrivate *d;

Write Preview
Loading…
Cancel
Save