Differential D2586 Diff 6694 kcmkwin/kwincompositing/compositing.h

Changeset View

Standalone View

View Options

kcmkwin/kwincompositing/compositing.h

Show All 19 Lines
20 20​
21 21​
22#ifndef COMPOSITING_H 22​#ifndef COMPOSITING_H
23#define COMPOSITING_H 23​#define COMPOSITING_H
24 24​
25#include <QAbstractItemModel> 25​#include <QAbstractItemModel>
26#include <QObject> 26​#include <QObject>
27 27​
28​class OrgKdeKwinCompositingInterface;
29​
28namespace KWin { 30​namespace KWin {
29namespace Compositing { 31​namespace Compositing {
30 32​
31class OpenGLPlatformInterfaceModel; 33​class OpenGLPlatformInterfaceModel;
32 34​
33class Compositing : public QObject 35​class Compositing : public QObject
34{ 36​{
35 37​
36 Q_OBJECT 38​ Q_OBJECT
37 Q_PROPERTY(int animationSpeed READ animationSpeed WRITE setAnimationSpeed NOTIFY animationSpeedChanged) 39​ Q_PROPERTY(int animationSpeed READ animationSpeed WRITE setAnimationSpeed NOTIFY animationSpeedChanged)
38 Q_PROPERTY(int windowThumbnail READ windowThumbnail WRITE setWindowThumbnail NOTIFY windowThumbnailChanged) 40​ Q_PROPERTY(int windowThumbnail READ windowThumbnail WRITE setWindowThumbnail NOTIFY windowThumbnailChanged)
39 Q_PROPERTY(int glScaleFilter READ glScaleFilter WRITE setGlScaleFilter NOTIFY glScaleFilterChanged) 41​ Q_PROPERTY(int glScaleFilter READ glScaleFilter WRITE setGlScaleFilter NOTIFY glScaleFilterChanged)
40 Q_PROPERTY(bool xrScaleFilter READ xrScaleFilter WRITE setXrScaleFilter NOTIFY xrScaleFilterChanged) 42​ Q_PROPERTY(bool xrScaleFilter READ xrScaleFilter WRITE setXrScaleFilter NOTIFY xrScaleFilterChanged)
41 Q_PROPERTY(int glSwapStrategy READ glSwapStrategy WRITE setGlSwapStrategy NOTIFY glSwapStrategyChanged) 43​ Q_PROPERTY(int glSwapStrategy READ glSwapStrategy WRITE setGlSwapStrategy NOTIFY glSwapStrategyChanged)
42 Q_PROPERTY(bool glColorCorrection READ glColorCorrection WRITE setGlColorCorrection NOTIFY glColorCorrectionChanged) 44​ Q_PROPERTY(bool glColorCorrection READ glColorCorrection WRITE setGlColorCorrection NOTIFY glColorCorrectionChanged)
43 Q_PROPERTY(int compositingType READ compositingType WRITE setCompositingType NOTIFY compositingTypeChanged) 45​ Q_PROPERTY(int compositingType READ compositingType WRITE setCompositingType NOTIFY compositingTypeChanged)
44 Q_PROPERTY(bool compositingEnabled READ compositingEnabled WRITE setCompositingEnabled NOTIFY compositingEnabledChanged) 46​ Q_PROPERTY(bool compositingEnabled READ compositingEnabled WRITE setCompositingEnabled NOTIFY compositingEnabledChanged)
45 Q_PROPERTY(KWin::Compositing::OpenGLPlatformInterfaceModel *openGLPlatformInterfaceModel READ openGLPlatformInterfaceModel CONSTANT) 47​ Q_PROPERTY(KWin::Compositing::OpenGLPlatformInterfaceModel *openGLPlatformInterfaceModel READ openGLPlatformInterfaceModel CONSTANT)
46 Q_PROPERTY(int openGLPlatformInterface READ openGLPlatformInterface WRITE setOpenGLPlatformInterface NOTIFY openGLPlatformInterfaceChanged) 48​ Q_PROPERTY(int openGLPlatformInterface READ openGLPlatformInterface WRITE setOpenGLPlatformInterface NOTIFY openGLPlatformInterfaceChanged)
47 Q_PROPERTY(bool windowsBlockCompositing READ windowsBlockCompositing WRITE setWindowsBlockCompositing NOTIFY windowsBlockCompositingChanged) 49​ Q_PROPERTY(bool windowsBlockCompositing READ windowsBlockCompositing WRITE setWindowsBlockCompositing NOTIFY windowsBlockCompositingChanged)
50​ Q_PROPERTY(bool compositingRequired READ compositingRequired CONSTANT)
sebasUnsubmitted
Done

again, same name instead of using 3 different variations

sebas: again, same name instead of using 3 different variations
48public: 51​public:
49 explicit Compositing(QObject *parent = 0); 52​ explicit Compositing(QObject *parent = 0);
50 53​
51 Q_INVOKABLE bool OpenGLIsUnsafe() const; 54​ Q_INVOKABLE bool OpenGLIsUnsafe() const;
52 Q_INVOKABLE bool OpenGLIsBroken(); 55​ Q_INVOKABLE bool OpenGLIsBroken();
53 Q_INVOKABLE void reenableOpenGLDetection(); 56​ Q_INVOKABLE void reenableOpenGLDetection();
54 int animationSpeed() const; 57​ int animationSpeed() const;
55 int windowThumbnail() const; 58​ int windowThumbnail() const;
56 int glScaleFilter() const; 59​ int glScaleFilter() const;
57 bool xrScaleFilter() const; 60​ bool xrScaleFilter() const;
58 int glSwapStrategy() const; 61​ int glSwapStrategy() const;
59 bool glColorCorrection() const; 62​ bool glColorCorrection() const;
60 int compositingType() const; 63​ int compositingType() const;
61 bool compositingEnabled() const; 64​ bool compositingEnabled() const;
62 int openGLPlatformInterface() const; 65​ int openGLPlatformInterface() const;
63 bool windowsBlockCompositing() const; 66​ bool windowsBlockCompositing() const;
67​ bool compositingRequired() const;
64 68​
65 OpenGLPlatformInterfaceModel *openGLPlatformInterfaceModel() const; 69​ OpenGLPlatformInterfaceModel *openGLPlatformInterfaceModel() const;
66 70​
67 void setAnimationSpeed(int speed); 71​ void setAnimationSpeed(int speed);
68 void setWindowThumbnail(int index); 72​ void setWindowThumbnail(int index);
69 void setGlScaleFilter(int index); 73​ void setGlScaleFilter(int index);
70 void setXrScaleFilter(bool filter); 74​ void setXrScaleFilter(bool filter);
71 void setGlSwapStrategy(int strategy); 75​ void setGlSwapStrategy(int strategy);
Show All 30 Lines101private:
102 int m_glSwapStrategy; 106​ int m_glSwapStrategy;
103 bool m_glColorCorrection; 107​ bool m_glColorCorrection;
104 int m_compositingType; 108​ int m_compositingType;
105 bool m_compositingEnabled; 109​ bool m_compositingEnabled;
106 bool m_changed; 110​ bool m_changed;
107 OpenGLPlatformInterfaceModel *m_openGLPlatformInterfaceModel; 111​ OpenGLPlatformInterfaceModel *m_openGLPlatformInterfaceModel;
108 int m_openGLPlatformInterface; 112​ int m_openGLPlatformInterface;
109 bool m_windowsBlockCompositing; 113​ bool m_windowsBlockCompositing;
114​ bool m_windowsBlockingCompositing;
115​ OrgKdeKwinCompositingInterface *m_compositingInterface;
110}; 116​};
111 117​
112 118​
113struct CompositingData; 119​struct CompositingData;
114 120​
115class CompositingType : public QAbstractItemModel 121​class CompositingType : public QAbstractItemModel
116{ 122​{
117 123​
▲ Show 20 Lines • Show All 63 Lines • Show Last 20 Lines