diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2010-05-28 11:12:42 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2010-05-28 11:12:42 +0200 |
| commit | 3cd1f78b70ad60fc0197db664d361e92487d5e8b (patch) | |
| tree | 96f54bc8232fd146c4d0c4c6c588bd79e415aa4d /src/bookmarks | |
| parent | SVN_SILENT made messages (.desktop file) (diff) | |
| parent | Don't use QString::number(), KDE will format the numbers is an l10n-friendly ... (diff) | |
| download | rekonq-3cd1f78b70ad60fc0197db664d361e92487d5e8b.tar.xz | |
Merge commit 'refs/merge-requests/2286' of git://gitorious.org/rekonq/mainline into m2286
Diffstat (limited to 'src/bookmarks')
| -rw-r--r-- | src/bookmarks/bookmarkcontextmenu.cpp | 4 | ||||
| -rw-r--r-- | src/bookmarks/bookmarksmanager.cpp | 4 | ||||
| -rw-r--r-- | src/bookmarks/bookmarkstreemodel.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/bookmarks/bookmarkcontextmenu.cpp b/src/bookmarks/bookmarkcontextmenu.cpp index c96fa7bf..4422763a 100644 --- a/src/bookmarks/bookmarkcontextmenu.cpp +++ b/src/bookmarks/bookmarkcontextmenu.cpp @@ -237,7 +237,7 @@ void BookmarkContextMenu::editBookmark() 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..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; @@ -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/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()) { |