whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add missing override 

Change-Id: I88000e82ecbdc55e621dc8e22aff5e8f55cf9d0e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
bb10
Alexander Volkov 2019-08-29 23:32:04 +03:00
parent e7ca98f40f
commit 9bad3508fc
12 changed files with 87 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
src/3rdparty/VulkanMemoryAllocator/vk_mem_alloc.h vendored
View File

@ -5268,22 +5268,22 @@ class VmaBlockMetadata_Generic : public VmaBlockMetadata
public:
VmaBlockMetadata_Generic(VmaAllocator hAllocator);
virtual ~VmaBlockMetadata_Generic();
virtual void Init(VkDeviceSize size);
void Init(VkDeviceSize size) override;
virtual bool Validate() const;
virtual size_t GetAllocationCount() const { return m_Suballocations.size() - m_FreeCount; }
virtual VkDeviceSize GetSumFreeSize() const { return m_SumFreeSize; }
virtual VkDeviceSize GetUnusedRangeSizeMax() const;
virtual bool IsEmpty() const;
bool Validate() const override;
size_t GetAllocationCount() const override { return m_Suballocations.size() - m_FreeCount; }
VkDeviceSize GetSumFreeSize() const override { return m_SumFreeSize; }
VkDeviceSize GetUnusedRangeSizeMax() const override;
bool IsEmpty() const override;
virtual void CalcAllocationStatInfo(VmaStatInfo& outInfo) const;
virtual void AddPoolStats(VmaPoolStats& inoutStats) const;
void CalcAllocationStatInfo(VmaStatInfo& outInfo) const override;
void AddPoolStats(VmaPoolStats& inoutStats) const override;
#if VMA_STATS_STRING_ENABLED
virtual void PrintDetailedMap(class VmaJsonWriter& json) const;
void PrintDetailedMap(class VmaJsonWriter& json) const override;
#endif
virtual bool CreateAllocationRequest(
bool CreateAllocationRequest(
uint32_t currentFrameIndex,
uint32_t frameInUseCount,
VkDeviceSize bufferImageGranularity,
@ -5293,28 +5293,28 @@ public:
VmaSuballocationType allocType,
bool canMakeOtherLost,
uint32_t strategy,
VmaAllocationRequest* pAllocationRequest);
VmaAllocationRequest* pAllocationRequest) override;
virtual bool MakeRequestedAllocationsLost(
bool MakeRequestedAllocationsLost(
uint32_t currentFrameIndex,
uint32_t frameInUseCount,
VmaAllocationRequest* pAllocationRequest);
VmaAllocationRequest* pAllocationRequest) override;
virtual uint32_t MakeAllocationsLost(uint32_t currentFrameIndex, uint32_t frameInUseCount);
uint32_t MakeAllocationsLost(uint32_t currentFrameIndex, uint32_t frameInUseCount) override;
virtual VkResult CheckCorruption(const void* pBlockData);
VkResult CheckCorruption(const void* pBlockData) override;
virtual void Alloc(
void Alloc(
const VmaAllocationRequest& request,
VmaSuballocationType type,
VkDeviceSize allocSize,
bool upperAddress,
VmaAllocation hAllocation);
VmaAllocation hAllocation) override;
virtual void Free(const VmaAllocation allocation);
virtual void FreeAtOffset(VkDeviceSize offset);
void Free(const VmaAllocation allocation) override;
void FreeAtOffset(VkDeviceSize offset) override;
virtual bool ResizeAllocation(const VmaAllocation alloc, VkDeviceSize newSize);
bool ResizeAllocation(const VmaAllocation alloc, VkDeviceSize newSize) override;
////////////////////////////////////////////////////////////////////////////////
// For defragmentation
@ -5449,22 +5449,22 @@ class VmaBlockMetadata_Linear : public VmaBlockMetadata
public:
VmaBlockMetadata_Linear(VmaAllocator hAllocator);
virtual ~VmaBlockMetadata_Linear();
virtual void Init(VkDeviceSize size);
void Init(VkDeviceSize size) override;
virtual bool Validate() const;
virtual size_t GetAllocationCount() const;
virtual VkDeviceSize GetSumFreeSize() const { return m_SumFreeSize; }
virtual VkDeviceSize GetUnusedRangeSizeMax() const;
virtual bool IsEmpty() const { return GetAllocationCount() == 0; }
bool Validate() const override;
size_t GetAllocationCount() const override;
VkDeviceSize GetSumFreeSize() const override { return m_SumFreeSize; }
VkDeviceSize GetUnusedRangeSizeMax() const override;
bool IsEmpty() const override { return GetAllocationCount() == 0; }
virtual void CalcAllocationStatInfo(VmaStatInfo& outInfo) const;
virtual void AddPoolStats(VmaPoolStats& inoutStats) const;
void CalcAllocationStatInfo(VmaStatInfo& outInfo) const override;
void AddPoolStats(VmaPoolStats& inoutStats) const override;
#if VMA_STATS_STRING_ENABLED
virtual void PrintDetailedMap(class VmaJsonWriter& json) const;
void PrintDetailedMap(class VmaJsonWriter& json) const override;
#endif
virtual bool CreateAllocationRequest(
bool CreateAllocationRequest(
uint32_t currentFrameIndex,
uint32_t frameInUseCount,
VkDeviceSize bufferImageGranularity,
@ -5474,26 +5474,26 @@ public:
VmaSuballocationType allocType,
bool canMakeOtherLost,
uint32_t strategy,
VmaAllocationRequest* pAllocationRequest);
VmaAllocationRequest* pAllocationRequest) override;
virtual bool MakeRequestedAllocationsLost(
bool MakeRequestedAllocationsLost(
uint32_t currentFrameIndex,
uint32_t frameInUseCount,
VmaAllocationRequest* pAllocationRequest);
VmaAllocationRequest* pAllocationRequest) override;
virtual uint32_t MakeAllocationsLost(uint32_t currentFrameIndex, uint32_t frameInUseCount);
uint32_t MakeAllocationsLost(uint32_t currentFrameIndex, uint32_t frameInUseCount) override;
virtual VkResult CheckCorruption(const void* pBlockData);
VkResult CheckCorruption(const void* pBlockData) override;
virtual void Alloc(
void Alloc(
const VmaAllocationRequest& request,
VmaSuballocationType type,
VkDeviceSize allocSize,
bool upperAddress,
VmaAllocation hAllocation);
VmaAllocation hAllocation) override;
virtual void Free(const VmaAllocation allocation);
virtual void FreeAtOffset(VkDeviceSize offset);
void Free(const VmaAllocation allocation) override;
void FreeAtOffset(VkDeviceSize offset) override;
private:
/*
@ -5559,22 +5559,22 @@ class VmaBlockMetadata_Buddy : public VmaBlockMetadata
public:
VmaBlockMetadata_Buddy(VmaAllocator hAllocator);
virtual ~VmaBlockMetadata_Buddy();
virtual void Init(VkDeviceSize size);
void Init(VkDeviceSize size) override;
virtual bool Validate() const;
virtual size_t GetAllocationCount() const { return m_AllocationCount; }
virtual VkDeviceSize GetSumFreeSize() const { return m_SumFreeSize + GetUnusableSize(); }
virtual VkDeviceSize GetUnusedRangeSizeMax() const;
virtual bool IsEmpty() const { return m_Root->type == Node::TYPE_FREE; }
bool Validate() const override;
size_t GetAllocationCount() const override { return m_AllocationCount; }
VkDeviceSize GetSumFreeSize() const override { return m_SumFreeSize + GetUnusableSize(); }
VkDeviceSize GetUnusedRangeSizeMax() const override;
bool IsEmpty() const override { return m_Root->type == Node::TYPE_FREE; }
virtual void CalcAllocationStatInfo(VmaStatInfo& outInfo) const;
virtual void AddPoolStats(VmaPoolStats& inoutStats) const;
void CalcAllocationStatInfo(VmaStatInfo& outInfo) const override;
void AddPoolStats(VmaPoolStats& inoutStats) const override;
#if VMA_STATS_STRING_ENABLED
virtual void PrintDetailedMap(class VmaJsonWriter& json) const;
void PrintDetailedMap(class VmaJsonWriter& json) const override;
#endif
virtual bool CreateAllocationRequest(
bool CreateAllocationRequest(
uint32_t currentFrameIndex,
uint32_t frameInUseCount,
VkDeviceSize bufferImageGranularity,
@ -5584,26 +5584,26 @@ public:
VmaSuballocationType allocType,
bool canMakeOtherLost,
uint32_t strategy,
VmaAllocationRequest* pAllocationRequest);
VmaAllocationRequest* pAllocationRequest) override;
virtual bool MakeRequestedAllocationsLost(
bool MakeRequestedAllocationsLost(
uint32_t currentFrameIndex,
uint32_t frameInUseCount,
VmaAllocationRequest* pAllocationRequest);
VmaAllocationRequest* pAllocationRequest) override;
virtual uint32_t MakeAllocationsLost(uint32_t currentFrameIndex, uint32_t frameInUseCount);
uint32_t MakeAllocationsLost(uint32_t currentFrameIndex, uint32_t frameInUseCount) override;
virtual VkResult CheckCorruption(const void* /*pBlockData*/) { return VK_ERROR_FEATURE_NOT_PRESENT; }
VkResult CheckCorruption(const void* /*pBlockData*/) override { return VK_ERROR_FEATURE_NOT_PRESENT; }
virtual void Alloc(
void Alloc(
const VmaAllocationRequest& request,
VmaSuballocationType type,
VkDeviceSize allocSize,
bool upperAddress,
VmaAllocation hAllocation);
VmaAllocation hAllocation) override;
virtual void Free(const VmaAllocation allocation) { FreeAtOffset(allocation, allocation->GetOffset()); }
virtual void FreeAtOffset(VkDeviceSize offset) { FreeAtOffset(VMA_NULL, offset); }
void Free(const VmaAllocation allocation) override { FreeAtOffset(allocation, allocation->GetOffset()); }
void FreeAtOffset(VkDeviceSize offset) override { FreeAtOffset(VMA_NULL, offset); }
private:
static const VkDeviceSize MIN_NODE_SIZE = 32;
@ -6025,16 +6025,16 @@ public:
bool overlappingMoveSupported);
virtual ~VmaDefragmentationAlgorithm_Generic();
virtual void AddAllocation(VmaAllocation hAlloc, VkBool32* pChanged);
virtual void AddAll() { m_AllAllocations = true; }
void AddAllocation(VmaAllocation hAlloc, VkBool32* pChanged) override;
void AddAll() override { m_AllAllocations = true; }
virtual VkResult Defragment(
VkResult Defragment(
VmaVector< VmaDefragmentationMove, VmaStlAllocator<VmaDefragmentationMove> >& moves,
VkDeviceSize maxBytesToMove,
uint32_t maxAllocationsToMove);
uint32_t maxAllocationsToMove) override;
virtual VkDeviceSize GetBytesMoved() const { return m_BytesMoved; }
virtual uint32_t GetAllocationsMoved() const { return m_AllocationsMoved; }
VkDeviceSize GetBytesMoved() const override { return m_BytesMoved; }
uint32_t GetAllocationsMoved() const override { return m_AllocationsMoved; }
private:
uint32_t m_AllocationCount;
@ -6152,16 +6152,16 @@ public:
bool overlappingMoveSupported);
virtual ~VmaDefragmentationAlgorithm_Fast();
virtual void AddAllocation(VmaAllocation /*hAlloc*/, VkBool32* /*pChanged*/) { ++m_AllocationCount; }
virtual void AddAll() { m_AllAllocations = true; }
void AddAllocation(VmaAllocation /*hAlloc*/, VkBool32* /*pChanged*/) override { ++m_AllocationCount; }
void AddAll() override { m_AllAllocations = true; }
virtual VkResult Defragment(
VkResult Defragment(
VmaVector< VmaDefragmentationMove, VmaStlAllocator<VmaDefragmentationMove> >& moves,
VkDeviceSize maxBytesToMove,
uint32_t maxAllocationsToMove);
uint32_t maxAllocationsToMove) override;
virtual VkDeviceSize GetBytesMoved() const { return m_BytesMoved; }
virtual uint32_t GetAllocationsMoved() const { return m_AllocationsMoved; }
VkDeviceSize GetBytesMoved() const override { return m_BytesMoved; }
uint32_t GetAllocationsMoved() const override { return m_AllocationsMoved; }
private:
struct BlockInfo

2
src/network/ssl/qdtls_openssl_p.h
View File

@ -187,7 +187,7 @@ private:
void doubleTimeout();
void resetTimeout() {timeoutMs = 1000;}
void stop();
void timerEvent(QTimerEvent *event);
void timerEvent(QTimerEvent *event) override;
int timerId = -1;
int timeoutMs = 1000;

6
src/platformsupport/eventdispatchers/qunixeventdispatcher_qpa_p.h
View File

@ -64,10 +64,10 @@ public:
explicit QUnixEventDispatcherQPA(QObject *parent = nullptr);
~QUnixEventDispatcherQPA();
bool processEvents(QEventLoop::ProcessEventsFlags flags);
bool hasPendingEvents();
bool processEvents(QEventLoop::ProcessEventsFlags flags) override;
bool hasPendingEvents() override;
void flush();
void flush() override;
};
QT_END_NAMESPACE

2
src/platformsupport/input/integrityhid/qintegrityhidmanager.h
View File

@ -55,7 +55,7 @@ public:
QIntegrityHIDManager(const QString &key, const QString &specification, QObject *parent = nullptr);
~QIntegrityHIDManager();
void run(void);
void run(void) override;
private:
void open_devices(void);

2
src/platformsupport/linuxaccessibility/application_p.h
View File

@ -79,7 +79,7 @@ Q_SIGNALS:
void windowActivated(QObject* window, bool active);
protected:
bool eventFilter(QObject *obj, QEvent *event);
bool eventFilter(QObject *obj, QEvent *event) override;
private Q_SLOTS:
void notifyKeyboardListenerCallback(const QDBusMessage& message);

4
src/platformsupport/linuxaccessibility/atspiadaptor_p.h
View File

@ -80,8 +80,8 @@ public:
~AtSpiAdaptor();
void registerApplication();
QString introspect(const QString &path) const;
bool handleMessage(const QDBusMessage &message, const QDBusConnection &connection);
QString introspect(const QString &path) const override;
bool handleMessage(const QDBusMessage &message, const QDBusConnection &connection) override;
void notify(QAccessibleEvent *event);
void init();

2
src/plugins/generic/libinput/main.cpp
View File

@ -48,7 +48,7 @@ class QLibInputPlugin : public QGenericPlugin
Q_PLUGIN_METADATA(IID QGenericPluginFactoryInterface_iid FILE "libinput.json")
public:
QObject *create(const QString &key, const QString &specification);
QObject *create(const QString &key, const QString &specification) override;
};
QObject *QLibInputPlugin::create(const QString &key, const QString &specification)

2
src/plugins/generic/tuiotouch/main.cpp
View File

@ -53,7 +53,7 @@ class QTuioTouchPlugin : public QGenericPlugin
public:
QTuioTouchPlugin();
QObject* create(const QString &key, const QString &specification);
QObject* create(const QString &key, const QString &specification) override;
};
QTuioTouchPlugin::QTuioTouchPlugin()

8
src/plugins/platforms/xcb/gl_integrations/xcb_egl/qxcbeglcontext.h
View File

@ -56,7 +56,7 @@ public:
{
}
void swapBuffers(QPlatformSurface *surface)
void swapBuffers(QPlatformSurface *surface) override
{
QEGLPlatformContext::swapBuffers(surface);
if (surface->surface()->surfaceClass() == QSurface::Window) {
@ -69,17 +69,17 @@ public:
}
}
bool makeCurrent(QPlatformSurface *surface)
bool makeCurrent(QPlatformSurface *surface) override
{
return QEGLPlatformContext::makeCurrent(surface);
}
void doneCurrent()
void doneCurrent() override
{
QEGLPlatformContext::doneCurrent();
}
EGLSurface eglSurfaceForPlatformSurface(QPlatformSurface *surface)
EGLSurface eglSurfaceForPlatformSurface(QPlatformSurface *surface) override
{
if (surface->surface()->surfaceClass() == QSurface::Window)
return static_cast<QXcbEglWindow *>(surface)->eglSurface();

2
src/plugins/platforms/xcb/gl_integrations/xcb_egl/qxcbeglmain.cpp
View File

@ -48,7 +48,7 @@ class QXcbEglIntegrationPlugin : public QXcbGlIntegrationPlugin
Q_OBJECT
Q_PLUGIN_METADATA(IID QXcbGlIntegrationFactoryInterface_iid FILE "xcb_egl.json")
public:
QXcbGlIntegration *create()
QXcbGlIntegration *create() override
{
return new QXcbEglIntegration();
}

2
src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxmain.cpp
View File

@ -48,7 +48,7 @@ class QXcbGlxIntegrationPlugin : public QXcbGlIntegrationPlugin
Q_OBJECT
Q_PLUGIN_METADATA(IID QXcbGlIntegrationFactoryInterface_iid FILE "xcb_glx.json")
public:
QXcbGlIntegration *create()
QXcbGlIntegration *create() override
{
return new QXcbGlxIntegration();
}

2
src/plugins/sqldrivers/odbc/main.cpp
View File

@ -51,7 +51,7 @@ class QODBCDriverPlugin : public QSqlDriverPlugin
public:
QODBCDriverPlugin();
QSqlDriver* create(const QString &);
QSqlDriver* create(const QString &) override;
};
QODBCDriverPlugin::QODBCDriverPlugin()