summaryrefslogtreecommitdiff
path: root/src/plugins/cpptools/cppcompletionassist.cpp
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@digia.com>2014-08-28 17:33:47 +0200
committerChristian Kandeler <christian.kandeler@digia.com>2014-08-29 14:10:41 +0200
commit1d5091e48f6df341dbd4436843c25afe25cbf4ce (patch)
tree9151d71b36bcffbba219ef1a0fc4e4f234adbc89 /src/plugins/cpptools/cppcompletionassist.cpp
parent7ba0f8a4c42c5db144b599861f38d2e771e0dafe (diff)
downloadqt-creator-1d5091e48f6df341dbd4436843c25afe25cbf4ce.tar.gz
Do not use deprecated Qt functionality.
Replace all* remaining deprecated Qt 4 functions with their Qt 5 counterparts. This means we no longer need to define the QT_DISABLE_DEPRECATED_BEFORE macro. This patch is relatively small because most source-compatible changes of this kind have been done before. * The one exception is the QmlDesigner, which uses QWeakPointer in a deprecated way all over the place. Change-Id: Id4b839c6685f3b5bdf2b89137f95231758ec53c7 Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
Diffstat (limited to 'src/plugins/cpptools/cppcompletionassist.cpp')
-rw-r--r--src/plugins/cpptools/cppcompletionassist.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/cpptools/cppcompletionassist.cpp b/src/plugins/cpptools/cppcompletionassist.cpp
index 6f1001e191..a0a2e2b055 100644
--- a/src/plugins/cpptools/cppcompletionassist.cpp
+++ b/src/plugins/cpptools/cppcompletionassist.cpp
@@ -375,11 +375,11 @@ QString CppFunctionHintModel::text(int index) const
const int end = overview.markedArgumentEnd;
QString hintText;
- hintText += Qt::escape(prettyMethod.left(begin));
+ hintText += prettyMethod.left(begin).toHtmlEscaped();
hintText += QLatin1String("<b>");
- hintText += Qt::escape(prettyMethod.mid(begin, end - begin));
+ hintText += prettyMethod.mid(begin, end - begin).toHtmlEscaped();
hintText += QLatin1String("</b>");
- hintText += Qt::escape(prettyMethod.mid(end));
+ hintText += prettyMethod.mid(end).toHtmlEscaped();
return hintText;
}