summaryrefslogtreecommitdiffstats
path: root/kview/modules
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:45:52 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-24 13:45:52 -0600
commit6adb71382c3d5277c3dcbc4ec24c5ff36b4c07ef (patch)
tree44659d1cc0c37eb995e572bc1b979e75a74210fb /kview/modules
parente2385b701b464dc2259fcd5f3819c98f2c8c4438 (diff)
downloadtdegraphics-6adb71382c3d5277c3dcbc4ec24c5ff36b4c07ef.tar.gz
tdegraphics-6adb71382c3d5277c3dcbc4ec24c5ff36b4c07ef.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kview/modules')
-rw-r--r--kview/modules/presenter/kviewpresenter.cpp2
-rw-r--r--kview/modules/scale/kfloatspinbox.cpp4
2 files changed, 3 insertions, 3 deletions
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<ImageListItem*>( 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()