From 0b85eec397423ef1e0f7c3a2127fc0596e6671a5 Mon Sep 17 00:00:00 2001 From: ShootingStarDragons Date: Tue, 5 Jul 2022 17:40:09 +0800 Subject: [PATCH] split p and q pointer --- components/CMakeLists.txt | 12 ++++-- .../qtmaterialcheckable.cpp | 14 +++--- .../qtmaterialcheckable_internal.cpp | 5 ++- .../materiallib/qtmaterialcheckable_p.h | 43 +++++++++++++++++++ .../qtmaterialoverlaywidget.cpp | 2 +- .../{lib => materiallib}/qtmaterialripple.cpp | 4 +- .../qtmaterialrippleoverlay.cpp | 4 +- .../qtmaterialstatetransition.cpp | 2 +- .../{lib => materiallib}/qtmaterialstyle.cpp | 4 +- .../{lib => materiallib}/qtmaterialstyle_p.h | 0 .../{lib => materiallib}/qtmaterialtheme.cpp | 6 ++- .../{lib => materiallib}/qtmaterialtheme_p.h | 0 components/qtmaterialradiobutton.cpp | 5 ++- examples/CMakeLists.txt | 2 +- .../qmetarial}/lib/qtmaterialcheckable.h | 0 .../lib/qtmaterialcheckable_internal.h | 0 .../qmetarial}/lib/qtmaterialcheckable_p.h | 0 .../qmetarial}/lib/qtmaterialoverlaywidget.h | 0 .../qmetarial}/lib/qtmaterialripple.h | 0 .../qmetarial}/lib/qtmaterialrippleoverlay.h | 0 .../lib/qtmaterialstatetransition.h | 0 .../lib/qtmaterialstatetransitionevent.h | 0 .../qmetarial}/lib/qtmaterialstyle.h | 0 include/qmetarial/lib/qtmaterialstyle_p.h | 24 +++++++++++ .../qmetarial}/lib/qtmaterialtheme.h | 0 include/qmetarial/lib/qtmaterialtheme_p.h | 24 +++++++++++ .../qmetarial}/qtmaterialappbar.h | 0 .../qmetarial}/qtmaterialautocomplete.h | 0 .../qtmaterialautocomplete_internal.h | 0 .../qmetarial}/qtmaterialavatar.h | 0 .../qmetarial}/qtmaterialbadge.h | 0 .../qmetarial}/qtmaterialcheckbox.h | 0 .../qmetarial}/qtmaterialcircularprogress.h | 0 .../qtmaterialcircularprogress_internal.h | 0 .../qmetarial}/qtmaterialdialog.h | 0 .../qmetarial}/qtmaterialdialog_internal.h | 0 .../qmetarial}/qtmaterialdrawer.h | 0 .../qmetarial}/qtmaterialdrawer_internal.h | 0 .../qmetarial}/qtmaterialfab.h | 0 .../qmetarial}/qtmaterialflatbutton.h | 0 .../qtmaterialflatbutton_internal.h | 0 .../qmetarial}/qtmaterialiconbutton.h | 0 .../qmetarial}/qtmateriallist.h | 0 .../qmetarial}/qtmateriallistitem.h | 0 .../qmetarial}/qtmaterialmenu.h | 0 .../qmetarial}/qtmaterialpaper.h | 0 .../qmetarial}/qtmaterialprogress.h | 0 .../qmetarial}/qtmaterialprogress_internal.h | 6 +-- .../qmetarial}/qtmaterialradiobutton.h | 0 .../qmetarial}/qtmaterialraisedbutton.h | 0 .../qmetarial}/qtmaterialscrollbar.h | 0 .../qmetarial}/qtmaterialscrollbar_internal.h | 0 .../qmetarial}/qtmaterialslider.h | 0 .../qmetarial}/qtmaterialslider_internal.h | 0 .../qmetarial}/qtmaterialsnackbar.h | 0 .../qmetarial}/qtmaterialsnackbar_internal.h | 0 .../qmetarial}/qtmaterialtable.h | 0 .../qmetarial}/qtmaterialtabs.h | 0 .../qmetarial}/qtmaterialtabs_internal.h | 0 .../qmetarial}/qtmaterialtextfield.h | 0 .../qmetarial}/qtmaterialtextfield_internal.h | 0 .../qmetarial}/qtmaterialtoggle.h | 0 .../qmetarial}/qtmaterialtoggle_internal.h | 0 63 files changed, 131 insertions(+), 26 deletions(-) rename components/{lib => materiallib}/qtmaterialcheckable.cpp (97%) rename components/{lib => materiallib}/qtmaterialcheckable_internal.cpp (94%) create mode 100644 components/materiallib/qtmaterialcheckable_p.h rename components/{lib => materiallib}/qtmaterialoverlaywidget.cpp (96%) rename components/{lib => materiallib}/qtmaterialripple.cpp (96%) rename components/{lib => materiallib}/qtmaterialrippleoverlay.cpp (95%) rename components/{lib => materiallib}/qtmaterialstatetransition.cpp (91%) rename components/{lib => materiallib}/qtmaterialstyle.cpp (93%) rename components/{lib => materiallib}/qtmaterialstyle_p.h (100%) rename components/{lib => materiallib}/qtmaterialtheme.cpp (99%) rename components/{lib => materiallib}/qtmaterialtheme_p.h (100%) rename {components => include/qmetarial}/lib/qtmaterialcheckable.h (100%) rename {components => include/qmetarial}/lib/qtmaterialcheckable_internal.h (100%) rename {components => include/qmetarial}/lib/qtmaterialcheckable_p.h (100%) rename {components => include/qmetarial}/lib/qtmaterialoverlaywidget.h (100%) rename {components => include/qmetarial}/lib/qtmaterialripple.h (100%) rename {components => include/qmetarial}/lib/qtmaterialrippleoverlay.h (100%) rename {components => include/qmetarial}/lib/qtmaterialstatetransition.h (100%) rename {components => include/qmetarial}/lib/qtmaterialstatetransitionevent.h (100%) rename {components => include/qmetarial}/lib/qtmaterialstyle.h (100%) create mode 100644 include/qmetarial/lib/qtmaterialstyle_p.h rename {components => include/qmetarial}/lib/qtmaterialtheme.h (100%) create mode 100644 include/qmetarial/lib/qtmaterialtheme_p.h rename {components => include/qmetarial}/qtmaterialappbar.h (100%) rename {components => include/qmetarial}/qtmaterialautocomplete.h (100%) rename {components => include/qmetarial}/qtmaterialautocomplete_internal.h (100%) rename {components => include/qmetarial}/qtmaterialavatar.h (100%) rename {components => include/qmetarial}/qtmaterialbadge.h (100%) rename {components => include/qmetarial}/qtmaterialcheckbox.h (100%) rename {components => include/qmetarial}/qtmaterialcircularprogress.h (100%) rename {components => include/qmetarial}/qtmaterialcircularprogress_internal.h (100%) rename {components => include/qmetarial}/qtmaterialdialog.h (100%) rename {components => include/qmetarial}/qtmaterialdialog_internal.h (100%) rename {components => include/qmetarial}/qtmaterialdrawer.h (100%) rename {components => include/qmetarial}/qtmaterialdrawer_internal.h (100%) rename {components => include/qmetarial}/qtmaterialfab.h (100%) rename {components => include/qmetarial}/qtmaterialflatbutton.h (100%) rename {components => include/qmetarial}/qtmaterialflatbutton_internal.h (100%) rename {components => include/qmetarial}/qtmaterialiconbutton.h (100%) rename {components => include/qmetarial}/qtmateriallist.h (100%) rename {components => include/qmetarial}/qtmateriallistitem.h (100%) rename {components => include/qmetarial}/qtmaterialmenu.h (100%) rename {components => include/qmetarial}/qtmaterialpaper.h (100%) rename {components => include/qmetarial}/qtmaterialprogress.h (100%) rename {components => include/qmetarial}/qtmaterialprogress_internal.h (90%) rename {components => include/qmetarial}/qtmaterialradiobutton.h (100%) rename {components => include/qmetarial}/qtmaterialraisedbutton.h (100%) rename {components => include/qmetarial}/qtmaterialscrollbar.h (100%) rename {components => include/qmetarial}/qtmaterialscrollbar_internal.h (100%) rename {components => include/qmetarial}/qtmaterialslider.h (100%) rename {components => include/qmetarial}/qtmaterialslider_internal.h (100%) rename {components => include/qmetarial}/qtmaterialsnackbar.h (100%) rename {components => include/qmetarial}/qtmaterialsnackbar_internal.h (100%) rename {components => include/qmetarial}/qtmaterialtable.h (100%) rename {components => include/qmetarial}/qtmaterialtabs.h (100%) rename {components => include/qmetarial}/qtmaterialtabs_internal.h (100%) rename {components => include/qmetarial}/qtmaterialtextfield.h (100%) rename {components => include/qmetarial}/qtmaterialtextfield_internal.h (100%) rename {components => include/qmetarial}/qtmaterialtoggle.h (100%) rename {components => include/qmetarial}/qtmaterialtoggle_internal.h (100%) diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt index 2a43b9d..f950178 100644 --- a/components/CMakeLists.txt +++ b/components/CMakeLists.txt @@ -18,12 +18,18 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) find_package(Qt5 REQUIRED COMPONENTS Core) find_package(Qt5 REQUIRED COMPONENTS Widgets) -file(GLOB THELIB "lib/*") +file(GLOB THELIB "materiallib/*") file(GLOB COMPONENTSHEADER "*.h") file(GLOB COMPONENTSSOURCE "*.cpp") +file(GLOB HEADER "../include/qmetarial/*") +file(GLOB HEADER2 "../include/qmetarial/lib/*") + set(RCC_FILES resources.qrc) add_library(${PROJECT_NAME} STATIC ${THELIB} ${COMPONENTSHEADER} - ${COMPONENTSSOURCE} ${RCC_FILES}) + ${COMPONENTSSOURCE} ${RCC_FILES} + ${HEADER} ${HEADER2}) target_link_libraries(${PROJECT_NAME} PRIVATE Qt5::Core Qt5::Widgets) - +target_include_directories(${PROJECT_NAME} PUBLIC + ../include/qmetarial/ +) target_link_directories(${PROJECT_NAME} PUBLIC .) diff --git a/components/lib/qtmaterialcheckable.cpp b/components/materiallib/qtmaterialcheckable.cpp similarity index 97% rename from components/lib/qtmaterialcheckable.cpp rename to components/materiallib/qtmaterialcheckable.cpp index 7e775cd..04ff113 100644 --- a/components/lib/qtmaterialcheckable.cpp +++ b/components/materiallib/qtmaterialcheckable.cpp @@ -1,9 +1,11 @@ -#include "lib/qtmaterialcheckable.h" -#include "lib/qtmaterialcheckable_internal.h" -#include "lib/qtmaterialcheckable_p.h" -#include "lib/qtmaterialripple.h" -#include "lib/qtmaterialrippleoverlay.h" -#include "lib/qtmaterialstyle.h" +#include +#include +#include +#include +#include + +#include "qtmaterialcheckable_p.h" + #include #include #include diff --git a/components/lib/qtmaterialcheckable_internal.cpp b/components/materiallib/qtmaterialcheckable_internal.cpp similarity index 94% rename from components/lib/qtmaterialcheckable_internal.cpp rename to components/materiallib/qtmaterialcheckable_internal.cpp index 762a3cd..a48c970 100644 --- a/components/lib/qtmaterialcheckable_internal.cpp +++ b/components/materiallib/qtmaterialcheckable_internal.cpp @@ -1,5 +1,6 @@ -#include "lib/qtmaterialcheckable_internal.h" -#include "lib/qtmaterialcheckable.h" +#include +#include + #include #include #include diff --git a/components/materiallib/qtmaterialcheckable_p.h b/components/materiallib/qtmaterialcheckable_p.h new file mode 100644 index 0000000..50fba2c --- /dev/null +++ b/components/materiallib/qtmaterialcheckable_p.h @@ -0,0 +1,43 @@ +#ifndef QTMATERIALCHECKABLE_P_H +#define QTMATERIALCHECKABLE_P_H + +#include +#include + +class QStateMachine; +class QState; +class QSignalTransition; +class QtMaterialRippleOverlay; +class QtMaterialCheckableIcon; + +class QtMaterialCheckablePrivate +{ + Q_DISABLE_COPY(QtMaterialCheckablePrivate) + Q_DECLARE_PUBLIC(QtMaterialCheckable) + +public: + QtMaterialCheckablePrivate(QtMaterialCheckable *q); + virtual ~QtMaterialCheckablePrivate(); + + void init(); + + QtMaterialCheckable *const q_ptr; + QtMaterialRippleOverlay *rippleOverlay; + QtMaterialCheckableIcon *checkedIcon; + QtMaterialCheckableIcon *uncheckedIcon; + QStateMachine *stateMachine; + QState *uncheckedState; + QState *checkedState; + QState *disabledUncheckedState; + QState *disabledCheckedState; + QSignalTransition *uncheckedTransition; + QSignalTransition *checkedTransition; + QtMaterialCheckable::LabelPosition labelPosition; + QColor checkedColor; + QColor uncheckedColor; + QColor textColor; + QColor disabledColor; + bool useThemeColors; +}; + +#endif // QTMATERIALCHECKABLE_P_H diff --git a/components/lib/qtmaterialoverlaywidget.cpp b/components/materiallib/qtmaterialoverlaywidget.cpp similarity index 96% rename from components/lib/qtmaterialoverlaywidget.cpp rename to components/materiallib/qtmaterialoverlaywidget.cpp index 1c0a6ce..2511fe2 100644 --- a/components/lib/qtmaterialoverlaywidget.cpp +++ b/components/materiallib/qtmaterialoverlaywidget.cpp @@ -1,4 +1,4 @@ -#include "lib/qtmaterialoverlaywidget.h" +#include #include /*! diff --git a/components/lib/qtmaterialripple.cpp b/components/materiallib/qtmaterialripple.cpp similarity index 96% rename from components/lib/qtmaterialripple.cpp rename to components/materiallib/qtmaterialripple.cpp index 186b90f..f22e7ee 100644 --- a/components/lib/qtmaterialripple.cpp +++ b/components/materiallib/qtmaterialripple.cpp @@ -1,5 +1,5 @@ -#include "qtmaterialripple.h" -#include "lib/qtmaterialrippleoverlay.h" +#include +#include /*! * \class QtMaterialRipple diff --git a/components/lib/qtmaterialrippleoverlay.cpp b/components/materiallib/qtmaterialrippleoverlay.cpp similarity index 95% rename from components/lib/qtmaterialrippleoverlay.cpp rename to components/materiallib/qtmaterialrippleoverlay.cpp index 3ab9c43..af1ed70 100644 --- a/components/lib/qtmaterialrippleoverlay.cpp +++ b/components/materiallib/qtmaterialrippleoverlay.cpp @@ -1,5 +1,5 @@ -#include "lib/qtmaterialrippleoverlay.h" -#include "lib/qtmaterialripple.h" +#include +#include #include /*! diff --git a/components/lib/qtmaterialstatetransition.cpp b/components/materiallib/qtmaterialstatetransition.cpp similarity index 91% rename from components/lib/qtmaterialstatetransition.cpp rename to components/materiallib/qtmaterialstatetransition.cpp index 01b5755..99cf246 100644 --- a/components/lib/qtmaterialstatetransition.cpp +++ b/components/materiallib/qtmaterialstatetransition.cpp @@ -1,4 +1,4 @@ -#include "lib/qtmaterialstatetransition.h" +#include QtMaterialStateTransition::QtMaterialStateTransition(QtMaterialStateTransitionType type) : m_type(type) diff --git a/components/lib/qtmaterialstyle.cpp b/components/materiallib/qtmaterialstyle.cpp similarity index 93% rename from components/lib/qtmaterialstyle.cpp rename to components/materiallib/qtmaterialstyle.cpp index 7133db0..7c7883e 100644 --- a/components/lib/qtmaterialstyle.cpp +++ b/components/materiallib/qtmaterialstyle.cpp @@ -1,5 +1,5 @@ -#include "lib/qtmaterialstyle.h" -#include "lib/qtmaterialtheme.h" +#include +#include #include /*! diff --git a/components/lib/qtmaterialstyle_p.h b/components/materiallib/qtmaterialstyle_p.h similarity index 100% rename from components/lib/qtmaterialstyle_p.h rename to components/materiallib/qtmaterialstyle_p.h diff --git a/components/lib/qtmaterialtheme.cpp b/components/materiallib/qtmaterialtheme.cpp similarity index 99% rename from components/lib/qtmaterialtheme.cpp rename to components/materiallib/qtmaterialtheme.cpp index f12e15b..799057b 100644 --- a/components/lib/qtmaterialtheme.cpp +++ b/components/materiallib/qtmaterialtheme.cpp @@ -1,5 +1,7 @@ -#include "lib/qtmaterialtheme.h" -#include "lib/qtmaterialtheme_p.h" +#include + +#include "qtmaterialtheme_p.h" + #include #include #include diff --git a/components/lib/qtmaterialtheme_p.h b/components/materiallib/qtmaterialtheme_p.h similarity index 100% rename from components/lib/qtmaterialtheme_p.h rename to components/materiallib/qtmaterialtheme_p.h diff --git a/components/qtmaterialradiobutton.cpp b/components/qtmaterialradiobutton.cpp index a054500..ae6efba 100644 --- a/components/qtmaterialradiobutton.cpp +++ b/components/qtmaterialradiobutton.cpp @@ -8,7 +8,9 @@ /*! * \class QtMaterialRadioButtonPrivate - * \internal + * @parma state private class + * @internal + * */ QtMaterialRadioButtonPrivate::QtMaterialRadioButtonPrivate(QtMaterialRadioButton *q) @@ -20,6 +22,7 @@ QtMaterialRadioButtonPrivate::~QtMaterialRadioButtonPrivate() {} void QtMaterialRadioButtonPrivate::init() { + // get the public button Q_Q(QtMaterialRadioButton); q->setAutoExclusive(true); diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index c6e315b..03e59b7 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -29,7 +29,7 @@ add_executable( ${RCC_FILES} ) target_include_directories(${PROJECT_NAME} PUBLIC - ../components/ + ../include/qmetarial/ ) target_link_libraries( diff --git a/components/lib/qtmaterialcheckable.h b/include/qmetarial/lib/qtmaterialcheckable.h similarity index 100% rename from components/lib/qtmaterialcheckable.h rename to include/qmetarial/lib/qtmaterialcheckable.h diff --git a/components/lib/qtmaterialcheckable_internal.h b/include/qmetarial/lib/qtmaterialcheckable_internal.h similarity index 100% rename from components/lib/qtmaterialcheckable_internal.h rename to include/qmetarial/lib/qtmaterialcheckable_internal.h diff --git a/components/lib/qtmaterialcheckable_p.h b/include/qmetarial/lib/qtmaterialcheckable_p.h similarity index 100% rename from components/lib/qtmaterialcheckable_p.h rename to include/qmetarial/lib/qtmaterialcheckable_p.h diff --git a/components/lib/qtmaterialoverlaywidget.h b/include/qmetarial/lib/qtmaterialoverlaywidget.h similarity index 100% rename from components/lib/qtmaterialoverlaywidget.h rename to include/qmetarial/lib/qtmaterialoverlaywidget.h diff --git a/components/lib/qtmaterialripple.h b/include/qmetarial/lib/qtmaterialripple.h similarity index 100% rename from components/lib/qtmaterialripple.h rename to include/qmetarial/lib/qtmaterialripple.h diff --git a/components/lib/qtmaterialrippleoverlay.h b/include/qmetarial/lib/qtmaterialrippleoverlay.h similarity index 100% rename from components/lib/qtmaterialrippleoverlay.h rename to include/qmetarial/lib/qtmaterialrippleoverlay.h diff --git a/components/lib/qtmaterialstatetransition.h b/include/qmetarial/lib/qtmaterialstatetransition.h similarity index 100% rename from components/lib/qtmaterialstatetransition.h rename to include/qmetarial/lib/qtmaterialstatetransition.h diff --git a/components/lib/qtmaterialstatetransitionevent.h b/include/qmetarial/lib/qtmaterialstatetransitionevent.h similarity index 100% rename from components/lib/qtmaterialstatetransitionevent.h rename to include/qmetarial/lib/qtmaterialstatetransitionevent.h diff --git a/components/lib/qtmaterialstyle.h b/include/qmetarial/lib/qtmaterialstyle.h similarity index 100% rename from components/lib/qtmaterialstyle.h rename to include/qmetarial/lib/qtmaterialstyle.h diff --git a/include/qmetarial/lib/qtmaterialstyle_p.h b/include/qmetarial/lib/qtmaterialstyle_p.h new file mode 100644 index 0000000..e96e1cd --- /dev/null +++ b/include/qmetarial/lib/qtmaterialstyle_p.h @@ -0,0 +1,24 @@ +#ifndef QTMATERIALSTYLE_P_H +#define QTMATERIALSTYLE_P_H + +#include + +class QtMaterialStyle; +class QtMaterialTheme; + +class QtMaterialStylePrivate +{ + Q_DISABLE_COPY(QtMaterialStylePrivate) + Q_DECLARE_PUBLIC(QtMaterialStyle) + +public: + QtMaterialStylePrivate(QtMaterialStyle *q); + ~QtMaterialStylePrivate(); + + void init(); + + QtMaterialStyle *const q_ptr; + QtMaterialTheme *theme; +}; + +#endif // QTMATERIALSTYLE_P_H diff --git a/components/lib/qtmaterialtheme.h b/include/qmetarial/lib/qtmaterialtheme.h similarity index 100% rename from components/lib/qtmaterialtheme.h rename to include/qmetarial/lib/qtmaterialtheme.h diff --git a/include/qmetarial/lib/qtmaterialtheme_p.h b/include/qmetarial/lib/qtmaterialtheme_p.h new file mode 100644 index 0000000..85b619b --- /dev/null +++ b/include/qmetarial/lib/qtmaterialtheme_p.h @@ -0,0 +1,24 @@ +#ifndef QTMATERIALTHEME_P_H +#define QTMATERIALTHEME_P_H + +#include +#include + +class QtMaterialTheme; + +class QtMaterialThemePrivate +{ + Q_DISABLE_COPY(QtMaterialThemePrivate) + Q_DECLARE_PUBLIC(QtMaterialTheme) + +public: + QtMaterialThemePrivate(QtMaterialTheme *q); + ~QtMaterialThemePrivate(); + + QColor rgba(int r, int g, int b, qreal a) const; + + QtMaterialTheme *const q_ptr; + QHash colors; +}; + +#endif // QTMATERIALTHEME_P_H diff --git a/components/qtmaterialappbar.h b/include/qmetarial/qtmaterialappbar.h similarity index 100% rename from components/qtmaterialappbar.h rename to include/qmetarial/qtmaterialappbar.h diff --git a/components/qtmaterialautocomplete.h b/include/qmetarial/qtmaterialautocomplete.h similarity index 100% rename from components/qtmaterialautocomplete.h rename to include/qmetarial/qtmaterialautocomplete.h diff --git a/components/qtmaterialautocomplete_internal.h b/include/qmetarial/qtmaterialautocomplete_internal.h similarity index 100% rename from components/qtmaterialautocomplete_internal.h rename to include/qmetarial/qtmaterialautocomplete_internal.h diff --git a/components/qtmaterialavatar.h b/include/qmetarial/qtmaterialavatar.h similarity index 100% rename from components/qtmaterialavatar.h rename to include/qmetarial/qtmaterialavatar.h diff --git a/components/qtmaterialbadge.h b/include/qmetarial/qtmaterialbadge.h similarity index 100% rename from components/qtmaterialbadge.h rename to include/qmetarial/qtmaterialbadge.h diff --git a/components/qtmaterialcheckbox.h b/include/qmetarial/qtmaterialcheckbox.h similarity index 100% rename from components/qtmaterialcheckbox.h rename to include/qmetarial/qtmaterialcheckbox.h diff --git a/components/qtmaterialcircularprogress.h b/include/qmetarial/qtmaterialcircularprogress.h similarity index 100% rename from components/qtmaterialcircularprogress.h rename to include/qmetarial/qtmaterialcircularprogress.h diff --git a/components/qtmaterialcircularprogress_internal.h b/include/qmetarial/qtmaterialcircularprogress_internal.h similarity index 100% rename from components/qtmaterialcircularprogress_internal.h rename to include/qmetarial/qtmaterialcircularprogress_internal.h diff --git a/components/qtmaterialdialog.h b/include/qmetarial/qtmaterialdialog.h similarity index 100% rename from components/qtmaterialdialog.h rename to include/qmetarial/qtmaterialdialog.h diff --git a/components/qtmaterialdialog_internal.h b/include/qmetarial/qtmaterialdialog_internal.h similarity index 100% rename from components/qtmaterialdialog_internal.h rename to include/qmetarial/qtmaterialdialog_internal.h diff --git a/components/qtmaterialdrawer.h b/include/qmetarial/qtmaterialdrawer.h similarity index 100% rename from components/qtmaterialdrawer.h rename to include/qmetarial/qtmaterialdrawer.h diff --git a/components/qtmaterialdrawer_internal.h b/include/qmetarial/qtmaterialdrawer_internal.h similarity index 100% rename from components/qtmaterialdrawer_internal.h rename to include/qmetarial/qtmaterialdrawer_internal.h diff --git a/components/qtmaterialfab.h b/include/qmetarial/qtmaterialfab.h similarity index 100% rename from components/qtmaterialfab.h rename to include/qmetarial/qtmaterialfab.h diff --git a/components/qtmaterialflatbutton.h b/include/qmetarial/qtmaterialflatbutton.h similarity index 100% rename from components/qtmaterialflatbutton.h rename to include/qmetarial/qtmaterialflatbutton.h diff --git a/components/qtmaterialflatbutton_internal.h b/include/qmetarial/qtmaterialflatbutton_internal.h similarity index 100% rename from components/qtmaterialflatbutton_internal.h rename to include/qmetarial/qtmaterialflatbutton_internal.h diff --git a/components/qtmaterialiconbutton.h b/include/qmetarial/qtmaterialiconbutton.h similarity index 100% rename from components/qtmaterialiconbutton.h rename to include/qmetarial/qtmaterialiconbutton.h diff --git a/components/qtmateriallist.h b/include/qmetarial/qtmateriallist.h similarity index 100% rename from components/qtmateriallist.h rename to include/qmetarial/qtmateriallist.h diff --git a/components/qtmateriallistitem.h b/include/qmetarial/qtmateriallistitem.h similarity index 100% rename from components/qtmateriallistitem.h rename to include/qmetarial/qtmateriallistitem.h diff --git a/components/qtmaterialmenu.h b/include/qmetarial/qtmaterialmenu.h similarity index 100% rename from components/qtmaterialmenu.h rename to include/qmetarial/qtmaterialmenu.h diff --git a/components/qtmaterialpaper.h b/include/qmetarial/qtmaterialpaper.h similarity index 100% rename from components/qtmaterialpaper.h rename to include/qmetarial/qtmaterialpaper.h diff --git a/components/qtmaterialprogress.h b/include/qmetarial/qtmaterialprogress.h similarity index 100% rename from components/qtmaterialprogress.h rename to include/qmetarial/qtmaterialprogress.h diff --git a/components/qtmaterialprogress_internal.h b/include/qmetarial/qtmaterialprogress_internal.h similarity index 90% rename from components/qtmaterialprogress_internal.h rename to include/qmetarial/qtmaterialprogress_internal.h index 811e3d6..31401ee 100644 --- a/components/qtmaterialprogress_internal.h +++ b/include/qmetarial/qtmaterialprogress_internal.h @@ -1,8 +1,8 @@ #ifndef QTMATERIALPROGRESS_INTERNAL_H #define QTMATERIALPROGRESS_INTERNAL_H -#include #include "qtmaterialprogress.h" +#include class QtMaterialProgressDelegate : public QObject { @@ -21,7 +21,7 @@ private: Q_DISABLE_COPY(QtMaterialProgressDelegate) QtMaterialProgress *const m_progress; - qreal m_offset; + qreal m_offset; }; inline void QtMaterialProgressDelegate::setOffset(qreal offset) @@ -35,4 +35,4 @@ inline qreal QtMaterialProgressDelegate::offset() const return m_offset; } -#endif // QTMATERIALPROGRESS_INTERNAL_H +#endif // QTMATERIALPROGRESS_INTERNAL_H diff --git a/components/qtmaterialradiobutton.h b/include/qmetarial/qtmaterialradiobutton.h similarity index 100% rename from components/qtmaterialradiobutton.h rename to include/qmetarial/qtmaterialradiobutton.h diff --git a/components/qtmaterialraisedbutton.h b/include/qmetarial/qtmaterialraisedbutton.h similarity index 100% rename from components/qtmaterialraisedbutton.h rename to include/qmetarial/qtmaterialraisedbutton.h diff --git a/components/qtmaterialscrollbar.h b/include/qmetarial/qtmaterialscrollbar.h similarity index 100% rename from components/qtmaterialscrollbar.h rename to include/qmetarial/qtmaterialscrollbar.h diff --git a/components/qtmaterialscrollbar_internal.h b/include/qmetarial/qtmaterialscrollbar_internal.h similarity index 100% rename from components/qtmaterialscrollbar_internal.h rename to include/qmetarial/qtmaterialscrollbar_internal.h diff --git a/components/qtmaterialslider.h b/include/qmetarial/qtmaterialslider.h similarity index 100% rename from components/qtmaterialslider.h rename to include/qmetarial/qtmaterialslider.h diff --git a/components/qtmaterialslider_internal.h b/include/qmetarial/qtmaterialslider_internal.h similarity index 100% rename from components/qtmaterialslider_internal.h rename to include/qmetarial/qtmaterialslider_internal.h diff --git a/components/qtmaterialsnackbar.h b/include/qmetarial/qtmaterialsnackbar.h similarity index 100% rename from components/qtmaterialsnackbar.h rename to include/qmetarial/qtmaterialsnackbar.h diff --git a/components/qtmaterialsnackbar_internal.h b/include/qmetarial/qtmaterialsnackbar_internal.h similarity index 100% rename from components/qtmaterialsnackbar_internal.h rename to include/qmetarial/qtmaterialsnackbar_internal.h diff --git a/components/qtmaterialtable.h b/include/qmetarial/qtmaterialtable.h similarity index 100% rename from components/qtmaterialtable.h rename to include/qmetarial/qtmaterialtable.h diff --git a/components/qtmaterialtabs.h b/include/qmetarial/qtmaterialtabs.h similarity index 100% rename from components/qtmaterialtabs.h rename to include/qmetarial/qtmaterialtabs.h diff --git a/components/qtmaterialtabs_internal.h b/include/qmetarial/qtmaterialtabs_internal.h similarity index 100% rename from components/qtmaterialtabs_internal.h rename to include/qmetarial/qtmaterialtabs_internal.h diff --git a/components/qtmaterialtextfield.h b/include/qmetarial/qtmaterialtextfield.h similarity index 100% rename from components/qtmaterialtextfield.h rename to include/qmetarial/qtmaterialtextfield.h diff --git a/components/qtmaterialtextfield_internal.h b/include/qmetarial/qtmaterialtextfield_internal.h similarity index 100% rename from components/qtmaterialtextfield_internal.h rename to include/qmetarial/qtmaterialtextfield_internal.h diff --git a/components/qtmaterialtoggle.h b/include/qmetarial/qtmaterialtoggle.h similarity index 100% rename from components/qtmaterialtoggle.h rename to include/qmetarial/qtmaterialtoggle.h diff --git a/components/qtmaterialtoggle_internal.h b/include/qmetarial/qtmaterialtoggle_internal.h similarity index 100% rename from components/qtmaterialtoggle_internal.h rename to include/qmetarial/qtmaterialtoggle_internal.h