diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:40:41 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:40:41 -0600 |
| commit | 0b54abbdf80cef08e5cb8ef7b8b7af31c54dd9b4 (patch) | |
| tree | 322767e10a0d28887f54f3cefe6399098713dc82 /kttsd/plugins/festivalint/festivalintconf.cpp | |
| parent | 11f5b1c38c194ef53638bafa0df70e821a7a6427 (diff) | |
| download | tdeaccessibility-0b54abbdf80cef08e5cb8ef7b8b7af31c54dd9b4.tar.gz tdeaccessibility-0b54abbdf80cef08e5cb8ef7b8b7af31c54dd9b4.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kttsd/plugins/festivalint/festivalintconf.cpp')
| -rw-r--r-- | kttsd/plugins/festivalint/festivalintconf.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kttsd/plugins/festivalint/festivalintconf.cpp b/kttsd/plugins/festivalint/festivalintconf.cpp index 4e34b1a..c7563a6 100644 --- a/kttsd/plugins/festivalint/festivalintconf.cpp +++ b/kttsd/plugins/festivalint/festivalintconf.cpp @@ -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 ) { |