Differential D5538 Diff 13672 src/platformtheme/kdeplatformtheme.h

Changeset View

Standalone View

View Options

src/platformtheme/kdeplatformtheme.h

Context not available.
23 23​
24#include <qpa/qplatformtheme.h> 24​#include <qpa/qplatformtheme.h>
25 25​
26​#include <vector>
27​
26#include <QHash> 28​#include <QHash>
27#include <QObject> 29​#include <QObject>
28#include <QKeySequence> 30​#include <QKeySequence>
31​#include <QStringList>
32​
29 33​
30class KHintsSettings; 34​class KHintsSettings;
31class KFontSettingsData; 35​class KFontSettingsData;
32class KWaylandIntegration; 36​class KWaylandIntegration;
33class X11Integration; 37​class X11Integration;
34class QIconEngine; 38​class QIconEngine;
39​class QMimeDatabase;
35class QWindow; 40​class QWindow;
36 41​
37class AltKeyEventListener; 42​class AltKeyEventListener;
Context not available.
43 ~KdePlatformTheme(); 48​ ~KdePlatformTheme();
graesslinUnsubmitted
Done

please use override instead of Q_DECL_OVERRIDE

graesslin: please use override instead of Q_DECL_OVERRIDE
44 49​
45 QVariant themeHint(ThemeHint hint) const Q_DECL_OVERRIDE; 50​ QVariant themeHint(ThemeHint hint) const Q_DECL_OVERRIDE;
51​#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0)
52​ QIcon fileIcon(const QFileInfo &fileInfo, QPlatformTheme::IconOptions iconOptions) const Q_DECL_OVERRIDE;
53​#else
54​ QPixmap fileIconPixmap(const QFileInfo &fileInfo, const QSizeF &size,
55​ QPlatformTheme::IconOptions iconOptions) const Q_DECL_OVERRIDE;
56​#endif
46 const QPalette *palette(Palette type = SystemPalette) const Q_DECL_OVERRIDE; 57​ const QPalette *palette(Palette type = SystemPalette) const Q_DECL_OVERRIDE;
47 const QFont *font(Font type) const Q_DECL_OVERRIDE; 58​ const QFont *font(Font type) const Q_DECL_OVERRIDE;
48 QIconEngine *createIconEngine(const QString &iconName) const Q_DECL_OVERRIDE; 59​ QIconEngine *createIconEngine(const QString &iconName) const Q_DECL_OVERRIDE;
Context not available.
60#endif 71​#endif
61 72​
62private: 73​private:
74​
75​ class FileIconProvider
76​ {
77​ public:
78​ FileIconProvider();
79​ QIcon fileIcon(const QFileInfo &fileInfo, QPlatformTheme::IconOptions iconOptions) const;
80​
81​ private:
82​ struct StandardPathItem {
83​ QString iconName;
84​ QStringList locations;
85​ };
86​ std::vector<StandardPathItem> m_standardPathItems;
87​ QScopedPointer<QMimeDatabase> m_mimeDatabase;
88​ };
89​
63 void loadSettings(); 90​ void loadSettings();
64 91​
65 static void setWindowProperty(QWindow *window, const QByteArray &name, const QByteArray &value); 92​ static void setWindowProperty(QWindow *window, const QByteArray &name, const QByteArray &value);
93​ const FileIconProvider* fileIconProvider() const;
66 94​
67 KHintsSettings *m_hints; 95​ KHintsSettings *m_hints;
68 KFontSettingsData *m_fontsData; 96​ KFontSettingsData *m_fontsData;
69 QScopedPointer<KWaylandIntegration> m_kwaylandIntegration; 97​ QScopedPointer<KWaylandIntegration> m_kwaylandIntegration;
70 QScopedPointer<X11Integration> m_x11Integration; 98​ QScopedPointer<X11Integration> m_x11Integration;
71 99​
graesslinUnsubmitted
Done

nitpick: unrelated removal of empty line

graesslin: nitpick: unrelated removal of empty line
100​ mutable QScopedPointer<FileIconProvider> m_fileIconProvider;
72}; 101​};
73 102​
74#endif // KDEPLATFORMTHEME_H 103​#endif // KDEPLATFORMTHEME_H
Context not available.