diff --git a/src/plugins/bookmarks/bookmarkmanager.cpp b/src/plugins/bookmarks/bookmarkmanager.cpp index 39957f2596279a3809e307a1a46e00939ac8d80f..3197fbc4d193fc773fe511b8bb36d97ff040772c 100644 --- a/src/plugins/bookmarks/bookmarkmanager.cpp +++ b/src/plugins/bookmarks/bookmarkmanager.cpp @@ -119,7 +119,7 @@ void BookmarkDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opti painter->save(); QFontMetrics fm(opt.font); - static int lwidth = fm.width("8888") + 18; + static int lwidth = fm.width(QLatin1String("8888")) + 18; QColor backgroundColor; QColor textColor; @@ -753,11 +753,11 @@ void BookmarkManager::addBookmark(Bookmark *bookmark, bool userset) void BookmarkManager::addBookmark(const QString &s) { // index3 is a frontier beetween note text and other bookmarks data - int index3 = s.lastIndexOf('\t'); + int index3 = s.lastIndexOf(QLatin1Char('\t')); if (index3 < 0) index3 = s.size(); - int index2 = s.lastIndexOf(':', index3 - 1); - int index1 = s.indexOf(':'); + int index2 = s.lastIndexOf(QLatin1Char(':'), index3 - 1); + int index1 = s.indexOf(QLatin1Char(':')); if (index3 != -1 || index2 != -1 || index1 != -1) { const QString &filePath = s.mid(index1+1, index2-index1-1); @@ -795,7 +795,7 @@ void BookmarkManager::saveBookmarks() foreach (const Bookmark *bookmark, m_bookmarksList) list << bookmarkToString(bookmark); - sessionManager()->setValue("Bookmarks", list); + sessionManager()->setValue(QLatin1String("Bookmarks"), list); } void BookmarkManager::operateTooltip(TextEditor::ITextEditor *textEditor, const QPoint &pos, Bookmark *mark) @@ -814,7 +814,7 @@ void BookmarkManager::operateTooltip(TextEditor::ITextEditor *textEditor, const void BookmarkManager::loadBookmarks() { removeAllBookmarks(); - const QStringList &list = sessionManager()->value("Bookmarks").toStringList(); + const QStringList &list = sessionManager()->value(QLatin1String("Bookmarks")).toStringList(); foreach (const QString &bookmarkString, list) addBookmark(bookmarkString); diff --git a/src/plugins/bookmarks/bookmarks.pro b/src/plugins/bookmarks/bookmarks.pro index ec84fb75118404a9fe25923a5fd9a430bd11a6d7..0c87874cd20b6bcfbd60986484d4bc300723e492 100644 --- a/src/plugins/bookmarks/bookmarks.pro +++ b/src/plugins/bookmarks/bookmarks.pro @@ -6,6 +6,8 @@ include(../../plugins/projectexplorer/projectexplorer.pri) include(../../plugins/coreplugin/coreplugin.pri) include(../../plugins/texteditor/texteditor.pri) +DEFINES += QT_NO_CAST_FROM_ASCII + HEADERS += bookmarksplugin.h \ bookmark.h \ bookmarkmanager.h \ diff --git a/src/plugins/bookmarks/bookmarks.qbs b/src/plugins/bookmarks/bookmarks.qbs index c7d02f9e7daf39ccd72d61b70550599051fd0022..b4d4926fe7cc2b769397d08aaeb04243a033d9ab 100644 --- a/src/plugins/bookmarks/bookmarks.qbs +++ b/src/plugins/bookmarks/bookmarks.qbs @@ -13,6 +13,7 @@ QtcPlugin { Depends { name: "Locator" } Depends { name: "cpp" } + cpp.defines: base.concat(["QT_NO_CAST_FROM_ASCII"]) files: [ "bookmark.cpp",