From edaae61c36de21dda224b3e40d9abc1d5e8c057a Mon Sep 17 00:00:00 2001
From: Filip Fila <filipfila.kde@gmail.com>
Date: Tue, 2 Jul 2019 10:02:03 +0200
Subject: [PATCH] Make includes more orderly

1. header files
2. Qt
3. KDE

- alphabetically organized
- no spacing after copyright info
- one line of spacing after last include

NOTE: xcursor.cpp differs because it won't compile with a standardized ordering of includes.
---
 sddmauthhelper.cpp                      | 14 +++++++-------
 sddmthemeinstaller.cpp                  | 11 +++++------
 src/advanceconfig.cpp                   | 15 +++++++--------
 src/configwidgets/selectimagebutton.cpp |  6 ++----
 src/cursortheme/cursortheme.cpp         | 11 ++++-------
 src/cursortheme/cursortheme.h           |  3 +--
 src/cursortheme/dummytheme.cpp          |  3 +--
 src/cursortheme/sortproxymodel.cpp      |  5 ++---
 src/cursortheme/sortproxymodel.h        |  4 ++--
 src/cursortheme/thememodel.cpp          | 15 ++++++---------
 src/cursortheme/thememodel.h            |  1 -
 src/cursortheme/xcursortheme.cpp        | 13 ++++++-------
 src/cursortheme/xcursortheme.h          |  5 ++---
 src/sddmkcm.cpp                         | 19 +++++++------------
 src/sessionmodel.cpp                    |  6 ++----
 src/sessionmodel.h                      |  2 --
 src/themeconfig.cpp                     | 15 +++++++--------
 src/thememetadata.cpp                   |  2 +-
 src/thememetadata.h                     |  2 +-
 src/themesdelegate.cpp                  |  7 +++----
 src/themesmodel.cpp                     |  9 +++------
 src/usersmodel.cpp                      |  3 +--
 22 files changed, 70 insertions(+), 101 deletions(-)

diff --git a/sddmauthhelper.cpp b/sddmauthhelper.cpp
index 3a18ae2b..576cb301 100644
--- a/sddmauthhelper.cpp
+++ b/sddmauthhelper.cpp
@@ -17,20 +17,20 @@
  */
 #include "sddmauthhelper.h"
 
+#include <QDebug>
+#include <QDir>
 #include <QFile>
 #include <QFileInfo>
-#include <QDir>
-#include <QSharedPointer>
-#include <QDebug>
-#include <QMimeType>
 #include <QMimeDatabase>
+#include <QMimeType>
+#include <QSharedPointer>
 
-#include <KLocalizedString>
-#include <KZip>
-#include <KTar>
 #include <KArchive>
 #include <KConfig>
 #include <KConfigGroup>
+#include <KLocalizedString>
+#include <KTar>
+#include <KZip>
 
 static QSharedPointer<KConfig> openConfig(const QString &filePath)
 {
diff --git a/sddmthemeinstaller.cpp b/sddmthemeinstaller.cpp
index 3bf99c23..3bd4b140 100644
--- a/sddmthemeinstaller.cpp
+++ b/sddmthemeinstaller.cpp
@@ -17,21 +17,20 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  */
-
 #include <QApplication>
+#include <QCommandLineOption>
+#include <QCommandLineParser>
 #include <QDir>
-#include <QFile>
 #include <QDebug>
+#include <QFile>
 #include <QProcess>
-#include <QCommandLineOption>
-#include <QCommandLineParser>
 
-#include <KLocalizedString>
 #include <KAuthAction>
 #include <KAuthExecuteJob>
+#include <KConfigGroup>
+#include <KLocalizedString>
 #include <KMessageBox>
 #include <KSharedConfig>
-#include <KConfigGroup>
 
 int main(int argc, char **argv)
 {
diff --git a/src/advanceconfig.cpp b/src/advanceconfig.cpp
index 34debee6..42b512b5 100644
--- a/src/advanceconfig.cpp
+++ b/src/advanceconfig.cpp
@@ -16,20 +16,19 @@
  */
 #include "advanceconfig.h"
 #include "ui_advanceconfig.h"
+#include "config.h"
+#include "cursortheme/thememodel.h"
+#include "cursortheme/sortproxymodel.h"
+#include "cursortheme/cursortheme.h"
+#include "sessionmodel.h"
+#include "usersmodel.h"
 
+#include <QDebug>
 #include <QIntValidator>
 
-#include <QDebug>
 #include <KConfigGroup>
 #include <KUser>
 
-#include "usersmodel.h"
-#include "sessionmodel.h"
-#include "config.h"
-#include "cursortheme/thememodel.h"
-#include "cursortheme/sortproxymodel.h"
-#include "cursortheme/cursortheme.h"
-
 const int MIN_UID = 1000;
 const int MAX_UID = 60000;
 
diff --git a/src/configwidgets/selectimagebutton.cpp b/src/configwidgets/selectimagebutton.cpp
index ff8f562e..ac6ccd76 100644
--- a/src/configwidgets/selectimagebutton.cpp
+++ b/src/configwidgets/selectimagebutton.cpp
@@ -18,15 +18,13 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-
 #include "selectimagebutton.h"
 
-#include <QWidgetAction>
-
-#include <QUrl>
 #include <QFileDialog>
 #include <QImageReader>
 #include <QMenu>
+#include <QUrl>
+#include <QWidgetAction>
 
 #include <KLocalizedString>
 #include <KMessageBox>
diff --git a/src/cursortheme/cursortheme.cpp b/src/cursortheme/cursortheme.cpp
index 8ff9c318..f6fcea94 100644
--- a/src/cursortheme/cursortheme.cpp
+++ b/src/cursortheme/cursortheme.cpp
@@ -16,24 +16,21 @@
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
+#include "cursortheme.h"
+// #include <config-X11.h>
 
 #include <QApplication>
-#include <QStyle>
 #include <QCursor>
-#include <QImage>
 #include <QFile>
+#include <QImage>
+#include <QStyle>
 #include <QX11Info>
 
-#include "cursortheme.h"
-
-// #include <config-X11.h>
-
 #ifdef HAVE_XFIXES
 #  include <X11/Xlib.h>
 #  include <X11/extensions/Xfixes.h>
 #endif
 
-
 CursorTheme::CursorTheme(const QString &title, const QString &description)
 {
     setTitle(title);
diff --git a/src/cursortheme/cursortheme.h b/src/cursortheme/cursortheme.h
index fc1fbc64..adff06d5 100644
--- a/src/cursortheme/cursortheme.h
+++ b/src/cursortheme/cursortheme.h
@@ -16,12 +16,11 @@
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
-
 #ifndef CURSORTHEME_H
 #define CURSORTHEME_H
 
-#include <QPixmap>
 #include <QHash>
+#include <QPixmap>
 
 /**
  * This is the abstract base class for all cursor themes stored in a
diff --git a/src/cursortheme/dummytheme.cpp b/src/cursortheme/dummytheme.cpp
index da80e502..01626da7 100644
--- a/src/cursortheme/dummytheme.cpp
+++ b/src/cursortheme/dummytheme.cpp
@@ -14,11 +14,10 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #include "dummytheme.h"
 
-#include <QImage>
 #include <QCursor>
+#include <QImage>
 
 #include <KLocalizedString>
 
diff --git a/src/cursortheme/sortproxymodel.cpp b/src/cursortheme/sortproxymodel.cpp
index b9d63092..52e163f9 100644
--- a/src/cursortheme/sortproxymodel.cpp
+++ b/src/cursortheme/sortproxymodel.cpp
@@ -16,11 +16,10 @@
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
-
-#include <QString>
-#include "sortproxymodel.h"
 #include "cursortheme.h"
+#include "sortproxymodel.h"
 
+#include <QString>
 
 int SortProxyModel::compare(const QModelIndex &left, const QModelIndex &right, int role) const
 {
diff --git a/src/cursortheme/sortproxymodel.h b/src/cursortheme/sortproxymodel.h
index f420c776..c1fa7814 100644
--- a/src/cursortheme/sortproxymodel.h
+++ b/src/cursortheme/sortproxymodel.h
@@ -16,13 +16,13 @@
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
-
 #ifndef SORTPROXYMODEL_H
 #define SORTPROXYMODEL_H
 
-#include <QSortFilterProxyModel>
 #include "thememodel.h"
 
+#include <QSortFilterProxyModel>
+
 /**
  * SortProxyModel is a sorting proxy model intended to be used in combination
  * with the ItemDelegate class.
diff --git a/src/cursortheme/thememodel.cpp b/src/cursortheme/thememodel.cpp
index ce8b9820..becc1bc5 100644
--- a/src/cursortheme/thememodel.cpp
+++ b/src/cursortheme/thememodel.cpp
@@ -15,17 +15,16 @@
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
+#include "thememodel.h"
+#include "xcursortheme.h"
 
-
-#include <KLocalizedString>
-#include <KConfig>
-#include <KConfigGroup>
-#include <QStringList>
 #include <QDir>
+#include <QStringList>
 #include <QX11Info>
 
-#include "thememodel.h"
-#include "xcursortheme.h"
+#include <KConfig>
+#include <KConfigGroup>
+#include <KLocalizedString>
 
 #include <X11/Xlib.h>
 #include <X11/Xcursor/Xcursor.h>
@@ -36,8 +35,6 @@
 #  define XCURSOR_LIB_MINOR XCURSOR_MINOR
 #endif
 
-
-
 CursorThemeModel::CursorThemeModel(QObject *parent)
     : QAbstractTableModel(parent)
 {
diff --git a/src/cursortheme/thememodel.h b/src/cursortheme/thememodel.h
index 007064a3..7654bf8a 100644
--- a/src/cursortheme/thememodel.h
+++ b/src/cursortheme/thememodel.h
@@ -16,7 +16,6 @@
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
-
 #ifndef THEMEMODEL_H
 #define THEMEMODEL_H
 
diff --git a/src/cursortheme/xcursortheme.cpp b/src/cursortheme/xcursortheme.cpp
index 2b3e25c0..195c5766 100644
--- a/src/cursortheme/xcursortheme.cpp
+++ b/src/cursortheme/xcursortheme.cpp
@@ -16,22 +16,21 @@
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
+#include <QCursor>
+#include <QDir>
+#include <QImage>
+#include <QTextStream>
+#include <QX11Info>
 
-#include <KLocalizedString>
 #include <KConfig>
 #include <KConfigGroup>
+#include <KLocalizedString>
 
-#include <QCursor>
-#include <QImage>
-#include <QDir>
-#include <QX11Info>
-#include <QTextStream>
 #include <X11/Xlib.h>
 #include <X11/Xcursor/Xcursor.h>
 
 #include "xcursortheme.h"
 
-
 // Static variable holding alternative names for some cursors
 QHash<QString, QString> XCursorTheme::alternatives;
 
diff --git a/src/cursortheme/xcursortheme.h b/src/cursortheme/xcursortheme.h
index 8c7d760c..63f70000 100644
--- a/src/cursortheme/xcursortheme.h
+++ b/src/cursortheme/xcursortheme.h
@@ -16,14 +16,13 @@
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
-
 #ifndef XCURSORTHEME_H
 #define XCURSORTHEME_H
 
-#include <QHash>
-
 #include "cursortheme.h"
 
+#include <QHash>
+
 class QDir;
 
 struct _XcursorImage;
diff --git a/src/sddmkcm.cpp b/src/sddmkcm.cpp
index 87f43636..0dc41eaf 100644
--- a/src/sddmkcm.cpp
+++ b/src/sddmkcm.cpp
@@ -14,30 +14,25 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include "advanceconfig.h"
+#include "config.h"
 #include "sddmkcm.h"
+#include "themeconfig.h"
 
 #include <algorithm>
 
+#include <QDebug>
 #include <QDir>
 #include <QHBoxLayout>
 #include <QTabWidget>
 
-#include <KPluginFactory>
-
-#include <KAuth/KAuthActionReply>
-
 #include <KAboutData>
-
+#include <KAuth/KAuthActionReply>
+#include <kauthexecutejob.h>
 #include <KLocalizedString>
-#include <QDebug>
-
-#include "config.h"
-#include "themeconfig.h"
-#include "advanceconfig.h"
-
+#include <KPluginFactory>
 #include <kpluginfactory.h>
 #include <kpluginloader.h>
-#include <kauthexecutejob.h>
 
 K_PLUGIN_FACTORY(SddmKcmFactory, registerPlugin<SddmKcm>();)
 
diff --git a/src/sessionmodel.cpp b/src/sessionmodel.cpp
index 0bbe2173..efa7ef6d 100644
--- a/src/sessionmodel.cpp
+++ b/src/sessionmodel.cpp
@@ -16,20 +16,18 @@
 * Free Software Foundation, Inc.,
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 ***************************************************************************/
-
 #include "config.h"
 #include "sessionmodel.h"
 
+#include <memory>
+
 #include <QDir>
 #include <QFile>
 #include <QList>
 #include <QTextStream>
 
-#include <memory>
-
 #include <KLocalizedString>
 
-
 class Session {
 public:
     QString file;
diff --git a/src/sessionmodel.h b/src/sessionmodel.h
index e307d37b..9256a769 100644
--- a/src/sessionmodel.h
+++ b/src/sessionmodel.h
@@ -16,12 +16,10 @@
 * Free Software Foundation, Inc.,
 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 ***************************************************************************/
-
 #ifndef SDDM_SESSIONMODEL_H
 #define SDDM_SESSIONMODEL_H
 
 #include <QAbstractListModel>
-
 #include <QHash>
 
 class SessionModelPrivate;
diff --git a/src/themeconfig.cpp b/src/themeconfig.cpp
index d50cc016..83772ab2 100644
--- a/src/themeconfig.cpp
+++ b/src/themeconfig.cpp
@@ -14,28 +14,27 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+#include "config.h"
 #include "themeconfig.h"
 #include "ui_themeconfig.h"
 #include "themesmodel.h"
 #include "themesdelegate.h"
 
+#include <QDebug>
 #include <QFile>
+#include <QFileDialog>
+#include <QPointer>
 #include <QQuickView>
 #include <QQuickItem>
 #include <QQmlContext>
-#include <QDebug>
 #include <QStandardPaths>
-#include <QPointer>
-#include <QFileDialog>
 
-#include <KMessageBox>
-#include <KConfigGroup>
-#include <KNewStuff3/KNS3/DownloadDialog>
 #include <KAuthAction>
 #include <KAuthActionReply>
 #include <KAuthExecuteJob>
-
-#include "config.h"
+#include <KConfigGroup>
+#include <KMessageBox>
+#include <KNewStuff3/KNS3/DownloadDialog>
 
 ThemeConfig::ThemeConfig(const KSharedConfigPtr &config, QWidget *parent) :
     QWidget(parent),
diff --git a/src/thememetadata.cpp b/src/thememetadata.cpp
index 666e7705..909eae30 100644
--- a/src/thememetadata.cpp
+++ b/src/thememetadata.cpp
@@ -20,8 +20,8 @@
 #include <QSharedData>
 #include <QSharedPointer>
 
-#include <KDesktopFile>
 #include <KConfigGroup>
+#include <KDesktopFile>
 
 class ThemeMetadataPrivate : public QSharedData
 {
diff --git a/src/thememetadata.h b/src/thememetadata.h
index 51cb28a6..bba3fd72 100644
--- a/src/thememetadata.h
+++ b/src/thememetadata.h
@@ -18,8 +18,8 @@
 #ifndef THEMEMETADATA_H
 #define THEMEMETADATA_H
 
-#include <QString>
 #include <QSharedDataPointer>
+#include <QString>
 
 class ThemeMetadataPrivate;
 
diff --git a/src/themesdelegate.cpp b/src/themesdelegate.cpp
index 73530900..46f0973f 100644
--- a/src/themesdelegate.cpp
+++ b/src/themesdelegate.cpp
@@ -17,18 +17,17 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "themesdelegate.h"
+#include "themesmodel.h"
 
 #include <QApplication>
+#include <QDebug>
+#include <QFontDatabase>
 #include <QPainter>
 #include <QTextDocument>
 #include <QTime>
-#include <QDebug>
-#include <QFontDatabase>
 
 #include <KLocalizedString>
 
-#include "themesmodel.h"
-
 static const int BLUR_PAD = 6;
 
 ThemesDelegate::ThemesDelegate(QObject *parent)
diff --git a/src/themesmodel.cpp b/src/themesmodel.cpp
index 2c6cef42..968d3285 100644
--- a/src/themesmodel.cpp
+++ b/src/themesmodel.cpp
@@ -14,21 +14,18 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
-
+#include "config.h"
+#include "thememetadata.h"
 #include "themesmodel.h"
 
 #include <QDir>
+#include <QStandardPaths>
 #include <QString>
 
 #include <KConfig>
 #include <KConfigGroup>
 #include <QDebug>
 #include <KSharedConfig>
-#include <QStandardPaths>
-
-#include "config.h"
-#include "thememetadata.h"
 
 ThemesModel::ThemesModel(QObject *parent)
     : QAbstractListModel(parent)
diff --git a/src/usersmodel.cpp b/src/usersmodel.cpp
index e2d6855b..0e32ca34 100644
--- a/src/usersmodel.cpp
+++ b/src/usersmodel.cpp
@@ -14,11 +14,10 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-
 #include "usersmodel.h"
 
-#include <KUser>
 #include <KLocalizedString>
+#include <KUser>
 
 UsersModel::UsersModel(QObject *parent)
     : QAbstractListModel(parent)