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 /kmouth/phrasebook | |
| 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')
| -rw-r--r-- | kmouth/phrasebook/phrasebook.cpp | 2 | ||||
| -rw-r--r-- | kmouth/phrasebook/phrasebookdialog.cpp | 2 | ||||
| -rw-r--r-- | kmouth/phrasebook/phrasetree.cpp | 8 |
3 files changed, 6 insertions, 6 deletions
diff --git a/kmouth/phrasebook/phrasebook.cpp b/kmouth/phrasebook/phrasebook.cpp index ffa3ff2..f03cd96 100644 --- a/kmouth/phrasebook/phrasebook.cpp +++ b/kmouth/phrasebook/phrasebook.cpp @@ -102,7 +102,7 @@ void PhraseBook::print(KPrinter *pPrinter) { int x = size.x(); int y = size.y(); int w = size.width(); - printpainter.setFont (TQFont (KGlobalSettings::generalFont().family(), 12)); + printpainter.setFont (TQFont (TDEGlobalSettings::generalFont().family(), 12)); TQFontMetrics metrics = printpainter.fontMetrics(); PhraseBookEntryList::iterator it; diff --git a/kmouth/phrasebook/phrasebookdialog.cpp b/kmouth/phrasebook/phrasebookdialog.cpp index a8a0609..832e184 100644 --- a/kmouth/phrasebook/phrasebookdialog.cpp +++ b/kmouth/phrasebook/phrasebookdialog.cpp @@ -403,7 +403,7 @@ TQString PhraseBookDialog::displayPath (TQString filename) { } StandardBookList PhraseBookDialog::standardPhraseBooks() { - TQStringList bookPaths = KGlobal::instance()->dirs()->findAllResources ( + TQStringList bookPaths = TDEGlobal::instance()->dirs()->findAllResources ( "data", "kmouth/books/*.phrasebook", true, true); TQStringList bookNames; TQMap<TQString,StandardBook> bookMap; 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)); |