diff options
author | Timothy Pearson <[email protected]> | 2013-01-24 13:40:41 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2013-01-24 13:40:41 -0600 |
commit | 0b54abbdf80cef08e5cb8ef7b8b7af31c54dd9b4 (patch) | |
tree | 322767e10a0d28887f54f3cefe6399098713dc82 /kmouth/phrasebook/phrasetree.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 'kmouth/phrasebook/phrasetree.cpp')
-rw-r--r-- | kmouth/phrasebook/phrasetree.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kmouth/phrasebook/phrasetree.cpp b/kmouth/phrasebook/phrasetree.cpp index 27735c5..f8e89a9 100644 --- a/kmouth/phrasebook/phrasetree.cpp +++ b/kmouth/phrasebook/phrasetree.cpp @@ -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)); |