From 3e1ea4e6b0b09c8c2ccbfdbabd50c5069c029707 Mon Sep 17 00:00:00 2001 From: Jonathan Thomas Date: Thu, 27 May 2010 10:41:57 -0400 Subject: Encapsulate single characters in single quotes, since passing a char to QString is more efficient than passing a one-character string. --- src/bookmarks/bookmarkcontextmenu.cpp | 6 +++--- src/bookmarks/bookmarksmanager.cpp | 2 +- src/mainview.cpp | 2 +- src/newtabpage.cpp | 2 +- src/urlbar/urlresolver.cpp | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/bookmarks/bookmarkcontextmenu.cpp b/src/bookmarks/bookmarkcontextmenu.cpp index c96fa7bf..78d64aa5 100644 --- a/src/bookmarks/bookmarkcontextmenu.cpp +++ b/src/bookmarks/bookmarkcontextmenu.cpp @@ -234,10 +234,10 @@ void BookmarkContextMenu::deleteBookmark() void BookmarkContextMenu::editBookmark() { KBookmark selected = bookmark(); - selected.setFullText(selected.text().replace("&&", "&")); + selected.setFullText(selected.text().replace("&&", '&')); KBookmarkDialog *dialog = owner()->bookmarkDialog(manager(), QApplication::activeWindow()); dialog->editBookmark(selected); - selected.setFullText(selected.text().replace("&", "&&")); + selected.setFullText(selected.text().replace('&', "&&")); delete dialog; } @@ -319,7 +319,7 @@ void BookmarkContextMenu::bookmarkCurrentPage() if (selected.isGroup()) parent = selected.toGroup(); - KBookmark newBk = parent.addBookmark(owner()->currentTitle().replace("&", "&&"), KUrl(owner()->currentUrl()), "text-html"); + KBookmark newBk = parent.addBookmark(owner()->currentTitle().replace('&', "&&"), KUrl(owner()->currentUrl()), "text-html"); parent.moveBookmark(newBk, selected.parentGroup().previous(selected)); } diff --git a/src/bookmarks/bookmarksmanager.cpp b/src/bookmarks/bookmarksmanager.cpp index c06375b5..bac45b61 100644 --- a/src/bookmarks/bookmarksmanager.cpp +++ b/src/bookmarks/bookmarksmanager.cpp @@ -412,7 +412,7 @@ void BookmarkProvider::fillBookmarkBar(KToolBar *toolBar) else { KBookmarkAction* a = new KBookmarkAction(bookmark, m_owner, this); - a->setIconText(a->iconText().replace("&", "&&")); + a->setIconText(a->iconText().replace('&', "&&")); toolBar->addAction(a); } } diff --git a/src/mainview.cpp b/src/mainview.cpp index 0bc6fbde..84dc70af 100644 --- a/src/mainview.cpp +++ b/src/mainview.cpp @@ -596,7 +596,7 @@ void MainView::webViewTitleChanged(const QString &title) { QString viewTitle = title.isEmpty()? i18n("(Untitled)") : title; QString tabTitle = viewTitle; - tabTitle.replace("&", "&&"); + tabTitle.replace('&', "&&"); WebView *view = qobject_cast(sender()); int index = indexOf(view->parentWidget()); diff --git a/src/newtabpage.cpp b/src/newtabpage.cpp index 015e655b..2ab52c50 100644 --- a/src/newtabpage.cpp +++ b/src/newtabpage.cpp @@ -582,7 +582,7 @@ void NewTabPage::downloadsPage() div.appendInside("" + date + ""); div.appendInside("
"); - div.appendInside("" + item.srcUrlString + ""); + div.appendInside(""); div.appendInside("
"); div.appendInside(markup("a")); diff --git a/src/urlbar/urlresolver.cpp b/src/urlbar/urlresolver.cpp index 494c8145..7333e305 100644 --- a/src/urlbar/urlresolver.cpp +++ b/src/urlbar/urlresolver.cpp @@ -91,7 +91,7 @@ UrlResolver::UrlResolver(const QString &typedUrl) "y[etu]|z[amw]|aero|arpa|biz|com|coop|edu|info|int|gov|mil|museum|name|net|org|"\ "pro)"; - _browseRegexp = QRegExp("(" + protocol + ")|(" + local + ")|(" + address + ")|(" + ipv6 + ")|(" + ipv4 +")"); + _browseRegexp = QRegExp('(' + protocol + ")|(" + local + ")|(" + address + ")|(" + ipv6 + ")|(" + ipv4 +')'); } } -- cgit v1.2.1 From 11e76d89f7b8305d120b5dfbddc0029c96147216 Mon Sep 17 00:00:00 2001 From: Jonathan Thomas Date: Thu, 27 May 2010 10:45:57 -0400 Subject: The second arg of QString::replace has to be a QString, I suppose --- src/bookmarks/bookmarkcontextmenu.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/bookmarks/bookmarkcontextmenu.cpp b/src/bookmarks/bookmarkcontextmenu.cpp index 78d64aa5..4422763a 100644 --- a/src/bookmarks/bookmarkcontextmenu.cpp +++ b/src/bookmarks/bookmarkcontextmenu.cpp @@ -234,7 +234,7 @@ void BookmarkContextMenu::deleteBookmark() void BookmarkContextMenu::editBookmark() { KBookmark selected = bookmark(); - selected.setFullText(selected.text().replace("&&", '&')); + selected.setFullText(selected.text().replace("&&", "&")); KBookmarkDialog *dialog = owner()->bookmarkDialog(manager(), QApplication::activeWindow()); dialog->editBookmark(selected); selected.setFullText(selected.text().replace('&', "&&")); -- cgit v1.2.1 From 498eac8ccbc952228ab14178fc36635360ddde91 Mon Sep 17 00:00:00 2001 From: Jonathan Thomas Date: Thu, 27 May 2010 10:57:10 -0400 Subject: Const iterator fixes --- src/mainwindow.cpp | 2 +- src/newtabpage.cpp | 3 +-- src/webpage.cpp | 4 ++-- src/webtab.cpp | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 95fbd92d..d5b81c1e 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -680,7 +680,7 @@ void MainWindow::updateActions() if (am->menu()) am->menu()->clear(); - foreach (HistoryItem item, mainView()->recentlyClosedTabs()) + foreach (const HistoryItem &item, mainView()->recentlyClosedTabs()) { KAction *a = new KAction(Application::icon(item.url), item.title, this); a->setData(item.url); diff --git a/src/newtabpage.cpp b/src/newtabpage.cpp index 2ab52c50..9c381f97 100644 --- a/src/newtabpage.cpp +++ b/src/newtabpage.cpp @@ -380,8 +380,7 @@ void NewTabPage::browsingMenu(const KUrl ¤tUrl) nav.findFirst("span").appendInside(i18n("Downloads")); navItems.append(nav); - QWebElement it; - foreach(it, navItems) + foreach(QWebElement it, navItems) { if (it.findFirst("a").attribute("href") == currentUrl.toMimeDataString()) it.addClass("current"); diff --git a/src/webpage.cpp b/src/webpage.cpp index 00745445..45059def 100644 --- a/src/webpage.cpp +++ b/src/webpage.cpp @@ -615,14 +615,14 @@ void WebPage::downloadAllContentsWithKGet(QPoint) KUrl relativeUrl; QWebElementCollection images = mainFrame()->documentElement().findAll("img"); - foreach(QWebElement img, images) + foreach(const QWebElement &img, images) { relativeUrl.setEncodedUrl(img.attribute("src").toUtf8(), KUrl::TolerantMode); contents << baseUrl.resolved(relativeUrl).toString(); } QWebElementCollection links = mainFrame()->documentElement().findAll("a"); - foreach(QWebElement link, links) + foreach(const QWebElement &link, links) { relativeUrl.setEncodedUrl(link.attribute("href").toUtf8(), KUrl::TolerantMode); contents << baseUrl.resolved(relativeUrl).toString(); diff --git a/src/webtab.cpp b/src/webtab.cpp index a6bedc97..47780a44 100644 --- a/src/webtab.cpp +++ b/src/webtab.cpp @@ -183,7 +183,7 @@ void WebTab::showRSSInfo(QPoint pos) QMap map; - foreach(QWebElement el, col) + foreach(const QWebElement &el, col) { QString urlString; if (el.attribute("href").startsWith(QL1S("http"))) -- cgit v1.2.1 From ae153a16ec6ecf667fb0137d813d3c52a0785c71 Mon Sep 17 00:00:00 2001 From: Jonathan Thomas Date: Thu, 27 May 2010 11:07:43 -0400 Subject: Don't use QString::number(), KDE will format the numbers is an l10n-friendly fashion, QString::number() won't --- src/bookmarks/bookmarksmanager.cpp | 2 +- src/bookmarks/bookmarkstreemodel.cpp | 2 +- src/history/historypanel.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/bookmarks/bookmarksmanager.cpp b/src/bookmarks/bookmarksmanager.cpp index bac45b61..c430078b 100644 --- a/src/bookmarks/bookmarksmanager.cpp +++ b/src/bookmarks/bookmarksmanager.cpp @@ -103,7 +103,7 @@ void BookmarkOwner::openFolderinTabs(const KBookmarkGroup &bookmark) i18ncp("%1=Number of tabs. Value is always >=8", "You are about to open %1 tabs.\nAre you sure?", "You are about to open %1 tabs.\nAre you sure?", - QString::number( urlList.length() )) + urlList.length()) ) == KMessageBox::Continue) ) return; diff --git a/src/bookmarks/bookmarkstreemodel.cpp b/src/bookmarks/bookmarkstreemodel.cpp index 4003cf3f..a865a99d 100644 --- a/src/bookmarks/bookmarkstreemodel.cpp +++ b/src/bookmarks/bookmarkstreemodel.cpp @@ -75,7 +75,7 @@ QVariant BtmItem::data(int role) const } if (m_kbm.isGroup()) { - tooltip += i18nc("%1=Number of items in bookmark folder", " (%1 items)", QString::number(childCount())); + tooltip += i18nc("%1=Number of items in bookmark folder", " (%1 items)", childCount()); } if (!m_kbm.url().url().isEmpty()) { diff --git a/src/history/historypanel.cpp b/src/history/historypanel.cpp index 28284e0a..d8309eed 100644 --- a/src/history/historypanel.cpp +++ b/src/history/historypanel.cpp @@ -175,7 +175,7 @@ void HistoryPanel::openAll() i18ncp("%1=Number of tabs. Value is always >=8", "You are about to open %1 tabs.\nAre you sure?", "You are about to open %1 tabs.\nAre you sure?", - QString::number(allChild.length()))) == KMessageBox::Continue) + allChild.length())) == KMessageBox::Continue) ) return; } -- cgit v1.2.1