From 1d5091e48f6df341dbd4436843c25afe25cbf4ce Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 28 Aug 2014 17:33:47 +0200 Subject: 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 Reviewed-by: hjk --- src/plugins/cpptools/cppcompletionassist.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/plugins/cpptools/cppcompletionassist.cpp') 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(""); - hintText += Qt::escape(prettyMethod.mid(begin, end - begin)); + hintText += prettyMethod.mid(begin, end - begin).toHtmlEscaped(); hintText += QLatin1String(""); - hintText += Qt::escape(prettyMethod.mid(end)); + hintText += prettyMethod.mid(end).toHtmlEscaped(); return hintText; } -- cgit v1.2.1