summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2019-11-06 15:43:19 +0200
committerTomi Valkeinen <tomi.valkeinen@ti.com>2019-11-06 17:16:23 +0200
commitc6984ae0666c06a7bee8812627069ae3c197ea9e (patch)
treea78894f6f616b685ec8987e165b06d526478929b
parent4dd5456fb352fad9a81034a067d572f2a1ba4dd8 (diff)
kms++: use 'override' all around
-rw-r--r--kms++/inc/kms++/blob.h2
-rw-r--r--kms++/inc/kms++/connector.h4
-rw-r--r--kms++/inc/kms++/crtc.h4
-rw-r--r--kms++/inc/kms++/dmabufframebuffer.h26
-rw-r--r--kms++/inc/kms++/drmpropobject.h2
-rw-r--r--kms++/inc/kms++/dumbframebuffer.h20
-rw-r--r--kms++/inc/kms++/encoder.h2
-rw-r--r--kms++/inc/kms++/extframebuffer.h16
-rw-r--r--kms++/inc/kms++/framebuffer.h6
-rw-r--r--kms++/inc/kms++/plane.h2
-rw-r--r--kms++/inc/kms++/property.h2
11 files changed, 43 insertions, 43 deletions
diff --git a/kms++/inc/kms++/blob.h b/kms++/inc/kms++/blob.h
index fd872f1..31e915c 100644
--- a/kms++/inc/kms++/blob.h
+++ b/kms++/inc/kms++/blob.h
@@ -11,7 +11,7 @@ class Blob : public DrmObject
public:
Blob(Card& card, uint32_t blob_id);
Blob(Card& card, void* data, size_t len);
- virtual ~Blob();
+ ~Blob() override;
std::vector<uint8_t> data();
diff --git a/kms++/inc/kms++/connector.h b/kms++/inc/kms++/connector.h
index 155f916..323d37d 100644
--- a/kms++/inc/kms++/connector.h
+++ b/kms++/inc/kms++/connector.h
@@ -46,9 +46,9 @@ public:
std::vector<Encoder*> get_encoders() const;
private:
Connector(Card& card, uint32_t id, uint32_t idx);
- ~Connector();
+ ~Connector() override;
- void setup();
+ void setup() override;
void restore_mode();
ConnectorPriv* m_priv;
diff --git a/kms++/inc/kms++/crtc.h b/kms++/inc/kms++/crtc.h
index ea20ef8..990fc20 100644
--- a/kms++/inc/kms++/crtc.h
+++ b/kms++/inc/kms++/crtc.h
@@ -42,9 +42,9 @@ public:
int gamma_size() const;
private:
Crtc(Card& card, uint32_t id, uint32_t idx);
- ~Crtc();
+ ~Crtc() override;
- void setup();
+ void setup() override;
void restore_mode(Connector *conn);
CrtcPriv* m_priv;
diff --git a/kms++/inc/kms++/dmabufframebuffer.h b/kms++/inc/kms++/dmabufframebuffer.h
index 95460cb..73c6d21 100644
--- a/kms++/inc/kms++/dmabufframebuffer.h
+++ b/kms++/inc/kms++/dmabufframebuffer.h
@@ -12,23 +12,23 @@ class DmabufFramebuffer : public Framebuffer
public:
DmabufFramebuffer(Card& card, uint32_t width, uint32_t height, PixelFormat format,
std::vector<int> fds, std::vector<uint32_t> pitches, std::vector<uint32_t> offsets);
- virtual ~DmabufFramebuffer();
+ ~DmabufFramebuffer() override;
- uint32_t width() const { return Framebuffer::width(); }
- uint32_t height() const { return Framebuffer::height(); }
+ uint32_t width() const override { return Framebuffer::width(); }
+ uint32_t height() const override { return Framebuffer::height(); }
- PixelFormat format() const { return m_format; }
- unsigned num_planes() const { return m_num_planes; }
+ PixelFormat format() const override { return m_format; }
+ unsigned num_planes() const override { return m_num_planes; }
uint32_t handle(unsigned plane) const { return m_planes[plane].handle; }
- uint32_t stride(unsigned plane) const { return m_planes[plane].stride; }
- uint32_t size(unsigned plane) const { return m_planes[plane].size; }
- uint32_t offset(unsigned plane) const { return m_planes[plane].offset; }
- uint8_t* map(unsigned plane);
- int prime_fd(unsigned plane);
-
- void begin_cpu_access(CpuAccess access);
- void end_cpu_access();
+ uint32_t stride(unsigned plane) const override { return m_planes[plane].stride; }
+ uint32_t size(unsigned plane) const override { return m_planes[plane].size; }
+ uint32_t offset(unsigned plane) const override { return m_planes[plane].offset; }
+ uint8_t* map(unsigned plane) override;
+ int prime_fd(unsigned plane) override;
+
+ void begin_cpu_access(CpuAccess access) override;
+ void end_cpu_access() override;
private:
struct FramebufferPlane {
diff --git a/kms++/inc/kms++/drmpropobject.h b/kms++/inc/kms++/drmpropobject.h
index d9ba58e..809caf5 100644
--- a/kms++/inc/kms++/drmpropobject.h
+++ b/kms++/inc/kms++/drmpropobject.h
@@ -31,7 +31,7 @@ protected:
DrmPropObject(Card& card, uint32_t object_type);
DrmPropObject(Card& card, uint32_t id, uint32_t object_type, uint32_t idx = 0);
- virtual ~DrmPropObject();
+ ~DrmPropObject() override;
private:
std::map<uint32_t, uint64_t> m_prop_values;
diff --git a/kms++/inc/kms++/dumbframebuffer.h b/kms++/inc/kms++/dumbframebuffer.h
index 9051c03..b722615 100644
--- a/kms++/inc/kms++/dumbframebuffer.h
+++ b/kms++/inc/kms++/dumbframebuffer.h
@@ -11,20 +11,20 @@ class DumbFramebuffer : public Framebuffer
public:
DumbFramebuffer(Card& card, uint32_t width, uint32_t height, const std::string& fourcc);
DumbFramebuffer(Card& card, uint32_t width, uint32_t height, PixelFormat format);
- virtual ~DumbFramebuffer();
+ ~DumbFramebuffer() override;
- uint32_t width() const { return Framebuffer::width(); }
- uint32_t height() const { return Framebuffer::height(); }
+ uint32_t width() const override { return Framebuffer::width(); }
+ uint32_t height() const override { return Framebuffer::height(); }
- PixelFormat format() const { return m_format; }
- unsigned num_planes() const { return m_num_planes; }
+ PixelFormat format() const override { return m_format; }
+ unsigned num_planes() const override { return m_num_planes; }
uint32_t handle(unsigned plane) const { return m_planes[plane].handle; }
- uint32_t stride(unsigned plane) const { return m_planes[plane].stride; }
- uint32_t size(unsigned plane) const { return m_planes[plane].size; }
- uint32_t offset(unsigned plane) const { return m_planes[plane].offset; }
- uint8_t* map(unsigned plane);
- int prime_fd(unsigned plane);
+ uint32_t stride(unsigned plane) const override { return m_planes[plane].stride; }
+ uint32_t size(unsigned plane) const override { return m_planes[plane].size; }
+ uint32_t offset(unsigned plane) const override { return m_planes[plane].offset; }
+ uint8_t* map(unsigned plane) override;
+ int prime_fd(unsigned plane) override;
private:
struct FramebufferPlane {
diff --git a/kms++/inc/kms++/encoder.h b/kms++/inc/kms++/encoder.h
index 1d36adc..72c0213 100644
--- a/kms++/inc/kms++/encoder.h
+++ b/kms++/inc/kms++/encoder.h
@@ -20,7 +20,7 @@ public:
const std::string& get_encoder_type() const;
private:
Encoder(Card& card, uint32_t id, uint32_t idx);
- ~Encoder();
+ ~Encoder() override;
EncoderPriv* m_priv;
};
diff --git a/kms++/inc/kms++/extframebuffer.h b/kms++/inc/kms++/extframebuffer.h
index f764c50..0b9d08a 100644
--- a/kms++/inc/kms++/extframebuffer.h
+++ b/kms++/inc/kms++/extframebuffer.h
@@ -12,18 +12,18 @@ class ExtFramebuffer : public Framebuffer
public:
ExtFramebuffer(Card& card, uint32_t width, uint32_t height, PixelFormat format,
std::vector<uint32_t> handles, std::vector<uint32_t> pitches, std::vector<uint32_t> offsets);
- virtual ~ExtFramebuffer();
+ ~ExtFramebuffer() override;
- uint32_t width() const { return Framebuffer::width(); }
- uint32_t height() const { return Framebuffer::height(); }
+ uint32_t width() const override { return Framebuffer::width(); }
+ uint32_t height() const override { return Framebuffer::height(); }
- PixelFormat format() const { return m_format; }
- unsigned num_planes() const { return m_num_planes; }
+ PixelFormat format() const override { return m_format; }
+ unsigned num_planes() const override { return m_num_planes; }
uint32_t handle(unsigned plane) const { return m_planes[plane].handle; }
- uint32_t stride(unsigned plane) const { return m_planes[plane].stride; }
- uint32_t size(unsigned plane) const { return m_planes[plane].size; }
- uint32_t offset(unsigned plane) const { return m_planes[plane].offset; }
+ uint32_t stride(unsigned plane) const override { return m_planes[plane].stride; }
+ uint32_t size(unsigned plane) const override { return m_planes[plane].size; }
+ uint32_t offset(unsigned plane) const override { return m_planes[plane].offset; }
private:
struct FramebufferPlane {
diff --git a/kms++/inc/kms++/framebuffer.h b/kms++/inc/kms++/framebuffer.h
index 6f90541..bcfd1f0 100644
--- a/kms++/inc/kms++/framebuffer.h
+++ b/kms++/inc/kms++/framebuffer.h
@@ -36,10 +36,10 @@ class Framebuffer : public DrmObject, public IFramebuffer
{
public:
Framebuffer(Card& card, uint32_t id);
- virtual ~Framebuffer();
+ ~Framebuffer() override;
- uint32_t width() const { return m_width; }
- uint32_t height() const { return m_height; }
+ uint32_t width() const override { return m_width; }
+ uint32_t height() const override { return m_height; }
void flush();
protected:
diff --git a/kms++/inc/kms++/plane.h b/kms++/inc/kms++/plane.h
index 27e819b..1d78537 100644
--- a/kms++/inc/kms++/plane.h
+++ b/kms++/inc/kms++/plane.h
@@ -35,7 +35,7 @@ public:
uint32_t gamma_size() const;
private:
Plane(Card& card, uint32_t id, uint32_t idx);
- ~Plane();
+ ~Plane() override;
PlanePriv* m_priv;
};
diff --git a/kms++/inc/kms++/property.h b/kms++/inc/kms++/property.h
index b9097ff..8d6088e 100644
--- a/kms++/inc/kms++/property.h
+++ b/kms++/inc/kms++/property.h
@@ -34,7 +34,7 @@ public:
std::vector<uint32_t> get_blob_ids() const;
private:
Property(Card& card, uint32_t id);
- ~Property();
+ ~Property() override;
PropertyType m_type;