Index: src/trayicon.cpp
===================================================================
--- src/trayicon.cpp	(revision 975438)
+++ src/trayicon.cpp	(working copy)
@@ -55,7 +55,7 @@
 	modes << "Off" << "Discoverable" << "Connectable" ;
 	
 	setParent(kapp);
-	setIconByName("kbluetooth4");
+	setIcon("kbluetooth4");
 	setToolTip("kbluetooth4", "KBluetooth", "KDE bluetooth framewrok");
 	setCategory(KNotificationItem::Hardware);
 	 
@@ -194,7 +194,7 @@
 
 	online = true;
 	setStatus(KNotificationItem::Active);
-	setIconByPixmap( m_IconEnabled );
+	setImage( m_IconEnabled );
 	
 	adapter = new Solid::Control::BluetoothInterface(man.defaultInterface());
 	connect(adapter,SIGNAL(propertyChanged(const QString&, const QVariant&)),this,SLOT(slotPropertyChanged(const QString&, const QVariant&)));
@@ -246,7 +246,7 @@
 	settingsMenu->setEnabled(false);
 	
 	setStatus(KNotificationItem::Passive);
-	setIconByPixmap( m_IconDisabled );
+	setImage( m_IconDisabled );
 		
 	if (adapter) {
                 kDebug() << "Unregistering Agent";
@@ -466,8 +466,8 @@
 void KBlueTray::lockEnabled()
 {
 	QString iconPath = KIconLoader::global()->iconPath( "document-encrypt", KIconLoader::Panel );
-	setOverlayIconByPixmap( QIcon(iconPath).pixmap(14, 14) );
-	setIconByPixmap(m_IconEnabled);
+	setOverlayImage( QIcon(iconPath).pixmap(14, 14) );
+	setImage(m_IconEnabled);
 	showMessage("KBluetooth", "kbluelock is looking for the target device...", "kbluetooth4");
 	lockConfigureAction->setEnabled(true);
 }
@@ -476,8 +476,8 @@
 {
   	lockConfigureAction->setEnabled(false);
 	kDebug() << "Lock disabled";
-	setOverlayIconByPixmap(QIcon());
-	setIconByPixmap(m_IconEnabled);
+	setOverlayImage(QIcon());
+	setImage(m_IconEnabled);
 	delete m_kBlueLock;
 	m_kBlueLock = 0;
 }