From 79b21d47bce1ee428affc97534cd8b257232a871 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 24 Jan 2013 13:43:14 -0600
Subject: Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4

---
 kioslave/thumbnail/exrcreator.cpp | 2 +-
 kioslave/thumbnail/thumbnail.cpp  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'kioslave/thumbnail')

diff --git a/kioslave/thumbnail/exrcreator.cpp b/kioslave/thumbnail/exrcreator.cpp
index d0edbd38e..0cc8d54d3 100644
--- a/kioslave/thumbnail/exrcreator.cpp
+++ b/kioslave/thumbnail/exrcreator.cpp
@@ -62,7 +62,7 @@ bool EXRCreator::create(const TQString &path, int, int, TQImage &img)
 	// EXR images just to turn it into an icon, so we go back
 	// to honouring it in here.
 	kdDebug() << "EXRcreator - using original image" << endl;
-	KConfig * config = KGlobal::config();
+	KConfig * config = TDEGlobal::config();
 	KConfigGroupSaver cgs( config, "PreviewSettings" );
 	unsigned long long maxSize = config->readNumEntry( "MaximumSize", 1024*1024 /* 1MB */ );
 	unsigned long long fileSize = TQFile( path ).size();
diff --git a/kioslave/thumbnail/thumbnail.cpp b/kioslave/thumbnail/thumbnail.cpp
index 29c3c8620..ac7525c60 100644
--- a/kioslave/thumbnail/thumbnail.cpp
+++ b/kioslave/thumbnail/thumbnail.cpp
@@ -195,7 +195,7 @@ void ThumbnailProtocol::get(const KURL &url)
 #endif
 
     if (!iconSize)
-        iconSize = KGlobal::iconLoader()->currentSize(KIcon::Desktop);
+        iconSize = TDEGlobal::iconLoader()->currentSize(KIcon::Desktop);
     if (iconSize != m_iconSize)
         m_iconDict.clear();
     m_iconSize = iconSize;
@@ -206,7 +206,7 @@ void ThumbnailProtocol::get(const KURL &url)
 
     TQImage img;
 
-    KConfigGroup group( KGlobal::config(), "PreviewSettings" );
+    KConfigGroup group( TDEGlobal::config(), "PreviewSettings" );
 
     
     // ### KFMI
@@ -341,7 +341,7 @@ void ThumbnailProtocol::get(const KURL &url)
     }
 #endif
 
-    if ((flags & ThumbCreator::BlendIcon) && KGlobal::iconLoader()->alphaBlending(KIcon::Desktop))
+    if ((flags & ThumbCreator::BlendIcon) && TDEGlobal::iconLoader()->alphaBlending(KIcon::Desktop))
     {
         // blending the mimetype icon in
         TQImage icon = getIcon();
-- 
cgit v1.2.1