diff options
author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-03-17 15:46:46 +0100 |
---|---|---|
committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2016-03-18 22:14:34 +0000 |
commit | 09e83913e9bfee232d436773a9a08f153aa00a70 (patch) | |
tree | 0b907bd45dd57a2d7f410f755a0f2868aa5147c5 /src/imports/controls/material/qquickmaterialtheme_p.h | |
parent | 94136244c58ed035be44183bd8eb00314bccf7df (diff) |
Cleanup QQuickProxyStyle
Install and remove the proxy theme automatically to eliminate the
need for TestTheme do it in tst_applicationwindow. Furthermore,
fix some Qt coding conventions, align header guards, remove unneeded
empty destructor, and add missing explicit keywords for one-parameter
constructors and cleanup somemeaningless ones in paremeterless ctors.
Change-Id: Ib95dad003e35e468e941f3a0d2be5b21323fcccd
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/imports/controls/material/qquickmaterialtheme_p.h')
-rw-r--r-- | src/imports/controls/material/qquickmaterialtheme_p.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/imports/controls/material/qquickmaterialtheme_p.h b/src/imports/controls/material/qquickmaterialtheme_p.h index 9fd74bcc..55533ee5 100644 --- a/src/imports/controls/material/qquickmaterialtheme_p.h +++ b/src/imports/controls/material/qquickmaterialtheme_p.h @@ -34,8 +34,8 @@ ** ****************************************************************************/ -#ifndef QQUICKMATERIALTHEME_H -#define QQUICKMATERIALTHEME_H +#ifndef QQUICKMATERIALTHEME_P_H +#define QQUICKMATERIALTHEME_P_H // // W A R N I N G @@ -48,7 +48,6 @@ // We mean it. // -#include <QtGui/qpa/qplatformtheme.h> #include <QtGui/qfont.h> #include <QtQuickControls/private/qquickproxytheme_p.h> @@ -57,9 +56,7 @@ QT_BEGIN_NAMESPACE class QQuickMaterialTheme : public QQuickProxyTheme { public: - QQuickMaterialTheme(QPlatformTheme *theme); - - ~QQuickMaterialTheme(); + explicit QQuickMaterialTheme(QPlatformTheme *theme = nullptr); const QFont *font(Font type = SystemFont) const override; @@ -72,4 +69,4 @@ private: QT_END_NAMESPACE -#endif // QQUICKMATERIALTHEME_H +#endif // QQUICKMATERIALTHEME_P_H |