diff options
| -rw-r--r-- | src/bookmarks/bookmarkprovider.cpp | 2 | ||||
| -rw-r--r-- | src/history/historymanager.cpp | 2 | ||||
| -rw-r--r-- | src/iconmanager.cpp | 4 | ||||
| -rw-r--r-- | src/urlbar/listitem.cpp | 2 | ||||
| -rw-r--r-- | src/urlbar/urlbar.cpp | 8 |
5 files changed, 11 insertions, 7 deletions
diff --git a/src/bookmarks/bookmarkprovider.cpp b/src/bookmarks/bookmarkprovider.cpp index 3e2d2814..beca5475 100644 --- a/src/bookmarks/bookmarkprovider.cpp +++ b/src/bookmarks/bookmarkprovider.cpp @@ -266,7 +266,7 @@ void BookmarkProvider::find(QList<KBookmark> *list, const KBookmark &bookmark, c } else { - QStringList words = text.split(" "); + QStringList words = text.split(' '); bool matches = true; foreach (const QString &word, words) { diff --git a/src/history/historymanager.cpp b/src/history/historymanager.cpp index 4a3039f3..4a2c0459 100644 --- a/src/history/historymanager.cpp +++ b/src/history/historymanager.cpp @@ -240,7 +240,7 @@ QList<HistoryItem> HistoryManager::find(const QString &text) int index = m_historyFilterModel->historyLocation(url); HistoryItem item = m_history.at(index); - QStringList words = text.split(" "); + QStringList words = text.split(' '); bool matches = true; foreach (const QString &word, words) { diff --git a/src/iconmanager.cpp b/src/iconmanager.cpp index c4b9751d..5086c59d 100644 --- a/src/iconmanager.cpp +++ b/src/iconmanager.cpp @@ -98,7 +98,7 @@ KIcon IconManager::iconForUrl(const KUrl &url) return KIcon(faviconDir + i); } - kDebug() << "Icon NOT Found. returning text-html one"; + kDebug() << "Icon NOT Found for url: " << url; return KIcon("text-html"); } @@ -149,7 +149,7 @@ void IconManager::provideIcon(QWebPage *page, const KUrl &url, bool notify) if(!relUrlString.isEmpty()) { - faviconUrl = relUrlString.startsWith("http") + faviconUrl = relUrlString.startsWith(QL1S("http")) ? KUrl(relUrlString) : KUrl(rootUrlString + QL1C('/') + relUrlString) ; } diff --git a/src/urlbar/listitem.cpp b/src/urlbar/listitem.cpp index 5ff90056..d84a5488 100644 --- a/src/urlbar/listitem.cpp +++ b/src/urlbar/listitem.cpp @@ -209,7 +209,7 @@ TextLabel::TextLabel(const QString &text, const QString &textToPointOut, QWidget : QLabel(parent) { QString t = text; - const bool wasItalic = t.startsWith("<i>"); + const bool wasItalic = t.startsWith(QL1S("<i>")); if (wasItalic) t.remove(QRegExp("<[/ib]*>")); diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp index c2b84d21..61c44907 100644 --- a/src/urlbar/urlbar.cpp +++ b/src/urlbar/urlbar.cpp @@ -132,7 +132,6 @@ void UrlBar::setQUrl(const QUrl& url) { if (url.scheme() == QL1S("about")) { - _icon->setIcon(KIcon("arrow-right")); clear(); setFocus(); } @@ -507,5 +506,10 @@ void UrlBar::suggest() void UrlBar::refreshFavicon() { - _icon->setIcon(Application::iconManager()->iconForUrl(_tab->view()->url())); + KUrl u = _tab->url(); + if(u.scheme() == QL1S("about")) { + _icon->setIcon(KIcon("arrow-right")); + return; + } + _icon->setIcon(Application::iconManager()->iconForUrl(u)); } |