summaryrefslogtreecommitdiffstats
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
parentce843d9ed1e2f6e4ee1ba31f7f6ac331c524da68 (diff)
downloadtdeaccessibility-98841fe5a255d63ee9d05d74acc4c90c4598bb00.zip
tdeaccessibility-98841fe5a255d63ee9d05d74acc4c90c4598bb00.tar.gz
Rename KIcon to enhance compatibility with KDE4
-rw-r--r--kbstateapplet/kbstate.cpp26
-rw-r--r--kmousetool/kmousetool/kmousetool.cpp10
-rw-r--r--kmouth/optionsdialog.cpp6
-rw-r--r--kmouth/phrasebook/phrasetree.cpp6
-rw-r--r--kmouth/phraselist.cpp2
-rw-r--r--ksayit/src/docbookclasses.cpp30
-rw-r--r--ksayit/src/ksayitsystemtray.cpp6
-rw-r--r--ksayit/src/voicesetupdlg.cpp4
-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
13 files changed, 82 insertions, 82 deletions
diff --git a/kbstateapplet/kbstate.cpp b/kbstateapplet/kbstate.cpp
index 19e7a28..49eb509 100644
--- a/kbstateapplet/kbstate.cpp
+++ b/kbstateapplet/kbstate.cpp
@@ -786,17 +786,17 @@ void KeyIcon::resizeEvent( TQResizeEvent*e )
void KeyIcon::updateImages () {
int size = width()<height() ? width() : height();
- locked = instance->iconLoader()->loadIcon("lock_overlay", KIcon::Panel, size-4);
+ locked = instance->iconLoader()->loadIcon("lock_overlay", TDEIcon::Panel, size-4);
if (strcmp(modifierKeys[keyId].icon, "")) {
- latched = instance->iconLoader()->loadIcon(modifierKeys[keyId].icon, KIcon::NoGroup, size-4);
- unlatched = instance->iconLoader()->loadIcon(modifierKeys[keyId].icon, KIcon::NoGroup, size-4);
+ latched = instance->iconLoader()->loadIcon(modifierKeys[keyId].icon, TDEIcon::NoGroup, size-4);
+ unlatched = instance->iconLoader()->loadIcon(modifierKeys[keyId].icon, TDEIcon::NoGroup, size-4);
TQImage img = latched.convertToImage();
- KIconEffect::colorize(img, TDEGlobalSettings::highlightedTextColor(), 1.0);
+ TDEIconEffect::colorize(img, TDEGlobalSettings::highlightedTextColor(), 1.0);
latched.convertFromImage (img);
img = unlatched.convertToImage();
- KIconEffect::colorize(img, TDEGlobalSettings::textColor(), 1.0);
+ TDEIconEffect::colorize(img, TDEGlobalSettings::textColor(), 1.0);
unlatched.convertFromImage (img);
}
@@ -887,11 +887,11 @@ void MouseIcon::resizeEvent( TQResizeEvent*e )
}
TQPixmap loadIcon(TDEInstance *instance, int size, TQColor color, TQString name) {
- KIconLoader *loader = instance->iconLoader();
- TQPixmap result = loader->loadIcon(name, KIcon::NoGroup, size);
+ TDEIconLoader *loader = instance->iconLoader();
+ TQPixmap result = loader->loadIcon(name, TDEIcon::NoGroup, size);
TQImage img = result.convertToImage();
- KIconEffect::colorize(img, color, 1.0);
+ TDEIconEffect::colorize(img, color, 1.0);
result.convertFromImage (img);
return result;
@@ -973,10 +973,10 @@ TimeoutIcon::~TimeoutIcon () {
void TimeoutIcon::update () {
int size = width()<height() ? width() : height();
if (pixmap.width() != size)
- pixmap = instance->iconLoader()->loadIcon(iconname, KIcon::NoGroup, size);
+ pixmap = instance->iconLoader()->loadIcon(iconname, TDEIcon::NoGroup, size);
TQImage img = pixmap.convertToImage();
- KIconEffect::colorize(img, TDEGlobalSettings::textColor(), 1.0);
+ TDEIconEffect::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, TDEGlobalSettings::textColor(), 1.0);
+ TDEIconEffect::colorize(img, TDEGlobalSettings::textColor(), 1.0);
pixmap.convertFromImage (img);
image = pixmap;
@@ -1000,10 +1000,10 @@ void TimeoutIcon::setImage (const TQString &name, int timeout) {
iconname = name;
if (!name.isNull() && !name.isEmpty()) {
int size = width()<height() ? width() : height();
- pixmap = instance->iconLoader()->loadIcon(iconname, KIcon::NoGroup, size);
+ pixmap = instance->iconLoader()->loadIcon(iconname, TDEIcon::NoGroup, size);
TQImage img = pixmap.convertToImage();
- KIconEffect::colorize(img, TDEGlobalSettings::textColor(), 1.0);
+ TDEIconEffect::colorize(img, TDEGlobalSettings::textColor(), 1.0);
pixmap.convertFromImage (img);
image = pixmap;
diff --git a/kmousetool/kmousetool/kmousetool.cpp b/kmousetool/kmousetool/kmousetool.cpp
index 256e00e..31ee09c 100644
--- a/kmousetool/kmousetool/kmousetool.cpp
+++ b/kmousetool/kmousetool/kmousetool.cpp
@@ -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 (TDEGlobal::iconLoader()->loadIcon("configure", KIcon::Small),
+ contextMenu()->insertItem (TDEGlobal::iconLoader()->loadIcon("configure", TDEIcon::Small),
i18n("&Configure KMouseTool..."), this, TQT_SIGNAL(configureSelected()));
contextMenu()->insertSeparator();
- contextMenu()->insertItem (TDEGlobal::iconLoader()->loadIcon("contents", KIcon::Small),
+ contextMenu()->insertItem (TDEGlobal::iconLoader()->loadIcon("contents", TDEIcon::Small),
i18n("KMousetool &Handbook"), this, TQT_SIGNAL(helpSelected()));
- contextMenu()->insertItem (TDEGlobal::iconLoader()->loadIcon("kmousetool", KIcon::Small),
+ contextMenu()->insertItem (TDEGlobal::iconLoader()->loadIcon("kmousetool", TDEIcon::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 = TDEGlobal::iconLoader()->loadIcon("kmousetool_on", KIcon::Small);
+ icon = TDEGlobal::iconLoader()->loadIcon("kmousetool_on", TDEIcon::Small);
}
else {
contextMenu()->changeItem (startStopId, i18n("&Start"));
- icon = TDEGlobal::iconLoader()->loadIcon("kmousetool_off", KIcon::Small);
+ icon = TDEGlobal::iconLoader()->loadIcon("kmousetool_off", TDEIcon::Small);
}
setPixmap (icon);
show();
diff --git a/kmouth/optionsdialog.cpp b/kmouth/optionsdialog.cpp
index c15f992..559370d 100644
--- a/kmouth/optionsdialog.cpp
+++ b/kmouth/optionsdialog.cpp
@@ -119,7 +119,7 @@ OptionsDialog::OptionsDialog (TQWidget *parent)
{
setHelp ("config-dialog");
- TQPixmap iconGeneral = TDEGlobal::iconLoader()->loadIcon("configure", KIcon::NoGroup, KIcon::SizeMedium);
+ TQPixmap iconGeneral = TDEGlobal::iconLoader()->loadIcon("configure", TDEIcon::NoGroup, TDEIcon::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 = TDEGlobal::iconLoader()->loadIcon("keyboard", KIcon::NoGroup, KIcon::SizeMedium);
+ TQPixmap iconCompletion = TDEGlobal::iconLoader()->loadIcon("keyboard", TDEIcon::NoGroup, TDEIcon::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 = TDEGlobal::iconLoader()->loadIcon("multimedia", KIcon::NoGroup, KIcon::SizeMedium);
+ TQPixmap iconKttsd = TDEGlobal::iconLoader()->loadIcon("multimedia", TDEIcon::NoGroup, TDEIcon::SizeMedium);
TQGrid *pageKttsd = addGridPage (1, Qt::Horizontal, i18n("KTTSD Speech Service"),
i18n("TDE Text-to-Speech Daemon Configuration"), iconKttsd);
diff --git a/kmouth/phrasebook/phrasetree.cpp b/kmouth/phrasebook/phrasetree.cpp
index 665750d..da82164 100644
--- a/kmouth/phrasebook/phrasetree.cpp
+++ b/kmouth/phrasebook/phrasetree.cpp
@@ -77,9 +77,9 @@ void PhraseTreeItem::setCut (TDEShortcut cut) {
PhraseTree::PhraseTree (TQWidget *parent, const char *name)
: TDEListView (parent, name)
{
- phrasebook_open = TDEGlobal::iconLoader()->loadIcon("phrasebook", KIcon::Small);
- phrasebook_closed = TDEGlobal::iconLoader()->loadIcon("phrasebook_closed", KIcon::Small);
- phrase = TDEGlobal::iconLoader()->loadIcon("phrase", KIcon::Small);
+ phrasebook_open = TDEGlobal::iconLoader()->loadIcon("phrasebook", TDEIcon::Small);
+ phrasebook_closed = TDEGlobal::iconLoader()->loadIcon("phrasebook_closed", TDEIcon::Small);
+ phrase = TDEGlobal::iconLoader()->loadIcon("phrase", TDEIcon::Small);
connect (this, TQT_SIGNAL(expanded (TQListViewItem *)), this, TQT_SLOT(itemExpanded (TQListViewItem *)));
connect (this, TQT_SIGNAL(collapsed (TQListViewItem *)), this, TQT_SLOT(itemCollapsed (TQListViewItem *)));
diff --git a/kmouth/phraselist.cpp b/kmouth/phraselist.cpp
index 1775c5a..d3df504 100644
--- a/kmouth/phraselist.cpp
+++ b/kmouth/phraselist.cpp
@@ -75,7 +75,7 @@ PhraseList::PhraseList(TQWidget *parent, const char *name) : TQWidget(parent,nam
rowLayout->addWidget(lineEdit);
lineEdit->setFocus();
- TQIconSet icon = TDEGlobal::iconLoader()->loadIconSet("speak", KIcon::Small);
+ TQIconSet icon = TDEGlobal::iconLoader()->loadIconSet("speak", TDEIcon::Small);
speakButton = new TQPushButton (icon, i18n("&Speak"), this);
speakButton->setFocusPolicy(TQ_NoFocus);
speakButton->setAutoDefault(false);
diff --git a/ksayit/src/docbookclasses.cpp b/ksayit/src/docbookclasses.cpp
index 3e1f091..914d99a 100644
--- a/ksayit/src/docbookclasses.cpp
+++ b/ksayit/src/docbookclasses.cpp
@@ -55,7 +55,7 @@ ListViewInterface::ListViewInterface(TDEListView *lv, TQString label)
RobDocument::RobDocument(TDEListView *lv, TQString label)
: ListViewInterface( lv, label )
{
- TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon("contents", KIcon::Small);
+ TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon("contents", TDEIcon::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 = TDEGlobal::iconLoader()->loadIcon("filenew", KIcon::Small);
+ TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon("filenew", TDEIcon::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 = TDEGlobal::iconLoader()->loadIcon("filenew", KIcon::Small);
+ TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon("filenew", TDEIcon::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 = TDEGlobal::iconLoader()->loadIcon("filenew", KIcon::Small);
+ TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon("filenew", TDEIcon::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 = TDEGlobal::iconLoader()->loadIcon("tdmconfig", KIcon::Small);
+ TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon("tdmconfig", TDEIcon::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 = TDEGlobal::iconLoader()->loadIcon("personal", KIcon::Small);
+ TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon("personal", TDEIcon::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 = TDEGlobal::iconLoader()->loadIcon("txt", KIcon::Small);
+ TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon("txt", TDEIcon::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 = TDEGlobal::iconLoader()->loadIcon("filenew", KIcon::Small);
+ TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon("filenew", TDEIcon::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 = TDEGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small);
+ TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon("leftjust", TDEIcon::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 = TDEGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small);
+ TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon("leftjust", TDEIcon::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 = TDEGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small);
+ TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon("leftjust", TDEIcon::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 = TDEGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small);
+ TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon("leftjust", TDEIcon::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 = TDEGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small);
+ TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon("leftjust", TDEIcon::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 = TDEGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small);
+ TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon("leftjust", TDEIcon::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 = TDEGlobal::iconLoader()->loadIcon("leftjust", KIcon::Small);
+ TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon("leftjust", TDEIcon::Small);
this->setPixmap(0, pixmap);
// new Concept (begin)
diff --git a/ksayit/src/ksayitsystemtray.cpp b/ksayit/src/ksayitsystemtray.cpp
index 589eb5d..9700b97 100644
--- a/ksayit/src/ksayitsystemtray.cpp
+++ b/ksayit/src/ksayitsystemtray.cpp
@@ -232,7 +232,7 @@ void State::mouseReleaseEventCall(KSayItSystemTray *caller, TQMouseEvent *e)
////////////////////////////////////////////
StateWAIT::StateWAIT(){
- m_traypixmap = TDEGlobal::iconLoader()->loadIcon("ksayit", KIcon::Toolbar);
+ m_traypixmap = TDEGlobal::iconLoader()->loadIcon("ksayit", TDEIcon::Toolbar);
}
StateWAIT::~StateWAIT(){
}
@@ -273,7 +273,7 @@ void StateWAIT::mouseReleaseEvent(KSayItSystemTray *caller, TQMouseEvent *e)
////////////////////////////////////////////
StateSAY::StateSAY(){
- m_traypixmap = TDEGlobal::iconLoader()->loadIcon("ksayit_talking", KIcon::Toolbar);
+ m_traypixmap = TDEGlobal::iconLoader()->loadIcon("ksayit_talking", TDEIcon::Toolbar);
}
StateSAY::~StateSAY(){
}
@@ -315,7 +315,7 @@ void StateSAY::mouseReleaseEvent(KSayItSystemTray *caller, TQMouseEvent *e)
////////////////////////////////////////////
StateCLIPEMPTY::StateCLIPEMPTY(){
- m_traypixmap = TDEGlobal::iconLoader()->loadIcon("ksayit_clipempty", KIcon::Toolbar);
+ m_traypixmap = TDEGlobal::iconLoader()->loadIcon("ksayit_clipempty", TDEIcon::Toolbar);
}
StateCLIPEMPTY::~StateCLIPEMPTY(){
}
diff --git a/ksayit/src/voicesetupdlg.cpp b/ksayit/src/voicesetupdlg.cpp
index 7944328..f8b30bd 100644
--- a/ksayit/src/voicesetupdlg.cpp
+++ b/ksayit/src/voicesetupdlg.cpp
@@ -66,7 +66,7 @@ VoiceSetupDlg::~VoiceSetupDlg()
void VoiceSetupDlg::initVoicePage()
{
- TQPixmap icon = TDEGlobal::iconLoader()->loadIcon("ksayit", KIcon::Toolbar, KIcon::SizeMedium);
+ TQPixmap icon = TDEGlobal::iconLoader()->loadIcon("ksayit", TDEIcon::Toolbar, TDEIcon::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 = TDEGlobal::iconLoader()->loadIcon("ksysguard", KIcon::Toolbar, KIcon::SizeMedium);
+ TQPixmap icon = TDEGlobal::iconLoader()->loadIcon("ksysguard", TDEIcon::Toolbar, TDEIcon::SizeMedium);
m_fxPage = addPage( i18n( "Audio FX" ), i18n("Effect Stack"), icon );
TQVBoxLayout *fxLayout = new TQVBoxLayout( m_fxPage, 0, spacingHint() );
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) {