From e943fcb39f4d0cf2abcdce65b0d092dd9541544f Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Mon, 26 Nov 2012 20:42:43 +0200
Subject: [PATCH] Bookmarks: Compile with QT_NO_CAST_FROM_ASCII
Change-Id: I54a3ff0ecf0393fc7b525e1ee86d68f18e9cd387
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
---
src/plugins/bookmarks/bookmarkmanager.cpp | 12 ++++++------
src/plugins/bookmarks/bookmarks.pro | 2 ++
src/plugins/bookmarks/bookmarks.qbs | 1 +
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/plugins/bookmarks/bookmarkmanager.cpp b/src/plugins/bookmarks/bookmarkmanager.cpp
index 39957f25962..3197fbc4d19 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 ec84fb75118..0c87874cd20 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 c7d02f9e7da..b4d4926fe7c 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",
--
GitLab