From a5c9d0d2dde1b4bb3fdd455b1d11459e5e71744b Mon Sep 17 00:00:00 2001 From: laserpants Date: Sun, 19 Jun 2016 17:27:21 +0300 Subject: [PATCH] make include order consistent --- components/appbar.cpp | 2 +- components/avatar.cpp | 2 +- components/badge.cpp | 2 +- components/badge_p.h | 2 ++ components/checkbox.cpp | 2 +- components/checkbox_p.h | 2 ++ components/circularprogress.cpp | 2 +- components/dialog.cpp | 2 +- components/fab.cpp | 2 +- components/fab_p.h | 1 + components/flatbutton.cpp | 2 +- components/iconbutton.cpp | 2 +- components/iconmenu.cpp | 2 +- components/list.cpp | 2 +- components/menu.cpp | 2 +- components/progress.cpp | 2 +- components/radiobutton.cpp | 2 +- components/radiobutton_p.h | 2 ++ components/raisedbutton.cpp | 2 +- components/raisedbutton_p.h | 1 + components/scrollwidget.cpp | 2 +- components/scrollwidget_p.h | 1 + components/slider.cpp | 2 +- components/snackbar.cpp | 2 +- components/snackbar_p.h | 1 + components/table.cpp | 2 +- components/tabs.cpp | 2 +- components/textfield.cpp | 2 +- components/textfield_p.h | 1 + components/toggle.cpp | 2 +- components/toggle_internal.cpp | 2 +- components/toggle_p.h | 1 + lib/checkable.cpp | 2 +- lib/rippleoverlay.cpp | 2 +- lib/scaleeffect.cpp | 2 +- lib/theme.cpp | 2 +- 36 files changed, 39 insertions(+), 27 deletions(-) diff --git a/components/appbar.cpp b/components/appbar.cpp index 5ab6a4b..ad28cf7 100644 --- a/components/appbar.cpp +++ b/components/appbar.cpp @@ -1,7 +1,7 @@ +#include "appbar.h" #include #include #include -#include "appbar.h" #include "lib/customshadoweffect.h" AppBar::AppBar(QWidget *parent) diff --git a/components/avatar.cpp b/components/avatar.cpp index 23ef44c..b6c028d 100644 --- a/components/avatar.cpp +++ b/components/avatar.cpp @@ -1,5 +1,5 @@ -#include "avatar_p.h" #include "avatar.h" +#include "avatar_p.h" #include #include #include diff --git a/components/badge.cpp b/components/badge.cpp index a88c183..cc291bf 100644 --- a/components/badge.cpp +++ b/components/badge.cpp @@ -1,9 +1,9 @@ #include "badge.h" +#include "badge_p.h" #include #include #include #include -#include "badge_p.h" #include "lib/style.h" BadgePrivate::BadgePrivate(Badge *q) diff --git a/components/badge_p.h b/components/badge_p.h index da316f9..0655777 100644 --- a/components/badge_p.h +++ b/components/badge_p.h @@ -2,6 +2,8 @@ #define BADGE_P_H #include +#include +#include class Badge; diff --git a/components/checkbox.cpp b/components/checkbox.cpp index df1918a..d68c93d 100644 --- a/components/checkbox.cpp +++ b/components/checkbox.cpp @@ -1,4 +1,5 @@ #include "checkbox.h" +#include "checkbox_p.h" #include #include #include @@ -6,7 +7,6 @@ #include #include #include -#include "checkbox_p.h" CheckBoxPrivate::CheckBoxPrivate(CheckBox *q) : CheckablePrivate(q) diff --git a/components/checkbox_p.h b/components/checkbox_p.h index 09a2dc0..3678fca 100644 --- a/components/checkbox_p.h +++ b/components/checkbox_p.h @@ -3,6 +3,8 @@ #include "lib/checkable_p.h" +class CheckBox; + class CheckBoxPrivate : public CheckablePrivate { Q_DISABLE_COPY(CheckBoxPrivate) diff --git a/components/circularprogress.cpp b/components/circularprogress.cpp index b8754d0..db51387 100644 --- a/components/circularprogress.cpp +++ b/components/circularprogress.cpp @@ -1,9 +1,9 @@ #include "circularprogress.h" +#include "circularprogress_p.h" #include #include #include #include -#include "circularprogress_p.h" #include "circularprogress_internal.h" #include "lib/style.h" diff --git a/components/dialog.cpp b/components/dialog.cpp index 8ceb75d..fdc3265 100644 --- a/components/dialog.cpp +++ b/components/dialog.cpp @@ -1,5 +1,5 @@ -#include "dialog_p.h" #include "dialog.h" +#include "dialog_p.h" #include #include #include "dialog_internal.h" diff --git a/components/fab.cpp b/components/fab.cpp index 438540b..b9533cf 100644 --- a/components/fab.cpp +++ b/components/fab.cpp @@ -1,7 +1,7 @@ #include "fab.h" +#include "fab_p.h" #include #include -#include "fab_p.h" FloatingActionButtonPrivate::FloatingActionButtonPrivate(FloatingActionButton *q) : RaisedButtonPrivate(q), diff --git a/components/fab_p.h b/components/fab_p.h index a7f7f64..2696b6f 100644 --- a/components/fab_p.h +++ b/components/fab_p.h @@ -2,6 +2,7 @@ #define FAB_P_H #include "raisedbutton_p.h" +#include "fab.h" class FloatingActionButtonPrivate : public RaisedButtonPrivate { diff --git a/components/flatbutton.cpp b/components/flatbutton.cpp index ac0fc43..59269e7 100644 --- a/components/flatbutton.cpp +++ b/components/flatbutton.cpp @@ -1,4 +1,5 @@ #include "flatbutton.h" +#include "flatbutton_p.h" #include #include #include @@ -7,7 +8,6 @@ #include #include "lib/rippleoverlay.h" #include "lib/ripple.h" -#include "flatbutton_p.h" FlatButtonPrivate::FlatButtonPrivate(FlatButton *q) : q_ptr(q), diff --git a/components/iconbutton.cpp b/components/iconbutton.cpp index 9996dd2..08c9daa 100644 --- a/components/iconbutton.cpp +++ b/components/iconbutton.cpp @@ -1,7 +1,7 @@ #include "iconbutton.h" +#include "iconbutton_p.h" #include #include -#include "iconbutton_p.h" #include "lib/style.h" #include "lib/rippleoverlay.h" diff --git a/components/iconmenu.cpp b/components/iconmenu.cpp index e6b6915..0434f03 100644 --- a/components/iconmenu.cpp +++ b/components/iconmenu.cpp @@ -1,9 +1,9 @@ +#include "iconmenu.h" #include #include #include #include #include -#include "iconmenu.h" #include "menu.h" //#include "lib/scaleeffect.h" diff --git a/components/list.cpp b/components/list.cpp index 1356242..0e29040 100644 --- a/components/list.cpp +++ b/components/list.cpp @@ -1,6 +1,6 @@ +#include "list.h" #include #include -#include "list.h" List::List(QWidget *parent) : QWidget(parent) diff --git a/components/menu.cpp b/components/menu.cpp index 6e26b60..249749b 100644 --- a/components/menu.cpp +++ b/components/menu.cpp @@ -1,8 +1,8 @@ +#include "menu.h" #include #include #include #include -#include "menu.h" MenuItem::MenuItem(QWidget *parent) : FlatButton(parent) diff --git a/components/progress.cpp b/components/progress.cpp index 1164c4e..c913862 100644 --- a/components/progress.cpp +++ b/components/progress.cpp @@ -1,8 +1,8 @@ #include "progress.h" +#include "progress_p.h" #include #include #include -#include "progress_p.h" #include "progress_internal.h" #include "lib/style.h" diff --git a/components/radiobutton.cpp b/components/radiobutton.cpp index d1361f4..6bab9e6 100644 --- a/components/radiobutton.cpp +++ b/components/radiobutton.cpp @@ -1,4 +1,5 @@ #include "radiobutton.h" +#include "radiobutton_p.h" #include #include #include @@ -6,7 +7,6 @@ #include #include #include -#include "radiobutton_p.h" RadioButtonPrivate::RadioButtonPrivate(RadioButton *q) : CheckablePrivate(q) diff --git a/components/radiobutton_p.h b/components/radiobutton_p.h index 5273259..7670303 100644 --- a/components/radiobutton_p.h +++ b/components/radiobutton_p.h @@ -3,6 +3,8 @@ #include "lib/checkable_p.h" +class RadioButton; + class RadioButtonPrivate : public CheckablePrivate { Q_DISABLE_COPY(RadioButtonPrivate) diff --git a/components/raisedbutton.cpp b/components/raisedbutton.cpp index 07c35eb..1c74f34 100644 --- a/components/raisedbutton.cpp +++ b/components/raisedbutton.cpp @@ -1,4 +1,5 @@ #include "raisedbutton.h" +#include "raisedbutton_p.h" #include #include #include @@ -8,7 +9,6 @@ #include #include #include -#include "raisedbutton_p.h" RaisedButtonPrivate::RaisedButtonPrivate(RaisedButton *q) : FlatButtonPrivate(q) diff --git a/components/raisedbutton_p.h b/components/raisedbutton_p.h index de016eb..a09ee46 100644 --- a/components/raisedbutton_p.h +++ b/components/raisedbutton_p.h @@ -2,6 +2,7 @@ #define RAISEDBUTTON_P_H #include "flatbutton_p.h" +#include "raisedbutton.h" class QGraphicsDropShadowEffect; diff --git a/components/scrollwidget.cpp b/components/scrollwidget.cpp index c95e279..d6e2349 100644 --- a/components/scrollwidget.cpp +++ b/components/scrollwidget.cpp @@ -1,7 +1,7 @@ #include "scrollwidget.h" +#include "scrollwidget_p.h" #include #include -#include "scrollwidget_p.h" #include "scrollwidget_internal.h" #include "lib/style.h" diff --git a/components/scrollwidget_p.h b/components/scrollwidget_p.h index 3693e87..1ade357 100644 --- a/components/scrollwidget_p.h +++ b/components/scrollwidget_p.h @@ -2,6 +2,7 @@ #define SCROLLWIDGET_P_H #include +#include class ScrollBar; class ScrollBarStateMachine; diff --git a/components/slider.cpp b/components/slider.cpp index ec6ed2d..45d9205 100644 --- a/components/slider.cpp +++ b/components/slider.cpp @@ -1,10 +1,10 @@ #include "slider.h" +#include "slider_p.h" #include #include #include #include #include -#include "slider_p.h" void SliderPrivate::init() { diff --git a/components/snackbar.cpp b/components/snackbar.cpp index 4429be7..5b1251f 100644 --- a/components/snackbar.cpp +++ b/components/snackbar.cpp @@ -1,8 +1,8 @@ #include "snackbar.h" +#include "snackbar_p.h" #include #include #include -#include "snackbar_p.h" #include "snackbar_internal.h" SnackbarPrivate::SnackbarPrivate(Snackbar *q) diff --git a/components/snackbar_p.h b/components/snackbar_p.h index 8b863f3..4f80ac1 100644 --- a/components/snackbar_p.h +++ b/components/snackbar_p.h @@ -2,6 +2,7 @@ #define SNACKBAR_P_H #include +#include class Snackbar; class SnackbarStateMachine; diff --git a/components/table.cpp b/components/table.cpp index d7d2b38..f0a07a2 100644 --- a/components/table.cpp +++ b/components/table.cpp @@ -1,7 +1,7 @@ +#include "table.h" #include #include #include -#include "table.h" #include "lib/style.h" Table::Table(QWidget *parent) diff --git a/components/tabs.cpp b/components/tabs.cpp index 47d4797..12fb7d1 100644 --- a/components/tabs.cpp +++ b/components/tabs.cpp @@ -1,8 +1,8 @@ #include "tabs.h" +#include "tabs_p.h" #include #include #include -#include "tabs_p.h" #include "tabs_internal.h" #include "lib/ripple.h" #include "lib/style.h" diff --git a/components/textfield.cpp b/components/textfield.cpp index e213034..e5b3fe3 100644 --- a/components/textfield.cpp +++ b/components/textfield.cpp @@ -1,8 +1,8 @@ #include "textfield.h" +#include "textfield_p.h" #include #include #include -#include "textfield_p.h" #include "textfield_internal.h" #include "lib/style.h" diff --git a/components/textfield_p.h b/components/textfield_p.h index f892085..a046377 100644 --- a/components/textfield_p.h +++ b/components/textfield_p.h @@ -2,6 +2,7 @@ #define TEXTFIELD_P_H #include +#include class TextField; class TextFieldStateMachine; diff --git a/components/toggle.cpp b/components/toggle.cpp index 97c054f..6587105 100644 --- a/components/toggle.cpp +++ b/components/toggle.cpp @@ -1,4 +1,5 @@ #include "toggle.h" +#include "toggle_p.h" #include #include #include @@ -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) diff --git a/components/toggle_internal.cpp b/components/toggle_internal.cpp index d051ad4..f0787dc 100644 --- a/components/toggle_internal.cpp +++ b/components/toggle_internal.cpp @@ -1,9 +1,9 @@ +#include "toggle_internal.h" #include #include #include #include "lib/style.h" #include "lib/rippleoverlay.h" -#include "toggle_internal.h" #include "toggle.h" #include "toggle_p.h" diff --git a/components/toggle_p.h b/components/toggle_p.h index 9a4e07e..7cc2306 100644 --- a/components/toggle_p.h +++ b/components/toggle_p.h @@ -2,6 +2,7 @@ #define TOGGLE_P_H #include +#include class RippleOverlay; class Toggle; diff --git a/lib/checkable.cpp b/lib/checkable.cpp index 549b2ee..b4e10bb 100644 --- a/lib/checkable.cpp +++ b/lib/checkable.cpp @@ -1,4 +1,5 @@ #include "checkable.h" +#include "checkable_p.h" #include #include #include @@ -7,7 +8,6 @@ #include #include #include -#include "checkable_p.h" #include "lib/rippleoverlay.h" #include "lib/style.h" #include "lib/ripple.h" diff --git a/lib/rippleoverlay.cpp b/lib/rippleoverlay.cpp index 78572a1..6e7a3b3 100644 --- a/lib/rippleoverlay.cpp +++ b/lib/rippleoverlay.cpp @@ -1,6 +1,6 @@ +#include "rippleoverlay.h" #include #include -#include "rippleoverlay.h" #include "ripple.h" RippleOverlay::RippleOverlay(QWidget *parent) diff --git a/lib/scaleeffect.cpp b/lib/scaleeffect.cpp index 802a71b..bce13eb 100644 --- a/lib/scaleeffect.cpp +++ b/lib/scaleeffect.cpp @@ -1,5 +1,5 @@ -#include #include "scaleeffect.h" +#include ScaleEffect::ScaleEffect(QObject *parent) : QGraphicsEffect(parent), diff --git a/lib/theme.cpp b/lib/theme.cpp index d1d3a18..f585948 100644 --- a/lib/theme.cpp +++ b/lib/theme.cpp @@ -1,6 +1,6 @@ #include "theme.h" -#include #include "theme_p.h" +#include QColor ThemePrivate::rgba(int r, int g, int b, qreal a) const {