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 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/bookmarks') 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); } } -- 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/bookmarks') 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 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 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/bookmarks') 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()) { -- cgit v1.2.1