summaryrefslogtreecommitdiffstats
path: root/kttsd
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-04 14:13:16 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-04 14:13:16 -0600
commit98841fe5a255d63ee9d05d74acc4c90c4598bb00 (patch)
tree5f54fdff4d43ba9e8c0c4fcaa3c4536edac3b6e2 /kttsd
parentce843d9ed1e2f6e4ee1ba31f7f6ac331c524da68 (diff)
downloadtdeaccessibility-98841fe5a255d63ee9d05d74acc4c90c4598bb00.tar.gz
tdeaccessibility-98841fe5a255d63ee9d05d74acc4c90c4598bb00.zip
Rename KIcon to enhance compatibility with KDE4
Diffstat (limited to 'kttsd')
-rw-r--r--kttsd/kcmkttsmgr/kcmkttsmgr.cpp24
-rw-r--r--kttsd/kttsjobmgr/kttsjobmgr.cpp26
-rw-r--r--kttsd/kttsmgr/kttsmgr.cpp16
-rw-r--r--kttsd/plugins/festivalint/festivalintconf.cpp4
-rw-r--r--kttsd/plugins/hadifix/hadifixconfigui.ui.h4
5 files changed, 37 insertions, 37 deletions
diff --git a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp
index dabeb63..9a5f52e 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(
- TDEGlobal::iconLoader()->loadIconSet("up", KIcon::Small));
+ TDEGlobal::iconLoader()->loadIconSet("up", TDEIcon::Small));
m_kttsmgrw->lowerTalkerPriorityButton->setIconSet(
- TDEGlobal::iconLoader()->loadIconSet("down", KIcon::Small));
+ TDEGlobal::iconLoader()->loadIconSet("down", TDEIcon::Small));
m_kttsmgrw->removeTalkerButton->setIconSet(
- TDEGlobal::iconLoader()->loadIconSet("edittrash", KIcon::Small));
+ TDEGlobal::iconLoader()->loadIconSet("edittrash", TDEIcon::Small));
m_kttsmgrw->configureTalkerButton->setIconSet(
- TDEGlobal::iconLoader()->loadIconSet("configure", KIcon::Small));
+ TDEGlobal::iconLoader()->loadIconSet("configure", TDEIcon::Small));
// Filters tab.
m_kttsmgrw->higherFilterPriorityButton->setIconSet(
- TDEGlobal::iconLoader()->loadIconSet("up", KIcon::Small));
+ TDEGlobal::iconLoader()->loadIconSet("up", TDEIcon::Small));
m_kttsmgrw->lowerFilterPriorityButton->setIconSet(
- TDEGlobal::iconLoader()->loadIconSet("down", KIcon::Small));
+ TDEGlobal::iconLoader()->loadIconSet("down", TDEIcon::Small));
m_kttsmgrw->removeFilterButton->setIconSet(
- TDEGlobal::iconLoader()->loadIconSet("edittrash", KIcon::Small));
+ TDEGlobal::iconLoader()->loadIconSet("edittrash", TDEIcon::Small));
m_kttsmgrw->configureFilterButton->setIconSet(
- TDEGlobal::iconLoader()->loadIconSet("configure", KIcon::Small));
+ TDEGlobal::iconLoader()->loadIconSet("configure", TDEIcon::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(
- TDEGlobal::iconLoader()->loadIconSet("edittrash", KIcon::Small));
+ TDEGlobal::iconLoader()->loadIconSet("edittrash", TDEIcon::Small));
m_kttsmgrw->notifyTestButton->setIconSet(
- TDEGlobal::iconLoader()->loadIconSet("speak", KIcon::Small));
+ TDEGlobal::iconLoader()->loadIconSet("speak", TDEIcon::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( TDEGlobal::iconLoader()->loadIconSet("up", KIcon::Small),
+ m_sbdPopmenu->insertItem( TDEGlobal::iconLoader()->loadIconSet("up", TDEIcon::Small),
i18n("U&p"), this, TQT_SLOT(slot_higherSbdFilterPriority()), 0, sbdBtnUp );
- m_sbdPopmenu->insertItem( TDEGlobal::iconLoader()->loadIconSet("down", KIcon::Small),
+ m_sbdPopmenu->insertItem( TDEGlobal::iconLoader()->loadIconSet("down", TDEIcon::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 );
diff --git a/kttsd/kttsjobmgr/kttsjobmgr.cpp b/kttsd/kttsjobmgr/kttsjobmgr.cpp
index a8002ce..33222d9 100644
--- a/kttsd/kttsjobmgr/kttsjobmgr.cpp
+++ b/kttsd/kttsjobmgr/kttsjobmgr.cpp
@@ -172,7 +172,7 @@ KttsJobMgrPart::KttsJobMgrPart(TQWidget *parent, const char *name) :
TQPushButton* btn;
TQString wt;
- btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("stop", KIcon::Small, 0, true),
+ btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("stop", TDEIcon::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(TDEGlobal::iconLoader()->loadIconSet("exec", KIcon::Small, 0, true),
+ btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("exec", TDEIcon::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(TDEGlobal::iconLoader()->loadIconSet("redo", KIcon::Small, 0, true),
+ btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("redo", TDEIcon::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(TDEGlobal::iconLoader()->loadIconSet("edittrash", KIcon::Small, 0, true),
+ btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("edittrash", TDEIcon::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(TDEGlobal::iconLoader()->loadIconSet("down", KIcon::Small, 0, true),
+ btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("down", TDEIcon::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(TDEGlobal::iconLoader()->loadIconSet("2leftarrow", KIcon::Small, 0, true),
+ btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("2leftarrow", TDEIcon::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(TDEGlobal::iconLoader()->loadIconSet("1leftarrow", KIcon::Small, 0, true),
+ btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("1leftarrow", TDEIcon::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(TDEGlobal::iconLoader()->loadIconSet("1rightarrow", KIcon::Small, 0, true),
+ btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("1rightarrow", TDEIcon::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(TDEGlobal::iconLoader()->loadIconSet("2rightarrow", KIcon::Small, 0, true),
+ btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("2rightarrow", TDEIcon::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(TDEGlobal::iconLoader()->loadIconSet("klipper", KIcon::Small, 0, true),
+ btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("klipper", TDEIcon::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(TDEGlobal::iconLoader()->loadIconSet("fileopen", KIcon::Small, 0, true),
+ btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("fileopen", TDEIcon::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(TDEGlobal::iconLoader()->loadIconSet("translate", KIcon::Small, 0, true),
+ btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("translate", TDEIcon::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(TDEGlobal::iconLoader()->loadIconSet("reload_page", KIcon::Small, 0, true),
+ btn = new TQPushButton(TDEGlobal::iconLoader()->loadIconSet("reload_page", TDEIcon::Small, 0, true),
i18n("&Refresh"), hbox3, "refresh");
wt = i18n(
"<p>Refresh the list of jobs.</p>");
diff --git a/kttsd/kttsmgr/kttsmgr.cpp b/kttsd/kttsmgr/kttsmgr.cpp
index 92805dd..95d4be5 100644
--- a/kttsd/kttsmgr/kttsmgr.cpp
+++ b/kttsd/kttsmgr/kttsmgr.cpp
@@ -81,7 +81,7 @@ int main (int argc, char *argv[])
KUniqueApplication app;
#if TDE_VERSION >= TDE_MAKE_VERSION (3,3,90)
- TQPixmap icon = TDEGlobal::iconLoader()->loadIcon("kttsd", KIcon::Panel);
+ TQPixmap icon = TDEGlobal::iconLoader()->loadIcon("kttsd", TDEIcon::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(TDEGlobal::iconLoader()->loadIcon("kttsd", KIcon::Small));
+ dlg.setIcon(TDEGlobal::iconLoader()->loadIcon("kttsd", TDEIcon::Small));
// Get SysTray and ShowMainWindow options.
TDEConfig* config = new TDEConfig("kttsdrc");
@@ -168,7 +168,7 @@ KttsMgrTray::KttsMgrTray(TQWidget *parent):
DCOPObject("kkttsmgr_kspeechsink"),
KSystemTray(parent, "kttsmgrsystemtray")
{
- TQPixmap icon = TDEGlobal::iconLoader()->loadIcon("kttsd", KIcon::Small);
+ TQPixmap icon = TDEGlobal::iconLoader()->loadIcon("kttsd", TDEIcon::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 (TDEGlobal::iconLoader()->loadIcon("klipper", KIcon::Small),
+ id = contextMenu()->insertItem (TDEGlobal::iconLoader()->loadIcon("klipper", TDEIcon::Small),
i18n("&Speak Clipboard Contents"), this, TQT_SLOT(speakClipboardSelected()));
- id = contextMenu()->insertItem (TDEGlobal::iconLoader()->loadIcon("stop", KIcon::Small),
+ id = contextMenu()->insertItem (TDEGlobal::iconLoader()->loadIcon("stop", TDEIcon::Small),
i18n("&Hold"), this, TQT_SLOT(holdSelected()));
- id = contextMenu()->insertItem (TDEGlobal::iconLoader()->loadIcon("exec", KIcon::Small),
+ id = contextMenu()->insertItem (TDEGlobal::iconLoader()->loadIcon("exec", TDEIcon::Small),
i18n("Resume"), this, TQT_SLOT(resumeSelected()));
id = contextMenu()->insertSeparator();
- id = contextMenu()->insertItem (TDEGlobal::iconLoader()->loadIcon("contents", KIcon::Small),
+ id = contextMenu()->insertItem (TDEGlobal::iconLoader()->loadIcon("contents", TDEIcon::Small),
i18n("KTTS &Handbook"), this, TQT_SLOT(helpSelected()));
- id = contextMenu()->insertItem (TDEGlobal::iconLoader()->loadIcon("kttsd", KIcon::Small),
+ id = contextMenu()->insertItem (TDEGlobal::iconLoader()->loadIcon("kttsd", TDEIcon::Small),
i18n("&About KTTSMgr"), this, TQT_SLOT(aboutSelected()));
connect(this, TQT_SIGNAL(quitSelected()), this, TQT_SLOT(quitSelected()));
diff --git a/kttsd/plugins/festivalint/festivalintconf.cpp b/kttsd/plugins/festivalint/festivalintconf.cpp
index 58c2bad..e7aa13b 100644
--- a/kttsd/plugins/festivalint/festivalintconf.cpp
+++ b/kttsd/plugins/festivalint/festivalintconf.cpp
@@ -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 = TDEGlobal::iconLoader()->loadIcon("male", KIcon::Small);
- TQPixmap femaleIcon = TDEGlobal::iconLoader()->loadIcon("female", KIcon::Small);
+ TQPixmap maleIcon = TDEGlobal::iconLoader()->loadIcon("male", TDEIcon::Small);
+ TQPixmap femaleIcon = TDEGlobal::iconLoader()->loadIcon("female", TDEIcon::Small);
TQStringList::ConstIterator itEnd = m_supportedVoiceCodes.constEnd();
for(TQStringList::ConstIterator it = m_supportedVoiceCodes.begin(); it != itEnd; ++it )
{
diff --git a/kttsd/plugins/hadifix/hadifixconfigui.ui.h b/kttsd/plugins/hadifix/hadifixconfigui.ui.h
index fbfa16c..9c8b14b 100644
--- a/kttsd/plugins/hadifix/hadifixconfigui.ui.h
+++ b/kttsd/plugins/hadifix/hadifixconfigui.ui.h
@@ -47,8 +47,8 @@ void HadifixConfigUI::frequencySlider_valueChanged (int sliderValue) {
}
void HadifixConfigUI::init () {
- male = TDEGlobal::iconLoader()->loadIcon("male", KIcon::Small);
- female = TDEGlobal::iconLoader()->loadIcon("female", KIcon::Small);
+ male = TDEGlobal::iconLoader()->loadIcon("male", TDEIcon::Small);
+ female = TDEGlobal::iconLoader()->loadIcon("female", TDEIcon::Small);
}
void HadifixConfigUI::addVoice (const TQString &filename, bool isMale) {