From 6adb71382c3d5277c3dcbc4ec24c5ff36b4c07ef Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 24 Jan 2013 13:45:52 -0600 Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4 --- kview/modules/presenter/kviewpresenter.cpp | 2 +- kview/modules/scale/kfloatspinbox.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'kview/modules') diff --git a/kview/modules/presenter/kviewpresenter.cpp b/kview/modules/presenter/kviewpresenter.cpp index 0fc6bfe2..7335f1af 100644 --- a/kview/modules/presenter/kviewpresenter.cpp +++ b/kview/modules/presenter/kviewpresenter.cpp @@ -353,7 +353,7 @@ void KViewPresenter::makeCurrent( TQListViewItem * item ) else { m_pCurrentItem = static_cast( item ); - m_pCurrentItem->setPixmap( 0, KGlobal::iconLoader()->loadIcon( "1rightarrow", KIcon::Small ) ); + m_pCurrentItem->setPixmap( 0, TDEGlobal::iconLoader()->loadIcon( "1rightarrow", KIcon::Small ) ); m_pImageList->m_pListView->ensureItemVisible( m_pCurrentItem ); } } diff --git a/kview/modules/scale/kfloatspinbox.cpp b/kview/modules/scale/kfloatspinbox.cpp index 6870a20b..c260119e 100644 --- a/kview/modules/scale/kfloatspinbox.cpp +++ b/kview/modules/scale/kfloatspinbox.cpp @@ -86,12 +86,12 @@ void KFloatSpinBox::setValueBlocking( float value ) TQString KFloatSpinBox::mapValueToText( int value ) { - return KGlobal::locale()->formatNumber( (float)value / (float)m_factor, 4 ); + return TDEGlobal::locale()->formatNumber( (float)value / (float)m_factor, 4 ); } int KFloatSpinBox::mapTextToValue( bool * ok ) { - return (int)( m_factor * KGlobal::locale()->readNumber( text(), ok ) ); + return (int)( m_factor * TDEGlobal::locale()->readNumber( text(), ok ) ); } void KFloatSpinBox::valueChange() -- cgit v1.2.1