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/kviewviewer/kviewkonqextension.cpp | 2 +- kview/kviewviewer/kviewviewer.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'kview/kviewviewer') diff --git a/kview/kviewviewer/kviewkonqextension.cpp b/kview/kviewviewer/kviewkonqextension.cpp index 2d4f8bb9..0fba3ab0 100644 --- a/kview/kviewviewer/kviewkonqextension.cpp +++ b/kview/kviewviewer/kviewkonqextension.cpp @@ -38,7 +38,7 @@ KViewKonqExtension::KViewKonqExtension( KImageViewer::Canvas * canvas, m_pViewer( parent ), m_pCanvas( canvas ) { - KGlobal::locale()->insertCatalogue("kview"); + TDEGlobal::locale()->insertCatalogue("kview"); } void KViewKonqExtension::setXYOffset( int x, int y ) diff --git a/kview/kviewviewer/kviewviewer.cpp b/kview/kviewviewer/kviewviewer.cpp index dbfa1c92..521e5d8c 100644 --- a/kview/kviewviewer/kviewviewer.cpp +++ b/kview/kviewviewer/kviewviewer.cpp @@ -649,7 +649,7 @@ void KViewViewer::setZoom( const TQString & newZoom ) if( newZoom == "33%" ) zoom = 1.0 / 3.0; else - zoom = KGlobal::locale()->readNumber( z ) / 100; + zoom = TDEGlobal::locale()->readNumber( z ) / 100; m_pCanvas->setZoom( zoom ); } -- cgit v1.2.3