3 files changed, 11 insertions, 13 deletions
diff --git a/tools/xmlpatterns/main.cpp b/tools/xmlpatterns/main.cpp
index 1c6f3cc..1e74227 100644
--- a/tools/xmlpatterns/main.cpp
+++ b/tools/xmlpatterns/main.cpp
@@ -109,8 +109,8 @@ public:
 #endif
 
 protected:
-    virtual QVariant convertToValue(const QApplicationArgument &arg,
-                                    const QString &input) const
+    QVariant convertToValue(const QApplicationArgument &arg,
+                            const QString &input) const override
     {
         if(arg.name() == QLatin1String("param"))
         {
@@ -161,7 +161,7 @@ protected:
             return QApplicationArgumentParser::convertToValue(arg, input);
     }
 
-    virtual QString typeToName(const QApplicationArgument &argument) const
+    QString typeToName(const QApplicationArgument &argument) const override
     {
         if(argument.name() == QLatin1String("param"))
             return QLatin1String("name=value");
@@ -171,7 +171,7 @@ protected:
             return QApplicationArgumentParser::typeToName(argument);
     }
 
-    virtual QVariant defaultValue(const QApplicationArgument &argument) const
+    QVariant defaultValue(const QApplicationArgument &argument) const override
     {
         if(argument.name() == QLatin1String("output"))
         {
diff --git a/tools/xmlpatterns/qapplicationargumentparser.cpp b/tools/xmlpatterns/qapplicationargumentparser.cpp
index 8aaae31..ce73485 100644
--- a/tools/xmlpatterns/qapplicationargumentparser.cpp
+++ b/tools/xmlpatterns/qapplicationargumentparser.cpp
@@ -245,7 +245,7 @@ bool QApplicationArgumentParserPrivate::error(const QString &message)
 bool QApplicationArgumentParserPrivate::errorMessage(const QString &message)
 {
     QTextStream out(stderr, QIODevice::WriteOnly);
-    out << message << endl;
+    out << message << Qt::endl;
     return false;
 }
 
@@ -290,7 +290,7 @@ void QApplicationArgumentParserPrivate::displayVersion() const
     QTextStream out(stderr);
 
     out << tr("%1 version %2 using Qt %3").arg(QCoreApplication::applicationName(), applicationVersion, QString::fromLatin1(qVersion()))
-        << endl;
+        << Qt::endl;
 }
 
 void QApplicationArgumentParserPrivate::displayHelp() const
@@ -356,16 +356,16 @@ void QApplicationArgumentParserPrivate::displayHelp() const
     }
 
     QTextStream out(stderr);
-    out << endl
+    out << Qt::endl
         << QString(IndentPadding, QLatin1Char(' '))
         << QCoreApplication::applicationName()
         << QLatin1String(" -- ")
         << applicationDescription
-        << endl;
+        << Qt::endl;
     // TODO synopsis
 
     /* One extra so we get some space between the overview and the options. */
-    out << endl;
+    out << Qt::endl;
 
     const int indentWidth = maxWidth + 3;
 
@@ -408,7 +408,7 @@ void QApplicationArgumentParserPrivate::displayHelp() const
 
         out << prolog
             << lineWrap(at.description(), indentWidth, LineWrapAt)
-            << endl;
+            << Qt::endl;
     }
 }
 
diff --git a/tools/xmlpatterns/qapplicationargumentparser_p.h b/tools/xmlpatterns/qapplicationargumentparser_p.h
index 9ad9751..819069d 100644
--- a/tools/xmlpatterns/qapplicationargumentparser_p.h
+++ b/tools/xmlpatterns/qapplicationargumentparser_p.h
@@ -40,15 +40,13 @@
 #define QApplicationArgumentParser_H
 
 #include <QtCore/QVariant> /* Needed, because we can't forward declare QVariantList. */
+#include <qcontainerfwd.h>
 
 QT_BEGIN_NAMESPACE
 
 class QApplicationArgument;
 class QApplicationArgumentParserPrivate;
 class QStringList;
-template<typename A, typename B> struct QPair;
-template<typename T> class QList;
-template<typename Value> class QList;
 
 class QApplicationArgumentParser
 {