From 1b5495573e4381721ff86c2a3999163c708cd918 Mon Sep 17 00:00:00 2001
From: namedkitten <kitteh@kitteh.pw>
Date: Sun, 26 Apr 2020 01:05:09 +0100
Subject: [PATCH] Revert back to capitalised names.

---
 src/Backends/MPV/MPVBackend.cpp           | 23 +++++++++++-----------
 src/Backends/MPV/MPVBackend.hpp           | 17 ++++++++--------
 src/Backends/MPVCommon/MPVCommon.cpp      | 23 ++++++++++------------
 src/Backends/MPVCommon/MPVCommon.hpp      |  6 +++---
 src/Backends/MPVNoFBO/MPVNoFBOBackend.cpp | 20 +++++++++----------
 src/Backends/MPVNoFBO/MPVNoFBOBackend.hpp | 21 +++++++++-----------
 src/Process.cpp                           |  4 ++--
 src/Process.h                             |  8 ++++----
 src/ThumbnailCache.cpp                    | 24 +++++++++++------------
 src/ThumbnailCache.h                      |  9 ++++-----
 src/enums.hpp                             |  5 ++---
 src/logger.cpp                            |  8 ++++----
 src/main.cpp                              | 23 ++++++++++------------
 src/qmldebugger.cpp                       |  8 ++++----
 src/qmldebugger.h                         |  7 +++----
 src/utils.cpp                             | 10 +++++-----
 src/utils.hpp                             |  7 +++----
 17 files changed, 103 insertions(+), 120 deletions(-)

diff --git a/src/Backends/MPV/MPVBackend.cpp b/src/Backends/MPV/MPVBackend.cpp
index b928570..dcb2c3d 100644
--- a/src/Backends/MPV/MPVBackend.cpp
+++ b/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 <qcoreapplication.h>
-#include <qguiapplication.h> // IWYU pragma: keep
-#include <qcoreevent.h>
-#include <qdebug.h>
-#include <qicon.h>
-#include <qmetaobject.h>
-#include <qnamespace.h>
-#include <qobject.h>
-#include <qopenglcontext.h>
-#include <qopenglframebufferobject.h>
-#include <qquickwindow.h>
+#include <QByteArray>
+#include <QCoreApplication>
+#include <QGuiApplication>
+#include <QEvent>
+#include <QDebug>
+#include <QIcon>
+#include <QMetaObject>
+#include <QObject>
+#include <QOpenGLContext>
+#include <QOpenGLFramebufferObject>
+#include <QQuickWindow>
 #include <stdio.h>
 #include <clocale>
 #include <iostream>
diff --git a/src/Backends/MPV/MPVBackend.hpp b/src/Backends/MPV/MPVBackend.hpp
index 86a6ef9..219a84a 100644
--- a/src/Backends/MPV/MPVBackend.hpp
+++ b/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 <qobjectdefs.h>
-#include <qquickframebufferobject.h>
-#include <qsettings.h>
-#include <qstring.h>
-#include <qvariant.h>
+#include <QMetaType>
+#include <QObject>
+#include <QEvent>
+#include <QQuickItem>
+#include <QQuickFramebufferObject>
+#include <QSettings>
+#include <QString>
+#include <QVariant>
 #include "src/backendinterface.hpp"
 #include "src/enums.hpp"
-class QEvent;
-class QObject;
-class QQuickItem;
 
 class MPVBackend
   : public QQuickFramebufferObject
diff --git a/src/Backends/MPVCommon/MPVCommon.cpp b/src/Backends/MPVCommon/MPVCommon.cpp
index 4447b1f..695b018 100644
--- a/src/Backends/MPVCommon/MPVCommon.cpp
+++ b/src/Backends/MPVCommon/MPVCommon.cpp
@@ -1,17 +1,14 @@
 #include "src/Backends/MPVCommon/MPVCommon.hpp"
-#include <qbytearray.h>
-#include <qcbormap.h> // IWYU pragma: keep
-#include <qcoreapplication.h>
-#include <qglobal.h>
-#include <qjsonvalue.h> // IWYU pragma: keep
-#include <qjsonarray.h> // IWYU pragma: keep
-#include <qjsonobject.h> // IWYU pragma: keep
-#include <qlist.h>
-#include <qlocale.h>
-#include <qmap.h>
-#include <qmetaobject.h>
-#include <qobjectdefs.h>
-#include <qsettings.h>
+#include <QByteArray>
+#include <QCoreApplication>
+#include <QJsonObject>
+#include <QList>
+#include <QLocale>
+#include <QMap>
+#include <QMetaObject>
+#include <QMetaMethod>
+#include <QObject>
+#include <QSettings>
 #include <spdlog/fmt/fmt.h>
 #include <string.h>
 #include <exception>
diff --git a/src/Backends/MPVCommon/MPVCommon.hpp b/src/Backends/MPVCommon/MPVCommon.hpp
index 8885515..4116d2a 100644
--- a/src/Backends/MPVCommon/MPVCommon.hpp
+++ b/src/Backends/MPVCommon/MPVCommon.hpp
@@ -2,9 +2,9 @@
 #define MPVCommon_H
 
 #include <mpv/client.h>
-#include <qmetatype.h>
-#include <qstring.h>
-#include <qvariant.h>
+#include <QMetaType>
+#include <QString>
+#include <QVariant>
 #include "src/enums.hpp"
 class BackendInterface;
 class QMetaMethod;
diff --git a/src/Backends/MPVNoFBO/MPVNoFBOBackend.cpp b/src/Backends/MPVNoFBO/MPVNoFBOBackend.cpp
index bc54dc3..ce55f41 100644
--- a/src/Backends/MPVNoFBO/MPVNoFBOBackend.cpp
+++ b/src/Backends/MPVNoFBO/MPVNoFBOBackend.cpp
@@ -1,15 +1,13 @@
 #include "src/Backends/MPVNoFBO/MPVNoFBOBackend.hpp"
-#include <QtCore/qglobal.h>
-#include <qapplication.h>
-#include <qbytearray.h>
-#include <qcoreapplication.h>
-#include <qcoreevent.h>
-#include <qdebug.h>
-#include <qicon.h>
-#include <qmetaobject.h>
-#include <qnamespace.h>
-#include <qopenglcontext.h>
-#include <qquickwindow.h>
+#include <QApplication>
+#include <QByteArray>
+#include <QCoreApplication>
+#include <QEvent>
+#include <QDebug>
+#include <QIcon>
+#include <QMetaObject>
+#include <QOpenGLContext>
+#include <QQuickWindow>
 #include <stdio.h>
 #include <stdlib.h>
 #include <clocale>
diff --git a/src/Backends/MPVNoFBO/MPVNoFBOBackend.hpp b/src/Backends/MPVNoFBO/MPVNoFBOBackend.hpp
index 80ac5ca..9674c0e 100644
--- a/src/Backends/MPVNoFBO/MPVNoFBOBackend.hpp
+++ b/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 <qmetatype.h>
-#include <qobject.h>
-#include <qobjectdefs.h>
-#include <qquickitem.h>
-#include <qquickwindow.h> // IWYU pragma: keep
-#include <qsettings.h>
-#include <qsize.h>
-#include <qstring.h>
-#include <qvariant.h>
+#include <QEvent>
+#include <QMetaType>
+#include <QObject>
+#include <QQuickItem>
+#include <QQuickWindow>
+#include <QSettings>
+#include <QSize>
+#include <QString>
+#include <QVariant>
 #include "src/backendinterface.hpp"
 #include "src/enums.hpp"
 
-class QEvent; // IWYU pragma: keep
-
 class MPVNoFBORenderer : public QObject
 {
   Q_OBJECT
diff --git a/src/Process.cpp b/src/Process.cpp
index e447f3f..c0a67bc 100644
--- a/src/Process.cpp
+++ b/src/Process.cpp
@@ -1,6 +1,6 @@
 #include "Process.h"
-#include <qstringlist.h>
-#include <qvariant.h>
+#include <QStringList>
+#include <QVariant>
 class QObject;
 
 Process::Process(QObject* parent)
diff --git a/src/Process.h b/src/Process.h
index 4ec6124..81b226d 100644
--- a/src/Process.h
+++ b/src/Process.h
@@ -1,10 +1,10 @@
 #ifndef Process_H
 #define Process_H
 
-#include <qmetatype.h>
-#include <qobjectdefs.h>
-#include <qprocess.h>
-#include <qstring.h>
+#include <QMetaType>
+#include <QObject>
+#include <QProcess>
+#include <QString>
 class QObject;
 
 class Process : public QProcess
diff --git a/src/ThumbnailCache.cpp b/src/ThumbnailCache.cpp
index c4d7d10..ff80c07 100644
--- a/src/ThumbnailCache.cpp
+++ b/src/ThumbnailCache.cpp
@@ -1,16 +1,16 @@
 #include "ThumbnailCache.h"
-#include <qbuffer.h>
-#include <qbytearray.h>
-#include <qcryptographichash.h>
-#include <qfileinfo.h>
-#include <qimage.h>
-#include <qimagereader.h>
-#include <qiodevice.h>
-#include <qnetworkaccessmanager.h>
-#include <qnetworkreply.h>
-#include <qnetworkrequest.h>
-#include <qstandardpaths.h>
-#include <qurl.h>
+#include <QBuffer>
+#include <QByteArray>
+#include <QCryptographicHash>
+#include <QFileInfo>
+#include <QImage>
+#include <QImageReader>
+#include <QIODevice>
+#include <QNetworkAccessManager>
+#include <QNetworkReply>
+#include <QNetworkRequest>
+#include <QStandardPaths>
+#include <QUrl>
 
 ThumbnailCache::ThumbnailCache(QObject* parent)
   : QObject(parent)
diff --git a/src/ThumbnailCache.h b/src/ThumbnailCache.h
index e4cb212..f828082 100644
--- a/src/ThumbnailCache.h
+++ b/src/ThumbnailCache.h
@@ -1,10 +1,9 @@
 #ifndef ThumbnailCache_H
 #define ThumbnailCache_H
-#include <qdir.h>
-#include <qobject.h>
-#include <qobjectdefs.h>
-#include <qstring.h>
-class QNetworkAccessManager;
+#include <QDir>
+#include <QObject>
+#include <QString>
+#include <QNetworkAccessManager>
 
 class ThumbnailCache : public QObject
 {
diff --git a/src/enums.hpp b/src/enums.hpp
index 6a71ac0..bac6a34 100644
--- a/src/enums.hpp
+++ b/src/enums.hpp
@@ -1,9 +1,8 @@
 #ifndef ENUMS_HPP
 #define ENUMS_HPP
 
-#include <qobject.h>
-#include <qobjectdefs.h>
-#include <qstring.h>
+#include <QObject>
+#include <QString>
 
 namespace Enums {
 Q_NAMESPACE
diff --git a/src/logger.cpp b/src/logger.cpp
index a53ee5d..6846923 100644
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -1,7 +1,7 @@
-#include <qbytearray.h>
-#include <qsettings.h>
-#include <qstring.h>
-#include <qvariant.h>
+#include <QByteArray>
+#include <QSettings>
+#include <QString>
+#include <QVariant>
 #include <spdlog/logger.h>
 #include <iterator>
 #include <vector>
diff --git a/src/main.cpp b/src/main.cpp
index 85514d4..2e80338 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,19 +1,16 @@
-#include <QtCore/qglobal.h>
+#include <QtGlobal>
 #include <locale.h>
-#include <qapplication.h>
-#include <qbytearray.h>
-#include <qmetatype.h>
-#include <qprocess.h>
-#include <qqml.h>
-#include <qqmlapplicationengine.h>
+#include <QApplication>
+#include <QProcess>
+#include <QtQml>
+#include <QQmlApplicationEngine>
 #ifdef QT_QML_DEBUG
-#include <qqmldebug.h>
+#include <QQmlDebug>
 #endif
-#include <qsettings.h>
-#include <qstring.h>
-#include <qstringliteral.h>
-#include <qurl.h>
-#include <qvariant.h>
+#include <QSettings>
+#include <QString>
+#include <QUrl>
+#include <QVariant>
 #include <spdlog/fmt/fmt.h>
 #include <cstdlib>
 #include <exception>
diff --git a/src/qmldebugger.cpp b/src/qmldebugger.cpp
index 92877cc..f5e93aa 100644
--- a/src/qmldebugger.cpp
+++ b/src/qmldebugger.cpp
@@ -1,8 +1,8 @@
 #include "qmldebugger.h"
-#include <qhash.h>
-#include <qmetaobject.h>
-#include <qquickitem.h>
-#include <qvariant.h>
+#include <QHash>
+#include <QMetaObject>
+#include <QQuickItem>
+#include <QVariant>
 
 QString
 QMLDebugger::properties(QQuickItem* item, bool linebreak)
diff --git a/src/qmldebugger.h b/src/qmldebugger.h
index 8465e14..14a5071 100644
--- a/src/qmldebugger.h
+++ b/src/qmldebugger.h
@@ -1,10 +1,9 @@
 #ifndef QMLDEBUGGER_H
 #define QMLDEBUGGER_H
 
-#include <qobject.h>
-#include <qobjectdefs.h>
-#include <qstring.h>
-class QQuickItem;
+#include <QQuickItem>
+#include <QVariant>
+#include <QString>
 
 class QMLDebugger : public QObject
 {
diff --git a/src/utils.cpp b/src/utils.cpp
index cd46a21..07b9052 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -1,9 +1,9 @@
 #include "utils.hpp"
-#include <qapplication.h>
-#include <qcoreapplication.h>
-#include <qguiapplication.h>
-#include <qprocess.h>
-#include <qstringlist.h>
+#include <QApplication>
+#include <QCoreApplication>
+#include <QGuiApplication>
+#include <QProcess>
+#include <QStringList>
 #include <memory>
 #include "logger.h"
 #include "spdlog/logger.h"
diff --git a/src/utils.hpp b/src/utils.hpp
index a35afec..6d2e419 100644
--- a/src/utils.hpp
+++ b/src/utils.hpp
@@ -1,9 +1,8 @@
 #ifndef UTILS_H
 #define UTILS_H
-#include <qobject.h>
-#include <qobjectdefs.h>
-#include <qstring.h>
-#include <qwindowdefs.h>
+#include <QObject>
+#include <QString>
+#include <QWindow>
 
 namespace Utils {
 Q_NAMESPACE