diff --git a/dolphin/src/dolphinmainwindow.cpp b/dolphin/src/dolphinmainwindow.cpp index 1bdcb9a7..5c434946 100644 --- a/dolphin/src/dolphinmainwindow.cpp +++ b/dolphin/src/dolphinmainwindow.cpp @@ -297,8 +297,7 @@ void DolphinMainWindow::changeUrl(const KUrl& url) updateGoActions(); setUrlAsCaption(url); - const QString iconName = KMimeType::iconNameForUrl(url); - m_tabBar->setTabIcon(m_tabIndex, KIcon(iconName)); + m_tabBar->setTabIcon(m_tabIndex, QIcon(KIO::pixmapForUrl(url))); m_tabBar->setTabText(m_tabIndex, squeezedText(tabName(view->url()))); emit urlChanged(url); @@ -397,8 +396,7 @@ void DolphinMainWindow::openNewTab(const KUrl& primaryUrl, const KUrl& secondary tabPage->hide(); - m_tabBar->addTab(KIcon(KMimeType::iconNameForUrl(primaryUrl)), - squeezedText(tabName(primaryUrl))); + m_tabBar->addTab(QIcon(KIO::pixmapForUrl(primaryUrl)), squeezedText(tabName(primaryUrl))); if (m_viewTab.count() > 1) { actionCollection()->action("close_tab")->setEnabled(true); @@ -1229,7 +1227,7 @@ void DolphinMainWindow::setActiveViewContainer(DolphinViewContainer* viewContain const KUrl url = m_activeViewContainer->url(); setUrlAsCaption(url); m_tabBar->setTabText(m_tabIndex, squeezedText(tabName(url))); - m_tabBar->setTabIcon(m_tabIndex, KIcon(KMimeType::iconNameForUrl(url))); + m_tabBar->setTabIcon(m_tabIndex, QIcon(KIO::pixmapForUrl(url))); emit urlChanged(url); } diff --git a/dolphin/src/dolphinrecenttabsmenu.cpp b/dolphin/src/dolphinrecenttabsmenu.cpp index d6c49701..1a2f49a7 100644 --- a/dolphin/src/dolphinrecenttabsmenu.cpp +++ b/dolphin/src/dolphinrecenttabsmenu.cpp @@ -24,6 +24,7 @@ #include #include #include +#include DolphinRecentTabsMenu::DolphinRecentTabsMenu(QObject* parent) : KActionMenu(KIcon("edit-undo"), i18n("Recently Closed Tabs"), parent) @@ -46,8 +47,7 @@ void DolphinRecentTabsMenu::rememberClosedTab(const KUrl& primaryUrl, const KUrl QAction* action = new QAction(menu()); action->setText(primaryUrl.path()); - const QString iconName = KMimeType::iconNameForUrl(primaryUrl); - action->setIcon(KIcon(iconName)); + action->setIcon(QIcon(KIO::pixmapForUrl(primaryUrl))); KUrl::List urls; urls << primaryUrl; diff --git a/dolphin/src/panels/places/placesitemeditdialog.cpp b/dolphin/src/panels/places/placesitemeditdialog.cpp index 9cf48da6..719683f9 100644 --- a/dolphin/src/panels/places/placesitemeditdialog.cpp +++ b/dolphin/src/panels/places/placesitemeditdialog.cpp @@ -32,6 +32,7 @@ #include #include #include +#include #include #include #include @@ -140,7 +141,7 @@ void PlacesItemEditDialog::initialize() m_iconButton->setIconSize(IconSize(KIconLoader::Desktop)); m_iconButton->setIconType(KIconLoader::NoGroup, KIconLoader::Place); if (m_icon.isEmpty()) { - m_iconButton->setIcon(KMimeType::iconNameForUrl(m_url)); + m_iconButton->setIcon(KIO::pixmapForUrl(m_url)); } else { m_iconButton->setIcon(m_icon); }