From f1f696c5dce82399559224a7507c941593553ed6 Mon Sep 17 00:00:00 2001 From: Achraf k Date: Thu, 17 Feb 2022 16:17:19 +0100 Subject: [PATCH] Class name matches the file name. --- components/CMakeLists.txt | 248 +++++++++--------- .../{qtmaterialappbar.cpp => appbar.cpp} | 6 +- components/{qtmaterialappbar.h => appbar.h} | 6 +- .../{qtmaterialappbar_p.h => appbar_p.h} | 6 +- ...erialautocomplete.cpp => autocomplete.cpp} | 2 +- ...tmaterialautocomplete.h => autocomplete.h} | 8 +- ...internal.cpp => autocomplete_internal.cpp} | 2 +- ...ete_internal.h => autocomplete_internal.h} | 8 +- ...erialautocomplete_p.h => autocomplete_p.h} | 14 +- .../{qtmaterialavatar.cpp => avatar.cpp} | 6 +- components/{qtmaterialavatar.h => avatar.h} | 8 +- .../{qtmaterialavatar_p.h => avatar_p.h} | 8 +- components/{qtmaterialbadge.cpp => badge.cpp} | 6 +- components/{qtmaterialbadge.h => badge.h} | 8 +- components/{qtmaterialbadge_p.h => badge_p.h} | 6 +- .../{qtmaterialcheckbox.cpp => checkbox.cpp} | 2 +- .../{qtmaterialcheckbox.h => checkbox.h} | 8 +- .../{qtmaterialcheckbox_p.h => checkbox_p.h} | 12 +- ...cularprogress.cpp => circularprogress.cpp} | 8 +- ...lcircularprogress.h => circularprogress.h} | 8 +- ...rnal.cpp => circularprogress_internal.cpp} | 2 +- ...internal.h => circularprogress_internal.h} | 8 +- ...cularprogress_p.h => circularprogress_p.h} | 8 +- .../{qtmaterialdialog.cpp => dialog.cpp} | 2 +- components/{qtmaterialdialog.h => dialog.h} | 14 +- ...ialog_internal.cpp => dialog_internal.cpp} | 2 +- ...ialdialog_internal.h => dialog_internal.h} | 8 +- .../{qtmaterialdialog_p.h => dialog_p.h} | 6 +- .../{qtmaterialdrawer.cpp => drawer.cpp} | 2 +- components/{qtmaterialdrawer.h => drawer.h} | 12 +- ...rawer_internal.cpp => drawer_internal.cpp} | 4 +- ...ialdrawer_internal.h => drawer_internal.h} | 2 +- .../{qtmaterialdrawer_p.h => drawer_p.h} | 0 components/{qtmaterialfab.cpp => fab.cpp} | 6 +- components/{qtmaterialfab.h => fab.h} | 8 +- components/{qtmaterialfab_p.h => fab_p.h} | 8 +- ...tmaterialflatbutton.cpp => flatbutton.cpp} | 12 +- .../{qtmaterialflatbutton.h => flatbutton.h} | 8 +- ...n_internal.cpp => flatbutton_internal.cpp} | 2 +- ...utton_internal.h => flatbutton_internal.h} | 10 +- ...tmaterialflatbutton_p.h => flatbutton_p.h} | 8 +- ...tmaterialiconbutton.cpp => iconbutton.cpp} | 8 +- .../{qtmaterialiconbutton.h => iconbutton.h} | 6 +- ...tmaterialiconbutton_p.h => iconbutton_p.h} | 6 +- components/layouts/qtmaterialsnackbarlayout.h | 7 - .../layouts/qtmaterialsnackbarlayout_p.h | 7 - ...lsnackbarlayout.cpp => snackbarlayout.cpp} | 0 components/layouts/snackbarlayout.h | 7 + components/layouts/snackbarlayout_p.h | 7 + ...{qtmaterialcheckable.cpp => checkable.cpp} | 12 +- .../{qtmaterialcheckable.h => checkable.h} | 6 +- ...le_internal.cpp => checkable_internal.cpp} | 4 +- ...ckable_internal.h => checkable_internal.h} | 6 +- ...{qtmaterialcheckable_p.h => checkable_p.h} | 8 +- ...ialoverlaywidget.cpp => overlaywidget.cpp} | 2 +- ...aterialoverlaywidget.h => overlaywidget.h} | 6 +- .../lib/{qtmaterialripple.cpp => ripple.cpp} | 4 +- .../lib/{qtmaterialripple.h => ripple.h} | 6 +- ...ialrippleoverlay.cpp => rippleoverlay.cpp} | 4 +- ...aterialrippleoverlay.h => rippleoverlay.h} | 8 +- ...tatetransition.cpp => statetransition.cpp} | 2 +- ...ialstatetransition.h => statetransition.h} | 8 +- ...ansitionevent.h => statetransitionevent.h} | 6 +- .../lib/{qtmaterialstyle.cpp => style.cpp} | 4 +- components/lib/{qtmaterialstyle.h => style.h} | 8 +- .../lib/{qtmaterialstyle_p.h => style_p.h} | 6 +- .../lib/{qtmaterialtheme.cpp => theme.cpp} | 4 +- components/lib/{qtmaterialtheme.h => theme.h} | 6 +- .../lib/{qtmaterialtheme_p.h => theme_p.h} | 6 +- components/list.cpp | 2 + components/list.h | 4 + components/list_p.h | 4 + components/listitem.cpp | 2 + components/listitem.h | 4 + components/listitem_p.h | 4 + components/{qtmaterialmenu.cpp => menu.cpp} | 4 +- components/{qtmaterialmenu.h => menu.h} | 6 +- ...ialmenu_internal.cpp => menu_internal.cpp} | 0 components/menu_internal.h | 7 + components/menu_p.h | 7 + components/paper.cpp | 7 + components/paper.h | 7 + components/paper_p.h | 7 + .../{qtmaterialprogress.cpp => progress.cpp} | 8 +- .../{qtmaterialprogress.h => progress.h} | 8 +- ...ess_internal.cpp => progress_internal.cpp} | 2 +- ...rogress_internal.h => progress_internal.h} | 8 +- .../{qtmaterialprogress_p.h => progress_p.h} | 8 +- components/qtmateriallist.cpp | 2 - components/qtmateriallist.h | 4 - components/qtmateriallist_p.h | 4 - components/qtmateriallistitem.cpp | 2 - components/qtmateriallistitem.h | 4 - components/qtmateriallistitem_p.h | 4 - components/qtmaterialmenu_internal.h | 7 - components/qtmaterialmenu_p.h | 7 - components/qtmaterialpaper.cpp | 7 - components/qtmaterialpaper.h | 7 - components/qtmaterialpaper_p.h | 7 - components/qtmaterialtable.cpp | 6 - components/qtmaterialtable.h | 7 - components/qtmaterialtable_p.h | 7 - ...aterialradiobutton.cpp => radiobutton.cpp} | 6 +- ...{qtmaterialradiobutton.h => radiobutton.h} | 8 +- ...aterialradiobutton_p.h => radiobutton_p.h} | 10 +- ...erialraisedbutton.cpp => raisedbutton.cpp} | 2 +- ...tmaterialraisedbutton.h => raisedbutton.h} | 8 +- ...erialraisedbutton_p.h => raisedbutton_p.h} | 10 +- ...{qtmaterialscrollbar.cpp => scrollbar.cpp} | 2 +- .../{qtmaterialscrollbar.h => scrollbar.h} | 12 +- ...ar_internal.cpp => scrollbar_internal.cpp} | 2 +- ...ollbar_internal.h => scrollbar_internal.h} | 8 +- ...{qtmaterialscrollbar_p.h => scrollbar_p.h} | 6 +- .../{qtmaterialslider.cpp => slider.cpp} | 10 +- components/{qtmaterialslider.h => slider.h} | 6 +- ...lider_internal.cpp => slider_internal.cpp} | 8 +- ...ialslider_internal.h => slider_internal.h} | 8 +- .../{qtmaterialslider_p.h => slider_p.h} | 6 +- .../{qtmaterialsnackbar.cpp => snackbar.cpp} | 10 +- .../{qtmaterialsnackbar.h => snackbar.h} | 8 +- ...bar_internal.cpp => snackbar_internal.cpp} | 6 +- ...nackbar_internal.h => snackbar_internal.h} | 6 +- .../{qtmaterialsnackbar_p.h => snackbar_p.h} | 6 +- components/table.cpp | 6 + components/table.h | 7 + components/table_p.h | 7 + components/{qtmaterialtabs.cpp => tabs.cpp} | 2 +- components/{qtmaterialtabs.h => tabs.h} | 14 +- ...ialtabs_internal.cpp => tabs_internal.cpp} | 2 +- ...aterialtabs_internal.h => tabs_internal.h} | 12 +- components/{qtmaterialtabs_p.h => tabs_p.h} | 8 +- ...{qtmaterialtextfield.cpp => textfield.cpp} | 8 +- .../{qtmaterialtextfield.h => textfield.h} | 6 +- ...ld_internal.cpp => textfield_internal.cpp} | 2 +- ...tfield_internal.h => textfield_internal.h} | 8 +- ...{qtmaterialtextfield_p.h => textfield_p.h} | 6 +- .../{qtmaterialtoggle.cpp => toggle.cpp} | 8 +- components/{qtmaterialtoggle.h => toggle.h} | 6 +- ...oggle_internal.cpp => toggle_internal.cpp} | 6 +- ...ialtoggle_internal.h => toggle_internal.h} | 8 +- .../{qtmaterialtoggle_p.h => toggle_p.h} | 6 +- examples/appbarsettingseditor.h | 6 +- examples/autocompletesettingseditor.h | 4 +- examples/avatarsettingseditor.h | 4 +- examples/badgesettingseditor.cpp | 4 +- examples/badgesettingseditor.h | 4 +- examples/checkboxsettingseditor.h | 2 +- examples/circularprogresssettingseditor.h | 2 +- examples/dialogsettingseditor.h | 4 +- examples/drawersettingseditor.h | 2 +- examples/fabsettingseditor.h | 2 +- examples/flatbuttonsettingseditor.h | 2 +- examples/iconbuttonsettingseditor.h | 4 +- examples/menusettingseditor.h | 4 +- examples/progresssettingseditor.h | 4 +- examples/radiobuttonsettingseditor.h | 2 +- examples/raisedbuttonsettingseditor.h | 2 +- examples/scrollbarsettingseditor.h | 2 +- examples/slidersettingseditor.h | 2 +- examples/snackbarsettingseditor.h | 2 +- examples/tabssettingseditor.h | 2 +- examples/textfieldsettingseditor.h | 2 +- examples/togglesettingseditor.h | 2 +- 163 files changed, 592 insertions(+), 592 deletions(-) rename components/{qtmaterialappbar.cpp => appbar.cpp} (95%) rename components/{qtmaterialappbar.h => appbar.h} (92%) rename components/{qtmaterialappbar_p.h => appbar_p.h} (81%) rename components/{qtmaterialautocomplete.cpp => autocomplete.cpp} (99%) rename components/{qtmaterialautocomplete.h => autocomplete.h} (80%) rename components/{qtmaterialautocomplete_internal.cpp => autocomplete_internal.cpp} (97%) rename components/{qtmaterialautocomplete_internal.h => autocomplete_internal.h} (73%) rename components/{qtmaterialautocomplete_p.h => autocomplete_p.h} (74%) rename components/{qtmaterialavatar.cpp => avatar.cpp} (98%) rename components/{qtmaterialavatar.h => avatar.h} (90%) rename components/{qtmaterialavatar_p.h => avatar_p.h} (81%) rename components/{qtmaterialbadge.cpp => badge.cpp} (98%) rename components/{qtmaterialbadge.h => badge.h} (92%) rename components/{qtmaterialbadge_p.h => badge_p.h} (87%) rename components/{qtmaterialcheckbox.cpp => checkbox.cpp} (98%) rename components/{qtmaterialcheckbox.h => checkbox.h} (65%) rename components/{qtmaterialcheckbox_p.h => checkbox_p.h} (60%) rename components/{qtmaterialcircularprogress.cpp => circularprogress.cpp} (97%) rename components/{qtmaterialcircularprogress.h => circularprogress.h} (87%) rename components/{qtmaterialcircularprogress_internal.cpp => circularprogress_internal.cpp} (88%) rename components/{qtmaterialcircularprogress_internal.h => circularprogress_internal.h} (89%) rename components/{qtmaterialcircularprogress_p.h => circularprogress_p.h} (81%) rename components/{qtmaterialdialog.cpp => dialog.cpp} (99%) rename components/{qtmaterialdialog.h => dialog.h} (69%) rename components/{qtmaterialdialog_internal.cpp => dialog_internal.cpp} (98%) rename components/{qtmaterialdialog_internal.h => dialog_internal.h} (92%) rename components/{qtmaterialdialog_p.h => dialog_p.h} (87%) rename components/{qtmaterialdrawer.cpp => drawer.cpp} (99%) rename components/{qtmaterialdrawer.h => drawer.h} (85%) rename components/{qtmaterialdrawer_internal.cpp => drawer_internal.cpp} (98%) rename components/{qtmaterialdrawer_internal.h => drawer_internal.h} (97%) rename components/{qtmaterialdrawer_p.h => drawer_p.h} (100%) rename components/{qtmaterialfab.cpp => fab.cpp} (98%) rename components/{qtmaterialfab.h => fab.h} (89%) rename components/{qtmaterialfab_p.h => fab_p.h} (88%) rename components/{qtmaterialflatbutton.cpp => flatbutton.cpp} (98%) rename components/{qtmaterialflatbutton.h => flatbutton.h} (96%) rename components/{qtmaterialflatbutton_internal.cpp => flatbutton_internal.cpp} (99%) rename components/{qtmaterialflatbutton_internal.h => flatbutton_internal.h} (93%) rename components/{qtmaterialflatbutton_p.h => flatbutton_p.h} (91%) rename components/{qtmaterialiconbutton.cpp => iconbutton.cpp} (96%) rename components/{qtmaterialiconbutton.h => iconbutton.h} (90%) rename components/{qtmaterialiconbutton_p.h => iconbutton_p.h} (83%) delete mode 100644 components/layouts/qtmaterialsnackbarlayout.h delete mode 100644 components/layouts/qtmaterialsnackbarlayout_p.h rename components/layouts/{qtmaterialsnackbarlayout.cpp => snackbarlayout.cpp} (100%) create mode 100644 components/layouts/snackbarlayout.h create mode 100644 components/layouts/snackbarlayout_p.h rename components/lib/{qtmaterialcheckable.cpp => checkable.cpp} (97%) rename components/lib/{qtmaterialcheckable.h => checkable.h} (94%) rename components/lib/{qtmaterialcheckable_internal.cpp => checkable_internal.cpp} (94%) rename components/lib/{qtmaterialcheckable_internal.h => checkable_internal.h} (93%) rename components/lib/{qtmaterialcheckable_p.h => checkable_p.h} (90%) rename components/lib/{qtmaterialoverlaywidget.cpp => overlaywidget.cpp} (96%) rename components/lib/{qtmaterialoverlaywidget.h => overlaywidget.h} (79%) rename components/lib/{qtmaterialripple.cpp => ripple.cpp} (97%) rename components/lib/{qtmaterialripple.h => ripple.h} (97%) rename components/lib/{qtmaterialrippleoverlay.cpp => rippleoverlay.cpp} (95%) rename components/lib/{qtmaterialrippleoverlay.h => rippleoverlay.h} (88%) rename components/lib/{qtmaterialstatetransition.cpp => statetransition.cpp} (90%) rename components/lib/{qtmaterialstatetransition.h => statetransition.h} (66%) rename components/lib/{qtmaterialstatetransitionevent.h => statetransitionevent.h} (87%) rename components/lib/{qtmaterialstyle.cpp => style.cpp} (92%) rename components/lib/{qtmaterialstyle.h => style.h} (84%) rename components/lib/{qtmaterialstyle_p.h => style_p.h} (75%) rename components/lib/{qtmaterialtheme.cpp => theme.cpp} (99%) rename components/lib/{qtmaterialtheme.h => theme.h} (98%) rename components/lib/{qtmaterialtheme_p.h => theme_p.h} (79%) create mode 100644 components/list.cpp create mode 100644 components/list.h create mode 100644 components/list_p.h create mode 100644 components/listitem.cpp create mode 100644 components/listitem.h create mode 100644 components/listitem_p.h rename components/{qtmaterialmenu.cpp => menu.cpp} (61%) rename components/{qtmaterialmenu.h => menu.h} (67%) rename components/{qtmaterialmenu_internal.cpp => menu_internal.cpp} (100%) create mode 100644 components/menu_internal.h create mode 100644 components/menu_p.h create mode 100644 components/paper.cpp create mode 100644 components/paper.h create mode 100644 components/paper_p.h rename components/{qtmaterialprogress.cpp => progress.cpp} (96%) rename components/{qtmaterialprogress.h => progress.h} (88%) rename components/{qtmaterialprogress_internal.cpp => progress_internal.cpp} (87%) rename components/{qtmaterialprogress_internal.h => progress_internal.h} (80%) rename components/{qtmaterialprogress_p.h => progress_p.h} (81%) delete mode 100644 components/qtmateriallist.cpp delete mode 100644 components/qtmateriallist.h delete mode 100644 components/qtmateriallist_p.h delete mode 100644 components/qtmateriallistitem.cpp delete mode 100644 components/qtmateriallistitem.h delete mode 100644 components/qtmateriallistitem_p.h delete mode 100644 components/qtmaterialmenu_internal.h delete mode 100644 components/qtmaterialmenu_p.h delete mode 100644 components/qtmaterialpaper.cpp delete mode 100644 components/qtmaterialpaper.h delete mode 100644 components/qtmaterialpaper_p.h delete mode 100644 components/qtmaterialtable.cpp delete mode 100644 components/qtmaterialtable.h delete mode 100644 components/qtmaterialtable_p.h rename components/{qtmaterialradiobutton.cpp => radiobutton.cpp} (95%) rename components/{qtmaterialradiobutton.h => radiobutton.h} (68%) rename components/{qtmaterialradiobutton_p.h => radiobutton_p.h} (66%) rename components/{qtmaterialraisedbutton.cpp => raisedbutton.cpp} (98%) rename components/{qtmaterialraisedbutton.h => raisedbutton.h} (77%) rename components/{qtmaterialraisedbutton_p.h => raisedbutton_p.h} (76%) rename components/{qtmaterialscrollbar.cpp => scrollbar.cpp} (99%) rename components/{qtmaterialscrollbar.h => scrollbar.h} (84%) rename components/{qtmaterialscrollbar_internal.cpp => scrollbar_internal.cpp} (96%) rename components/{qtmaterialscrollbar_internal.h => scrollbar_internal.h} (84%) rename components/{qtmaterialscrollbar_p.h => scrollbar_p.h} (86%) rename components/{qtmaterialslider.cpp => slider.cpp} (97%) rename components/{qtmaterialslider.h => slider.h} (94%) rename components/{qtmaterialslider_internal.cpp => slider_internal.cpp} (98%) rename components/{qtmaterialslider_internal.h => slider_internal.h} (97%) rename components/{qtmaterialslider_p.h => slider_p.h} (92%) rename components/{qtmaterialsnackbar.cpp => snackbar.cpp} (96%) rename components/{qtmaterialsnackbar.h => snackbar.h} (89%) rename components/{qtmaterialsnackbar_internal.cpp => snackbar_internal.cpp} (96%) rename components/{qtmaterialsnackbar_internal.h => snackbar_internal.h} (86%) rename components/{qtmaterialsnackbar_p.h => snackbar_p.h} (88%) create mode 100644 components/table.cpp create mode 100644 components/table.h create mode 100644 components/table_p.h rename components/{qtmaterialtabs.cpp => tabs.cpp} (99%) rename components/{qtmaterialtabs.h => tabs.h} (84%) rename components/{qtmaterialtabs_internal.cpp => tabs_internal.cpp} (99%) rename components/{qtmaterialtabs_internal.h => tabs_internal.h} (88%) rename components/{qtmaterialtabs_p.h => tabs_p.h} (84%) rename components/{qtmaterialtextfield.cpp => textfield.cpp} (97%) rename components/{qtmaterialtextfield.h => textfield.h} (93%) rename components/{qtmaterialtextfield_internal.cpp => textfield_internal.cpp} (99%) rename components/{qtmaterialtextfield_internal.h => textfield_internal.h} (94%) rename components/{qtmaterialtextfield_p.h => textfield_p.h} (90%) rename components/{qtmaterialtoggle.cpp => toggle.cpp} (97%) rename components/{qtmaterialtoggle.h => toggle.h} (93%) rename components/{qtmaterialtoggle_internal.cpp => toggle_internal.cpp} (98%) rename components/{qtmaterialtoggle_internal.h => toggle_internal.h} (94%) rename components/{qtmaterialtoggle_p.h => toggle_p.h} (91%) diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt index 29e16fb..f745584 100644 --- a/components/CMakeLists.txt +++ b/components/CMakeLists.txt @@ -21,130 +21,130 @@ find_package(Qt${QT_VERSION_MAJOR} COMPONENTS StateMachine REQUIRED) # Create a library called "components" which includes the source file "*.cpp". # The extension is already found. Any number of sources could be listed here. set(PROJECT_SOURCES - qtmaterialavatar.cpp - lib/qtmaterialstyle.cpp - lib/qtmaterialtheme.cpp - qtmaterialbadge.cpp - lib/qtmaterialoverlaywidget.cpp - qtmaterialcheckbox.cpp - lib/qtmaterialcheckable_internal.cpp - lib/qtmaterialcheckable.cpp - lib/qtmaterialripple.cpp - lib/qtmaterialrippleoverlay.cpp - qtmaterialfab.cpp - qtmaterialraisedbutton.cpp - qtmaterialflatbutton_internal.cpp - qtmaterialflatbutton.cpp - lib/qtmaterialstatetransition.cpp - qtmaterialiconbutton.cpp - qtmaterialprogress_internal.cpp - qtmaterialprogress.cpp - qtmaterialcircularprogress_internal.cpp - qtmaterialcircularprogress.cpp - qtmaterialslider_internal.cpp - qtmaterialslider.cpp - qtmaterialsnackbar_internal.cpp - qtmaterialsnackbar.cpp - qtmaterialradiobutton.cpp - qtmaterialtoggle_internal.cpp - qtmaterialtoggle.cpp - qtmaterialtextfield_internal.cpp - qtmaterialtextfield.cpp - qtmaterialtabs_internal.cpp - qtmaterialtabs.cpp - qtmaterialscrollbar_internal.cpp - qtmaterialscrollbar.cpp - qtmaterialdialog_internal.cpp - qtmaterialdialog.cpp - qtmaterialdrawer_internal.cpp - qtmaterialdrawer.cpp - qtmaterialappbar.cpp - qtmaterialautocomplete.cpp - qtmaterialpaper.cpp - qtmaterialtable.cpp - layouts/qtmaterialsnackbarlayout.cpp - qtmaterialautocomplete_internal.cpp - qtmaterialmenu.cpp - qtmaterialmenu_internal.cpp - qtmateriallist.cpp - qtmateriallistitem.cpp - qtmaterialavatar_p.h - qtmaterialavatar.h - lib/qtmaterialstyle_p.h - lib/qtmaterialstyle.h - lib/qtmaterialtheme_p.h - lib/qtmaterialtheme.h - qtmaterialbadge_p.h - qtmaterialbadge.h - lib/qtmaterialoverlaywidget.h - qtmaterialcheckbox_p.h - qtmaterialcheckbox.h - lib/qtmaterialcheckable_internal.h - lib/qtmaterialcheckable_p.h - lib/qtmaterialripple.h - lib/qtmaterialrippleoverlay.h - lib/qtmaterialcheckable.h - qtmaterialfab_p.h - qtmaterialfab.h - qtmaterialraisedbutton_p.h - qtmaterialraisedbutton.h - qtmaterialflatbutton_internal.h - qtmaterialflatbutton_p.h - qtmaterialflatbutton.h - lib/qtmaterialstatetransition.h - lib/qtmaterialstatetransitionevent.h - qtmaterialiconbutton_p.h - qtmaterialiconbutton.h - qtmaterialprogress_internal.h - qtmaterialprogress_p.h - qtmaterialprogress.h - qtmaterialcircularprogress_internal.h - qtmaterialcircularprogress_p.h - qtmaterialcircularprogress.h - qtmaterialslider_internal.h - qtmaterialslider_p.h - qtmaterialslider.h - qtmaterialsnackbar_internal.h - qtmaterialsnackbar_p.h - qtmaterialsnackbar.h - qtmaterialradiobutton_p.h - qtmaterialradiobutton.h - qtmaterialtoggle_internal.h - qtmaterialtoggle_p.h - qtmaterialtoggle.h - qtmaterialtextfield_internal.h - qtmaterialtextfield_p.h - qtmaterialtextfield.h - qtmaterialtabs_internal.h - qtmaterialtabs_p.h - qtmaterialtabs.h - qtmaterialscrollbar_internal.h - qtmaterialscrollbar_p.h - qtmaterialscrollbar.h - qtmaterialdialog_internal.h - qtmaterialdialog_p.h - qtmaterialdialog.h - qtmaterialdrawer_internal.h - qtmaterialdrawer_p.h - qtmaterialdrawer.h - qtmaterialappbar.h - qtmaterialappbar_p.h - qtmaterialautocomplete.h - qtmaterialautocomplete_p.h - qtmaterialpaper.h - qtmaterialpaper_p.h - qtmaterialtable.h - qtmaterialtable_p.h - layouts/qtmaterialsnackbarlayout.h - layouts/qtmaterialsnackbarlayout_p.h - qtmaterialautocomplete_internal.h - qtmaterialmenu.h - qtmaterialmenu_p.h - qtmaterialmenu_internal.h - qtmateriallist.h - qtmateriallist_p.h - qtmateriallistitem.h - qtmateriallistitem_p.h + avatar.cpp + lib/style.cpp + lib/theme.cpp + badge.cpp + lib/overlaywidget.cpp + checkbox.cpp + lib/checkable_internal.cpp + lib/checkable.cpp + lib/ripple.cpp + lib/rippleoverlay.cpp + fab.cpp + raisedbutton.cpp + flatbutton_internal.cpp + flatbutton.cpp + lib/statetransition.cpp + iconbutton.cpp + progress_internal.cpp + progress.cpp + circularprogress_internal.cpp + circularprogress.cpp + slider_internal.cpp + slider.cpp + snackbar_internal.cpp + snackbar.cpp + radiobutton.cpp + toggle_internal.cpp + toggle.cpp + textfield_internal.cpp + textfield.cpp + tabs_internal.cpp + tabs.cpp + scrollbar_internal.cpp + scrollbar.cpp + dialog_internal.cpp + dialog.cpp + drawer_internal.cpp + drawer.cpp + appbar.cpp + autocomplete.cpp + paper.cpp + table.cpp + layouts/snackbarlayout.cpp + autocomplete_internal.cpp + menu.cpp + menu_internal.cpp + list.cpp + listitem.cpp + avatar_p.h + avatar.h + lib/style_p.h + lib/style.h + lib/theme_p.h + lib/theme.h + badge_p.h + badge.h + lib/overlaywidget.h + checkbox_p.h + checkbox.h + lib/checkable_internal.h + lib/checkable_p.h + lib/ripple.h + lib/rippleoverlay.h + lib/checkable.h + fab_p.h + fab.h + raisedbutton_p.h + raisedbutton.h + flatbutton_internal.h + flatbutton_p.h + flatbutton.h + lib/statetransition.h + lib/statetransitionevent.h + iconbutton_p.h + iconbutton.h + progress_internal.h + progress_p.h + progress.h + circularprogress_internal.h + circularprogress_p.h + circularprogress.h + slider_internal.h + slider_p.h + slider.h + snackbar_internal.h + snackbar_p.h + snackbar.h + radiobutton_p.h + radiobutton.h + toggle_internal.h + toggle_p.h + toggle.h + textfield_internal.h + textfield_p.h + textfield.h + tabs_internal.h + tabs_p.h + tabs.h + scrollbar_internal.h + scrollbar_p.h + scrollbar.h + dialog_internal.h + dialog_p.h + dialog.h + drawer_internal.h + drawer_p.h + drawer.h + appbar.h + appbar_p.h + autocomplete.h + autocomplete_p.h + paper.h + paper_p.h + table.h + table_p.h + layouts/snackbarlayout.h + layouts/snackbarlayout_p.h + autocomplete_internal.h + menu.h + menu_p.h + menu_internal.h + list.h + list_p.h + listitem.h + listitem_p.h ) if(${QT_VERSION_MAJOR} GREATER_EQUAL 6) diff --git a/components/qtmaterialappbar.cpp b/components/appbar.cpp similarity index 95% rename from components/qtmaterialappbar.cpp rename to components/appbar.cpp index a93a6f3..557765b 100644 --- a/components/qtmaterialappbar.cpp +++ b/components/appbar.cpp @@ -1,8 +1,8 @@ -#include "qtmaterialappbar.h" -#include "qtmaterialappbar_p.h" +#include "appbar.h" +#include "appbar_p.h" #include #include -#include "lib/qtmaterialstyle.h" +#include "lib/style.h" namespace md { /*! diff --git a/components/qtmaterialappbar.h b/components/appbar.h similarity index 92% rename from components/qtmaterialappbar.h rename to components/appbar.h index 8e7fb14..e0168a4 100644 --- a/components/qtmaterialappbar.h +++ b/components/appbar.h @@ -1,5 +1,5 @@ -#ifndef QTMATERIALAPPBAR_H -#define QTMATERIALAPPBAR_H +#ifndef APPBAR_H +#define APPBAR_H #include #include @@ -50,4 +50,4 @@ inline QHBoxLayout *AppBar::appBarLayout() const } -#endif // QTMATERIALAPPBAR_H +#endif // APPBAR_H diff --git a/components/qtmaterialappbar_p.h b/components/appbar_p.h similarity index 81% rename from components/qtmaterialappbar_p.h rename to components/appbar_p.h index cd344cd..85e2c55 100644 --- a/components/qtmaterialappbar_p.h +++ b/components/appbar_p.h @@ -1,5 +1,5 @@ -#ifndef QTMATERIALAPPBAR_P_H -#define QTMATERIALAPPBAR_P_H +#ifndef APPBAR_P_H +#define APPBAR_P_H #include #include @@ -28,4 +28,4 @@ public: } -#endif // QTMATERIALAPPBAR_P_H +#endif // APPBAR_P_H diff --git a/components/qtmaterialautocomplete.cpp b/components/autocomplete.cpp similarity index 99% rename from components/qtmaterialautocomplete.cpp rename to components/autocomplete.cpp index ecaf1fe..463595f 100644 --- a/components/qtmaterialautocomplete.cpp +++ b/components/autocomplete.cpp @@ -1,4 +1,4 @@ -#include "qtmaterialautocomplete_p.h" +#include "autocomplete_p.h" namespace md diff --git a/components/qtmaterialautocomplete.h b/components/autocomplete.h similarity index 80% rename from components/qtmaterialautocomplete.h rename to components/autocomplete.h index 0e6a234..cf126c1 100644 --- a/components/qtmaterialautocomplete.h +++ b/components/autocomplete.h @@ -1,7 +1,7 @@ -#ifndef QTMATERIALAUTOCOMPLETE_H -#define QTMATERIALAUTOCOMPLETE_H +#ifndef AUTOCOMPLETE_H +#define AUTOCOMPLETE_H -#include "qtmaterialtextfield.h" +#include "textfield.h" namespace md { @@ -35,4 +35,4 @@ private: } -#endif // QTMATERIALAUTOCOMPLETE_H +#endif // AUTOCOMPLETE_H diff --git a/components/qtmaterialautocomplete_internal.cpp b/components/autocomplete_internal.cpp similarity index 97% rename from components/qtmaterialautocomplete_internal.cpp rename to components/autocomplete_internal.cpp index 75c548c..7fff61b 100644 --- a/components/qtmaterialautocomplete_internal.cpp +++ b/components/autocomplete_internal.cpp @@ -1,4 +1,4 @@ -#include "qtmaterialautocomplete_internal.h" +#include "autocomplete_internal.h" #include #include #include diff --git a/components/qtmaterialautocomplete_internal.h b/components/autocomplete_internal.h similarity index 73% rename from components/qtmaterialautocomplete_internal.h rename to components/autocomplete_internal.h index 0621eab..d628b55 100644 --- a/components/qtmaterialautocomplete_internal.h +++ b/components/autocomplete_internal.h @@ -1,8 +1,8 @@ -#ifndef QTMATERIALAUTOCOMPLETESTATEMACHINE_H -#define QTMATERIALAUTOCOMPLETESTATEMACHINE_H +#ifndef AUTOCOMPLETESTATEMACHINE_H +#define AUTOCOMPLETESTATEMACHINE_H #include -#include "qtmaterialautocomplete.h" +#include "autocomplete.h" namespace md { @@ -31,4 +31,4 @@ private: } -#endif // QTMATERIALAUTOCOMPLETESTATEMACHINE_H +#endif // AUTOCOMPLETESTATEMACHINE_H diff --git a/components/qtmaterialautocomplete_p.h b/components/autocomplete_p.h similarity index 74% rename from components/qtmaterialautocomplete_p.h rename to components/autocomplete_p.h index fd5004c..a0baae9 100644 --- a/components/qtmaterialautocomplete_p.h +++ b/components/autocomplete_p.h @@ -1,5 +1,5 @@ -#ifndef QTMATERIALAUTOCOMPLETE_P_H -#define QTMATERIALAUTOCOMPLETE_P_H +#ifndef AUTOCOMPLETE_P_H +#define AUTOCOMPLETE_P_H #include #include @@ -8,10 +8,10 @@ #include #include -#include "qtmaterialautocomplete.h" -#include "qtmaterialautocomplete_internal.h" -#include "qtmaterialflatbutton.h" -#include "qtmaterialtextfield_p.h" +#include "autocomplete.h" +#include "autocomplete_internal.h" +#include "flatbutton.h" +#include "textfield_p.h" namespace md { @@ -40,4 +40,4 @@ public: } -#endif // QTMATERIALAUTOCOMPLETE_P_H +#endif // AUTOCOMPLETE_P_H diff --git a/components/qtmaterialavatar.cpp b/components/avatar.cpp similarity index 98% rename from components/qtmaterialavatar.cpp rename to components/avatar.cpp index 56578dc..c1d0ea2 100644 --- a/components/qtmaterialavatar.cpp +++ b/components/avatar.cpp @@ -1,8 +1,8 @@ -#include "qtmaterialavatar.h" -#include "qtmaterialavatar_p.h" +#include "avatar.h" +#include "avatar_p.h" #include #include -#include "lib/qtmaterialstyle.h" +#include "lib/style.h" namespace md { diff --git a/components/qtmaterialavatar.h b/components/avatar.h similarity index 90% rename from components/qtmaterialavatar.h rename to components/avatar.h index a118421..3fefc28 100644 --- a/components/qtmaterialavatar.h +++ b/components/avatar.h @@ -1,8 +1,8 @@ -#ifndef QTMATERIALAVATAR_H -#define QTMATERIALAVATAR_H +#ifndef AVATAR_H +#define AVATAR_H #include -#include "lib/qtmaterialtheme.h" +#include "lib/theme.h" namespace md { class AvatarPrivate; @@ -49,4 +49,4 @@ private: }; } -#endif // QTMATERIALAVATAR_H +#endif // AVATAR_H diff --git a/components/qtmaterialavatar_p.h b/components/avatar_p.h similarity index 81% rename from components/qtmaterialavatar_p.h rename to components/avatar_p.h index 4870d77..5901b24 100644 --- a/components/qtmaterialavatar_p.h +++ b/components/avatar_p.h @@ -1,5 +1,5 @@ -#ifndef QTMATERIALAVATAR_P_H -#define QTMATERIALAVATAR_P_H +#ifndef AVATAR_P_H +#define AVATAR_P_H #include #include @@ -7,7 +7,7 @@ #include #include #include -#include "lib/qtmaterialtheme.h" +#include "lib/theme.h" namespace md { @@ -39,4 +39,4 @@ public: } -#endif // QTMATERIALAVATAR_P_H +#endif // AVATAR_P_H diff --git a/components/qtmaterialbadge.cpp b/components/badge.cpp similarity index 98% rename from components/qtmaterialbadge.cpp rename to components/badge.cpp index 71046fe..f6dff5a 100644 --- a/components/qtmaterialbadge.cpp +++ b/components/badge.cpp @@ -1,7 +1,7 @@ -#include "qtmaterialbadge.h" -#include "qtmaterialbadge_p.h" +#include "badge.h" +#include "badge_p.h" #include -#include "lib/qtmaterialstyle.h" +#include "lib/style.h" namespace md { diff --git a/components/qtmaterialbadge.h b/components/badge.h similarity index 92% rename from components/qtmaterialbadge.h rename to components/badge.h index 8df8dff..80f504f 100644 --- a/components/qtmaterialbadge.h +++ b/components/badge.h @@ -1,7 +1,7 @@ -#ifndef QTMATERIALBADGE_H -#define QTMATERIALBADGE_H +#ifndef BADGE_H +#define BADGE_H -#include "lib/qtmaterialoverlaywidget.h" +#include "lib/overlaywidget.h" namespace md { @@ -62,4 +62,4 @@ private: } -#endif // QTMATERIALBADGE_H +#endif // BADGE_H diff --git a/components/qtmaterialbadge_p.h b/components/badge_p.h similarity index 87% rename from components/qtmaterialbadge_p.h rename to components/badge_p.h index c72d5a4..89a110f 100644 --- a/components/qtmaterialbadge_p.h +++ b/components/badge_p.h @@ -1,5 +1,5 @@ -#ifndef QTMATERIALBADGE_P_H -#define QTMATERIALBADGE_P_H +#ifndef BADGE_P_H +#define BADGE_P_H #include #include @@ -34,4 +34,4 @@ public: }; } -#endif // QTMATERIALBADGE_P_H +#endif // BADGE_P_H diff --git a/components/qtmaterialcheckbox.cpp b/components/checkbox.cpp similarity index 98% rename from components/qtmaterialcheckbox.cpp rename to components/checkbox.cpp index 9ef8e51..4e491b4 100644 --- a/components/qtmaterialcheckbox.cpp +++ b/components/checkbox.cpp @@ -1,4 +1,4 @@ -#include "qtmaterialcheckbox_p.h" +#include "checkbox_p.h" namespace md { diff --git a/components/qtmaterialcheckbox.h b/components/checkbox.h similarity index 65% rename from components/qtmaterialcheckbox.h rename to components/checkbox.h index b09de4f..743cb40 100644 --- a/components/qtmaterialcheckbox.h +++ b/components/checkbox.h @@ -1,7 +1,7 @@ -#ifndef QTMATERIALCHECKBOX_H -#define QTMATERIALCHECKBOX_H +#ifndef CHECKBOX_H +#define CHECKBOX_H -#include "lib/qtmaterialcheckable.h" +#include "lib/checkable.h" namespace md { @@ -22,4 +22,4 @@ private: }; } -#endif // QTMATERIALCHECKBOX_H +#endif // CHECKBOX_H diff --git a/components/qtmaterialcheckbox_p.h b/components/checkbox_p.h similarity index 60% rename from components/qtmaterialcheckbox_p.h rename to components/checkbox_p.h index 565e6c1..da3471c 100644 --- a/components/qtmaterialcheckbox_p.h +++ b/components/checkbox_p.h @@ -1,13 +1,13 @@ -#ifndef QTMATERIALCHECKBOX_P_H -#define QTMATERIALCHECKBOX_P_H +#ifndef CHECKBOX_P_H +#define CHECKBOX_P_H #include #include #include -#include "qtmaterialcheckbox.h" -#include "lib/qtmaterialcheckable_internal.h" -#include "lib/qtmaterialcheckable_p.h" +#include "checkbox.h" +#include "lib/checkable_internal.h" +#include "lib/checkable_p.h" namespace md { @@ -26,4 +26,4 @@ public: void init(); }; } -#endif // QTMATERIALCHECKBOX_P_H +#endif // CHECKBOX_P_H diff --git a/components/qtmaterialcircularprogress.cpp b/components/circularprogress.cpp similarity index 97% rename from components/qtmaterialcircularprogress.cpp rename to components/circularprogress.cpp index 6718756..2203a2e 100644 --- a/components/qtmaterialcircularprogress.cpp +++ b/components/circularprogress.cpp @@ -1,11 +1,11 @@ -#include "qtmaterialcircularprogress.h" -#include "qtmaterialcircularprogress_p.h" +#include "circularprogress.h" +#include "circularprogress_p.h" #include #include #include #include -#include "qtmaterialcircularprogress_internal.h" -#include "lib/qtmaterialstyle.h" +#include "circularprogress_internal.h" +#include "lib/style.h" namespace md { diff --git a/components/qtmaterialcircularprogress.h b/components/circularprogress.h similarity index 87% rename from components/qtmaterialcircularprogress.h rename to components/circularprogress.h index 3273f4a..365e7d3 100644 --- a/components/qtmaterialcircularprogress.h +++ b/components/circularprogress.h @@ -1,8 +1,8 @@ -#ifndef QTMATERIALCIRCULARPROGRESS_H -#define QTMATERIALCIRCULARPROGRESS_H +#ifndef CIRCULARPROGRESS_H +#define CIRCULARPROGRESS_H #include -#include "lib/qtmaterialtheme.h" +#include "lib/theme.h" namespace md { @@ -50,4 +50,4 @@ private: } -#endif // QTMATERIALCIRCULARPROGRESS_H +#endif // CIRCULARPROGRESS_H diff --git a/components/qtmaterialcircularprogress_internal.cpp b/components/circularprogress_internal.cpp similarity index 88% rename from components/qtmaterialcircularprogress_internal.cpp rename to components/circularprogress_internal.cpp index 79a55b2..5480a1f 100644 --- a/components/qtmaterialcircularprogress_internal.cpp +++ b/components/circularprogress_internal.cpp @@ -1,4 +1,4 @@ -#include "qtmaterialcircularprogress_internal.h" +#include "circularprogress_internal.h" namespace md { diff --git a/components/qtmaterialcircularprogress_internal.h b/components/circularprogress_internal.h similarity index 89% rename from components/qtmaterialcircularprogress_internal.h rename to components/circularprogress_internal.h index 41a5f6b..5273a8e 100644 --- a/components/qtmaterialcircularprogress_internal.h +++ b/components/circularprogress_internal.h @@ -1,8 +1,8 @@ -#ifndef QTMATERIALCIRCULARPROGRESS_INTERNAL_H -#define QTMATERIALCIRCULARPROGRESS_INTERNAL_H +#ifndef CIRCULARPROGRESS_INTERNAL_H +#define CIRCULARPROGRESS_INTERNAL_H #include -#include "qtmaterialcircularprogress.h" +#include "circularprogress.h" namespace md { @@ -71,4 +71,4 @@ inline int CircularProgressDelegate::angle() const } -#endif // QTMATERIALCIRCULARPROGRESS_INTERNAL_H +#endif // CIRCULARPROGRESS_INTERNAL_H diff --git a/components/qtmaterialcircularprogress_p.h b/components/circularprogress_p.h similarity index 81% rename from components/qtmaterialcircularprogress_p.h rename to components/circularprogress_p.h index 66a4592..ad22930 100644 --- a/components/qtmaterialcircularprogress_p.h +++ b/components/circularprogress_p.h @@ -1,8 +1,8 @@ -#ifndef QTMATERIALCIRCULARPROGRESS_P_H -#define QTMATERIALCIRCULARPROGRESS_P_H +#ifndef CIRCULARPROGRESS_P_H +#define CIRCULARPROGRESS_P_H #include -#include "lib/qtmaterialtheme.h" +#include "lib/theme.h" namespace md { @@ -31,4 +31,4 @@ public: } -#endif // QTMATERIALCIRCULARPROGRESS_P_H +#endif // CIRCULARPROGRESS_P_H diff --git a/components/qtmaterialdialog.cpp b/components/dialog.cpp similarity index 99% rename from components/qtmaterialdialog.cpp rename to components/dialog.cpp index 7a5a6d8..78e7f61 100644 --- a/components/qtmaterialdialog.cpp +++ b/components/dialog.cpp @@ -1,4 +1,4 @@ -#include "qtmaterialdialog.h" +#include "dialog.h" namespace md { diff --git a/components/qtmaterialdialog.h b/components/dialog.h similarity index 69% rename from components/qtmaterialdialog.h rename to components/dialog.h index fc3c668..5429c85 100644 --- a/components/qtmaterialdialog.h +++ b/components/dialog.h @@ -1,13 +1,13 @@ -#ifndef QTMATERIALDIALOG_H -#define QTMATERIALDIALOG_H +#ifndef DIALOG_H +#define DIALOG_H #include #include -#include "qtmaterialdialog_p.h" -#include "qtmaterialdialog_internal.h" -#include "lib/qtmaterialstatetransition.h" -#include "lib/qtmaterialoverlaywidget.h" +#include "dialog_p.h" +#include "dialog_internal.h" +#include "lib/statetransition.h" +#include "lib/overlaywidget.h" namespace md { @@ -39,4 +39,4 @@ private: Q_DECLARE_PRIVATE(Dialog) }; } -#endif // QTMATERIALDIALOG_H +#endif // DIALOG_H diff --git a/components/qtmaterialdialog_internal.cpp b/components/dialog_internal.cpp similarity index 98% rename from components/qtmaterialdialog_internal.cpp rename to components/dialog_internal.cpp index c93ffbb..1e58c7e 100644 --- a/components/qtmaterialdialog_internal.cpp +++ b/components/dialog_internal.cpp @@ -1,4 +1,4 @@ -#include "qtmaterialdialog_internal.h" +#include "dialog_internal.h" namespace md { diff --git a/components/qtmaterialdialog_internal.h b/components/dialog_internal.h similarity index 92% rename from components/qtmaterialdialog_internal.h rename to components/dialog_internal.h index b1f49de..1146888 100644 --- a/components/qtmaterialdialog_internal.h +++ b/components/dialog_internal.h @@ -1,5 +1,5 @@ -#ifndef QTMATERIALDIALOG_INTERNAL_H -#define QTMATERIALDIALOG_INTERNAL_H +#ifndef DIALOG_INTERNAL_H +#define DIALOG_INTERNAL_H #include #include @@ -7,7 +7,7 @@ #include #include -#include "qtmaterialdialog.h" +#include "dialog.h" namespace md { @@ -85,5 +85,5 @@ private: }; } -#endif // QTMATERIALDIALOG_INTERNAL_H +#endif // DIALOG_INTERNAL_H diff --git a/components/qtmaterialdialog_p.h b/components/dialog_p.h similarity index 87% rename from components/qtmaterialdialog_p.h rename to components/dialog_p.h index d1b7cbf..11db165 100644 --- a/components/qtmaterialdialog_p.h +++ b/components/dialog_p.h @@ -1,5 +1,5 @@ -#ifndef QTMATERIALDIALOG_P_H -#define QTMATERIALDIALOG_P_H +#ifndef DIALOG_P_H +#define DIALOG_P_H #include #include @@ -36,4 +36,4 @@ public: DialogProxy *proxy; }; } -#endif // QTMATERIALDIALOG_P_H +#endif // DIALOG_P_H diff --git a/components/qtmaterialdrawer.cpp b/components/drawer.cpp similarity index 99% rename from components/qtmaterialdrawer.cpp rename to components/drawer.cpp index c6dc174..49e2261 100644 --- a/components/qtmaterialdrawer.cpp +++ b/components/drawer.cpp @@ -1,4 +1,4 @@ -#include "qtmaterialdrawer.h" +#include "drawer.h" namespace md { diff --git a/components/qtmaterialdrawer.h b/components/drawer.h similarity index 85% rename from components/qtmaterialdrawer.h rename to components/drawer.h index b0e7f0a..a881476 100644 --- a/components/qtmaterialdrawer.h +++ b/components/drawer.h @@ -1,5 +1,5 @@ -#ifndef QTMATERIALDRAWER_H -#define QTMATERIALDRAWER_H +#ifndef DRAWER_H +#define DRAWER_H #include #include @@ -10,9 +10,9 @@ #include #include -#include "qtmaterialdrawer_p.h" -#include "qtmaterialdrawer_internal.h" -#include "lib/qtmaterialoverlaywidget.h" +#include "drawer_p.h" +#include "drawer_internal.h" +#include "lib/overlaywidget.h" namespace md { @@ -59,4 +59,4 @@ private: Q_DECLARE_PRIVATE(Drawer) }; } -#endif // QTMATERIALDRAWER_H +#endif // DRAWER_H diff --git a/components/qtmaterialdrawer_internal.cpp b/components/drawer_internal.cpp similarity index 98% rename from components/qtmaterialdrawer_internal.cpp rename to components/drawer_internal.cpp index 3d354cb..3e2f1e7 100644 --- a/components/qtmaterialdrawer_internal.cpp +++ b/components/drawer_internal.cpp @@ -1,10 +1,10 @@ -#include "qtmaterialdrawer_internal.h" +#include "drawer_internal.h" #include #include #include #include #include -#include "qtmaterialdrawer.h" +#include "drawer.h" namespace md { /*! diff --git a/components/qtmaterialdrawer_internal.h b/components/drawer_internal.h similarity index 97% rename from components/qtmaterialdrawer_internal.h rename to components/drawer_internal.h index ca2d9ca..5370179 100644 --- a/components/qtmaterialdrawer_internal.h +++ b/components/drawer_internal.h @@ -2,7 +2,7 @@ #define DRAWER_INTERNAL_H #include -#include "lib/qtmaterialoverlaywidget.h" +#include "lib/overlaywidget.h" namespace md { diff --git a/components/qtmaterialdrawer_p.h b/components/drawer_p.h similarity index 100% rename from components/qtmaterialdrawer_p.h rename to components/drawer_p.h diff --git a/components/qtmaterialfab.cpp b/components/fab.cpp similarity index 98% rename from components/qtmaterialfab.cpp rename to components/fab.cpp index c7e0479..0e57f68 100644 --- a/components/qtmaterialfab.cpp +++ b/components/fab.cpp @@ -1,10 +1,10 @@ -#include "qtmaterialfab.h" -#include "qtmaterialfab_p.h" +#include "fab.h" +#include "fab_p.h" #include #include #include #include -#include "lib/qtmaterialrippleoverlay.h" +#include "lib/rippleoverlay.h" namespace md { diff --git a/components/qtmaterialfab.h b/components/fab.h similarity index 89% rename from components/qtmaterialfab.h rename to components/fab.h index 9e23cc0..5a97943 100644 --- a/components/qtmaterialfab.h +++ b/components/fab.h @@ -1,7 +1,7 @@ -#ifndef QTMATERIALFAB_H -#define QTMATERIALFAB_H +#ifndef FAB_H +#define FAB_H -#include "qtmaterialraisedbutton.h" +#include "raisedbutton.h" namespace md { @@ -45,4 +45,4 @@ private: }; } -#endif // QTMATERIALFAB_H +#endif // FAB_H diff --git a/components/qtmaterialfab_p.h b/components/fab_p.h similarity index 88% rename from components/qtmaterialfab_p.h rename to components/fab_p.h index 6cd7355..9055fd1 100644 --- a/components/qtmaterialfab_p.h +++ b/components/fab_p.h @@ -1,7 +1,7 @@ -#ifndef QTMATERIALFAB_P_H -#define QTMATERIALFAB_P_H +#ifndef FAB_P_H +#define FAB_P_H -#include "qtmaterialraisedbutton_p.h" +#include "raisedbutton_p.h" namespace md { @@ -49,4 +49,4 @@ inline int FloatingActionButtonPrivate::iconSize() const return mini ? MiniIconSize : DefaultIconSize; } } -#endif // QTMATERIALFAB_P_H +#endif // FAB_P_H diff --git a/components/qtmaterialflatbutton.cpp b/components/flatbutton.cpp similarity index 98% rename from components/qtmaterialflatbutton.cpp rename to components/flatbutton.cpp index 0c1b1c6..5b1c0fb 100644 --- a/components/qtmaterialflatbutton.cpp +++ b/components/flatbutton.cpp @@ -1,15 +1,15 @@ -#include "qtmaterialflatbutton.h" -#include "qtmaterialflatbutton_p.h" +#include "flatbutton.h" +#include "flatbutton_p.h" #include #include #include #include #include #include -#include "lib/qtmaterialrippleoverlay.h" -#include "lib/qtmaterialripple.h" -#include "lib/qtmaterialstyle.h" -#include "qtmaterialflatbutton_internal.h" +#include "lib/rippleoverlay.h" +#include "lib/ripple.h" +#include "lib/style.h" +#include "flatbutton_internal.h" namespace md { diff --git a/components/qtmaterialflatbutton.h b/components/flatbutton.h similarity index 96% rename from components/qtmaterialflatbutton.h rename to components/flatbutton.h index 48c9454..554ac39 100644 --- a/components/qtmaterialflatbutton.h +++ b/components/flatbutton.h @@ -1,9 +1,9 @@ -#ifndef QTMATERIALFLATBUTTON_H -#define QTMATERIALFLATBUTTON_H +#ifndef FLATBUTTON_H +#define FLATBUTTON_H #include #include -#include "lib/qtmaterialtheme.h" +#include "lib/theme.h" namespace md { @@ -113,4 +113,4 @@ private: } -#endif // QTMATERIALFLATBUTTON_H +#endif // FLATBUTTON_H diff --git a/components/qtmaterialflatbutton_internal.cpp b/components/flatbutton_internal.cpp similarity index 99% rename from components/qtmaterialflatbutton_internal.cpp rename to components/flatbutton_internal.cpp index 53142c5..de0991c 100644 --- a/components/qtmaterialflatbutton_internal.cpp +++ b/components/flatbutton_internal.cpp @@ -1,4 +1,4 @@ -#include "qtmaterialflatbutton_internal.h" +#include "flatbutton_internal.h" namespace md { diff --git a/components/qtmaterialflatbutton_internal.h b/components/flatbutton_internal.h similarity index 93% rename from components/qtmaterialflatbutton_internal.h rename to components/flatbutton_internal.h index 8eef9ff..4e31a4b 100644 --- a/components/qtmaterialflatbutton_internal.h +++ b/components/flatbutton_internal.h @@ -1,5 +1,5 @@ -#ifndef QTMATERIALFLATBUTTON_INTERNAL_H -#define QTMATERIALFLATBUTTON_INTERNAL_H +#ifndef FLATBUTTON_INTERNAL_H +#define FLATBUTTON_INTERNAL_H #include #include @@ -8,8 +8,8 @@ #include #include -#include "qtmaterialflatbutton.h" -#include "lib/qtmaterialstatetransition.h" +#include "flatbutton.h" +#include "lib/statetransition.h" namespace md { @@ -109,4 +109,4 @@ inline qreal FlatButtonStateMachine::haloScaleFactor() const } } -#endif // QTMATERIALFLATBUTTON_INTERNAL_H +#endif // FLATBUTTON_INTERNAL_H diff --git a/components/qtmaterialflatbutton_p.h b/components/flatbutton_p.h similarity index 91% rename from components/qtmaterialflatbutton_p.h rename to components/flatbutton_p.h index 1e5c899..1fa0394 100644 --- a/components/qtmaterialflatbutton_p.h +++ b/components/flatbutton_p.h @@ -1,9 +1,9 @@ -#ifndef QTMATERIALFLATBUTTON_P_H -#define QTMATERIALFLATBUTTON_P_H +#ifndef FLATBUTTON_P_H +#define FLATBUTTON_P_H #include #include -#include "lib/qtmaterialtheme.h" +#include "lib/theme.h" namespace md { @@ -46,4 +46,4 @@ public: }; } -#endif // QTMATERIALFLATBUTTON_P_H +#endif // FLATBUTTON_P_H diff --git a/components/qtmaterialiconbutton.cpp b/components/iconbutton.cpp similarity index 96% rename from components/qtmaterialiconbutton.cpp rename to components/iconbutton.cpp index e86f553..e2375dc 100644 --- a/components/qtmaterialiconbutton.cpp +++ b/components/iconbutton.cpp @@ -1,9 +1,9 @@ -#include "qtmaterialiconbutton.h" -#include "qtmaterialiconbutton_p.h" +#include "iconbutton.h" +#include "iconbutton_p.h" #include #include -#include "lib/qtmaterialstyle.h" -#include "lib/qtmaterialrippleoverlay.h" +#include "lib/style.h" +#include "lib/rippleoverlay.h" namespace md { diff --git a/components/qtmaterialiconbutton.h b/components/iconbutton.h similarity index 90% rename from components/qtmaterialiconbutton.h rename to components/iconbutton.h index 1495743..f16d6ae 100644 --- a/components/qtmaterialiconbutton.h +++ b/components/iconbutton.h @@ -1,5 +1,5 @@ -#ifndef QTMATERIALICONBUTTON_H -#define QTMATERIALICONBUTTON_H +#ifndef ICONBUTTON_H +#define ICONBUTTON_H #include @@ -44,4 +44,4 @@ private: } -#endif // QTMATERIALICONBUTTON_H +#endif // ICONBUTTON_H diff --git a/components/qtmaterialiconbutton_p.h b/components/iconbutton_p.h similarity index 83% rename from components/qtmaterialiconbutton_p.h rename to components/iconbutton_p.h index 1d8b642..ee27a0d 100644 --- a/components/qtmaterialiconbutton_p.h +++ b/components/iconbutton_p.h @@ -1,5 +1,5 @@ -#ifndef QTMATERIALICONBUTTON_P_H -#define QTMATERIALICONBUTTON_P_H +#ifndef ICONBUTTON_P_H +#define ICONBUTTON_P_H #include #include @@ -30,4 +30,4 @@ public: } -#endif // QTMATERIALICONBUTTON_P_H +#endif // ICONBUTTON_P_H diff --git a/components/layouts/qtmaterialsnackbarlayout.h b/components/layouts/qtmaterialsnackbarlayout.h deleted file mode 100644 index 274166b..0000000 --- a/components/layouts/qtmaterialsnackbarlayout.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef QTMATERIALSNACKBARLAYOUT_H -#define QTMATERIALSNACKBARLAYOUT_H -namespace md -{ - -} -#endif // QTMATERIALSNACKBARLAYOUT_H diff --git a/components/layouts/qtmaterialsnackbarlayout_p.h b/components/layouts/qtmaterialsnackbarlayout_p.h deleted file mode 100644 index 570f62c..0000000 --- a/components/layouts/qtmaterialsnackbarlayout_p.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef QTMATERIALSNACKBARLAYOUT_P_H -#define QTMATERIALSNACKBARLAYOUT_P_H -namespace md -{ - -} -#endif // QTMATERIALSNACKBARLAYOUT_P_H diff --git a/components/layouts/qtmaterialsnackbarlayout.cpp b/components/layouts/snackbarlayout.cpp similarity index 100% rename from components/layouts/qtmaterialsnackbarlayout.cpp rename to components/layouts/snackbarlayout.cpp diff --git a/components/layouts/snackbarlayout.h b/components/layouts/snackbarlayout.h new file mode 100644 index 0000000..6a6dedc --- /dev/null +++ b/components/layouts/snackbarlayout.h @@ -0,0 +1,7 @@ +#ifndef SNACKBARLAYOUT_H +#define SNACKBARLAYOUT_H +namespace md +{ + +} +#endif // SNACKBARLAYOUT_H diff --git a/components/layouts/snackbarlayout_p.h b/components/layouts/snackbarlayout_p.h new file mode 100644 index 0000000..7aa4b1c --- /dev/null +++ b/components/layouts/snackbarlayout_p.h @@ -0,0 +1,7 @@ +#ifndef SNACKBARLAYOUT_P_H +#define SNACKBARLAYOUT_P_H +namespace md +{ + +} +#endif // SNACKBARLAYOUT_P_H diff --git a/components/lib/qtmaterialcheckable.cpp b/components/lib/checkable.cpp similarity index 97% rename from components/lib/qtmaterialcheckable.cpp rename to components/lib/checkable.cpp index 25ca9eb..d69d6cb 100644 --- a/components/lib/qtmaterialcheckable.cpp +++ b/components/lib/checkable.cpp @@ -1,9 +1,9 @@ -#include "lib/qtmaterialcheckable.h" -#include "lib/qtmaterialcheckable_p.h" -#include "lib/qtmaterialrippleoverlay.h" -#include "lib/qtmaterialripple.h" -#include "lib/qtmaterialstyle.h" -#include "lib/qtmaterialcheckable_internal.h" +#include "lib/checkable.h" +#include "lib/checkable_p.h" +#include "lib/rippleoverlay.h" +#include "lib/ripple.h" +#include "lib/style.h" +#include "lib/checkable_internal.h" namespace md { diff --git a/components/lib/qtmaterialcheckable.h b/components/lib/checkable.h similarity index 94% rename from components/lib/qtmaterialcheckable.h rename to components/lib/checkable.h index 7ac3a86..aa3b800 100644 --- a/components/lib/qtmaterialcheckable.h +++ b/components/lib/checkable.h @@ -1,5 +1,5 @@ -#ifndef QTMATERIALCHECKABLE_H -#define QTMATERIALCHECKABLE_H +#ifndef CHECKABLE_H +#define CHECKABLE_H #include namespace md @@ -63,4 +63,4 @@ private: }; } -#endif // QTMATERIALCHECKABLE_H +#endif // CHECKABLE_H diff --git a/components/lib/qtmaterialcheckable_internal.cpp b/components/lib/checkable_internal.cpp similarity index 94% rename from components/lib/qtmaterialcheckable_internal.cpp rename to components/lib/checkable_internal.cpp index 075fba6..1977e04 100644 --- a/components/lib/qtmaterialcheckable_internal.cpp +++ b/components/lib/checkable_internal.cpp @@ -1,8 +1,8 @@ -#include "lib/qtmaterialcheckable_internal.h" +#include "lib/checkable_internal.h" #include #include #include -#include "lib/qtmaterialcheckable.h" +#include "lib/checkable.h" namespace md { diff --git a/components/lib/qtmaterialcheckable_internal.h b/components/lib/checkable_internal.h similarity index 93% rename from components/lib/qtmaterialcheckable_internal.h rename to components/lib/checkable_internal.h index c7d3bc4..1aa7d98 100644 --- a/components/lib/qtmaterialcheckable_internal.h +++ b/components/lib/checkable_internal.h @@ -1,5 +1,5 @@ -#ifndef QTMATERIALCHECKABLE_INTERNAL_H -#define QTMATERIALCHECKABLE_INTERNAL_H +#ifndef CHECKABLE_INTERNAL_H +#define CHECKABLE_INTERNAL_H #include #include @@ -93,4 +93,4 @@ inline qreal CheckableIcon::opacity() const } } -#endif // QTMATERIALCHECKABLE_INTERNAL_H +#endif // CHECKABLE_INTERNAL_H diff --git a/components/lib/qtmaterialcheckable_p.h b/components/lib/checkable_p.h similarity index 90% rename from components/lib/qtmaterialcheckable_p.h rename to components/lib/checkable_p.h index 6d19970..5c88547 100644 --- a/components/lib/qtmaterialcheckable_p.h +++ b/components/lib/checkable_p.h @@ -1,5 +1,5 @@ -#ifndef QTMATERIALCHECKABLE_P_H -#define QTMATERIALCHECKABLE_P_H +#ifndef CHECKABLE_P_H +#define CHECKABLE_P_H #include #include @@ -10,7 +10,7 @@ #include #include -#include "lib/qtmaterialcheckable.h" +#include "lib/checkable.h" namespace md { @@ -48,4 +48,4 @@ public: }; } -#endif // QTMATERIALCHECKABLE_P_H +#endif // CHECKABLE_P_H diff --git a/components/lib/qtmaterialoverlaywidget.cpp b/components/lib/overlaywidget.cpp similarity index 96% rename from components/lib/qtmaterialoverlaywidget.cpp rename to components/lib/overlaywidget.cpp index cc2c59b..8bde9fc 100644 --- a/components/lib/qtmaterialoverlaywidget.cpp +++ b/components/lib/overlaywidget.cpp @@ -1,4 +1,4 @@ -#include "lib/qtmaterialoverlaywidget.h" +#include "lib/overlaywidget.h" #include namespace md diff --git a/components/lib/qtmaterialoverlaywidget.h b/components/lib/overlaywidget.h similarity index 79% rename from components/lib/qtmaterialoverlaywidget.h rename to components/lib/overlaywidget.h index 26914d6..3b6743b 100644 --- a/components/lib/qtmaterialoverlaywidget.h +++ b/components/lib/overlaywidget.h @@ -1,5 +1,5 @@ -#ifndef QTMATERIALOVERLAYWIDGET_H -#define QTMATERIALOVERLAYWIDGET_H +#ifndef OVERLAYWIDGET_H +#define OVERLAYWIDGET_H #include @@ -24,4 +24,4 @@ private: }; } -#endif // QTMATERIALOVERLAYWIDGET_H +#endif // OVERLAYWIDGET_H diff --git a/components/lib/qtmaterialripple.cpp b/components/lib/ripple.cpp similarity index 97% rename from components/lib/qtmaterialripple.cpp rename to components/lib/ripple.cpp index bed491b..8488ae2 100644 --- a/components/lib/qtmaterialripple.cpp +++ b/components/lib/ripple.cpp @@ -1,5 +1,5 @@ -#include "qtmaterialripple.h" -#include "lib/qtmaterialrippleoverlay.h" +#include "ripple.h" +#include "lib/rippleoverlay.h" namespace md { diff --git a/components/lib/qtmaterialripple.h b/components/lib/ripple.h similarity index 97% rename from components/lib/qtmaterialripple.h rename to components/lib/ripple.h index 60074c5..ac7ef60 100644 --- a/components/lib/qtmaterialripple.h +++ b/components/lib/ripple.h @@ -1,5 +1,5 @@ -#ifndef QTMATERIALRIPPLE_H -#define QTMATERIALRIPPLE_H +#ifndef RIPPLE_H +#define RIPPLE_H #include #include @@ -136,4 +136,4 @@ inline void Ripple::setDuration(int msecs) } } -#endif // QTMATERIALRIPPLE_H +#endif // RIPPLE_H diff --git a/components/lib/qtmaterialrippleoverlay.cpp b/components/lib/rippleoverlay.cpp similarity index 95% rename from components/lib/qtmaterialrippleoverlay.cpp rename to components/lib/rippleoverlay.cpp index 2da652a..ec0fb0c 100644 --- a/components/lib/qtmaterialrippleoverlay.cpp +++ b/components/lib/rippleoverlay.cpp @@ -1,6 +1,6 @@ -#include "lib/qtmaterialrippleoverlay.h" +#include "lib/rippleoverlay.h" #include -#include "lib/qtmaterialripple.h" +#include "lib/ripple.h" namespace md { diff --git a/components/lib/qtmaterialrippleoverlay.h b/components/lib/rippleoverlay.h similarity index 88% rename from components/lib/qtmaterialrippleoverlay.h rename to components/lib/rippleoverlay.h index 639a9df..d46e221 100644 --- a/components/lib/qtmaterialrippleoverlay.h +++ b/components/lib/rippleoverlay.h @@ -1,8 +1,8 @@ -#ifndef QTMATERIALRIPPLEOVERLAY_H -#define QTMATERIALRIPPLEOVERLAY_H +#ifndef RIPPLEOVERLAY_H +#define RIPPLEOVERLAY_H #include -#include "lib/qtmaterialoverlaywidget.h" +#include "lib/overlaywidget.h" namespace md { @@ -64,4 +64,4 @@ inline QList RippleOverlay::ripples() const } } -#endif // QTMATERIALRIPPLEOVERLAY_H +#endif // RIPPLEOVERLAY_H diff --git a/components/lib/qtmaterialstatetransition.cpp b/components/lib/statetransition.cpp similarity index 90% rename from components/lib/qtmaterialstatetransition.cpp rename to components/lib/statetransition.cpp index bbfbd16..3aea6fb 100644 --- a/components/lib/qtmaterialstatetransition.cpp +++ b/components/lib/statetransition.cpp @@ -1,4 +1,4 @@ -#include "lib/qtmaterialstatetransition.h" +#include "lib/statetransition.h" namespace md { diff --git a/components/lib/qtmaterialstatetransition.h b/components/lib/statetransition.h similarity index 66% rename from components/lib/qtmaterialstatetransition.h rename to components/lib/statetransition.h index e7e3172..883c191 100644 --- a/components/lib/qtmaterialstatetransition.h +++ b/components/lib/statetransition.h @@ -1,8 +1,8 @@ -#ifndef QTMATERIALSTATETRANSITION_H -#define QTMATERIALSTATETRANSITION_H +#ifndef STATETRANSITION_H +#define STATETRANSITION_H #include -#include "lib/qtmaterialstatetransitionevent.h" +#include "lib/statetransitionevent.h" namespace md { @@ -22,4 +22,4 @@ private: }; } -#endif // QTMATERIALSTATETRANSITION_H +#endif // STATETRANSITION_H diff --git a/components/lib/qtmaterialstatetransitionevent.h b/components/lib/statetransitionevent.h similarity index 87% rename from components/lib/qtmaterialstatetransitionevent.h rename to components/lib/statetransitionevent.h index c797e92..2a9f512 100644 --- a/components/lib/qtmaterialstatetransitionevent.h +++ b/components/lib/statetransitionevent.h @@ -1,5 +1,5 @@ -#ifndef QTMATERIALSTATETRANSITIONEVENT_H -#define QTMATERIALSTATETRANSITIONEVENT_H +#ifndef STATETRANSITIONEVENT_H +#define STATETRANSITIONEVENT_H #include @@ -42,4 +42,4 @@ struct StateTransitionEvent : public QEvent }; } -#endif // QTMATERIALSTATETRANSITIONEVENT_H +#endif // STATETRANSITIONEVENT_H diff --git a/components/lib/qtmaterialstyle.cpp b/components/lib/style.cpp similarity index 92% rename from components/lib/qtmaterialstyle.cpp rename to components/lib/style.cpp index a9f6121..eff72a4 100644 --- a/components/lib/qtmaterialstyle.cpp +++ b/components/lib/style.cpp @@ -1,6 +1,6 @@ -#include "lib/qtmaterialstyle.h" +#include "lib/style.h" #include -#include "lib/qtmaterialtheme.h" +#include "lib/theme.h" namespace md { diff --git a/components/lib/qtmaterialstyle.h b/components/lib/style.h similarity index 84% rename from components/lib/qtmaterialstyle.h rename to components/lib/style.h index ce545db..6feb83b 100644 --- a/components/lib/qtmaterialstyle.h +++ b/components/lib/style.h @@ -1,8 +1,8 @@ -#ifndef QTMATERIALSTYLE_H -#define QTMATERIALSTYLE_H +#ifndef STYLE_H +#define STYLE_H #include -#include "lib/qtmaterialstyle_p.h" +#include "lib/style_p.h" #define MATERIAL_DISABLE_THEME_COLORS \ if (d->useThemeColors == true) { d->useThemeColors = false; } @@ -40,4 +40,4 @@ inline Style &Style::instance() } } -#endif // QTMATERIALSTYLE_H +#endif // STYLE_H diff --git a/components/lib/qtmaterialstyle_p.h b/components/lib/style_p.h similarity index 75% rename from components/lib/qtmaterialstyle_p.h rename to components/lib/style_p.h index 3c17451..d32afa0 100644 --- a/components/lib/qtmaterialstyle_p.h +++ b/components/lib/style_p.h @@ -1,5 +1,5 @@ -#ifndef QTMATERIALSTYLE_P_H -#define QTMATERIALSTYLE_P_H +#ifndef STYLE_P_H +#define STYLE_P_H #include @@ -24,4 +24,4 @@ public: }; } -#endif // QTMATERIALSTYLE_P_H +#endif // STYLE_P_H diff --git a/components/lib/qtmaterialtheme.cpp b/components/lib/theme.cpp similarity index 99% rename from components/lib/qtmaterialtheme.cpp rename to components/lib/theme.cpp index 4340d6f..9b6f057 100644 --- a/components/lib/qtmaterialtheme.cpp +++ b/components/lib/theme.cpp @@ -1,5 +1,5 @@ -#include "lib/qtmaterialtheme.h" -#include "lib/qtmaterialtheme_p.h" +#include "lib/theme.h" +#include "lib/theme_p.h" #include #include #include diff --git a/components/lib/qtmaterialtheme.h b/components/lib/theme.h similarity index 98% rename from components/lib/qtmaterialtheme.h rename to components/lib/theme.h index 37a8434..9c25aac 100644 --- a/components/lib/qtmaterialtheme.h +++ b/components/lib/theme.h @@ -1,5 +1,5 @@ -#ifndef QTMATERIALTHEME_H -#define QTMATERIALTHEME_H +#ifndef THEME_H +#define THEME_H #include #include @@ -344,4 +344,4 @@ private: }; } -#endif // QTMATERIALTHEME_H +#endif // THEME_H diff --git a/components/lib/qtmaterialtheme_p.h b/components/lib/theme_p.h similarity index 79% rename from components/lib/qtmaterialtheme_p.h rename to components/lib/theme_p.h index 988dabc..4d69995 100644 --- a/components/lib/qtmaterialtheme_p.h +++ b/components/lib/theme_p.h @@ -1,5 +1,5 @@ -#ifndef QTMATERIALTHEME_P_H -#define QTMATERIALTHEME_P_H +#ifndef THEME_P_H +#define THEME_P_H #include #include @@ -24,4 +24,4 @@ public: }; } -#endif // QTMATERIALTHEME_P_H +#endif // THEME_P_H diff --git a/components/list.cpp b/components/list.cpp new file mode 100644 index 0000000..c6c6ded --- /dev/null +++ b/components/list.cpp @@ -0,0 +1,2 @@ +#include "list.h" +#include "list_p.h" diff --git a/components/list.h b/components/list.h new file mode 100644 index 0000000..8b8d443 --- /dev/null +++ b/components/list.h @@ -0,0 +1,4 @@ +#ifndef LIST_H +#define LIST_H + +#endif // LIST_H diff --git a/components/list_p.h b/components/list_p.h new file mode 100644 index 0000000..502ffed --- /dev/null +++ b/components/list_p.h @@ -0,0 +1,4 @@ +#ifndef LIST_P_H +#define LIST_P_H + +#endif // LIST_P_H diff --git a/components/listitem.cpp b/components/listitem.cpp new file mode 100644 index 0000000..4ebdbf1 --- /dev/null +++ b/components/listitem.cpp @@ -0,0 +1,2 @@ +#include "listitem.h" +#include "listitem_p.h" diff --git a/components/listitem.h b/components/listitem.h new file mode 100644 index 0000000..588e672 --- /dev/null +++ b/components/listitem.h @@ -0,0 +1,4 @@ +#ifndef LISTITEM_H +#define LISTITEM_H + +#endif // LISTITEM_H diff --git a/components/listitem_p.h b/components/listitem_p.h new file mode 100644 index 0000000..bc1b85a --- /dev/null +++ b/components/listitem_p.h @@ -0,0 +1,4 @@ +#ifndef LISTITEM_P_H +#define LISTITEM_P_H + +#endif // LISTITEM_P_H diff --git a/components/qtmaterialmenu.cpp b/components/menu.cpp similarity index 61% rename from components/qtmaterialmenu.cpp rename to components/menu.cpp index a6ff169..d433180 100644 --- a/components/qtmaterialmenu.cpp +++ b/components/menu.cpp @@ -1,5 +1,5 @@ -#include "qtmaterialmenu.h" -#include "qtmaterialmenu_p.h" +#include "menu.h" +#include "menu_p.h" namespace md { diff --git a/components/qtmaterialmenu.h b/components/menu.h similarity index 67% rename from components/qtmaterialmenu.h rename to components/menu.h index c466c89..c07f67a 100644 --- a/components/qtmaterialmenu.h +++ b/components/menu.h @@ -1,5 +1,5 @@ -#ifndef QTMATERIALMENU_H -#define QTMATERIALMENU_H +#ifndef MENU_H +#define MENU_H #include @@ -15,4 +15,4 @@ public: }; } -#endif // QTMATERIALMENU_H +#endif // MENU_H diff --git a/components/qtmaterialmenu_internal.cpp b/components/menu_internal.cpp similarity index 100% rename from components/qtmaterialmenu_internal.cpp rename to components/menu_internal.cpp diff --git a/components/menu_internal.h b/components/menu_internal.h new file mode 100644 index 0000000..0128af4 --- /dev/null +++ b/components/menu_internal.h @@ -0,0 +1,7 @@ +#ifndef MENU_INTERNAL_H +#define MENU_INTERNAL_H +namespace md +{ + +} +#endif // MENU_INTERNAL_H diff --git a/components/menu_p.h b/components/menu_p.h new file mode 100644 index 0000000..1226d2c --- /dev/null +++ b/components/menu_p.h @@ -0,0 +1,7 @@ +#ifndef MENU_P_H +#define MENU_P_H +namespace md +{ + +} +#endif // MENU_P_H diff --git a/components/paper.cpp b/components/paper.cpp new file mode 100644 index 0000000..f0c5092 --- /dev/null +++ b/components/paper.cpp @@ -0,0 +1,7 @@ +#include "paper.h" +#include "paper_p.h" + +namespace md +{ + +} diff --git a/components/paper.h b/components/paper.h new file mode 100644 index 0000000..0c9bfdf --- /dev/null +++ b/components/paper.h @@ -0,0 +1,7 @@ +#ifndef PAPER_H +#define PAPER_H +namespace md +{ + +} +#endif // PAPER_H diff --git a/components/paper_p.h b/components/paper_p.h new file mode 100644 index 0000000..7e53b7d --- /dev/null +++ b/components/paper_p.h @@ -0,0 +1,7 @@ +#ifndef PAPER_P_H +#define PAPER_P_H +namespace md +{ + +} +#endif // PAPER_P_H diff --git a/components/qtmaterialprogress.cpp b/components/progress.cpp similarity index 96% rename from components/qtmaterialprogress.cpp rename to components/progress.cpp index d4deaaa..16f5324 100644 --- a/components/qtmaterialprogress.cpp +++ b/components/progress.cpp @@ -1,10 +1,10 @@ -#include "qtmaterialprogress.h" -#include "qtmaterialprogress_p.h" +#include "progress.h" +#include "progress_p.h" #include #include #include -#include "qtmaterialprogress_internal.h" -#include "lib/qtmaterialstyle.h" +#include "progress_internal.h" +#include "lib/style.h" namespace md { diff --git a/components/qtmaterialprogress.h b/components/progress.h similarity index 88% rename from components/qtmaterialprogress.h rename to components/progress.h index 44bfeaf..c8b6569 100644 --- a/components/qtmaterialprogress.h +++ b/components/progress.h @@ -1,8 +1,8 @@ -#ifndef QTMATERIALPROGRESS_H -#define QTMATERIALPROGRESS_H +#ifndef PROGRESS_H +#define PROGRESS_H #include -#include "lib/qtmaterialtheme.h" +#include "lib/theme.h" namespace md { @@ -42,4 +42,4 @@ private: Q_DECLARE_PRIVATE(ProgressBar) }; } -#endif // QTMATERIALPROGRESS_H +#endif // PROGRESS_H diff --git a/components/qtmaterialprogress_internal.cpp b/components/progress_internal.cpp similarity index 87% rename from components/qtmaterialprogress_internal.cpp rename to components/progress_internal.cpp index 6b970c6..9bd4211 100644 --- a/components/qtmaterialprogress_internal.cpp +++ b/components/progress_internal.cpp @@ -1,4 +1,4 @@ -#include "qtmaterialprogress_internal.h" +#include "progress_internal.h" namespace md { diff --git a/components/qtmaterialprogress_internal.h b/components/progress_internal.h similarity index 80% rename from components/qtmaterialprogress_internal.h rename to components/progress_internal.h index 67a507f..d474b57 100644 --- a/components/qtmaterialprogress_internal.h +++ b/components/progress_internal.h @@ -1,8 +1,8 @@ -#ifndef QTMATERIALPROGRESS_INTERNAL_H -#define QTMATERIALPROGRESS_INTERNAL_H +#ifndef PROGRESS_INTERNAL_H +#define PROGRESS_INTERNAL_H #include -#include "qtmaterialprogress.h" +#include "progress.h" namespace md { @@ -38,4 +38,4 @@ inline qreal ProgressBarDelegate::offset() const return m_offset; } } -#endif // QTMATERIALPROGRESS_INTERNAL_H +#endif // PROGRESS_INTERNAL_H diff --git a/components/qtmaterialprogress_p.h b/components/progress_p.h similarity index 81% rename from components/qtmaterialprogress_p.h rename to components/progress_p.h index 9256f5f..e9b97da 100644 --- a/components/qtmaterialprogress_p.h +++ b/components/progress_p.h @@ -1,9 +1,9 @@ -#ifndef QTMATERIALPROGRESS_P_H -#define QTMATERIALPROGRESS_P_H +#ifndef PROGRESS_P_H +#define PROGRESS_P_H #include #include -#include "lib/qtmaterialtheme.h" +#include "lib/theme.h" namespace md { @@ -29,4 +29,4 @@ public: bool useThemeColors; }; } -#endif // QTMATERIALPROGRESS_P_H +#endif // PROGRESS_P_H diff --git a/components/qtmateriallist.cpp b/components/qtmateriallist.cpp deleted file mode 100644 index e6b1aee..0000000 --- a/components/qtmateriallist.cpp +++ /dev/null @@ -1,2 +0,0 @@ -#include "qtmateriallist.h" -#include "qtmateriallist_p.h" diff --git a/components/qtmateriallist.h b/components/qtmateriallist.h deleted file mode 100644 index 7ace66a..0000000 --- a/components/qtmateriallist.h +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef QTMATERIALLIST_H -#define QTMATERIALLIST_H - -#endif // QTMATERIALLIST_H diff --git a/components/qtmateriallist_p.h b/components/qtmateriallist_p.h deleted file mode 100644 index c92b2d6..0000000 --- a/components/qtmateriallist_p.h +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef QTMATERIALLIST_P_H -#define QTMATERIALLIST_P_H - -#endif // QTMATERIALLIST_P_H diff --git a/components/qtmateriallistitem.cpp b/components/qtmateriallistitem.cpp deleted file mode 100644 index 67a7cd8..0000000 --- a/components/qtmateriallistitem.cpp +++ /dev/null @@ -1,2 +0,0 @@ -#include "qtmateriallistitem.h" -#include "qtmateriallistitem_p.h" diff --git a/components/qtmateriallistitem.h b/components/qtmateriallistitem.h deleted file mode 100644 index 9abc65b..0000000 --- a/components/qtmateriallistitem.h +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef QTMATERIALLISTITEM_H -#define QTMATERIALLISTITEM_H - -#endif // QTMATERIALLISTITEM_H diff --git a/components/qtmateriallistitem_p.h b/components/qtmateriallistitem_p.h deleted file mode 100644 index fb7ebd4..0000000 --- a/components/qtmateriallistitem_p.h +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef QTMATERIALLISTITEM_P_H -#define QTMATERIALLISTITEM_P_H - -#endif // QTMATERIALLISTITEM_P_H diff --git a/components/qtmaterialmenu_internal.h b/components/qtmaterialmenu_internal.h deleted file mode 100644 index f9a77f1..0000000 --- a/components/qtmaterialmenu_internal.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef QTMATERIALMENU_INTERNAL_H -#define QTMATERIALMENU_INTERNAL_H -namespace md -{ - -} -#endif // QTMATERIALMENU_INTERNAL_H diff --git a/components/qtmaterialmenu_p.h b/components/qtmaterialmenu_p.h deleted file mode 100644 index 7787c6e..0000000 --- a/components/qtmaterialmenu_p.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef QTMATERIALMENU_P_H -#define QTMATERIALMENU_P_H -namespace md -{ - -} -#endif // QTMATERIALMENU_P_H diff --git a/components/qtmaterialpaper.cpp b/components/qtmaterialpaper.cpp deleted file mode 100644 index b0873f5..0000000 --- a/components/qtmaterialpaper.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include "qtmaterialpaper.h" -#include "qtmaterialpaper_p.h" - -namespace md -{ - -} diff --git a/components/qtmaterialpaper.h b/components/qtmaterialpaper.h deleted file mode 100644 index 187a9ef..0000000 --- a/components/qtmaterialpaper.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef QTMATERIALPAPER_H -#define QTMATERIALPAPER_H -namespace md -{ - -} -#endif // QTMATERIALPAPER_H diff --git a/components/qtmaterialpaper_p.h b/components/qtmaterialpaper_p.h deleted file mode 100644 index 5dd3d49..0000000 --- a/components/qtmaterialpaper_p.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef QTMATERIALPAPER_P_H -#define QTMATERIALPAPER_P_H -namespace md -{ - -} -#endif // QTMATERIALPAPER_P_H diff --git a/components/qtmaterialtable.cpp b/components/qtmaterialtable.cpp deleted file mode 100644 index 7b284aa..0000000 --- a/components/qtmaterialtable.cpp +++ /dev/null @@ -1,6 +0,0 @@ -#include "qtmaterialtable.h" -#include "qtmaterialtable_p.h" -namespace md -{ - -} diff --git a/components/qtmaterialtable.h b/components/qtmaterialtable.h deleted file mode 100644 index 26f5465..0000000 --- a/components/qtmaterialtable.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef QTMATERIALTABLE_H -#define QTMATERIALTABLE_H -namespace md -{ - -} -#endif // QTMATERIALTABLE_H diff --git a/components/qtmaterialtable_p.h b/components/qtmaterialtable_p.h deleted file mode 100644 index a4c470e..0000000 --- a/components/qtmaterialtable_p.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef QTMATERIALTABLE_P_H -#define QTMATERIALTABLE_P_H -namespace md -{ - -} -#endif // QTMATERIALTABLE_P_H diff --git a/components/qtmaterialradiobutton.cpp b/components/radiobutton.cpp similarity index 95% rename from components/qtmaterialradiobutton.cpp rename to components/radiobutton.cpp index f180013..d2f067d 100644 --- a/components/qtmaterialradiobutton.cpp +++ b/components/radiobutton.cpp @@ -1,6 +1,6 @@ -#include "qtmaterialradiobutton.h" -#include "qtmaterialradiobutton_p.h" -#include "lib/qtmaterialcheckable_internal.h" +#include "radiobutton.h" +#include "radiobutton_p.h" +#include "lib/checkable_internal.h" namespace md { diff --git a/components/qtmaterialradiobutton.h b/components/radiobutton.h similarity index 68% rename from components/qtmaterialradiobutton.h rename to components/radiobutton.h index b6986a3..a63cbdc 100644 --- a/components/qtmaterialradiobutton.h +++ b/components/radiobutton.h @@ -1,7 +1,7 @@ -#ifndef QTMATERIALRADIOBUTTON_H -#define QTMATERIALRADIOBUTTON_H +#ifndef RADIOBUTTON_H +#define RADIOBUTTON_H -#include "lib/qtmaterialcheckable.h" +#include "lib/checkable.h" namespace md { @@ -24,4 +24,4 @@ private: Q_DECLARE_PRIVATE(RadioButton) }; } -#endif // QTMATERIALRADIOBUTTON_H +#endif // RADIOBUTTON_H diff --git a/components/qtmaterialradiobutton_p.h b/components/radiobutton_p.h similarity index 66% rename from components/qtmaterialradiobutton_p.h rename to components/radiobutton_p.h index 0d32fea..fb087a2 100644 --- a/components/qtmaterialradiobutton_p.h +++ b/components/radiobutton_p.h @@ -1,13 +1,13 @@ -#ifndef QTMATERIALRADIOBUTTON_P_H -#define QTMATERIALRADIOBUTTON_P_H +#ifndef RADIOBUTTON_P_H +#define RADIOBUTTON_P_H #include #include #include #include -#include "qtmaterialradiobutton.h" -#include "lib/qtmaterialcheckable_p.h" +#include "radiobutton.h" +#include "lib/checkable_p.h" namespace md { @@ -26,4 +26,4 @@ public: void init(); }; } -#endif // QTMATERIALRADIOBUTTON_P_H +#endif // RADIOBUTTON_P_H diff --git a/components/qtmaterialraisedbutton.cpp b/components/raisedbutton.cpp similarity index 98% rename from components/qtmaterialraisedbutton.cpp rename to components/raisedbutton.cpp index 6632346..1f15f8d 100644 --- a/components/qtmaterialraisedbutton.cpp +++ b/components/raisedbutton.cpp @@ -1,4 +1,4 @@ -#include "qtmaterialraisedbutton_p.h" +#include "raisedbutton_p.h" namespace md { diff --git a/components/qtmaterialraisedbutton.h b/components/raisedbutton.h similarity index 77% rename from components/qtmaterialraisedbutton.h rename to components/raisedbutton.h index aa4ea94..0836aaa 100644 --- a/components/qtmaterialraisedbutton.h +++ b/components/raisedbutton.h @@ -1,7 +1,7 @@ -#ifndef QTMATERIALRAISEDBUTTON_H -#define QTMATERIALRAISEDBUTTON_H +#ifndef RAISEDBUTTON_H +#define RAISEDBUTTON_H -#include "qtmaterialflatbutton.h" +#include "flatbutton.h" namespace md { @@ -27,4 +27,4 @@ private: Q_DECLARE_PRIVATE(RaisedButton) }; } -#endif // QTMATERIALRAISEDBUTTON_H +#endif // RAISEDBUTTON_H diff --git a/components/qtmaterialraisedbutton_p.h b/components/raisedbutton_p.h similarity index 76% rename from components/qtmaterialraisedbutton_p.h rename to components/raisedbutton_p.h index 615bc11..40b0ea1 100644 --- a/components/qtmaterialraisedbutton_p.h +++ b/components/raisedbutton_p.h @@ -1,13 +1,13 @@ -#ifndef QTMATERIALRAISEDBUTTON_P_H -#define QTMATERIALRAISEDBUTTON_P_H +#ifndef RAISEDBUTTON_P_H +#define RAISEDBUTTON_P_H #include #include #include #include -#include "qtmaterialflatbutton_p.h" -#include "qtmaterialraisedbutton.h" +#include "flatbutton_p.h" +#include "raisedbutton.h" namespace md { @@ -31,4 +31,4 @@ public: QGraphicsDropShadowEffect *effect; }; } -#endif // QTMATERIALRAISEDBUTTON_P_H +#endif // RAISEDBUTTON_P_H diff --git a/components/qtmaterialscrollbar.cpp b/components/scrollbar.cpp similarity index 99% rename from components/qtmaterialscrollbar.cpp rename to components/scrollbar.cpp index 5c6a0c1..8b5ae57 100644 --- a/components/qtmaterialscrollbar.cpp +++ b/components/scrollbar.cpp @@ -1,4 +1,4 @@ -#include "qtmaterialscrollbar.h" +#include "scrollbar.h" namespace md { diff --git a/components/qtmaterialscrollbar.h b/components/scrollbar.h similarity index 84% rename from components/qtmaterialscrollbar.h rename to components/scrollbar.h index 0ff4b5f..e44dfc3 100644 --- a/components/qtmaterialscrollbar.h +++ b/components/scrollbar.h @@ -1,14 +1,14 @@ -#ifndef QTMATERIALSCROLLBAR_H -#define QTMATERIALSCROLLBAR_H +#ifndef SCROLLBAR_H +#define SCROLLBAR_H #include #include #include #include -#include "qtmaterialscrollbar_p.h" -#include "qtmaterialscrollbar_internal.h" -#include "lib/qtmaterialstyle.h" +#include "scrollbar_p.h" +#include "scrollbar_internal.h" +#include "lib/style.h" namespace md { @@ -54,4 +54,4 @@ private: Q_DECLARE_PRIVATE(ScrollBar) }; } -#endif // QTMATERIALSCROLLBAR_H +#endif // SCROLLBAR_H diff --git a/components/qtmaterialscrollbar_internal.cpp b/components/scrollbar_internal.cpp similarity index 96% rename from components/qtmaterialscrollbar_internal.cpp rename to components/scrollbar_internal.cpp index 2317f45..f1c67d9 100644 --- a/components/qtmaterialscrollbar_internal.cpp +++ b/components/scrollbar_internal.cpp @@ -1,4 +1,4 @@ -#include "qtmaterialscrollbar_internal.h" +#include "scrollbar_internal.h" #include #include namespace md diff --git a/components/qtmaterialscrollbar_internal.h b/components/scrollbar_internal.h similarity index 84% rename from components/qtmaterialscrollbar_internal.h rename to components/scrollbar_internal.h index 013cd50..1a16194 100644 --- a/components/qtmaterialscrollbar_internal.h +++ b/components/scrollbar_internal.h @@ -1,8 +1,8 @@ -#ifndef QTMATERIALSCROLLBAR_INTERNAL_H -#define QTMATERIALSCROLLBAR_INTERNAL_H +#ifndef SCROLLBAR_INTERNAL_H +#define SCROLLBAR_INTERNAL_H #include -#include "qtmaterialscrollbar.h" +#include "scrollbar.h" namespace md { @@ -42,4 +42,4 @@ inline qreal ScrollBarStateMachine::opacity() const return m_opacity; } } -#endif // QTMATERIALSCROLLBAR_INTERNAL_H +#endif // SCROLLBAR_INTERNAL_H diff --git a/components/qtmaterialscrollbar_p.h b/components/scrollbar_p.h similarity index 86% rename from components/qtmaterialscrollbar_p.h rename to components/scrollbar_p.h index efcd191..0827771 100644 --- a/components/qtmaterialscrollbar_p.h +++ b/components/scrollbar_p.h @@ -1,5 +1,5 @@ -#ifndef QTMATERIALSCROLLBAR_P_H -#define QTMATERIALSCROLLBAR_P_H +#ifndef SCROLLBAR_P_H +#define SCROLLBAR_P_H #include #include @@ -30,4 +30,4 @@ public: bool useThemeColors; }; } -#endif // QTMATERIALSCROLLBAR_P_H +#endif // SCROLLBAR_P_H diff --git a/components/qtmaterialslider.cpp b/components/slider.cpp similarity index 97% rename from components/qtmaterialslider.cpp rename to components/slider.cpp index 797c20a..1dd4c06 100644 --- a/components/qtmaterialslider.cpp +++ b/components/slider.cpp @@ -1,10 +1,10 @@ -#include "qtmaterialslider.h" -#include "qtmaterialslider_p.h" +#include "slider.h" +#include "slider_p.h" #include #include -#include "qtmaterialslider_internal.h" -#include "lib/qtmaterialstyle.h" -#include "lib/qtmaterialstatetransitionevent.h" +#include "slider_internal.h" +#include "lib/style.h" +#include "lib/statetransitionevent.h" namespace md { diff --git a/components/qtmaterialslider.h b/components/slider.h similarity index 94% rename from components/qtmaterialslider.h rename to components/slider.h index 2f14e75..9de5809 100644 --- a/components/qtmaterialslider.h +++ b/components/slider.h @@ -1,5 +1,5 @@ -#ifndef QTMATERIALSLIDER_H -#define QTMATERIALSLIDER_H +#ifndef SLIDER_H +#define SLIDER_H #include #include @@ -58,4 +58,4 @@ private: Q_DECLARE_PRIVATE(Slider) }; } -#endif // QTMATERIALSLIDER_H +#endif // SLIDER_H diff --git a/components/qtmaterialslider_internal.cpp b/components/slider_internal.cpp similarity index 98% rename from components/qtmaterialslider_internal.cpp rename to components/slider_internal.cpp index c3a96d7..0b8c58f 100644 --- a/components/qtmaterialslider_internal.cpp +++ b/components/slider_internal.cpp @@ -1,13 +1,13 @@ -#include "qtmaterialslider_internal.h" +#include "slider_internal.h" #include #include #include #include #include #include -#include "qtmaterialslider.h" -#include "lib/qtmaterialstyle.h" -#include "lib/qtmaterialstatetransition.h" +#include "slider.h" +#include "lib/style.h" +#include "lib/statetransition.h" namespace md { diff --git a/components/qtmaterialslider_internal.h b/components/slider_internal.h similarity index 97% rename from components/qtmaterialslider_internal.h rename to components/slider_internal.h index 756a03f..1f18980 100644 --- a/components/qtmaterialslider_internal.h +++ b/components/slider_internal.h @@ -1,8 +1,8 @@ -#ifndef QTMATERIALSLIDER_INTERNAL_H -#define QTMATERIALSLIDER_INTERNAL_H +#ifndef SLIDER_INTERNAL_H +#define SLIDER_INTERNAL_H #include -#include "lib/qtmaterialoverlaywidget.h" +#include "lib/overlaywidget.h" namespace md { @@ -221,4 +221,4 @@ int SliderTrack::trackWidth() const return m_trackWidth; } } -#endif // QTMATERIALSLIDER_INTERNAL_H +#endif // SLIDER_INTERNAL_H diff --git a/components/qtmaterialslider_p.h b/components/slider_p.h similarity index 92% rename from components/qtmaterialslider_p.h rename to components/slider_p.h index d372b2f..313d67f 100644 --- a/components/qtmaterialslider_p.h +++ b/components/slider_p.h @@ -1,5 +1,5 @@ -#ifndef QTMATERIALSLIDER_P_H -#define QTMATERIALSLIDER_P_H +#ifndef SLIDER_P_H +#define SLIDER_P_H #include #include @@ -49,4 +49,4 @@ public: bool useThemeColors; }; } -#endif // QTMATERIALSLIDER_P_H +#endif // SLIDER_P_H diff --git a/components/qtmaterialsnackbar.cpp b/components/snackbar.cpp similarity index 96% rename from components/qtmaterialsnackbar.cpp rename to components/snackbar.cpp index 7b898c1..3d76201 100644 --- a/components/qtmaterialsnackbar.cpp +++ b/components/snackbar.cpp @@ -1,10 +1,10 @@ -#include "qtmaterialsnackbar.h" -#include "qtmaterialsnackbar_p.h" +#include "snackbar.h" +#include "snackbar_p.h" #include #include -#include "qtmaterialsnackbar_internal.h" -#include "lib/qtmaterialstyle.h" -#include "lib/qtmaterialstatetransition.h" +#include "snackbar_internal.h" +#include "lib/style.h" +#include "lib/statetransition.h" #include namespace md { diff --git a/components/qtmaterialsnackbar.h b/components/snackbar.h similarity index 89% rename from components/qtmaterialsnackbar.h rename to components/snackbar.h index c47a275..c20f06b 100644 --- a/components/qtmaterialsnackbar.h +++ b/components/snackbar.h @@ -1,7 +1,7 @@ -#ifndef QTMATERIALSNACKBAR_H -#define QTMATERIALSNACKBAR_H +#ifndef SNACKBAR_H +#define SNACKBAR_H -#include "lib/qtmaterialoverlaywidget.h" +#include "lib/overlaywidget.h" namespace md { @@ -57,4 +57,4 @@ private: Q_DECLARE_PRIVATE(SnackBar) }; } -#endif // QTMATERIALSNACKBAR_H +#endif // SNACKBAR_H diff --git a/components/qtmaterialsnackbar_internal.cpp b/components/snackbar_internal.cpp similarity index 96% rename from components/qtmaterialsnackbar_internal.cpp rename to components/snackbar_internal.cpp index cb705bc..8d298d2 100644 --- a/components/qtmaterialsnackbar_internal.cpp +++ b/components/snackbar_internal.cpp @@ -1,7 +1,7 @@ -#include "qtmaterialsnackbar_internal.h" +#include "snackbar_internal.h" #include -#include "qtmaterialsnackbar.h" -#include "lib/qtmaterialstatetransition.h" +#include "snackbar.h" +#include "lib/statetransition.h" #include namespace md { diff --git a/components/qtmaterialsnackbar_internal.h b/components/snackbar_internal.h similarity index 86% rename from components/qtmaterialsnackbar_internal.h rename to components/snackbar_internal.h index 0cf3a11..da0ed5c 100644 --- a/components/qtmaterialsnackbar_internal.h +++ b/components/snackbar_internal.h @@ -1,5 +1,5 @@ -#ifndef QTMATERIALSNACKBAR_INTERNAL_H -#define QTMATERIALSNACKBAR_INTERNAL_H +#ifndef SNACKBAR_INTERNAL_H +#define SNACKBAR_INTERNAL_H #include #include @@ -44,4 +44,4 @@ inline qreal SnackBarStateMachine::offset() const return m_offset; } } -#endif // QTMATERIALSNACKBAR_INTERNAL_H +#endif // SNACKBAR_INTERNAL_H diff --git a/components/qtmaterialsnackbar_p.h b/components/snackbar_p.h similarity index 88% rename from components/qtmaterialsnackbar_p.h rename to components/snackbar_p.h index a24ba57..6a5bcba 100644 --- a/components/qtmaterialsnackbar_p.h +++ b/components/snackbar_p.h @@ -1,5 +1,5 @@ -#ifndef QTMATERIALSNACKBAR_P_H -#define QTMATERIALSNACKBAR_P_H +#ifndef SNACKBAR_P_H +#define SNACKBAR_P_H #include #include @@ -33,4 +33,4 @@ public: bool useThemeColors; }; } -#endif // QTMATERIALSNACKBAR_P_H +#endif // SNACKBAR_P_H diff --git a/components/table.cpp b/components/table.cpp new file mode 100644 index 0000000..691d896 --- /dev/null +++ b/components/table.cpp @@ -0,0 +1,6 @@ +#include "table.h" +#include "table_p.h" +namespace md +{ + +} diff --git a/components/table.h b/components/table.h new file mode 100644 index 0000000..66bf702 --- /dev/null +++ b/components/table.h @@ -0,0 +1,7 @@ +#ifndef TABLE_H +#define TABLE_H +namespace md +{ + +} +#endif // TABLE_H diff --git a/components/table_p.h b/components/table_p.h new file mode 100644 index 0000000..21164ce --- /dev/null +++ b/components/table_p.h @@ -0,0 +1,7 @@ +#ifndef TABLE_P_H +#define TABLE_P_H +namespace md +{ + +} +#endif // TABLE_P_H diff --git a/components/qtmaterialtabs.cpp b/components/tabs.cpp similarity index 99% rename from components/qtmaterialtabs.cpp rename to components/tabs.cpp index 04bb774..3f17457 100644 --- a/components/qtmaterialtabs.cpp +++ b/components/tabs.cpp @@ -1,4 +1,4 @@ -#include "qtmaterialtabs.h" +#include "tabs.h" namespace md { diff --git a/components/qtmaterialtabs.h b/components/tabs.h similarity index 84% rename from components/qtmaterialtabs.h rename to components/tabs.h index b3517d6..e050ff9 100644 --- a/components/qtmaterialtabs.h +++ b/components/tabs.h @@ -1,14 +1,14 @@ -#ifndef QTMATERIALTABS_H -#define QTMATERIALTABS_H +#ifndef TABS_H +#define TABS_H #include #include #include -#include "qtmaterialtabs_p.h" -#include "qtmaterialtabs_internal.h" -#include "lib/qtmaterialstyle.h" -#include "lib/qtmaterialtheme.h" +#include "tabs_p.h" +#include "tabs_internal.h" +#include "lib/style.h" +#include "lib/theme.h" namespace md { @@ -63,4 +63,4 @@ private: Q_DECLARE_PRIVATE(Tabs) }; } -#endif // QTMATERIALTABS_H +#endif // TABS_H diff --git a/components/qtmaterialtabs_internal.cpp b/components/tabs_internal.cpp similarity index 99% rename from components/qtmaterialtabs_internal.cpp rename to components/tabs_internal.cpp index 951a6a1..dd1072d 100644 --- a/components/qtmaterialtabs_internal.cpp +++ b/components/tabs_internal.cpp @@ -1,4 +1,4 @@ -#include "qtmaterialtabs_internal.h" +#include "tabs_internal.h" namespace md { diff --git a/components/qtmaterialtabs_internal.h b/components/tabs_internal.h similarity index 88% rename from components/qtmaterialtabs_internal.h rename to components/tabs_internal.h index e05932e..82f0305 100644 --- a/components/qtmaterialtabs_internal.h +++ b/components/tabs_internal.h @@ -1,5 +1,5 @@ -#ifndef QTMATERIALTABS_INTERNAL_H -#define QTMATERIALTABS_INTERNAL_H +#ifndef TABS_INTERNAL_H +#define TABS_INTERNAL_H #include #include @@ -8,9 +8,9 @@ #include #include -#include "qtmaterialtabs.h" -#include "lib/qtmaterialoverlaywidget.h" -#include "qtmaterialflatbutton.h" +#include "tabs.h" +#include "lib/overlaywidget.h" +#include "flatbutton.h" namespace md { @@ -95,4 +95,4 @@ inline bool Tab::isActive() const return m_active; } } -#endif // QTMATERIALTABS_INTERNAL_H +#endif // TABS_INTERNAL_H diff --git a/components/qtmaterialtabs_p.h b/components/tabs_p.h similarity index 84% rename from components/qtmaterialtabs_p.h rename to components/tabs_p.h index 2698219..aabf861 100644 --- a/components/qtmaterialtabs_p.h +++ b/components/tabs_p.h @@ -1,10 +1,10 @@ -#ifndef QTMATERIALTABS_P_H -#define QTMATERIALTABS_P_H +#ifndef TABS_P_H +#define TABS_P_H #include #include -#include "lib/qtmaterialtheme.h" +#include "lib/theme.h" namespace md { @@ -35,4 +35,4 @@ public: bool useThemeColors; }; } -#endif // QTMATERIALTABS_P_H +#endif // TABS_P_H diff --git a/components/qtmaterialtextfield.cpp b/components/textfield.cpp similarity index 97% rename from components/qtmaterialtextfield.cpp rename to components/textfield.cpp index 938a811..9c26f88 100644 --- a/components/qtmaterialtextfield.cpp +++ b/components/textfield.cpp @@ -1,9 +1,9 @@ -#include "qtmaterialtextfield.h" -#include "qtmaterialtextfield_p.h" +#include "textfield.h" +#include "textfield_p.h" #include #include -#include "qtmaterialtextfield_internal.h" -#include "lib/qtmaterialstyle.h" +#include "textfield_internal.h" +#include "lib/style.h" #include namespace md { diff --git a/components/qtmaterialtextfield.h b/components/textfield.h similarity index 93% rename from components/qtmaterialtextfield.h rename to components/textfield.h index 4ecd074..625774d 100644 --- a/components/qtmaterialtextfield.h +++ b/components/textfield.h @@ -1,5 +1,5 @@ -#ifndef QTMATERIALTEXTFIELD_H -#define QTMATERIALTEXTFIELD_H +#ifndef TEXTFIELD_H +#define TEXTFIELD_H #include #include @@ -61,4 +61,4 @@ private: Q_DECLARE_PRIVATE(TextField) }; } -#endif // QTMATERIALTEXTFIELD_H +#endif // TEXTFIELD_H diff --git a/components/qtmaterialtextfield_internal.cpp b/components/textfield_internal.cpp similarity index 99% rename from components/qtmaterialtextfield_internal.cpp rename to components/textfield_internal.cpp index be79e20..bb57c36 100644 --- a/components/qtmaterialtextfield_internal.cpp +++ b/components/textfield_internal.cpp @@ -1,4 +1,4 @@ -#include "qtmaterialtextfield_internal.h" +#include "textfield_internal.h" namespace md { diff --git a/components/qtmaterialtextfield_internal.h b/components/textfield_internal.h similarity index 94% rename from components/qtmaterialtextfield_internal.h rename to components/textfield_internal.h index 0600d31..49d8664 100644 --- a/components/qtmaterialtextfield_internal.h +++ b/components/textfield_internal.h @@ -1,5 +1,5 @@ -#ifndef QTMATERIALTEXTFIELD_INTERNAL_H -#define QTMATERIALTEXTFIELD_INTERNAL_H +#ifndef TEXTFIELD_INTERNAL_H +#define TEXTFIELD_INTERNAL_H #include #include @@ -7,7 +7,7 @@ #include #include -#include "qtmaterialtextfield.h" +#include "textfield.h" namespace md { @@ -123,4 +123,4 @@ inline QColor TextFieldLabel::color() const return m_color; } } -#endif // QTMATERIALTEXTFIELD_INTERNAL_H +#endif // TEXTFIELD_INTERNAL_H diff --git a/components/qtmaterialtextfield_p.h b/components/textfield_p.h similarity index 90% rename from components/qtmaterialtextfield_p.h rename to components/textfield_p.h index a3682be..bfa4d01 100644 --- a/components/qtmaterialtextfield_p.h +++ b/components/textfield_p.h @@ -1,5 +1,5 @@ -#ifndef QTMATERIALTEXTFIELD_P_H -#define QTMATERIALTEXTFIELD_P_H +#ifndef TEXTFIELD_P_H +#define TEXTFIELD_P_H #include #include @@ -36,4 +36,4 @@ public: }; } -#endif // QTMATERIALTEXTFIELD_P_H +#endif // TEXTFIELD_P_H diff --git a/components/qtmaterialtoggle.cpp b/components/toggle.cpp similarity index 97% rename from components/qtmaterialtoggle.cpp rename to components/toggle.cpp index dd9ebe9..a76727d 100644 --- a/components/qtmaterialtoggle.cpp +++ b/components/toggle.cpp @@ -1,8 +1,8 @@ -#include "qtmaterialtoggle.h" +#include "toggle.h" -#include "qtmaterialtoggle_p.h" -#include "qtmaterialtoggle_internal.h" -#include "lib/qtmaterialstyle.h" +#include "toggle_p.h" +#include "toggle_internal.h" +#include "lib/style.h" namespace md { diff --git a/components/qtmaterialtoggle.h b/components/toggle.h similarity index 93% rename from components/qtmaterialtoggle.h rename to components/toggle.h index fe2efe1..46edf79 100644 --- a/components/qtmaterialtoggle.h +++ b/components/toggle.h @@ -1,5 +1,5 @@ -#ifndef QTMATERIALTOGGLE_H -#define QTMATERIALTOGGLE_H +#ifndef TOGGLE_H +#define TOGGLE_H #include @@ -52,4 +52,4 @@ private: Q_DECLARE_PRIVATE(Toggle) }; } -#endif // QTMATERIALTOGGLE_H +#endif // TOGGLE_H diff --git a/components/qtmaterialtoggle_internal.cpp b/components/toggle_internal.cpp similarity index 98% rename from components/qtmaterialtoggle_internal.cpp rename to components/toggle_internal.cpp index 86f3e91..8970f65 100644 --- a/components/qtmaterialtoggle_internal.cpp +++ b/components/toggle_internal.cpp @@ -1,7 +1,7 @@ -#include "qtmaterialtoggle_internal.h" +#include "toggle_internal.h" -#include "qtmaterialtoggle.h" -#include "lib/qtmaterialripple.h" +#include "toggle.h" +#include "lib/ripple.h" namespace md { diff --git a/components/qtmaterialtoggle_internal.h b/components/toggle_internal.h similarity index 94% rename from components/qtmaterialtoggle_internal.h rename to components/toggle_internal.h index 4d4494e..d18ea80 100644 --- a/components/qtmaterialtoggle_internal.h +++ b/components/toggle_internal.h @@ -1,12 +1,12 @@ -#ifndef QTMATERIALTOGGLE_INTERNAL_H -#define QTMATERIALTOGGLE_INTERNAL_H +#ifndef TOGGLE_INTERNAL_H +#define TOGGLE_INTERNAL_H #include #include #include #include -#include "lib/qtmaterialrippleoverlay.h" +#include "lib/rippleoverlay.h" namespace md { @@ -124,4 +124,4 @@ inline QColor ToggleTrack::trackColor() const return m_trackColor; } } -#endif // QTMATERIALTOGGLE_INTERNAL_H +#endif // TOGGLE_INTERNAL_H diff --git a/components/qtmaterialtoggle_p.h b/components/toggle_p.h similarity index 91% rename from components/qtmaterialtoggle_p.h rename to components/toggle_p.h index bcd3b6a..941a75c 100644 --- a/components/qtmaterialtoggle_p.h +++ b/components/toggle_p.h @@ -1,5 +1,5 @@ -#ifndef QTMATERIALTOGGLE_P_H -#define QTMATERIALTOGGLE_P_H +#ifndef TOGGLE_P_H +#define TOGGLE_P_H #include #include @@ -42,4 +42,4 @@ public: bool useThemeColors; }; } -#endif // QTMATERIALTOGGLE_P_H +#endif // TOGGLE_P_H diff --git a/examples/appbarsettingseditor.h b/examples/appbarsettingseditor.h index be9dce3..6c5beca 100644 --- a/examples/appbarsettingseditor.h +++ b/examples/appbarsettingseditor.h @@ -6,9 +6,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "ui_appbarsettingsform.h" diff --git a/examples/autocompletesettingseditor.h b/examples/autocompletesettingseditor.h index cbc7c3a..44be9b3 100644 --- a/examples/autocompletesettingseditor.h +++ b/examples/autocompletesettingseditor.h @@ -8,8 +8,8 @@ #include #include -#include -#include "lib/qtmaterialoverlaywidget.h" +#include +#include "lib/overlaywidget.h" using namespace md; diff --git a/examples/avatarsettingseditor.h b/examples/avatarsettingseditor.h index eda4fe1..655bbfa 100644 --- a/examples/avatarsettingseditor.h +++ b/examples/avatarsettingseditor.h @@ -4,8 +4,8 @@ #include #include -#include -#include +#include +#include #include "ui_avatarsettingsform.h" diff --git a/examples/badgesettingseditor.cpp b/examples/badgesettingseditor.cpp index 5f2be5e..e33ed89 100644 --- a/examples/badgesettingseditor.cpp +++ b/examples/badgesettingseditor.cpp @@ -1,7 +1,7 @@ #include "badgesettingseditor.h" #include -#include -#include +#include +#include BadgeSettingsEditor::BadgeSettingsEditor(QWidget *parent) : QWidget(parent), diff --git a/examples/badgesettingseditor.h b/examples/badgesettingseditor.h index 3e22ae1..4c687a8 100644 --- a/examples/badgesettingseditor.h +++ b/examples/badgesettingseditor.h @@ -3,8 +3,8 @@ #include -#include -#include +#include +#include #include "ui_badgesettingsform.h" diff --git a/examples/checkboxsettingseditor.h b/examples/checkboxsettingseditor.h index ac0f19a..78243ec 100644 --- a/examples/checkboxsettingseditor.h +++ b/examples/checkboxsettingseditor.h @@ -5,7 +5,7 @@ #include #include -#include +#include #include "ui_checkboxsettingsform.h" diff --git a/examples/circularprogresssettingseditor.h b/examples/circularprogresssettingseditor.h index e008fff..28c58b5 100644 --- a/examples/circularprogresssettingseditor.h +++ b/examples/circularprogresssettingseditor.h @@ -5,7 +5,7 @@ #include #include -#include +#include #include "ui_circularprogresssettingsform.h" diff --git a/examples/dialogsettingseditor.h b/examples/dialogsettingseditor.h index 1de0de4..357f368 100644 --- a/examples/dialogsettingseditor.h +++ b/examples/dialogsettingseditor.h @@ -4,9 +4,9 @@ #include #include #include -#include +#include -#include +#include #include "ui_dialogsettingsform.h" diff --git a/examples/drawersettingseditor.h b/examples/drawersettingseditor.h index 0c57864..2aeaf95 100644 --- a/examples/drawersettingseditor.h +++ b/examples/drawersettingseditor.h @@ -5,7 +5,7 @@ #include #include -#include +#include #include "ui_drawersettingsform.h" diff --git a/examples/fabsettingseditor.h b/examples/fabsettingseditor.h index 8973039..5fcf434 100644 --- a/examples/fabsettingseditor.h +++ b/examples/fabsettingseditor.h @@ -6,7 +6,7 @@ #include #include -#include +#include #include "ui_fabsettingsform.h" diff --git a/examples/flatbuttonsettingseditor.h b/examples/flatbuttonsettingseditor.h index 044ac99..56f2f2d 100644 --- a/examples/flatbuttonsettingseditor.h +++ b/examples/flatbuttonsettingseditor.h @@ -5,7 +5,7 @@ #include #include -#include +#include #include "ui_flatbuttonsettingsform.h" diff --git a/examples/iconbuttonsettingseditor.h b/examples/iconbuttonsettingseditor.h index 275f2e2..9ef9e26 100644 --- a/examples/iconbuttonsettingseditor.h +++ b/examples/iconbuttonsettingseditor.h @@ -4,8 +4,8 @@ #include #include -#include -#include +#include +#include #include "ui_iconbuttonsettingsform.h" diff --git a/examples/menusettingseditor.h b/examples/menusettingseditor.h index d6ecc43..1a64f54 100644 --- a/examples/menusettingseditor.h +++ b/examples/menusettingseditor.h @@ -5,8 +5,8 @@ #include #include -#include -#include "lib/qtmaterialoverlaywidget.h" +#include +#include "lib/overlaywidget.h" //#include "ui_menusettingsform.h" diff --git a/examples/progresssettingseditor.h b/examples/progresssettingseditor.h index fcd6317..d0d89bf 100644 --- a/examples/progresssettingseditor.h +++ b/examples/progresssettingseditor.h @@ -4,8 +4,8 @@ #include #include -#include -#include +#include +#include #include "ui_progresssettingsform.h" diff --git a/examples/radiobuttonsettingseditor.h b/examples/radiobuttonsettingseditor.h index 3625a17..1a3f9d4 100644 --- a/examples/radiobuttonsettingseditor.h +++ b/examples/radiobuttonsettingseditor.h @@ -6,7 +6,7 @@ #include #include -#include +#include #include "ui_radiobuttonsettingsform.h" diff --git a/examples/raisedbuttonsettingseditor.h b/examples/raisedbuttonsettingseditor.h index 225292e..95babf3 100644 --- a/examples/raisedbuttonsettingseditor.h +++ b/examples/raisedbuttonsettingseditor.h @@ -1,7 +1,7 @@ #ifndef RAISEDBUTTONSETTINGSEDITOR_H #define RAISEDBUTTONSETTINGSEDITOR_H -#include +#include #include "flatbuttonsettingseditor.h" using namespace md; diff --git a/examples/scrollbarsettingseditor.h b/examples/scrollbarsettingseditor.h index 971d12e..3b6fced 100644 --- a/examples/scrollbarsettingseditor.h +++ b/examples/scrollbarsettingseditor.h @@ -6,7 +6,7 @@ #include #include -#include +#include #include "ui_scrollbarsettingsform.h" diff --git a/examples/slidersettingseditor.h b/examples/slidersettingseditor.h index fdd3d9f..0bb69d9 100644 --- a/examples/slidersettingseditor.h +++ b/examples/slidersettingseditor.h @@ -5,7 +5,7 @@ #include #include -#include +#include #include "ui_slidersettingsform.h" diff --git a/examples/snackbarsettingseditor.h b/examples/snackbarsettingseditor.h index e51c163..01d02db 100644 --- a/examples/snackbarsettingseditor.h +++ b/examples/snackbarsettingseditor.h @@ -5,7 +5,7 @@ #include #include -#include +#include #include "ui_snackbarsettingsform.h" diff --git a/examples/tabssettingseditor.h b/examples/tabssettingseditor.h index 806a4cd..02fa821 100644 --- a/examples/tabssettingseditor.h +++ b/examples/tabssettingseditor.h @@ -5,7 +5,7 @@ #include #include -#include +#include #include "ui_tabssettingsform.h" diff --git a/examples/textfieldsettingseditor.h b/examples/textfieldsettingseditor.h index cc01a1c..90bd4b6 100644 --- a/examples/textfieldsettingseditor.h +++ b/examples/textfieldsettingseditor.h @@ -5,7 +5,7 @@ #include #include -#include +#include #include "ui_textfieldsettingsform.h" diff --git a/examples/togglesettingseditor.h b/examples/togglesettingseditor.h index 435c76c..e5e20fd 100644 --- a/examples/togglesettingseditor.h +++ b/examples/togglesettingseditor.h @@ -4,7 +4,7 @@ #include #include -#include +#include #include "ui_togglesettingsform.h"