diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2014-08-28 17:33:47 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-08-29 14:10:41 +0200 |
| commit | 1d5091e48f6df341dbd4436843c25afe25cbf4ce (patch) | |
| tree | 9151d71b36bcffbba219ef1a0fc4e4f234adbc89 /src/plugins/beautifier | |
| parent | 7ba0f8a4c42c5db144b599861f38d2e771e0dafe (diff) | |
| download | qt-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/beautifier')
| -rw-r--r-- | src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/beautifier/uncrustify/uncrustifysettings.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp b/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp index 619e37868d..875f19df2f 100644 --- a/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp +++ b/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp @@ -207,7 +207,7 @@ void ArtisticStyleSettings::createDocumentationFile() const const QString text = QLatin1String("<p><span class=\"option\">") + keys.filter(QRegExp(QLatin1String("^\\-"))).join(QLatin1String(", ")) + QLatin1String("</span></p><p>") - + Qt::escape(docu.join(QLatin1Char(' '))) + + (docu.join(QLatin1Char(' ')).toHtmlEscaped()) + QLatin1String("</p>"); stream.writeTextElement(QLatin1String(Constants::DOCUMENTATION_XMLDOC), text); stream.writeEndElement(); diff --git a/src/plugins/beautifier/uncrustify/uncrustifysettings.cpp b/src/plugins/beautifier/uncrustify/uncrustifysettings.cpp index c1453519ae..b41e2ebafc 100644 --- a/src/plugins/beautifier/uncrustify/uncrustifysettings.cpp +++ b/src/plugins/beautifier/uncrustify/uncrustifysettings.cpp @@ -153,7 +153,7 @@ void UncrustifySettings::createDocumentationFile() const const QString text = QLatin1String("<p><span class=\"option\">") + keyword + QLatin1String("</span> <span class=\"param\">") + options + QLatin1String("</span></p><p>") - + Qt::escape(docu.join(QLatin1Char(' '))) + + (docu.join(QLatin1Char(' ')).toHtmlEscaped()) + QLatin1String("</p>"); stream.writeStartElement(QLatin1String(Constants::DOCUMENTATION_XMLENTRY)); stream.writeTextElement(QLatin1String(Constants::DOCUMENTATION_XMLKEY), keyword); |