diff --git a/src/lib/navigation/locationbar.cpp b/src/lib/navigation/locationbar.cpp index 5ebb3fdd9..bde88ab1b 100644 --- a/src/lib/navigation/locationbar.cpp +++ b/src/lib/navigation/locationbar.cpp @@ -341,7 +341,7 @@ void LocationBar::showUrl(const QUrl &url) void LocationBar::updateSiteIcon() { const QIcon icon = m_webView ? m_webView->icon() : IconProvider::emptyWebIcon(); - m_siteIcon->setIcon(QIcon(icon.pixmap(16, 16))); + m_siteIcon->setIcon(QIcon(icon.pixmap(16))); } void LocationBar::setPrivacyState(bool state) diff --git a/src/lib/navigation/navigationbar.cpp b/src/lib/navigation/navigationbar.cpp index 7eedf2889..d79c9a4a2 100644 --- a/src/lib/navigation/navigationbar.cpp +++ b/src/lib/navigation/navigationbar.cpp @@ -382,8 +382,8 @@ QString NavigationBar::titleForUrl(QString title, const QUrl &url) QIcon NavigationBar::iconForPage(const QUrl &url, const QIcon &sIcon) { QIcon icon; - icon.addPixmap(url.scheme() == QL1S("qupzilla") ? QIcon(QSL(":icons/qupzilla.png")).pixmap(16, 16) : IconProvider::iconForUrl(url).pixmap(16, 16)); - icon.addPixmap(sIcon.pixmap(16, 16), QIcon::Active); + icon.addPixmap(url.scheme() == QL1S("qupzilla") ? QIcon(QSL(":icons/qupzilla.png")).pixmap(16) : IconProvider::iconForUrl(url).pixmap(16)); + icon.addPixmap(sIcon.pixmap(16), QIcon::Active); return icon; } diff --git a/src/lib/navigation/siteicon.cpp b/src/lib/navigation/siteicon.cpp index 4ac8a6201..192e6a36c 100644 --- a/src/lib/navigation/siteicon.cpp +++ b/src/lib/navigation/siteicon.cpp @@ -142,7 +142,7 @@ void SiteIcon::mouseMoveEvent(QMouseEvent* e) QMimeData* mime = new QMimeData; mime->setUrls(QList() << url); mime->setText(title); - mime->setImageData(icon().pixmap(16, 16).toImage()); + mime->setImageData(icon().pixmap(16).toImage()); drag->setMimeData(mime); drag->setPixmap(QzTools::createPixmapForSite(icon(), title, url.toString())); diff --git a/src/lib/opensearch/editsearchengine.cpp b/src/lib/opensearch/editsearchengine.cpp index 7a0ea521a..0f045bb4d 100644 --- a/src/lib/opensearch/editsearchengine.cpp +++ b/src/lib/opensearch/editsearchengine.cpp @@ -86,7 +86,7 @@ QIcon EditSearchEngine::icon() void EditSearchEngine::setIcon(const QIcon &icon) { - ui->icon->setPixmap(icon.pixmap(16, 16)); + ui->icon->setPixmap(icon.pixmap(16)); } void EditSearchEngine::hideIconLabels() diff --git a/src/lib/popupwindow/popuplocationbar.cpp b/src/lib/popupwindow/popuplocationbar.cpp index 2286b00ff..7436cf11f 100644 --- a/src/lib/popupwindow/popuplocationbar.cpp +++ b/src/lib/popupwindow/popuplocationbar.cpp @@ -32,7 +32,7 @@ class QUPZILLA_EXPORT PopupSiteIcon : public QWidget public: explicit PopupSiteIcon(QWidget* parent = 0) : QWidget(parent) { } void setIcon(const QIcon &icon) { - m_icon = QIcon(icon.pixmap(16, 16)); + m_icon = QIcon(icon.pixmap(16)); update(); } diff --git a/src/lib/tabwidget/tabbar.cpp b/src/lib/tabwidget/tabbar.cpp index ca64c95cb..6c88f3c85 100644 --- a/src/lib/tabwidget/tabbar.cpp +++ b/src/lib/tabwidget/tabbar.cpp @@ -69,7 +69,7 @@ TabBar::TabBar(BrowserWindow* window, TabWidget* tabWidget) if (mApp->isPrivate()) { QLabel* privateBrowsing = new QLabel(this); privateBrowsing->setObjectName(QSL("private-browsing-icon")); - privateBrowsing->setPixmap(IconProvider::privateBrowsingIcon().pixmap(16, 16)); + privateBrowsing->setPixmap(IconProvider::privateBrowsingIcon().pixmap(16)); privateBrowsing->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter); privateBrowsing->setFixedWidth(30); addCornerWidget(privateBrowsing, Qt::TopLeftCorner); diff --git a/src/lib/tools/buttonwithmenu.h b/src/lib/tools/buttonwithmenu.h index 72d540425..baaec1c33 100644 --- a/src/lib/tools/buttonwithmenu.h +++ b/src/lib/tools/buttonwithmenu.h @@ -38,7 +38,7 @@ public: } bool operator==(const Item &a) { - return (a.text == text) && (a.icon.pixmap(16, 16).toImage() == icon.pixmap(16, 16).toImage()); + return (a.text == text) && (a.icon.pixmap(16).toImage() == icon.pixmap(16).toImage()); } bool isEmpty() { diff --git a/src/lib/tools/docktitlebarwidget.cpp b/src/lib/tools/docktitlebarwidget.cpp index 05138f6ba..cba0eb71a 100644 --- a/src/lib/tools/docktitlebarwidget.cpp +++ b/src/lib/tools/docktitlebarwidget.cpp @@ -22,7 +22,7 @@ DockTitleBarWidget::DockTitleBarWidget(const QString &title, QWidget* parent) : QWidget(parent) { setupUi(this); - closeButton->setIcon(QIcon(IconProvider::standardIcon(QStyle::SP_DialogCloseButton).pixmap(16, 16))); + closeButton->setIcon(QIcon(IconProvider::standardIcon(QStyle::SP_DialogCloseButton).pixmap(16))); label->setText(title); connect(closeButton, SIGNAL(clicked()), parent, SLOT(close())); diff --git a/src/lib/tools/iconprovider.cpp b/src/lib/tools/iconprovider.cpp index 6e6238ef8..fd4cbd2ad 100644 --- a/src/lib/tools/iconprovider.cpp +++ b/src/lib/tools/iconprovider.cpp @@ -49,7 +49,7 @@ void IconProvider::saveIcon(WebView* view) BufferedIcon item; item.first = view->url(); - item.second = view->icon().pixmap(16, 16).toImage(); + item.second = view->icon().pixmap(32).toImage(); if (item.second == IconProvider::emptyWebImage()) { return;