Differential D5538 Diff 13675 src/platformtheme/kdeplatformtheme.h

Changeset View

Standalone View

View Options

src/platformtheme/kdeplatformtheme.h

Context not available.
43 ~KdePlatformTheme(); 43​ ~KdePlatformTheme();
44 44​
45 QVariant themeHint(ThemeHint hint) const Q_DECL_OVERRIDE; 45​ QVariant themeHint(ThemeHint hint) const Q_DECL_OVERRIDE;
46​#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
47​ QIcon fileIcon(const QFileInfo &fileInfo,
48​ QPlatformTheme::IconOptions iconOptions) const Q_DECL_OVERRIDE;
graesslinUnsubmitted
Done

please use override instead of Q_DECL_OVERRIDE

graesslin: please use override instead of Q_DECL_OVERRIDE
49​#else
50​ QPixmap fileIconPixmap(const QFileInfo &fileInfo, const QSizeF &size,
51​ QPlatformTheme::IconOptions iconOptions) const Q_DECL_OVERRIDE;
52​ // this will be the implementation
53​ QIcon fileIcon(const QFileInfo &fileInfo,
54​ QPlatformTheme::IconOptions iconOptions) const;
55​#endif
46 const QPalette *palette(Palette type = SystemPalette) const Q_DECL_OVERRIDE; 56​ const QPalette *palette(Palette type = SystemPalette) const Q_DECL_OVERRIDE;
47 const QFont *font(Font type) const Q_DECL_OVERRIDE; 57​ const QFont *font(Font type) const Q_DECL_OVERRIDE;
48 QIconEngine *createIconEngine(const QString &iconName) const Q_DECL_OVERRIDE; 58​ QIconEngine *createIconEngine(const QString &iconName) const Q_DECL_OVERRIDE;
Context not available.
68 KFontSettingsData *m_fontsData; 78​ KFontSettingsData *m_fontsData;
69 QScopedPointer<KWaylandIntegration> m_kwaylandIntegration; 79​ QScopedPointer<KWaylandIntegration> m_kwaylandIntegration;
70 QScopedPointer<X11Integration> m_x11Integration; 80​ QScopedPointer<X11Integration> m_x11Integration;
71 ​
graesslinUnsubmitted
Done

nitpick: unrelated removal of empty line

graesslin: nitpick: unrelated removal of empty line
72}; 81​};
73 82​
74#endif // KDEPLATFORMTHEME_H 83​#endif // KDEPLATFORMTHEME_H
Context not available.