SVN commit 512518 by pletourn: Reduce the number of conversion KUrl <-> QString M +2 -2 trees/history_module/history_item.cpp M +1 -1 trees/history_module/history_module.cpp M +2 -2 web_module/web_module.cpp --- trunk/KDE/kdebase/konqueror/sidebar/trees/history_module/history_item.cpp #512517:512518 @@ -93,7 +93,7 @@ bool KonqSidebarHistoryItem::populateMimeData( QMimeData* mimeData, bool /*move*/ ) { - QString icon = KonqFavIconMgr::iconForURL( m_entry->url.url() ); + QString icon = KonqFavIconMgr::iconForURL( m_entry->url ); KBookmark bookmark = KBookmark::standaloneBookmark( m_entry->title, m_entry->url, icon ); bookmark.populateMimeData( mimeData ); @@ -238,7 +238,7 @@ bool KonqSidebarHistoryGroupItem::populateMimeData( QMimeData* mimeData, bool /*move*/ ) { - QString icon = KonqFavIconMgr::iconForURL( m_url.url() ); + QString icon = KonqFavIconMgr::iconForURL( m_url ); KBookmark bookmark = KBookmark::standaloneBookmark( QString(), m_url, icon ); bookmark.populateMimeData( mimeData ); --- trunk/KDE/kdebase/konqueror/sidebar/trees/history_module/history_module.cpp #512517:512518 @@ -328,7 +328,7 @@ if ( !group ) { group = new KonqSidebarHistoryGroupItem( url, m_topLevelItem ); - QString icon = KonqFavIconMgr::iconForURL( url.url() ); + QString icon = KonqFavIconMgr::iconForURL( url ); if ( icon.isEmpty() ) group->setPixmap( 0, m_folderClosed ); else --- trunk/KDE/kdebase/konqueror/sidebar/web_module/web_module.cpp #512517:512518 @@ -139,10 +139,10 @@ void KonqSideBarWebModule::loadFavicon() { - QString icon = KonqPixmapProvider::iconForURL(_url.url()); + QString icon = KonqPixmapProvider::iconForURL(_url); if (icon.isEmpty()) { KonqFavIconMgr::downloadHostIcon(_url); - icon = KonqPixmapProvider::iconForURL(_url.url()); + icon = KonqPixmapProvider::iconForURL(_url); } if (!icon.isEmpty()) {