summaryrefslogtreecommitdiffstats
path: root/tdeioslave
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-04 14:14:55 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-04 14:14:55 -0600
commitde9b6c9ad15f9f51812daae17cce635d1050a9ba (patch)
tree6b26400ab1a616925443c5d365246eb86c9bad57 /tdeioslave
parent4f841fbbbc5d3399535ade061699cc76363c7a3f (diff)
downloadtdebase-de9b6c9ad15f9f51812daae17cce635d1050a9ba.tar.gz
tdebase-de9b6c9ad15f9f51812daae17cce635d1050a9ba.zip
Rename KIcon to enhance compatibility with KDE4
Diffstat (limited to 'tdeioslave')
-rw-r--r--tdeioslave/info/info.cc2
-rw-r--r--tdeioslave/media/mediamanager/dialog.cpp2
-rw-r--r--tdeioslave/media/mounthelper/dialog.cpp2
-rw-r--r--tdeioslave/media/tdecmodule/serviceview.ui2
-rw-r--r--tdeioslave/thumbnail/thumbnail.cpp6
5 files changed, 7 insertions, 7 deletions
diff --git a/tdeioslave/info/info.cc b/tdeioslave/info/info.cc
index ee11eabbd..4d973bc5f 100644
--- a/tdeioslave/info/info.cc
+++ b/tdeioslave/info/info.cc
@@ -92,7 +92,7 @@ void InfoProtocol::get( const KURL& url )
// extract the path and node from url
decodeURL( url );
- TQString path = TDEGlobal::iconLoader()->iconPath("up", KIcon::Toolbar, true);
+ TQString path = TDEGlobal::iconLoader()->iconPath("up", TDEIcon::Toolbar, true);
int revindex = path.findRev('/');
path = path.left(revindex);
diff --git a/tdeioslave/media/mediamanager/dialog.cpp b/tdeioslave/media/mediamanager/dialog.cpp
index 40e99a84d..ffa97b3b7 100644
--- a/tdeioslave/media/mediamanager/dialog.cpp
+++ b/tdeioslave/media/mediamanager/dialog.cpp
@@ -34,7 +34,7 @@ Dialog::Dialog(TQString url, TQString iconName) :
enableButton( User1, false );
- TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon(iconName, KIcon::NoGroup, KIcon::SizeLarge);
+ TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon(iconName, TDEIcon::NoGroup, TDEIcon::SizeLarge);
decryptDialog->encryptedIcon->setPixmap( pixmap );
connect(decryptDialog->passwordEdit, TQT_SIGNAL (textChanged(const TQString &)), this, TQT_SLOT (slotPasswordChanged(const TQString &)));
diff --git a/tdeioslave/media/mounthelper/dialog.cpp b/tdeioslave/media/mounthelper/dialog.cpp
index 40e99a84d..ffa97b3b7 100644
--- a/tdeioslave/media/mounthelper/dialog.cpp
+++ b/tdeioslave/media/mounthelper/dialog.cpp
@@ -34,7 +34,7 @@ Dialog::Dialog(TQString url, TQString iconName) :
enableButton( User1, false );
- TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon(iconName, KIcon::NoGroup, KIcon::SizeLarge);
+ TQPixmap pixmap = TDEGlobal::iconLoader()->loadIcon(iconName, TDEIcon::NoGroup, TDEIcon::SizeLarge);
decryptDialog->encryptedIcon->setPixmap( pixmap );
connect(decryptDialog->passwordEdit, TQT_SIGNAL (textChanged(const TQString &)), this, TQT_SLOT (slotPasswordChanged(const TQString &)));
diff --git a/tdeioslave/media/tdecmodule/serviceview.ui b/tdeioslave/media/tdecmodule/serviceview.ui
index 2991d4c9f..64b077583 100644
--- a/tdeioslave/media/tdecmodule/serviceview.ui
+++ b/tdeioslave/media/tdecmodule/serviceview.ui
@@ -68,7 +68,7 @@
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="KIconButton">
+ <widget class="TDEIconButton">
<property name="name">
<cstring>iconButton</cstring>
</property>
diff --git a/tdeioslave/thumbnail/thumbnail.cpp b/tdeioslave/thumbnail/thumbnail.cpp
index 5a8210b23..3603cf781 100644
--- a/tdeioslave/thumbnail/thumbnail.cpp
+++ b/tdeioslave/thumbnail/thumbnail.cpp
@@ -195,7 +195,7 @@ void ThumbnailProtocol::get(const KURL &url)
#endif
if (!iconSize)
- iconSize = TDEGlobal::iconLoader()->currentSize(KIcon::Desktop);
+ iconSize = TDEGlobal::iconLoader()->currentSize(TDEIcon::Desktop);
if (iconSize != m_iconSize)
m_iconDict.clear();
m_iconSize = iconSize;
@@ -341,7 +341,7 @@ void ThumbnailProtocol::get(const KURL &url)
}
#endif
- if ((flags & ThumbCreator::BlendIcon) && TDEGlobal::iconLoader()->alphaBlending(KIcon::Desktop))
+ if ((flags & ThumbCreator::BlendIcon) && TDEGlobal::iconLoader()->alphaBlending(TDEIcon::Desktop))
{
// blending the mimetype icon in
TQImage icon = getIcon();
@@ -420,7 +420,7 @@ const TQImage& ThumbnailProtocol::getIcon()
TQImage* icon = m_iconDict.find(m_mimeType);
if ( !icon ) // generate it!
{
- icon = new TQImage( KMimeType::mimeType(m_mimeType)->pixmap( KIcon::Desktop, m_iconSize ).convertToImage() );
+ icon = new TQImage( KMimeType::mimeType(m_mimeType)->pixmap( TDEIcon::Desktop, m_iconSize ).convertToImage() );
icon->setAlphaBuffer( true );
int w = icon->width();