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>
This commit is contained in:
Christian Kandeler
2014-08-28 17:33:47 +02:00
parent 7ba0f8a4c4
commit 1d5091e48f
76 changed files with 202 additions and 199 deletions

View File

@@ -311,11 +311,11 @@ QString ClangFunctionHintModel::text(int index) const
const int end = overview.markedArgumentEnd();
QString hintText;
hintText += Qt::escape(prettyMethod.left(begin));
hintText += prettyMethod.left(begin).toHtmlEscaped());
hintText += "<b>";
hintText += Qt::escape(prettyMethod.mid(begin, end - begin));
hintText += prettyMethod.mid(begin, end - begin).toHtmlEscaped());
hintText += "</b>";
hintText += Qt::escape(prettyMethod.mid(end));
hintText += prettyMethod.mid(end).toHtmlEscaped());
return hintText;
#endif
return m_functionSymbols.at(index).hint();