diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2010-09-11 23:33:04 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2010-09-11 23:33:04 +0200 |
| commit | 76debe817e0bfcb0d69d6474b44c41dea76d7558 (patch) | |
| tree | c7a415082525413e233ef750b3caa38bf078637e | |
| parent | rekonq 0.5.88 (diff) | |
| parent | Switch QLatin1String to QL1S (diff) | |
| download | rekonq-76debe817e0bfcb0d69d6474b44c41dea76d7558.tar.xz | |
Merge commit 'refs/merge-requests/208' of git://gitorious.org/rekonq/mainline into m208
| -rw-r--r-- | src/bookmarks/bookmarkprovider.cpp | 2 | ||||
| -rw-r--r-- | src/history/historymanager.cpp | 2 | ||||
| -rw-r--r-- | src/iconmanager.cpp | 2 | ||||
| -rw-r--r-- | src/urlbar/listitem.cpp | 2 |
4 files changed, 4 insertions, 4 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..80f0d7fb 100644 --- a/src/iconmanager.cpp +++ b/src/iconmanager.cpp @@ -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]*>")); |