diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-24 13:43:14 -0600 |
commit | 79b21d47bce1ee428affc97534cd8b257232a871 (patch) | |
tree | 0df1fa0109d9f2bcef932eda8b5c25b2e06669ed /kioslave/thumbnail/thumbnail.cpp | |
parent | 9a898d493f493adbc404f7223043c85f3817472b (diff) | |
download | tdebase-79b21d47bce1ee428affc97534cd8b257232a871.tar.gz tdebase-79b21d47bce1ee428affc97534cd8b257232a871.zip |
Rename KGlobal, KProcess, and KClipboard to avoid conflicts with KDE4
Diffstat (limited to 'kioslave/thumbnail/thumbnail.cpp')
-rw-r--r-- | kioslave/thumbnail/thumbnail.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
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(); |