From 79b21d47bce1ee428affc97534cd8b257232a871 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:43:14 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp | 2 +- kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'kcontrol/kfontinst/kcmfontinst') diff --git a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp index 5b2ac8a1a..814703b0f 100644 --- a/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp +++ b/kcontrol/kfontinst/kcmfontinst/KCmFontInst.cpp @@ -82,7 +82,7 @@ CKCmFontInst::CKCmFontInst(TQWidget *parent, const char *, const TQStringList&) #endif itsConfig(KFI_UI_CFG_FILE) { - KGlobal::locale()->insertCatalogue(KFI_CATALOGUE); + TDEGlobal::locale()->insertCatalogue(KFI_CATALOGUE); TDEAboutData* about = new TDEAboutData("kcmfontinst", I18N_NOOP("TDE Font Installer"), diff --git a/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp b/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp index df1bbe746..df50e81a3 100644 --- a/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp +++ b/kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp @@ -189,7 +189,7 @@ void CKFileFontView::slotActivate(TQListViewItem *item) void CKFileFontView::selected(TQListViewItem *item) { if (item && !(TDEApplication::keyboardMouseState() & (ShiftButton|ControlButton)) && - KGlobalSettings::singleClick()) + TDEGlobalSettings::singleClick()) { const KFileItem *fi = ((CFontListViewItem*)item)->fileInfo(); @@ -632,7 +632,7 @@ void CFontListViewItem::init() CFontListViewItem::setPixmap(COL_NAME, itsInf->pixmap(KIcon::SizeSmall)); setText(COL_NAME, itsInf->text()); - setText(COL_SIZE, itsInf->isDir() ? "" : KGlobal::locale()->formatNumber(itsInf->size(), 0)); + setText(COL_SIZE, itsInf->isDir() ? "" : TDEGlobal::locale()->formatNumber(itsInf->size(), 0)); setText(COL_TYPE, itsInf->mimeComment()); } -- cgit v1.2.1