diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
| commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
| tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp | |
| parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
| download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip | |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp')
| -rw-r--r-- | kcontrol/kfontinst/kcmfontinst/KFileFontView.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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()); } |