From cee429821aa6f1acc97fb482d325fb4eb37376ca Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:44:46 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kvoctrain/kvoctrain/common-dialogs/kvoctrain.kcfg | 4 ++-- kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp | 10 +++++----- kvoctrain/kvoctrain/kva_init.cpp | 2 +- kvoctrain/kvoctrain/kvoctraintable.cpp | 6 +++--- kvoctrain/kvoctrain/kvoctraintableitem.cpp | 4 ++-- kvoctrain/kvoctrain/kvoctrainview.cpp | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) (limited to 'kvoctrain') diff --git a/kvoctrain/kvoctrain/common-dialogs/kvoctrain.kcfg b/kvoctrain/kvoctrain/common-dialogs/kvoctrain.kcfg index 2aea0769..2eef8ebd 100644 --- a/kvoctrain/kvoctrain/common-dialogs/kvoctrain.kcfg +++ b/kvoctrain/kvoctrain/common-dialogs/kvoctrain.kcfg @@ -133,11 +133,11 @@ - KGlobalSettings::generalFont() + TDEGlobalSettings::generalFont() - KGlobalSettings::generalFont() + TDEGlobalSettings::generalFont() diff --git a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp index 49f12597..ffdf44d4 100644 --- a/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp +++ b/kvoctrain/kvoctrain/common-dialogs/languageoptions.cpp @@ -1007,16 +1007,16 @@ LangSet LanguageOptions::getLangSet () const void LanguageOptions::loadCountryData() { // temperary use of our locale as the global locale - KLocale *lsave = KGlobal::_locale; + KLocale *lsave = TDEGlobal::_locale; TQString curr_lang = lsave->language(); // KLocale locale("kvoctrain"); KLocale locale(TQString::null); locale.setLanguage(curr_lang); - KGlobal::_locale = &locale; + TDEGlobal::_locale = &locale; TQString sub = TQString::fromLatin1("l10n/"); - TQStringList regionlist = KGlobal::dirs()->findAllResources("locale", sub + TQString::fromLatin1("*.desktop")); + TQStringList regionlist = TDEGlobal::dirs()->findAllResources("locale", sub + TQString::fromLatin1("*.desktop")); regionlist.sort(); TQMap regions; @@ -1040,7 +1040,7 @@ void LanguageOptions::loadCountryData() } // add all languages to the list - TQStringList countrylist = KGlobal::dirs()->findAllResources("locale", sub + TQString::fromLatin1("*/entry.desktop")); + TQStringList countrylist = TDEGlobal::dirs()->findAllResources("locale", sub + TQString::fromLatin1("*/entry.desktop")); int idx = 0; for (TQStringList::ConstIterator sit = countrylist.begin(); sit != countrylist.end(); ++sit) @@ -1120,7 +1120,7 @@ void LanguageOptions::loadCountryData() } // restore the old global locale - KGlobal::_locale = lsave; + TDEGlobal::_locale = lsave; } diff --git a/kvoctrain/kvoctrain/kva_init.cpp b/kvoctrain/kvoctrain/kva_init.cpp index 9610355b..86cc7589 100644 --- a/kvoctrain/kvoctrain/kva_init.cpp +++ b/kvoctrain/kvoctrain/kva_init.cpp @@ -168,7 +168,7 @@ void kvoctrainApp::initActions() editRemoveSelectedArea->setWhatsThis(i18n("Delete the selected rows")); editRemoveSelectedArea->setToolTip(editRemoveSelectedArea->whatsThis()); - editSaveSelectedArea = new KAction(i18n("Save E&ntries in Query As..."), KGlobal::iconLoader()->loadIcon("filesaveas", KIcon::Small), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveSelection()), actionCollection(),"edit_save_selected_area"); + editSaveSelectedArea = new KAction(i18n("Save E&ntries in Query As..."), TDEGlobal::iconLoader()->loadIcon("filesaveas", KIcon::Small), 0, TQT_TQOBJECT(this), TQT_SLOT(slotSaveSelection()), actionCollection(),"edit_save_selected_area"); editSaveSelectedArea->setWhatsThis(i18n("Save the entries in the query as a new vocabulary")); editSaveSelectedArea->setToolTip(editSaveSelectedArea->whatsThis()); diff --git a/kvoctrain/kvoctrain/kvoctraintable.cpp b/kvoctrain/kvoctrain/kvoctraintable.cpp index d432ab1b..10adff15 100644 --- a/kvoctrain/kvoctrain/kvoctraintable.cpp +++ b/kvoctrain/kvoctrain/kvoctraintable.cpp @@ -57,8 +57,8 @@ KVocTrainTable::KVocTrainTable(kvoctrainDoc *doc, const LangSet *ls, TQWidget *p triggerSect = -1; - m_pixInQuery = TQPixmap(KGlobal::iconLoader()->loadIcon("ok", KIcon::Small)); - m_pixInactive = TQPixmap(KGlobal::iconLoader()->loadIcon("no", KIcon::Small)); + m_pixInQuery = TQPixmap(TDEGlobal::iconLoader()->loadIcon("ok", KIcon::Small)); + m_pixInactive = TQPixmap(TDEGlobal::iconLoader()->loadIcon("no", KIcon::Small)); delayTimer = new TQTimer(this); connect(delayTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(menuTriggerTimeout())); @@ -288,7 +288,7 @@ void KVocTrainTable::headerPressEvent(int sec) void KVocTrainTable::setFont(const TQFont & font) { TQTable::setFont(font); - horizontalHeader()->setFont(KGlobalSettings::generalFont()); + horizontalHeader()->setFont(TDEGlobalSettings::generalFont()); for (unsigned i = 0; i < (unsigned) numRows(); ++i) setRowHeight(i, fontMetrics().lineSpacing()); } diff --git a/kvoctrain/kvoctrain/kvoctraintableitem.cpp b/kvoctrain/kvoctrain/kvoctraintableitem.cpp index 34b00912..b3d54a0b 100644 --- a/kvoctrain/kvoctrain/kvoctraintableitem.cpp +++ b/kvoctrain/kvoctrain/kvoctraintableitem.cpp @@ -60,7 +60,7 @@ TQWidget *KVocTrainTableItem::createEditor() const switch (col()) { case KV_COL_LESS: { TQComboBox *lessonbox = new TQComboBox(table()->viewport() ); - lessonbox->setFont(KGlobalSettings::generalFont()); + lessonbox->setFont(TDEGlobalSettings::generalFont()); lessonbox->insertItem (m_doc->getLessonDescr(0)); for (unsigned i = 1; i <= (unsigned) m_doc->numLessons(); ++i) lessonbox->insertItem (m_doc->getLessonDescr(i)); @@ -71,7 +71,7 @@ TQWidget *KVocTrainTableItem::createEditor() const case KV_COL_MARK: { TQComboBox *statebox = new TQComboBox(table()->viewport() ); - statebox->setFont(KGlobalSettings::generalFont()); + statebox->setFont(TDEGlobalSettings::generalFont()); statebox->insertItem (i18n("state of a row", "Active, Not in Query")); statebox->insertItem (i18n("state of a row", "In Query")); statebox->insertItem (i18n("state of a row", "Inactive")); diff --git a/kvoctrain/kvoctrain/kvoctrainview.cpp b/kvoctrain/kvoctrain/kvoctrainview.cpp index 30f19f6d..f3e9e76a 100644 --- a/kvoctrain/kvoctrain/kvoctrainview.cpp +++ b/kvoctrain/kvoctrain/kvoctrainview.cpp @@ -368,7 +368,7 @@ void kvoctrainView::newPage(TQPainter & painter, int res, int startCol, int endC TQRect cr; TQRect w = painter.window(); painter.resetXForm(); - painter.setFont(KGlobalSettings::generalFont()); + painter.setFont(TDEGlobalSettings::generalFont()); painter.drawText(marg, marg - 20, i18n("KVocTrain - %1").arg(m_doc->getTitle())); painter.translate(marg, marg); painter.drawLine(-1 , 0, -1, hh - 1); @@ -387,7 +387,7 @@ void kvoctrainView::newPage(TQPainter & painter, int res, int startCol, int endC void kvoctrainView::endOfPage(TQPainter & painter, int pageNum, int res) { painter.resetXForm(); - painter.setFont(KGlobalSettings::generalFont()); + painter.setFont(TDEGlobalSettings::generalFont()); TQRect w = painter.window(); TQRect r = painter.boundingRect(0, 0, 0, 0, AlignAuto, TQString::number(pageNum)); painter.drawText((w.width()/2) - (r.width()/2), w.height() - res + 20, TQString::number(pageNum)); -- cgit v1.2.1