summaryrefslogtreecommitdiffstats
path: root/kview/kviewviewer
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/kviewviewer
parente2385b701b464dc2259fcd5f3819c98f2c8c4438 (diff)
downloadtdegraphics-6adb71382c3d5277c3dcbc4ec24c5ff36b4c07ef.tar.gz
tdegraphics-6adb71382c3d5277c3dcbc4ec24c5ff36b4c07ef.zip
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kview/kviewviewer')
-rw-r--r--kview/kviewviewer/kviewkonqextension.cpp2
-rw-r--r--kview/kviewviewer/kviewviewer.cpp2
2 files changed, 2 insertions, 2 deletions
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 );
}