From 6d96e6b1aece9007c1542f3844b309e64a7f4c70 Mon Sep 17 00:00:00 2001 From: johanneshilden Date: Wed, 4 Oct 2017 13:56:50 +0300 Subject: [PATCH] Use <> in include statements instead of quotes for library headers --- examples/avatarsettingseditor.cpp | 4 ++-- examples/badgesettingseditor.cpp | 4 ++-- examples/checkboxsettingseditor.cpp | 2 +- examples/circularprogresssettingseditor.cpp | 2 +- examples/dialogsettingseditor.cpp | 2 +- examples/drawersettingseditor.cpp | 2 +- examples/examples.pro | 7 +++---- examples/fabsettingseditor.cpp | 2 +- examples/flatbuttonsettingseditor.cpp | 2 +- examples/iconbuttonsettingseditor.cpp | 4 ++-- examples/progresssettingseditor.cpp | 4 ++-- examples/radiobuttonsettingseditor.cpp | 2 +- examples/raisedbuttonsettingseditor.cpp | 2 +- examples/scrollbarsettingseditor.cpp | 2 +- examples/slidersettingseditor.cpp | 2 +- examples/snackbarsettingseditor.cpp | 2 +- examples/tabssettingseditor.cpp | 2 +- examples/textfieldsettingseditor.cpp | 2 +- examples/togglesettingseditor.cpp | 2 +- 19 files changed, 25 insertions(+), 26 deletions(-) diff --git a/examples/avatarsettingseditor.cpp b/examples/avatarsettingseditor.cpp index 86edfda..1720480 100644 --- a/examples/avatarsettingseditor.cpp +++ b/examples/avatarsettingseditor.cpp @@ -1,7 +1,7 @@ #include "avatarsettingseditor.h" #include -#include "qtmaterialavatar.h" -#include "lib/qtmaterialtheme.h" +#include +#include AvatarSettingsEditor::AvatarSettingsEditor(QWidget *parent) : QWidget(parent), diff --git a/examples/badgesettingseditor.cpp b/examples/badgesettingseditor.cpp index cb8e578..4b52146 100644 --- a/examples/badgesettingseditor.cpp +++ b/examples/badgesettingseditor.cpp @@ -1,7 +1,7 @@ #include "badgesettingseditor.h" #include -#include "qtmaterialavatar.h" -#include "qtmaterialbadge.h" +#include +#include BadgeSettingsEditor::BadgeSettingsEditor(QWidget *parent) : QWidget(parent), diff --git a/examples/checkboxsettingseditor.cpp b/examples/checkboxsettingseditor.cpp index bcf37f1..2e4037d 100644 --- a/examples/checkboxsettingseditor.cpp +++ b/examples/checkboxsettingseditor.cpp @@ -1,7 +1,7 @@ #include "checkboxsettingseditor.h" #include #include -#include "qtmaterialcheckbox.h" +#include CheckBoxSettingsEditor::CheckBoxSettingsEditor(QWidget *parent) : QWidget(parent), diff --git a/examples/circularprogresssettingseditor.cpp b/examples/circularprogresssettingseditor.cpp index bdc1bae..8c049fc 100644 --- a/examples/circularprogresssettingseditor.cpp +++ b/examples/circularprogresssettingseditor.cpp @@ -1,7 +1,7 @@ #include "circularprogresssettingseditor.h" #include #include -#include "qtmaterialcircularprogress.h" +#include CircularProgressSettingsEditor::CircularProgressSettingsEditor(QWidget *parent) : QWidget(parent), diff --git a/examples/dialogsettingseditor.cpp b/examples/dialogsettingseditor.cpp index 611aba2..9c0ac89 100644 --- a/examples/dialogsettingseditor.cpp +++ b/examples/dialogsettingseditor.cpp @@ -1,7 +1,7 @@ #include "dialogsettingseditor.h" #include #include -#include "qtmaterialdialog.h" +#include DialogSettingsEditor::DialogSettingsEditor(QWidget *parent) : QWidget(parent), diff --git a/examples/drawersettingseditor.cpp b/examples/drawersettingseditor.cpp index a90396a..e90773e 100644 --- a/examples/drawersettingseditor.cpp +++ b/examples/drawersettingseditor.cpp @@ -1,7 +1,7 @@ #include "drawersettingseditor.h" #include #include -#include "qtmaterialdrawer.h" +#include DrawerSettingsEditor::DrawerSettingsEditor(QWidget *parent) : QWidget(parent), diff --git a/examples/examples.pro b/examples/examples.pro index 837ca3c..80cb451 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -40,10 +40,9 @@ HEADERS = mainwindow.h \ dialogsettingseditor.h \ drawersettingseditor.h \ scrollbarsettingseditor.h -LIBS += ../components/libcomponents.a -INCLUDEPATH += ../components/ -TARGET = ../examples-exe -PRE_TARGETDEPS += ../components/libcomponents.a +LIBS += $$top_builddir/components/libcomponents.a +INCLUDEPATH += $$top_srcdir/components/ +TARGET = $$top_builddir/examples-exe RESOURCES += \ examples.qrc diff --git a/examples/fabsettingseditor.cpp b/examples/fabsettingseditor.cpp index c68beaa..efbceed 100644 --- a/examples/fabsettingseditor.cpp +++ b/examples/fabsettingseditor.cpp @@ -2,7 +2,7 @@ #include #include #include -#include "qtmaterialfab.h" +#include FloatingActionButtonSettingsEditor::FloatingActionButtonSettingsEditor(QWidget *parent) : QWidget(parent), diff --git a/examples/flatbuttonsettingseditor.cpp b/examples/flatbuttonsettingseditor.cpp index e4d03c2..43fee7d 100644 --- a/examples/flatbuttonsettingseditor.cpp +++ b/examples/flatbuttonsettingseditor.cpp @@ -1,6 +1,6 @@ #include "flatbuttonsettingseditor.h" #include -#include "qtmaterialflatbutton.h" +#include FlatButtonSettingsEditor::FlatButtonSettingsEditor(QWidget *parent) : QWidget(parent), diff --git a/examples/iconbuttonsettingseditor.cpp b/examples/iconbuttonsettingseditor.cpp index 768b68f..4dbc518 100644 --- a/examples/iconbuttonsettingseditor.cpp +++ b/examples/iconbuttonsettingseditor.cpp @@ -1,7 +1,7 @@ #include "iconbuttonsettingseditor.h" #include -#include "qtmaterialiconbutton.h" -#include "lib/qtmaterialtheme.h" +#include +#include IconButtonSettingsEditor::IconButtonSettingsEditor(QWidget *parent) : QWidget(parent), diff --git a/examples/progresssettingseditor.cpp b/examples/progresssettingseditor.cpp index 83ac4e7..401eb57 100644 --- a/examples/progresssettingseditor.cpp +++ b/examples/progresssettingseditor.cpp @@ -1,7 +1,7 @@ #include "progresssettingseditor.h" #include -#include "qtmaterialprogress.h" -#include "lib/qtmaterialtheme.h" +#include +#include ProgressSettingsEditor::ProgressSettingsEditor(QWidget *parent) : QWidget(parent), diff --git a/examples/radiobuttonsettingseditor.cpp b/examples/radiobuttonsettingseditor.cpp index 05284c9..2a039ce 100644 --- a/examples/radiobuttonsettingseditor.cpp +++ b/examples/radiobuttonsettingseditor.cpp @@ -2,7 +2,7 @@ #include #include #include -#include "qtmaterialradiobutton.h" +#include RadioButtonSettingsEditor::RadioButtonSettingsEditor(QWidget *parent) : QWidget(parent), diff --git a/examples/raisedbuttonsettingseditor.cpp b/examples/raisedbuttonsettingseditor.cpp index b747bbf..3dc41e0 100644 --- a/examples/raisedbuttonsettingseditor.cpp +++ b/examples/raisedbuttonsettingseditor.cpp @@ -1,5 +1,5 @@ #include "raisedbuttonsettingseditor.h" -#include "qtmaterialraisedbutton.h" +#include RaisedButtonSettingsEditor::RaisedButtonSettingsEditor(QWidget *parent) : FlatButtonSettingsEditor(new QtMaterialRaisedButton("Rise up"), parent) diff --git a/examples/scrollbarsettingseditor.cpp b/examples/scrollbarsettingseditor.cpp index 5ea55d4..8c0df9b 100644 --- a/examples/scrollbarsettingseditor.cpp +++ b/examples/scrollbarsettingseditor.cpp @@ -2,7 +2,7 @@ #include #include #include -#include "qtmaterialscrollbar.h" +#include ScrollBarSettingsEditor::ScrollBarSettingsEditor(QWidget *parent) : QWidget(parent), diff --git a/examples/slidersettingseditor.cpp b/examples/slidersettingseditor.cpp index d066543..2911fdb 100644 --- a/examples/slidersettingseditor.cpp +++ b/examples/slidersettingseditor.cpp @@ -1,7 +1,7 @@ #include "slidersettingseditor.h" #include #include -#include "qtmaterialslider.h" +#include SliderSettingsEditor::SliderSettingsEditor(QWidget *parent) : QWidget(parent), diff --git a/examples/snackbarsettingseditor.cpp b/examples/snackbarsettingseditor.cpp index 6d6736a..0a9dcca 100644 --- a/examples/snackbarsettingseditor.cpp +++ b/examples/snackbarsettingseditor.cpp @@ -1,7 +1,7 @@ #include "snackbarsettingseditor.h" #include #include -#include "qtmaterialsnackbar.h" +#include SnackbarSettingsEditor::SnackbarSettingsEditor(QWidget *parent) : QWidget(parent), diff --git a/examples/tabssettingseditor.cpp b/examples/tabssettingseditor.cpp index 8c3f9a0..9b53a1d 100644 --- a/examples/tabssettingseditor.cpp +++ b/examples/tabssettingseditor.cpp @@ -1,7 +1,7 @@ #include "tabssettingseditor.h" #include #include -#include "qtmaterialtabs.h" +#include TabsSettingsEditor::TabsSettingsEditor(QWidget *parent) : QWidget(parent), diff --git a/examples/textfieldsettingseditor.cpp b/examples/textfieldsettingseditor.cpp index 3f2fe5f..dcb7069 100644 --- a/examples/textfieldsettingseditor.cpp +++ b/examples/textfieldsettingseditor.cpp @@ -1,7 +1,7 @@ #include "textfieldsettingseditor.h" #include #include -#include "qtmaterialtextfield.h" +#include TextFieldSettingsEditor::TextFieldSettingsEditor(QWidget *parent) : QWidget(parent), diff --git a/examples/togglesettingseditor.cpp b/examples/togglesettingseditor.cpp index 3952f8d..36fe978 100644 --- a/examples/togglesettingseditor.cpp +++ b/examples/togglesettingseditor.cpp @@ -1,6 +1,6 @@ #include "togglesettingseditor.h" #include -#include "qtmaterialtoggle.h" +#include ToggleSettingsEditor::ToggleSettingsEditor(QWidget *parent) : QWidget(parent),