[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [minuet/refactoring] src: Fix include order
From: Sandro S. Andrade <sandroandrade () kde ! org>
Date: 2016-07-01 1:35:29
Message-ID: E1bInMf-0003XJ-Ld () code ! kde ! org
[Download RAW message or body]
Git commit f2cb707a73e4dc319449b4ae3b86effd17d3cf62 by Sandro S. Andrade.
Committed on 01/07/2016 at 01:35.
Pushed by sandroandrade into branch 'refactoring'.
Fix include order
M +4 -4 src/app/main.cpp
M +2 -2 src/interfaces/icore.h
M +1 -1 src/interfaces/iexercisecontroller.cpp
M +3 -3 src/interfaces/iexercisecontroller.h
M +2 -2 src/interfaces/iplugin.h
M +2 -2 src/interfaces/iplugincontroller.h
M +1 -1 src/interfaces/isoundbackend.cpp
M +2 -2 src/interfaces/isoundbackend.h
M +2 -2 src/interfaces/iuicontroller.h
M +5 -5 src/plugins/drumsticksoundbackend/drumsticksoundbackend.cpp
M +2 -2 src/plugins/drumsticksoundbackend/drumsticksoundbackend.h
M +1 -1 src/shell/core.cpp
M +3 -4 src/shell/exercisecontroller.cpp
M +2 -2 src/shell/exercisecontroller.h
M +7 -11 src/shell/minuetmainwindow.cpp
M +2 -2 src/shell/plugincontroller.cpp
M +2 -2 src/shell/plugincontroller.h
M +2 -3 src/shell/uicontroller.h
M +2 -3 src/shell/wizard.cpp
M +1 -2 src/shell/wizard.h
http://commits.kde.org/minuet/f2cb707a73e4dc319449b4ae3b86effd17d3cf62
diff --git a/src/app/main.cpp b/src/app/main.cpp
index 18b0c0d..4ecd622 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -22,19 +22,19 @@
#include "minuet_version.h"
+#include <shell/core.h>
+
#include <KCrash>
#include <KAboutData>
#include <KLocalizedString>
-#include <QCommandLineParser>
-#include <QApplication>
#include <QIcon>
+#include <QApplication>
+#include <QCommandLineParser>
//#include <QQmlDebuggingEnabler>
//QQmlDebuggingEnabler enabler;
-#include <shell/core.h>
-
int main(int argc, char **argv)
{
QApplication application(argc, argv);
diff --git a/src/interfaces/icore.h b/src/interfaces/icore.h
index 1a38940..50567e9 100644
--- a/src/interfaces/icore.h
+++ b/src/interfaces/icore.h
@@ -23,10 +23,10 @@
#ifndef MINUET_ICORE_H
#define MINUET_ICORE_H
-#include <QtCore/QObject>
-
#include "minuetinterfacesexport.h"
+#include <QObject>
+
namespace Minuet
{
diff --git a/src/interfaces/iexercisecontroller.cpp \
b/src/interfaces/iexercisecontroller.cpp index 7a81f4e..5ba2a9a 100644
--- a/src/interfaces/iexercisecontroller.cpp
+++ b/src/interfaces/iexercisecontroller.cpp
@@ -22,7 +22,7 @@
#include "iexercisecontroller.h"
-#include <QtQml>
+#include <qqml.h>
namespace Minuet
{
diff --git a/src/interfaces/iexercisecontroller.h \
b/src/interfaces/iexercisecontroller.h index 028077d..49318f3 100644
--- a/src/interfaces/iexercisecontroller.h
+++ b/src/interfaces/iexercisecontroller.h
@@ -23,11 +23,11 @@
#ifndef MINUET_IEXERCISECONTROLLER_H
#define MINUET_IEXERCISECONTROLLER_H
-#include <QtCore/QObject>
-#include <QtCore/QJsonArray>
-
#include "minuetinterfacesexport.h"
+#include <QObject>
+#include <QJsonArray>
+
namespace Minuet
{
diff --git a/src/interfaces/iplugin.h b/src/interfaces/iplugin.h
index dcff0e0..f5c8470 100644
--- a/src/interfaces/iplugin.h
+++ b/src/interfaces/iplugin.h
@@ -23,10 +23,10 @@
#ifndef MINUET_IPLUGIN_H
#define MINUET_IPLUGIN_H
-#include <QtCore/QObject>
-
#include "minuetinterfacesexport.h"
+#include <QObject>
+
namespace Minuet
{
diff --git a/src/interfaces/iplugincontroller.h b/src/interfaces/iplugincontroller.h
index 98b57e7..9a440c6 100644
--- a/src/interfaces/iplugincontroller.h
+++ b/src/interfaces/iplugincontroller.h
@@ -23,10 +23,10 @@
#ifndef MINUET_IPLUGINCONTROLLER_H
#define MINUET_IPLUGINCONTROLLER_H
-#include <QtCore/QObject>
-
#include "minuetinterfacesexport.h"
+#include <QObject>
+
namespace Minuet
{
diff --git a/src/interfaces/isoundbackend.cpp b/src/interfaces/isoundbackend.cpp
index 8d6c19c..2b06af0 100644
--- a/src/interfaces/isoundbackend.cpp
+++ b/src/interfaces/isoundbackend.cpp
@@ -22,7 +22,7 @@
#include "isoundbackend.h"
-#include <QtQml>
+#include <qqml.h>
namespace Minuet
{
diff --git a/src/interfaces/isoundbackend.h b/src/interfaces/isoundbackend.h
index 091b892..9489061 100644
--- a/src/interfaces/isoundbackend.h
+++ b/src/interfaces/isoundbackend.h
@@ -25,10 +25,10 @@
#include "iplugin.h"
-#include <QJsonArray>
-
#include "minuetinterfacesexport.h"
+#include <QJsonArray>
+
namespace Minuet
{
diff --git a/src/interfaces/iuicontroller.h b/src/interfaces/iuicontroller.h
index 5628b48..1b4f297 100644
--- a/src/interfaces/iuicontroller.h
+++ b/src/interfaces/iuicontroller.h
@@ -23,10 +23,10 @@
#ifndef MINUET_IUICONTROLLER_H
#define MINUET_IUICONTROLLER_H
-#include <QtCore/QObject>
-
#include "minuetinterfacesexport.h"
+#include <QObject>
+
namespace Minuet
{
diff --git a/src/plugins/drumsticksoundbackend/drumsticksoundbackend.cpp \
b/src/plugins/drumsticksoundbackend/drumsticksoundbackend.cpp index 3da178d..7bf1db0 \
100644
--- a/src/plugins/drumsticksoundbackend/drumsticksoundbackend.cpp
+++ b/src/plugins/drumsticksoundbackend/drumsticksoundbackend.cpp
@@ -22,15 +22,15 @@
#include "drumsticksoundbackend.h"
-#include <QtMath>
-#include <QTime>
-#include <QJsonObject>
+#include "song.h"
+#include "midisequenceroutputthread.h"
#include <drumstick/alsaqueue.h>
#include <drumstick/alsaclient.h>
-#include "song.h"
-#include "midisequenceroutputthread.h"
+#include <QTime>
+#include <QtMath>
+#include <QJsonObject>
DrumstickSoundBackend::DrumstickSoundBackend(QObject *parent)
: Minuet::ISoundBackend(parent),
diff --git a/src/plugins/drumsticksoundbackend/drumsticksoundbackend.h \
b/src/plugins/drumsticksoundbackend/drumsticksoundbackend.h index 68f73ff..7808484 \
100644
--- a/src/plugins/drumsticksoundbackend/drumsticksoundbackend.h
+++ b/src/plugins/drumsticksoundbackend/drumsticksoundbackend.h
@@ -25,10 +25,10 @@
#include <interfaces/isoundbackend.h>
-#include <QLoggingCategory>
-
#include <KProcess>
+#include <QLoggingCategory>
+
Q_DECLARE_LOGGING_CATEGORY(MINUET)
Q_LOGGING_CATEGORY(MINUET, "minuet")
diff --git a/src/shell/core.cpp b/src/shell/core.cpp
index dac1d6d..7047842 100644
--- a/src/shell/core.cpp
+++ b/src/shell/core.cpp
@@ -22,9 +22,9 @@
#include "core.h"
+#include "uicontroller.h"
#include "plugincontroller.h"
#include "exercisecontroller.h"
-#include "uicontroller.h"
#include <interfaces/isoundbackend.h>
diff --git a/src/shell/exercisecontroller.cpp b/src/shell/exercisecontroller.cpp
index f6095d8..1594acf 100644
--- a/src/shell/exercisecontroller.cpp
+++ b/src/shell/exercisecontroller.cpp
@@ -22,17 +22,16 @@
#include "exercisecontroller.h"
+#include <drumstick/alsaevent.h>
+
#include <KLocalizedString>
#include <QDir>
+#include <qqml.h>
#include <QDateTime>
#include <QJsonDocument>
#include <QStandardPaths>
-#include <QtQml> // krazy:exclude=includes
-
-#include <drumstick/alsaevent.h>
-
namespace Minuet
{
diff --git a/src/shell/exercisecontroller.h b/src/shell/exercisecontroller.h
index 02f6881..bff0f3a 100644
--- a/src/shell/exercisecontroller.h
+++ b/src/shell/exercisecontroller.h
@@ -25,11 +25,11 @@
#include <interfaces/iexercisecontroller.h>
+#include "minuetshellexport.h"
+
#include <QStringList>
#include <QJsonObject>
-#include "minuetshellexport.h"
-
namespace Minuet
{
diff --git a/src/shell/minuetmainwindow.cpp b/src/shell/minuetmainwindow.cpp
index dc2b2a9..0e1fa77 100644
--- a/src/shell/minuetmainwindow.cpp
+++ b/src/shell/minuetmainwindow.cpp
@@ -23,28 +23,24 @@
#include "minuetmainwindow.h"
#include "wizard.h"
+#include "core.h"
-#include <KActionCollection>
#include <KMessageBox>
#include <KConfigDialog>
+#include <KActionCollection>
+#include <QTimer>
+#include <QPointer>
+#include <QToolBar>
#include <QQmlEngine>
+#include <QQuickView>
#include <QQmlContext>
+#include <QStringList>
#include <QLoggingCategory>
Q_DECLARE_LOGGING_CATEGORY(MINUET)
Q_LOGGING_CATEGORY(MINUET, "minuet")
-#include <QTimer>
-#include <QPointer>
-#include <QStringList>
-
-#include <QQuickView>
-
-#include <QToolBar>
-
-#include "core.h"
-
MinuetMainWindow::MinuetMainWindow(Minuet::Core *core, QWidget *parent, \
Qt::WindowFlags f) : KXmlGuiWindow(parent, f),
m_quickView(new QQuickView),
diff --git a/src/shell/plugincontroller.cpp b/src/shell/plugincontroller.cpp
index 74efd13..2c292aa 100644
--- a/src/shell/plugincontroller.cpp
+++ b/src/shell/plugincontroller.cpp
@@ -22,12 +22,12 @@
#include "plugincontroller.h"
-#include <KPluginLoader>
+#include "core.h"
#include <interfaces/iplugin.h>
#include <interfaces/isoundbackend.h>
-#include "core.h"
+#include <KPluginLoader>
#include <QDebug>
diff --git a/src/shell/plugincontroller.h b/src/shell/plugincontroller.h
index a2f5c6f..dd2bce3 100644
--- a/src/shell/plugincontroller.h
+++ b/src/shell/plugincontroller.h
@@ -25,10 +25,10 @@
#include <interfaces/iplugincontroller.h>
-#include <KPluginMetaData>
-
#include "minuetshellexport.h"
+#include <KPluginMetaData>
+
namespace Minuet
{
diff --git a/src/shell/uicontroller.h b/src/shell/uicontroller.h
index 0cd2163..07777ba 100644
--- a/src/shell/uicontroller.h
+++ b/src/shell/uicontroller.h
@@ -23,12 +23,11 @@
#ifndef MINUET_UICONTROLLER_H
#define MINUET_UICONTROLLER_H
-#include <interfaces/iuicontroller.h>
-
#include "minuetmainwindow.h"
-
#include "minuetshellexport.h"
+#include <interfaces/iuicontroller.h>
+
namespace Minuet
{
diff --git a/src/shell/wizard.cpp b/src/shell/wizard.cpp
index b7bf87b..038e0e6 100644
--- a/src/shell/wizard.cpp
+++ b/src/shell/wizard.cpp
@@ -27,11 +27,10 @@
#include <KLocalizedString>
#include <QTimer>
-#include <QDirIterator>
-#include <QStandardPaths>
-
#include <QLabel>
#include <QVBoxLayout>
+#include <QDirIterator>
+#include <QStandardPaths>
Wizard::Wizard(QWidget *parent, Qt::WindowFlags flags) :
QWizard(parent, flags),
diff --git a/src/shell/wizard.h b/src/shell/wizard.h
index 1f2fdb1..f761a41 100644
--- a/src/shell/wizard.h
+++ b/src/shell/wizard.h
@@ -25,9 +25,8 @@
#include "ui_wizardsystemcheck.h"
-#include <QPainter>
-
#include <QWizard>
+#include <QPainter>
#include <QItemDelegate>
class WizardDelegate: public QItemDelegate
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic