summaryrefslogtreecommitdiffstats
path: root/kttsd/kcmkttsmgr
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:40:41 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:40:41 -0600
commit0b54abbdf80cef08e5cb8ef7b8b7af31c54dd9b4 (patch)
tree322767e10a0d28887f54f3cefe6399098713dc82 /kttsd/kcmkttsmgr
parent11f5b1c38c194ef53638bafa0df70e821a7a6427 (diff)
downloadtdeaccessibility-0b54abbdf80cef08e5cb8ef7b8b7af31c54dd9b4.tar.gz
tdeaccessibility-0b54abbdf80cef08e5cb8ef7b8b7af31c54dd9b4.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kttsd/kcmkttsmgr')
-rw-r--r--kttsd/kcmkttsmgr/addtalker.cpp10
-rw-r--r--kttsd/kcmkttsmgr/kcmkttsmgr.cpp32
-rw-r--r--kttsd/kcmkttsmgr/selectevent.cpp2
3 files changed, 22 insertions, 22 deletions
diff --git a/kttsd/kcmkttsmgr/addtalker.cpp b/kttsd/kcmkttsmgr/addtalker.cpp
index 200d419..d43b5b2 100644
--- a/kttsd/kcmkttsmgr/addtalker.cpp
+++ b/kttsd/kcmkttsmgr/addtalker.cpp
@@ -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;
}
diff --git a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp
index 2b8cd93..46a395e 100644
--- a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp
+++ b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp
@@ -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");
diff --git a/kttsd/kcmkttsmgr/selectevent.cpp b/kttsd/kcmkttsmgr/selectevent.cpp
index 0d9fe60..de97a6c 100644
--- a/kttsd/kcmkttsmgr/selectevent.cpp
+++ b/kttsd/kcmkttsmgr/selectevent.cpp
@@ -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)