AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QtGui: Add missing override

Browse Source 
Change-Id: Ief5b0863d7649d5a8d421c05766513276c264776
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Alexander Volkov 2016-11-24 02:02:42 +03:00 committed by Thiago Macieira
parent 20526cb014
commit 1ff2acf20f
10 changed files with 73 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/image/qbmphandler_p.h
View File

@ -93,17 +93,17 @@ public:
}; };
explicit QBmpHandler(InternalFormat fmt = BmpFormat); explicit QBmpHandler(InternalFormat fmt = BmpFormat);
bool canRead() const; bool canRead() const override;
bool read(QImage *image); bool read(QImage *image) override;
bool write(const QImage &image); bool write(const QImage &image) override;
QByteArray name() const; QByteArray name() const override;
static bool canRead(QIODevice *device); static bool canRead(QIODevice *device);
QVariant option(ImageOption option) const; QVariant option(ImageOption option) const override;
void setOption(ImageOption option, const QVariant &value); void setOption(ImageOption option, const QVariant &value) override;
bool supportsOption(ImageOption option) const; bool supportsOption(ImageOption option) const override;
private: private:
bool readHeader(); bool readHeader();

14
src/gui/image/qpnghandler_p.h
View File

@ -64,15 +64,15 @@ public:
QPngHandler(); QPngHandler();
~QPngHandler(); ~QPngHandler();
bool canRead() const; bool canRead() const override;
bool read(QImage *image); bool read(QImage *image) override;
bool write(const QImage &image); bool write(const QImage &image) override;
QByteArray name() const; QByteArray name() const override;
QVariant option(ImageOption option) const; QVariant option(ImageOption option) const override;
void setOption(ImageOption option, const QVariant &value); void setOption(ImageOption option, const QVariant &value) override;
bool supportsOption(ImageOption option) const; bool supportsOption(ImageOption option) const override;
static bool canRead(QIODevice *device); static bool canRead(QIODevice *device);

14
src/gui/image/qppmhandler_p.h
View File

@ -62,17 +62,17 @@ class QPpmHandler : public QImageIOHandler
{ {
public: public:
QPpmHandler(); QPpmHandler();
bool canRead() const; bool canRead() const override;
bool read(QImage *image); bool read(QImage *image) override;
bool write(const QImage &image); bool write(const QImage &image) override;
QByteArray name() const; QByteArray name() const override;
static bool canRead(QIODevice *device, QByteArray *subType = 0); static bool canRead(QIODevice *device, QByteArray *subType = 0);
QVariant option(ImageOption option) const; QVariant option(ImageOption option) const override;
void setOption(ImageOption option, const QVariant &value); void setOption(ImageOption option, const QVariant &value) override;
bool supportsOption(ImageOption option) const; bool supportsOption(ImageOption option) const override;
private: private:
bool readHeader(); bool readHeader();

14
src/gui/image/qxbmhandler_p.h
View File

@ -61,17 +61,17 @@ class QXbmHandler : public QImageIOHandler
{ {
public: public:
QXbmHandler(); QXbmHandler();
bool canRead() const; bool canRead() const override;
bool read(QImage *image); bool read(QImage *image) override;
bool write(const QImage &image); bool write(const QImage &image) override;
QByteArray name() const; QByteArray name() const override;
static bool canRead(QIODevice *device); static bool canRead(QIODevice *device);
QVariant option(ImageOption option) const; QVariant option(ImageOption option) const override;
void setOption(ImageOption option, const QVariant &value); void setOption(ImageOption option, const QVariant &value) override;
bool supportsOption(ImageOption option) const; bool supportsOption(ImageOption option) const override;
private: private:
bool readHeader(); bool readHeader();

14
src/gui/image/qxpmhandler_p.h
View File

@ -61,17 +61,17 @@ class QXpmHandler : public QImageIOHandler
{ {
public: public:
QXpmHandler(); QXpmHandler();
bool canRead() const; bool canRead() const override;
bool read(QImage *image); bool read(QImage *image) override;
bool write(const QImage &image); bool write(const QImage &image) override;
static bool canRead(QIODevice *device); static bool canRead(QIODevice *device);
QByteArray name() const; QByteArray name() const override;
QVariant option(ImageOption option) const; QVariant option(ImageOption option) const override;
void setOption(ImageOption option, const QVariant &value); void setOption(ImageOption option, const QVariant &value) override;
bool supportsOption(ImageOption option) const; bool supportsOption(ImageOption option) const override;
private: private:
bool readHeader(); bool readHeader();

6
src/gui/opengl/qopenglpaintdevice.h
View File

@ -61,8 +61,8 @@ public:
QOpenGLPaintDevice(int width, int height); QOpenGLPaintDevice(int width, int height);
virtual ~QOpenGLPaintDevice(); virtual ~QOpenGLPaintDevice();
int devType() const { return QInternal::OpenGL; } int devType() const override { return QInternal::OpenGL; }
QPaintEngine *paintEngine() const; QPaintEngine *paintEngine() const override;
QOpenGLContext *context() const; QOpenGLContext *context() const;
QSize size() const; QSize size() const;
@ -82,7 +82,7 @@ public:
protected: protected:
QOpenGLPaintDevice(QOpenGLPaintDevicePrivate &dd); QOpenGLPaintDevice(QOpenGLPaintDevicePrivate &dd);
int metric(QPaintDevice::PaintDeviceMetric metric) const; int metric(QPaintDevice::PaintDeviceMetric metric) const override;
Q_DISABLE_COPY(QOpenGLPaintDevice) Q_DISABLE_COPY(QOpenGLPaintDevice)
QScopedPointer<QOpenGLPaintDevicePrivate> d_ptr; QScopedPointer<QOpenGLPaintDevicePrivate> d_ptr;

48
src/gui/painting/qemulationpaintengine_p.h
View File

@ -61,37 +61,37 @@ class QEmulationPaintEngine : public QPaintEngineEx
public: public:
QEmulationPaintEngine(QPaintEngineEx *engine); QEmulationPaintEngine(QPaintEngineEx *engine);
virtual bool begin(QPaintDevice *pdev); bool begin(QPaintDevice *pdev) override;
virtual bool end(); bool end() override;
virtual Type type() const; Type type() const override;
virtual QPainterState *createState(QPainterState *orig) const; QPainterState *createState(QPainterState *orig) const override;
virtual void fill(const QVectorPath &path, const QBrush &brush); void fill(const QVectorPath &path, const QBrush &brush) override;
virtual void stroke(const QVectorPath &path, const QPen &pen); void stroke(const QVectorPath &path, const QPen &pen) override;
virtual void clip(const QVectorPath &path, Qt::ClipOperation op); void clip(const QVectorPath &path, Qt::ClipOperation op) override;
virtual void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr); void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) override;
virtual void drawTextItem(const QPointF &p, const QTextItem &textItem); void drawTextItem(const QPointF &p, const QTextItem &textItem) override;
virtual void drawStaticTextItem(QStaticTextItem *item); void drawStaticTextItem(QStaticTextItem *item) override;
virtual void drawTiledPixmap(const QRectF &r, const QPixmap &pixmap, const QPointF &s); void drawTiledPixmap(const QRectF &r, const QPixmap &pixmap, const QPointF &s) override;
virtual void drawImage(const QRectF &r, const QImage &pm, const QRectF &sr, Qt::ImageConversionFlags flags); void drawImage(const QRectF &r, const QImage &pm, const QRectF &sr, Qt::ImageConversionFlags flags) override;
virtual void clipEnabledChanged(); void clipEnabledChanged() override;
virtual void penChanged(); void penChanged() override;
virtual void brushChanged(); void brushChanged() override;
virtual void brushOriginChanged(); void brushOriginChanged() override;
virtual void opacityChanged(); void opacityChanged() override;
virtual void compositionModeChanged(); void compositionModeChanged() override;
virtual void renderHintsChanged(); void renderHintsChanged() override;
virtual void transformChanged(); void transformChanged() override;
virtual void setState(QPainterState *s); void setState(QPainterState *s) override;
virtual void beginNativePainting(); void beginNativePainting() override;
virtual void endNativePainting(); void endNativePainting() override;
virtual uint flags() const {return QPaintEngineEx::IsEmulationEngine | QPaintEngineEx::DoNotEmulate;} uint flags() const override { return QPaintEngineEx::IsEmulationEngine | QPaintEngineEx::DoNotEmulate; }
inline QPainterState *state() { return (QPainterState *)QPaintEngine::state; } inline QPainterState *state() { return (QPainterState *)QPaintEngine::state; }
inline const QPainterState *state() const { return (const QPainterState *)QPaintEngine::state; } inline const QPainterState *state() const { return (const QPainterState *)QPaintEngine::state; }

2
src/gui/painting/qpaintengine_raster_p.h
View File

@ -286,7 +286,7 @@ public:
void rasterize(QT_FT_Outline *outline, ProcessSpans callback, void *userData, QRasterBuffer *rasterBuffer); void rasterize(QT_FT_Outline *outline, ProcessSpans callback, void *userData, QRasterBuffer *rasterBuffer);
void updateMatrixData(QSpanData *spanData, const QBrush &brush, const QTransform &brushMatrix); void updateMatrixData(QSpanData *spanData, const QBrush &brush, const QTransform &brushMatrix);
void systemStateChanged(); void systemStateChanged() override;
void drawImage(const QPointF &pt, const QImage &img, SrcOverBlendFunc func, void drawImage(const QPointF &pt, const QImage &img, SrcOverBlendFunc func,
const QRect &clip, int alpha, const QRect &sr = QRect()); const QRect &clip, int alpha, const QRect &sr = QRect());

12
src/gui/painting/qpdfwriter.h
View File

@ -67,7 +67,7 @@ public:
QString creator() const; QString creator() const;
void setCreator(const QString &creator); void setCreator(const QString &creator);
bool newPage(); bool newPage() override;
void setResolution(int resolution); void setResolution(int resolution);
int resolution() const; int resolution() const;
@ -83,14 +83,14 @@ public:
using QPagedPaintDevice::setPageSize; using QPagedPaintDevice::setPageSize;
#endif #endif
void setPageSize(PageSize size); void setPageSize(PageSize size) override;
void setPageSizeMM(const QSizeF &size); void setPageSizeMM(const QSizeF &size) override;
void setMargins(const Margins &m); void setMargins(const Margins &m) override;
protected: protected:
QPaintEngine *paintEngine() const; QPaintEngine *paintEngine() const override;
int metric(PaintDeviceMetric id) const; int metric(PaintDeviceMetric id) const override;
private: private:
Q_DISABLE_COPY(QPdfWriter) Q_DISABLE_COPY(QPdfWriter)

8
src/gui/painting/qstroker_p.h
View File

@ -233,7 +233,7 @@ protected:
static Qt::PenJoinStyle joinForJoinMode(LineJoinMode mode); static Qt::PenJoinStyle joinForJoinMode(LineJoinMode mode);
static LineJoinMode joinModeForJoin(Qt::PenJoinStyle joinStyle); static LineJoinMode joinModeForJoin(Qt::PenJoinStyle joinStyle);
virtual void processCurrentSubpath(); void processCurrentSubpath() override;
qfixed m_strokeWidth; qfixed m_strokeWidth;
qfixed m_miterLimit; qfixed m_miterLimit;
@ -264,14 +264,14 @@ public:
void setDashOffset(qreal offset) { m_dashOffset = offset; } void setDashOffset(qreal offset) { m_dashOffset = offset; }
qreal dashOffset() const { return m_dashOffset; } qreal dashOffset() const { return m_dashOffset; }
virtual void begin(void *data); void begin(void *data) override;
virtual void end(); void end() override;
inline void setStrokeWidth(qreal width) { m_stroke_width = width; } inline void setStrokeWidth(qreal width) { m_stroke_width = width; }
inline void setMiterLimit(qreal limit) { m_miter_limit = limit; } inline void setMiterLimit(qreal limit) { m_miter_limit = limit; }
protected: protected:
virtual void processCurrentSubpath(); void processCurrentSubpath() override;
QStroker *m_stroker; QStroker *m_stroker;
QVector<qfixed> m_dashPattern; QVector<qfixed> m_dashPattern;