make include order consistent

components/appbar.cpp

@@ -1,7 +1,7 @@
+#include "appbar.h"
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QPainter>
-#include "appbar.h"
 #include "lib/customshadoweffect.h"
 
 AppBar::AppBar(QWidget *parent)

components/avatar.cpp

@@ -1,5 +1,5 @@
-#include "avatar_p.h"
 #include "avatar.h"
+#include "avatar_p.h"
 #include <QWidget>
 #include <QPainter>
 #include <QIcon>

components/badge.cpp

@@ -1,9 +1,9 @@
 #include "badge.h"
+#include "badge_p.h"
 #include <QPainter>
 #include <QIcon>
 #include <QEvent>
 #include <QDebug>
-#include "badge_p.h"
 #include "lib/style.h"
 
 BadgePrivate::BadgePrivate(Badge *q)

components/badge_p.h

@@ -2,6 +2,8 @@
 #define BADGE_P_H
 
 #include <QObject>
+#include <QSize>
+#include <QIcon>
 
 class Badge;
 

components/checkbox.cpp

@@ -1,4 +1,5 @@
 #include "checkbox.h"
+#include "checkbox_p.h"
 #include <QStateMachine>
 #include <QEvent>
 #include <QSignalTransition>
@@ -6,7 +7,6 @@
 #include <QPropertyAnimation>
 #include <QApplication>
 #include <QDebug>
-#include "checkbox_p.h"
 
 CheckBoxPrivate::CheckBoxPrivate(CheckBox *q)
     : CheckablePrivate(q)

components/checkbox_p.h

@@ -3,6 +3,8 @@
 
 #include "lib/checkable_p.h"
 
+class CheckBox;
+
 class CheckBoxPrivate : public CheckablePrivate
 {
     Q_DISABLE_COPY(CheckBoxPrivate)

components/circularprogress.cpp

@@ -1,9 +1,9 @@
 #include "circularprogress.h"
+#include "circularprogress_p.h"
 #include <QPainter>
 #include <QPropertyAnimation>
 #include <QSequentialAnimationGroup>
 #include <QParallelAnimationGroup>
-#include "circularprogress_p.h"
 #include "circularprogress_internal.h"
 #include "lib/style.h"
 

components/dialog.cpp

@@ -1,5 +1,5 @@
-#include "dialog_p.h"
 #include "dialog.h"
+#include "dialog_p.h"
 #include <QEvent>
 #include <QPainter>
 #include "dialog_internal.h"

components/fab.cpp

@@ -1,7 +1,7 @@
 #include "fab.h"
+#include "fab_p.h"
 #include <QPainter>
 #include <QGraphicsDropShadowEffect>
-#include "fab_p.h"
 
 FloatingActionButtonPrivate::FloatingActionButtonPrivate(FloatingActionButton *q)
     : RaisedButtonPrivate(q),

components/fab_p.h

@@ -2,6 +2,7 @@
 #define FAB_P_H
 
 #include "raisedbutton_p.h"
+#include "fab.h"
 
 class FloatingActionButtonPrivate : public RaisedButtonPrivate
 {

components/flatbutton.cpp

@@ -1,4 +1,5 @@
 #include "flatbutton.h"
+#include "flatbutton_p.h"
 #include <QPainter>
 #include <QMouseEvent>
 #include <QStylePainter>
@@ -7,7 +8,6 @@
 #include <QDebug>
 #include "lib/rippleoverlay.h"
 #include "lib/ripple.h"
-#include "flatbutton_p.h"
 
 FlatButtonPrivate::FlatButtonPrivate(FlatButton *q)
     : q_ptr(q),

components/iconbutton.cpp

@@ -1,7 +1,7 @@
 #include "iconbutton.h"
+#include "iconbutton_p.h"
 #include <QPainter>
 #include <QEvent>
-#include "iconbutton_p.h"
 #include "lib/style.h"
 #include "lib/rippleoverlay.h"
 

components/iconmenu.cpp

@@ -1,9 +1,9 @@
+#include "iconmenu.h"
 #include <QEvent>
 #include <QLayout>
 #include <QPropertyAnimation>
 #include <QDebug>
 #include <QPainter>
-#include "iconmenu.h"
 #include "menu.h"
 //#include "lib/scaleeffect.h"
 

components/list.cpp

@@ -1,6 +1,6 @@
+#include "list.h"
 #include <QWidget>
 #include <QPainter>
-#include "list.h"
 
 List::List(QWidget *parent)
     : QWidget(parent)

components/menu.cpp

@@ -1,8 +1,8 @@
+#include "menu.h"
 #include <QWidget>
 #include <QVBoxLayout>
 #include <QPainter>
 #include <QGraphicsDropShadowEffect>
-#include "menu.h"
 
 MenuItem::MenuItem(QWidget *parent)
     : FlatButton(parent)

components/progress.cpp

@@ -1,8 +1,8 @@
 #include "progress.h"
+#include "progress_p.h"
 #include <QPainter>
 #include <QPropertyAnimation>
 #include <QDebug>
-#include "progress_p.h"
 #include "progress_internal.h"
 #include "lib/style.h"
 

components/radiobutton.cpp

@@ -1,4 +1,5 @@
 #include "radiobutton.h"
+#include "radiobutton_p.h"
 #include <QStateMachine>
 #include <QEvent>
 #include <QSignalTransition>
@@ -6,7 +7,6 @@
 #include <QPropertyAnimation>
 #include <QApplication>
 #include <QDebug>
-#include "radiobutton_p.h"
 
 RadioButtonPrivate::RadioButtonPrivate(RadioButton *q)
     : CheckablePrivate(q)

components/radiobutton_p.h

@@ -3,6 +3,8 @@
 
 #include "lib/checkable_p.h"
 
+class RadioButton;
+
 class RadioButtonPrivate : public CheckablePrivate
 {
     Q_DISABLE_COPY(RadioButtonPrivate)

components/raisedbutton.cpp

@@ -1,4 +1,5 @@
 #include "raisedbutton.h"
+#include "raisedbutton_p.h"
 #include <QGraphicsDropShadowEffect>
 #include <QEventTransition>
 #include <QSignalTransition>
@@ -8,7 +9,6 @@
 #include <QStyleOption>
 #include <QMouseEvent>
 #include <QDebug>
-#include "raisedbutton_p.h"
 
 RaisedButtonPrivate::RaisedButtonPrivate(RaisedButton *q)
     : FlatButtonPrivate(q)

components/raisedbutton_p.h

@@ -2,6 +2,7 @@
 #define RAISEDBUTTON_P_H
 
 #include "flatbutton_p.h"
+#include "raisedbutton.h"
 
 class QGraphicsDropShadowEffect;
 

components/scrollwidget.cpp

@@ -1,7 +1,7 @@
 #include "scrollwidget.h"
+#include "scrollwidget_p.h"
 #include <QPainter>
 #include <QApplication>
-#include "scrollwidget_p.h"
 #include "scrollwidget_internal.h"
 #include "lib/style.h"
 

components/scrollwidget_p.h

@@ -2,6 +2,7 @@
 #define SCROLLWIDGET_P_H
 
 #include <QObject>
+#include <QColor>
 
 class ScrollBar;
 class ScrollBarStateMachine;

components/slider.cpp

@@ -1,10 +1,10 @@
 #include "slider.h"
+#include "slider_p.h"
 #include <QPainter>
 #include <QPropertyAnimation>
 #include <QStringBuilder>
 #include <QMouseEvent>
 #include <QApplication>
-#include "slider_p.h"
 
 void SliderPrivate::init()
 {

components/snackbar.cpp

@@ -1,8 +1,8 @@
 #include "snackbar.h"
+#include "snackbar_p.h"
 #include <QPainter>
 #include <QEvent>
 #include <QDebug>
-#include "snackbar_p.h"
 #include "snackbar_internal.h"
 
 SnackbarPrivate::SnackbarPrivate(Snackbar *q)

components/snackbar_p.h

@@ -2,6 +2,7 @@
 #define SNACKBAR_P_H
 
 #include <QObject>
+#include <QColor>
 
 class Snackbar;
 class SnackbarStateMachine;

components/table.cpp

@@ -1,7 +1,7 @@
+#include "table.h"
 #include <QDebug>
 #include <QEvent>
 #include <QHeaderView>
-#include "table.h"
 #include "lib/style.h"
 
 Table::Table(QWidget *parent)

components/tabs.cpp

@@ -1,8 +1,8 @@
 #include "tabs.h"
+#include "tabs_p.h"
 #include <QHBoxLayout>
 #include <QPainter>
 #include <QPropertyAnimation>
-#include "tabs_p.h"
 #include "tabs_internal.h"
 #include "lib/ripple.h"
 #include "lib/style.h"

components/textfield.cpp

@@ -1,8 +1,8 @@
 #include "textfield.h"
+#include "textfield_p.h"
 #include <QPainter>
 #include <QPaintEvent>
 #include <QApplication>
-#include "textfield_p.h"
 #include "textfield_internal.h"
 #include "lib/style.h"
 

components/textfield_p.h

@@ -2,6 +2,7 @@
 #define TEXTFIELD_P_H
 
 #include <QObject>
+#include <QColor>
 
 class TextField;
 class TextFieldStateMachine;

components/toggle.cpp

@@ -1,4 +1,5 @@
 #include "toggle.h"
+#include "toggle_p.h"
 #include <QPainter>
 #include <QState>
 #include <QSignalTransition>
@@ -8,7 +9,6 @@
 #include "lib/rippleoverlay.h"
 #include "lib/ripple.h"
 #include "lib/style.h"
-#include "toggle_p.h"
 #include "toggle_internal.h"
 
 TogglePrivate::TogglePrivate(Toggle *q)

components/toggle_internal.cpp

@@ -1,9 +1,9 @@
+#include "toggle_internal.h"
 #include <QPainter>
 #include <QEvent>
 #include <QGraphicsDropShadowEffect>
 #include "lib/style.h"
 #include "lib/rippleoverlay.h"
-#include "toggle_internal.h"
 #include "toggle.h"
 #include "toggle_p.h"
 

components/toggle_p.h

@@ -2,6 +2,7 @@
 #define TOGGLE_P_H
 
 #include <QStateMachine>
+#include <QColor>
 
 class RippleOverlay;
 class Toggle;

lib/checkable.cpp

@@ -1,4 +1,5 @@
 #include "checkable.h"
+#include "checkable_p.h"
 #include <QPainter>
 #include <QEvent>
 #include <QStateMachine>
@@ -7,7 +8,6 @@
 #include <QPropertyAnimation>
 #include <QApplication>
 #include <QDebug>
-#include "checkable_p.h"
 #include "lib/rippleoverlay.h"
 #include "lib/style.h"
 #include "lib/ripple.h"

lib/rippleoverlay.cpp

@@ -1,6 +1,6 @@
+#include "rippleoverlay.h"
 #include <QDebug>
 #include <QPainter>
-#include "rippleoverlay.h"
 #include "ripple.h"
 
 RippleOverlay::RippleOverlay(QWidget *parent)

lib/scaleeffect.cpp

@@ -1,5 +1,5 @@
-#include <QPainter>
 #include "scaleeffect.h"
+#include <QPainter>
 
 ScaleEffect::ScaleEffect(QObject *parent)
     : QGraphicsEffect(parent),

lib/theme.cpp

@@ -1,6 +1,6 @@
 #include "theme.h"
-#include <QDebug>
 #include "theme_p.h"
+#include <QDebug>
 
 QColor ThemePrivate::rgba(int r, int g, int b, qreal a) const
 {