From c95b9d1d0c6fac0715593913ac394541d39c2c12 Mon Sep 17 00:00:00 2001 From: Arnold Dumas Date: Sat, 30 May 2015 00:04:59 +0200 Subject: [PATCH] Remove leftovers from Qt::escape(). Remove useless includes and comments related to the old Qt::escape(). Change-Id: Ice44317e5440c0dd41e770da6f1443ce687735f1 Reviewed-by: Christian Kandeler --- src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp | 1 - src/plugins/beautifier/uncrustify/uncrustifysettings.cpp | 2 -- src/plugins/projectexplorer/environmentwidget.cpp | 1 - 3 files changed, 4 deletions(-) diff --git a/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp b/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp index 4c6e718027..50d25d9a15 100644 --- a/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp +++ b/src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp @@ -42,7 +42,6 @@ #include #include #include -#include // Qt::escape() in Qt 4 #include namespace Beautifier { diff --git a/src/plugins/beautifier/uncrustify/uncrustifysettings.cpp b/src/plugins/beautifier/uncrustify/uncrustifysettings.cpp index f1b0c69a22..76a79b4cba 100644 --- a/src/plugins/beautifier/uncrustify/uncrustifysettings.cpp +++ b/src/plugins/beautifier/uncrustify/uncrustifysettings.cpp @@ -40,7 +40,6 @@ #include #include #include -#include // Qt::escape() in Qt 4 #include namespace Beautifier { @@ -150,7 +149,6 @@ void UncrustifySettings::createDocumentationFile() const while (++i < totalLines) { const QString &subline = lines.at(i); if (line.startsWith(QLatin1Char('#')) || subline.trimmed().isEmpty()) { - //TODO As soon as Qt 4 support is dropped, use toHtmlEscaped(). const QString text = QLatin1String("

") + keyword + QLatin1String(" ") + options + QLatin1String("

") diff --git a/src/plugins/projectexplorer/environmentwidget.cpp b/src/plugins/projectexplorer/environmentwidget.cpp index 073237f6e9..0644c37606 100644 --- a/src/plugins/projectexplorer/environmentwidget.cpp +++ b/src/plugins/projectexplorer/environmentwidget.cpp @@ -41,7 +41,6 @@ #include #include #include -#include // for Qt::escape #include #include -- GitLab