Rename KIcon to enhance compatibility with KDE4

5 files changed, 14 insertions, 14 deletions

diff --git a/kopete/libkopete/knotification.cpp b/kopete/libkopete/knotification.cpp
index e0f49646..ea28132f 100644
--- a/kopete/libkopete/knotification.cpp
+++ b/kopete/libkopete/knotification.cpp
@@ -163,11 +163,11 @@ void KNotification::notifyByMessagebox()
 void KNotification::notifyByPassivePopup(const TQPixmap &pix )
 {
 	TQString appName = TQString::fromAscii( KNotifyClient::instance()->instanceName() );
-	KIconLoader iconLoader( appName );
+	TDEIconLoader iconLoader( appName );
 	TDEConfig eventsFile( TQString::fromAscii( KNotifyClient::instance()->instanceName()+"/eventsrc" ), true, false, "data");
 	TDEConfigGroup config( &eventsFile, "!Global!" );
 	TQString iconName = config.readEntry( "IconName", appName );
-	TQPixmap icon = iconLoader.loadIcon( iconName, KIcon::Small );
+	TQPixmap icon = iconLoader.loadIcon( iconName, TDEIcon::Small );
 	TQString title = config.readEntry( "Comment", appName );
     //KPassivePopup::message(title, text, icon, senderWinId);
 
diff --git a/kopete/libkopete/kopeteaccount.cpp b/kopete/libkopete/kopeteaccount.cpp
index 70b88819..c3af2df8 100644
--- a/kopete/libkopete/kopeteaccount.cpp
+++ b/kopete/libkopete/kopeteaccount.cpp
@@ -186,12 +186,12 @@ TQPixmap Account::accountIcon(const int size) const
 	
 	// FIXME: this code is duplicated with OnlineStatus, can we merge it somehow?
 	TQPixmap base = TDEGlobal::instance()->iconLoader()->loadIcon(
-		icon, KIcon::Small, size );
+		icon, TDEIcon::Small, size );
 
 	if ( d->color.isValid() )
 	{
-		KIconEffect effect;
-		base = effect.apply( base, KIconEffect::Colorize, 1, d->color, 0);
+		TDEIconEffect effect;
+		base = effect.apply( base, TDEIconEffect::Colorize, 1, d->color, 0);
 	}
 
 	if ( size > 0 && base.width() != size )
diff --git a/kopete/libkopete/kopeteonlinestatusmanager.cpp b/kopete/libkopete/kopeteonlinestatusmanager.cpp
index c583198a..02daf0ab 100644
--- a/kopete/libkopete/kopeteonlinestatusmanager.cpp
+++ b/kopete/libkopete/kopeteonlinestatusmanager.cpp
@@ -311,26 +311,26 @@ TQPixmap* OnlineStatusManager::renderIcon( const OnlineStatus &statusFor, const
 
 	// Colorize
 	if ( color.isValid() )
-		*basis = KIconEffect().apply( *basis, KIconEffect::Colorize, 1, color, 0);
+		*basis = TDEIconEffect().apply( *basis, TDEIconEffect::Colorize, 1, color, 0);
 
 	// Note that we do this before compositing the overlay, since we want
 	// that to be colored in this case.
 	if ( statusFor.internalStatus() == Kopete::OnlineStatus::AccountOffline || statusFor.status() == Kopete::OnlineStatus::Offline )
 	{
-		*basis = KIconEffect().apply( *basis, KIconEffect::ToGray , 0.85, TQColor() , false  );
+		*basis = TDEIconEffect().apply( *basis, TDEIconEffect::ToGray , 0.85, TQColor() , false  );
 	}
 
 	//composite the iconOverlay for this status and the supplied baseIcon
 	TQStringList overlays = statusFor.overlayIcons();
 	if ( !( overlays.isEmpty() ) ) // otherwise leave the basis as-is
 	{
-		KIconLoader *loader = TDEGlobal::instance()->iconLoader();
+		TDEIconLoader *loader = TDEGlobal::instance()->iconLoader();
 
 		int i = 0;
 		for( TQStringList::iterator it = overlays.begin(), end = overlays.end(); it != end; ++it )
 		{
-			TQPixmap overlay = loader->loadIcon(*it, KIcon::Small, 0 ,
-				KIcon::DefaultState, 0L, /*canReturnNull=*/ true );
+			TQPixmap overlay = loader->loadIcon(*it, TDEIcon::Small, 0 ,
+				TDEIcon::DefaultState, 0L, /*canReturnNull=*/ true );
 
 			if ( !overlay.isNull() )
 			{
@@ -363,7 +363,7 @@ TQPixmap* OnlineStatusManager::renderIcon( const OnlineStatus &statusFor, const
 
 	// if idle, apply effects
 	if ( idle )
-		KIconEffect::semiTransparent( *basis );
+		TDEIconEffect::semiTransparent( *basis );
 
 	return basis;
 }
diff --git a/kopete/libkopete/kopetepassword.cpp b/kopete/libkopete/kopetepassword.cpp
index 8ee74036..766dfb46 100644
--- a/kopete/libkopete/kopetepassword.cpp
+++ b/kopete/libkopete/kopetepassword.cpp
@@ -420,7 +420,7 @@ void Kopete::Password::writeConfig()
 
 int Kopete::Password::preferredImageSize()
 {
-	return IconSize(KIcon::Toolbar);
+	return IconSize(TDEIcon::Toolbar);
 }
 
 bool Kopete::Password::allowBlankPassword()
diff --git a/kopete/libkopete/ui/metacontactselectorwidget.cpp b/kopete/libkopete/ui/metacontactselectorwidget.cpp
index 18580b7a..ee6ab0d5 100644
--- a/kopete/libkopete/ui/metacontactselectorwidget.cpp
+++ b/kopete/libkopete/ui/metacontactselectorwidget.cpp
@@ -146,7 +146,7 @@ void MetaContactSelectorWidgetLVI::buildVisualComponents()
 	Component *hbox = new BoxComponent( this, BoxComponent::Horizontal );
 	d->spacerBox = new BoxComponent( hbox, BoxComponent::Horizontal );
 	
-	d->contactIconSize = IconSize( KIcon::Small );
+	d->contactIconSize = IconSize( TDEIcon::Small );
 	Component *imageBox = new BoxComponent( hbox, BoxComponent::Vertical );
 	new VSpacerComponent( imageBox );
 	// include borders in size
@@ -169,7 +169,7 @@ void MetaContactSelectorWidgetLVI::slotUpdateContactBox()
 	TQPtrList<Kopete::Contact> contacts = d->metaContact->contacts();
 	for(Kopete::Contact *c = contacts.first(); c; c = contacts.next())
 	{
-		new ContactComponent(d->contactIconBox, c, IconSize( KIcon::Small ));
+		new ContactComponent(d->contactIconBox, c, IconSize( TDEIcon::Small ));
 	}
 }