Revert back to capitalised names.

src/Backends/MPV/MPVBackend.cpp

@@ -1,18 +1,17 @@
 #include "src/Backends/MPV/MPVBackend.hpp"
 #include <QtCore/qglobal.h>
 #include <mpv/render_gl.h>
-#include <qbytearray.h>
+#include <QByteArray>
-#include <qcoreapplication.h>
+#include <QCoreApplication>
-#include <qguiapplication.h> // IWYU pragma: keep
+#include <QGuiApplication>
-#include <qcoreevent.h>
+#include <QEvent>
-#include <qdebug.h>
+#include <QDebug>
-#include <qicon.h>
+#include <QIcon>
-#include <qmetaobject.h>
+#include <QMetaObject>
-#include <qnamespace.h>
+#include <QObject>
-#include <qobject.h>
+#include <QOpenGLContext>
-#include <qopenglcontext.h>
+#include <QOpenGLFramebufferObject>
-#include <qopenglframebufferobject.h>
+#include <QQuickWindow>
-#include <qquickwindow.h>
 #include <stdio.h>
 #include <clocale>
 #include <iostream>

src/Backends/MPV/MPVBackend.hpp

@@ -4,17 +4,16 @@
 #include <mpv/client.h>
 #include <mpv/opengl_cb.h>
 #include <mpv/render.h>
-#include <qmetatype.h>
+#include <QMetaType>
-#include <qobjectdefs.h>
+#include <QObject>
-#include <qquickframebufferobject.h>
+#include <QEvent>
-#include <qsettings.h>
+#include <QQuickItem>
-#include <qstring.h>
+#include <QQuickFramebufferObject>
-#include <qvariant.h>
+#include <QSettings>
+#include <QString>
+#include <QVariant>
 #include "src/backendinterface.hpp"
 #include "src/enums.hpp"
-class QEvent;
-class QObject;
-class QQuickItem;
 
 class MPVBackend
   : public QQuickFramebufferObject

src/Backends/MPVCommon/MPVCommon.cpp

@@ -1,17 +1,14 @@
 #include "src/Backends/MPVCommon/MPVCommon.hpp"
-#include <qbytearray.h>
+#include <QByteArray>
-#include <qcbormap.h> // IWYU pragma: keep
+#include <QCoreApplication>
-#include <qcoreapplication.h>
+#include <QJsonObject>
-#include <qglobal.h>
+#include <QList>
-#include <qjsonvalue.h> // IWYU pragma: keep
+#include <QLocale>
-#include <qjsonarray.h> // IWYU pragma: keep
+#include <QMap>
-#include <qjsonobject.h> // IWYU pragma: keep
+#include <QMetaObject>
-#include <qlist.h>
+#include <QMetaMethod>
-#include <qlocale.h>
+#include <QObject>
-#include <qmap.h>
+#include <QSettings>
-#include <qmetaobject.h>
-#include <qobjectdefs.h>
-#include <qsettings.h>
 #include <spdlog/fmt/fmt.h>
 #include <string.h>
 #include <exception>

src/Backends/MPVCommon/MPVCommon.hpp

@@ -2,9 +2,9 @@
 #define MPVCommon_H
 
 #include <mpv/client.h>
-#include <qmetatype.h>
+#include <QMetaType>
-#include <qstring.h>
+#include <QString>
-#include <qvariant.h>
+#include <QVariant>
 #include "src/enums.hpp"
 class BackendInterface;
 class QMetaMethod;

src/Backends/MPVNoFBO/MPVNoFBOBackend.cpp

@@ -1,15 +1,13 @@
 #include "src/Backends/MPVNoFBO/MPVNoFBOBackend.hpp"
-#include <QtCore/qglobal.h>
+#include <QApplication>
-#include <qapplication.h>
+#include <QByteArray>
-#include <qbytearray.h>
+#include <QCoreApplication>
-#include <qcoreapplication.h>
+#include <QEvent>
-#include <qcoreevent.h>
+#include <QDebug>
-#include <qdebug.h>
+#include <QIcon>
-#include <qicon.h>
+#include <QMetaObject>
-#include <qmetaobject.h>
+#include <QOpenGLContext>
-#include <qnamespace.h>
+#include <QQuickWindow>
-#include <qopenglcontext.h>
-#include <qquickwindow.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <clocale>

src/Backends/MPVNoFBO/MPVNoFBOBackend.hpp

@@ -3,21 +3,18 @@
 
 #include <mpv/client.h>
 #include <mpv/opengl_cb.h>
-#include <qevent.h> // IWYU pragma: keep
+#include <QEvent>
-#include <qmetatype.h>
+#include <QMetaType>
-#include <qobject.h>
+#include <QObject>
-#include <qobjectdefs.h>
+#include <QQuickItem>
-#include <qquickitem.h>
+#include <QQuickWindow>
-#include <qquickwindow.h> // IWYU pragma: keep
+#include <QSettings>
-#include <qsettings.h>
+#include <QSize>
-#include <qsize.h>
+#include <QString>
-#include <qstring.h>
+#include <QVariant>
-#include <qvariant.h>
 #include "src/backendinterface.hpp"
 #include "src/enums.hpp"
 
-class QEvent; // IWYU pragma: keep
-
 class MPVNoFBORenderer : public QObject
 {
   Q_OBJECT

src/Process.cpp

@@ -1,6 +1,6 @@
 #include "Process.h"
-#include <qstringlist.h>
+#include <QStringList>
-#include <qvariant.h>
+#include <QVariant>
 class QObject;
 
 Process::Process(QObject* parent)

src/Process.h

@@ -1,10 +1,10 @@
 #ifndef Process_H
 #define Process_H
 
-#include <qmetatype.h>
+#include <QMetaType>
-#include <qobjectdefs.h>
+#include <QObject>
-#include <qprocess.h>
+#include <QProcess>
-#include <qstring.h>
+#include <QString>
 class QObject;
 
 class Process : public QProcess

src/ThumbnailCache.cpp

@@ -1,16 +1,16 @@
 #include "ThumbnailCache.h"
-#include <qbuffer.h>
+#include <QBuffer>
-#include <qbytearray.h>
+#include <QByteArray>
-#include <qcryptographichash.h>
+#include <QCryptographicHash>
-#include <qfileinfo.h>
+#include <QFileInfo>
-#include <qimage.h>
+#include <QImage>
-#include <qimagereader.h>
+#include <QImageReader>
-#include <qiodevice.h>
+#include <QIODevice>
-#include <qnetworkaccessmanager.h>
+#include <QNetworkAccessManager>
-#include <qnetworkreply.h>
+#include <QNetworkReply>
-#include <qnetworkrequest.h>
+#include <QNetworkRequest>
-#include <qstandardpaths.h>
+#include <QStandardPaths>
-#include <qurl.h>
+#include <QUrl>
 
 ThumbnailCache::ThumbnailCache(QObject* parent)
   : QObject(parent)

src/ThumbnailCache.h

@@ -1,10 +1,9 @@
 #ifndef ThumbnailCache_H
 #define ThumbnailCache_H
-#include <qdir.h>
+#include <QDir>
-#include <qobject.h>
+#include <QObject>
-#include <qobjectdefs.h>
+#include <QString>
-#include <qstring.h>
+#include <QNetworkAccessManager>
-class QNetworkAccessManager;
 
 class ThumbnailCache : public QObject
 {

src/enums.hpp

@@ -1,9 +1,8 @@
 #ifndef ENUMS_HPP
 #define ENUMS_HPP
 
-#include <qobject.h>
+#include <QObject>
-#include <qobjectdefs.h>
+#include <QString>
-#include <qstring.h>
 
 namespace Enums {
 Q_NAMESPACE

src/logger.cpp

@@ -1,7 +1,7 @@
-#include <qbytearray.h>
+#include <QByteArray>
-#include <qsettings.h>
+#include <QSettings>
-#include <qstring.h>
+#include <QString>
-#include <qvariant.h>
+#include <QVariant>
 #include <spdlog/logger.h>
 #include <iterator>
 #include <vector>

src/main.cpp

@@ -1,19 +1,16 @@
-#include <QtCore/qglobal.h>
+#include <QtGlobal>
 #include <locale.h>
-#include <qapplication.h>
+#include <QApplication>
-#include <qbytearray.h>
+#include <QProcess>
-#include <qmetatype.h>
+#include <QtQml>
-#include <qprocess.h>
+#include <QQmlApplicationEngine>
-#include <qqml.h>
-#include <qqmlapplicationengine.h>
 #ifdef QT_QML_DEBUG
-#include <qqmldebug.h>
+#include <QQmlDebug>
 #endif
-#include <qsettings.h>
+#include <QSettings>
-#include <qstring.h>
+#include <QString>
-#include <qstringliteral.h>
+#include <QUrl>
-#include <qurl.h>
+#include <QVariant>
-#include <qvariant.h>
 #include <spdlog/fmt/fmt.h>
 #include <cstdlib>
 #include <exception>

src/qmldebugger.cpp

@@ -1,8 +1,8 @@
 #include "qmldebugger.h"
-#include <qhash.h>
+#include <QHash>
-#include <qmetaobject.h>
+#include <QMetaObject>
-#include <qquickitem.h>
+#include <QQuickItem>
-#include <qvariant.h>
+#include <QVariant>
 
 QString
 QMLDebugger::properties(QQuickItem* item, bool linebreak)

src/qmldebugger.h

@@ -1,10 +1,9 @@
 #ifndef QMLDEBUGGER_H
 #define QMLDEBUGGER_H
 
-#include <qobject.h>
+#include <QQuickItem>
-#include <qobjectdefs.h>
+#include <QVariant>
-#include <qstring.h>
+#include <QString>
-class QQuickItem;
 
 class QMLDebugger : public QObject
 {

src/utils.cpp

@@ -1,9 +1,9 @@
 #include "utils.hpp"
-#include <qapplication.h>
+#include <QApplication>
-#include <qcoreapplication.h>
+#include <QCoreApplication>
-#include <qguiapplication.h>
+#include <QGuiApplication>
-#include <qprocess.h>
+#include <QProcess>
-#include <qstringlist.h>
+#include <QStringList>
 #include <memory>
 #include "logger.h"
 #include "spdlog/logger.h"

src/utils.hpp

@@ -1,9 +1,8 @@
 #ifndef UTILS_H
 #define UTILS_H
-#include <qobject.h>
+#include <QObject>
-#include <qobjectdefs.h>
+#include <QString>
-#include <qstring.h>
+#include <QWindow>
-#include <qwindowdefs.h>
 
 namespace Utils {
 Q_NAMESPACE