diff options
author | Jüri Valdmann <juri.valdmann@qt.io> | 2019-10-22 16:04:13 +0200 |
---|---|---|
committer | Jüri Valdmann <juri.valdmann@qt.io> | 2019-10-30 10:57:14 +0200 |
commit | 418f929e7a067a13456f50b5478dcb64619b57ef (patch) | |
tree | fff790700a58b80273da4a79d490bf7627001643 /src/core | |
parent | 24bb272ac83fe42ad4cab58a9e97bdf2a53d2be8 (diff) |
Fix all GCC and Clang warnings
Fix all warnings save for -Wdeprecated-declarations in tests.
Warnings from GCC 9.2.0:
src/core/renderer/extensions/resource_request_policy_qt.cpp:157:23:
warning: variable 'resource_root_relative_path' set but not used
[-Wunused-but-set-variable]
src/core/chromium_overrides.cpp:121:21:
warning: moving a local object in a return statement prevents copy elision
[-Wpessimizing-move]
src/core/render_widget_host_view_qt.cpp:540:12:
warning: enumeration value 'kNull' not handled in switch [-Wswitch]
warning: enumeration value 'kMiddlePanningVertical' not handled in switch
[-Wswitch]
warning: enumeration value 'kMiddlePanningHorizontal' not handled in switch
[-Wswitch]
warning: enumeration value 'kDndNone' not handled in switch [-Wswitch]
warning: enumeration value 'kDndMove' not handled in switch [-Wswitch]
warning: enumeration value 'kDndCopy' not handled in switch [-Wswitch]
warning: enumeration value 'kDndLink' not handled in switch [-Wswitch]
warning: enumeration value 'kMaxValue' not handled in switch [-Wswitch]
src/core/type_conversion.cpp:57:12:
warning: enumeration value ‘kRGBA_F16Norm_SkColorType’ not handled in switch
[-Wswitch]
src/core/api/qtbug-60565.cpp:83:6:
warning: 'void __ShimCppDeleteArrayNoThrow(void*, const std::nothrow_t&)'
alias between functions of incompatible types 'void(void*, const
std::nothrow_t&) noexcept' and 'void(void*)' [-Wattribute-alias=]
src/core/api/qtbug-60565.cpp:79:6:
warning: 'void __ShimCppDeleteNoThrow(void*, const std::nothrow_t&)' alias
between functions of incompatible types 'void(void*, const std::nothrow_t&)
noexcept' and 'void(void*)' [-Wattribute-alias=]
src/core/api/qtbug-60565.cpp:75:6:
warning: 'void __ShimCppNewArrayNoThrow(size_t, const std::nothrow_t&)'
alias between functions of incompatible types 'void(size_t, const
std::nothrow_t&) noexcept' {aka 'void(long unsigned int, const
std::nothrow_t&) noexcept'} and 'void*(size_t)' {aka 'void*(long unsigned
int)'} [-Wattribute-alias=]
src/core/api/qtbug-60565.cpp:71:6:
warning: 'void __ShimCppNewNoThrow(size_t, const std::nothrow_t&)' alias
between functions of incompatible types 'void(size_t, const std::nothrow_t&)
noexcept' {aka 'void(long unsigned int, const std::nothrow_t&) noexcept'}
and 'void*(size_t)' {aka 'void*(long unsigned int)'} [-Wattribute-alias=]
Warnings from Clang 9.0.1:
src/core/renderer/extensions/renderer_permissions_policy_delegate_qt.h:61:29:
warning: private field 'm_dispatcher' is not used [-Wunused-private-field]
src/core/web_event_factory.cpp:1296:5:
warning: unannotated fall-through between switch labels
[-Wimplicit-fallthrough]
src/core/compositor/compositor_resource_fence.h:55:81:
warning: extra ';' after member function definition [-Wextra-semi]
src/core/renderer/render_frame_observer_qt.h:81:10:
warning: 'ReadyToCommitNavigation' overrides a member function but is not
marked 'override' [-Winconsistent-missing-override]
src/core/extensions/mime_handler_view_guest_delegate_qt.h:69:27:
warning: private field 'guest_' is not used [-Wunused-private-field]
src/core/chromium_overrides.cpp:121:12:
warning: moving a local object in a return statement prevents copy elision
[-Wpessimizing-move]
src/core/chromium_overrides.cpp:145:64:
warning: missing field 'set_up_command_line' initializer
[-Wmissing-field-initializers]
src/core/chromium_overrides.cpp:146:55:
warning: missing field 'set_up_command_line' initializer
[-Wmissing-field-initializers]
src/core/render_widget_host_view_qt.cpp:540:13:
warning: 7 enumeration values not handled in switch: 'kNull',
'kMiddlePanningVertical', 'kMiddlePanningHorizontal'... [-Wswitch]
src/core/compositor/stream_video_node.cpp:50:18:
warning: 'updateState' overrides a member function but is not marked
'override' [-Winconsistent-missing-override]
src/core/compositor/stream_video_node.cpp:103:18:
warning: 'initialize' overrides a member function but is not marked
'override' [-Winconsistent-missing-override]
src/core/type_conversion.cpp:57:13:
warning: enumeration value 'kRGBA_F16Norm_SkColorType' not handled in
switch [-Wswitch]
src/core/renderer_host/web_channel_ipc_transport_host.cpp:59:60:
warning: extra ';' outside of a function is incompatible with C++98
[-Wc++98-compat-extra-semi]
tests/auto/widgets/loadsignals/tst_loadsignals.cpp:237:10:
warning: lambda capture 'this' is not used [-Wunused-lambda-capture]
tests/auto/widgets/qwebenginedownloaditem/tst_qwebenginedownloaditem.cpp:1112:62:
warning: lambda capture 'item' is not used [-Wunused-lambda-capture]
tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp:1534:55:
warning: lambda capture 'this' is not used [-Wunused-lambda-capture]
Change-Id: I374be0d4e58accc0a00a2596a560dd6103a98994
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/api/qtbug-60565.cpp | 28 | ||||
-rw-r--r-- | src/core/chromium_overrides.cpp | 6 | ||||
-rw-r--r-- | src/core/compositor/compositor_resource_fence.h | 2 | ||||
-rw-r--r-- | src/core/compositor/stream_video_node.cpp | 4 | ||||
-rw-r--r-- | src/core/extensions/mime_handler_view_guest_delegate_qt.cpp | 2 | ||||
-rw-r--r-- | src/core/extensions/mime_handler_view_guest_delegate_qt.h | 2 | ||||
-rw-r--r-- | src/core/render_widget_host_view_qt.cpp | 9 | ||||
-rw-r--r-- | src/core/renderer/extensions/renderer_permissions_policy_delegate_qt.cpp | 3 | ||||
-rw-r--r-- | src/core/renderer/extensions/renderer_permissions_policy_delegate_qt.h | 2 | ||||
-rw-r--r-- | src/core/renderer/extensions/resource_request_policy_qt.cpp | 4 | ||||
-rw-r--r-- | src/core/renderer/render_frame_observer_qt.h | 2 | ||||
-rw-r--r-- | src/core/renderer_host/web_channel_ipc_transport_host.cpp | 2 | ||||
-rw-r--r-- | src/core/type_conversion.cpp | 1 | ||||
-rw-r--r-- | src/core/web_event_factory.cpp | 1 |
14 files changed, 45 insertions, 23 deletions
diff --git a/src/core/api/qtbug-60565.cpp b/src/core/api/qtbug-60565.cpp index be601b7e4..f48a2a701 100644 --- a/src/core/api/qtbug-60565.cpp +++ b/src/core/api/qtbug-60565.cpp @@ -68,20 +68,20 @@ void __ShimCppDeleteArray(void* address) SHIM_ALIAS_SYMBOL(ShimCppDeleteArray); __asm__(".symver __ShimCppNewNoThrow, _Znw" SIZE_T_MANGLING "RKSt9nothrow_t@Qt_5"); -void __ShimCppNewNoThrow(size_t size, const std::nothrow_t&) noexcept - SHIM_ALIAS_SYMBOL(ShimCppNew); +void *__ShimCppNewNoThrow(size_t size, const std::nothrow_t&) noexcept + SHIM_ALIAS_SYMBOL(ShimCppNewNoThrow); __asm__(".symver __ShimCppNewArrayNoThrow, _Zna" SIZE_T_MANGLING "RKSt9nothrow_t@Qt_5"); -void __ShimCppNewArrayNoThrow(size_t size, const std::nothrow_t&) noexcept - SHIM_ALIAS_SYMBOL(ShimCppNewArray); +void *__ShimCppNewArrayNoThrow(size_t size, const std::nothrow_t&) noexcept + SHIM_ALIAS_SYMBOL(ShimCppNewArrayNoThrow); __asm__(".symver __ShimCppDeleteNoThrow, _ZdlPvRKSt9nothrow_t@Qt_5"); void __ShimCppDeleteNoThrow(void* address, const std::nothrow_t&) noexcept - SHIM_ALIAS_SYMBOL(ShimCppDelete); + SHIM_ALIAS_SYMBOL(ShimCppDeleteNoThrow); __asm__(".symver __ShimCppDeleteArrayNoThrow, _ZdaPvRKSt9nothrow_t@Qt_5"); void __ShimCppDeleteArrayNoThrow(void* address, const std::nothrow_t&) noexcept - SHIM_ALIAS_SYMBOL(ShimCppDeleteArray); + SHIM_ALIAS_SYMBOL(ShimCppDeleteArrayNoThrow); static void* __shimCppNew(size_t size); static void* __shimCppNewArray(size_t size); @@ -92,17 +92,33 @@ SHIM_HIDDEN void* ShimCppNew(size_t size) { return __shimCppNew(size); } +SHIM_HIDDEN void* ShimCppNewNoThrow(size_t size, const std::nothrow_t&) noexcept { + return __shimCppNew(size); +} + SHIM_HIDDEN void* ShimCppNewArray(size_t size) { return __shimCppNewArray(size); } +SHIM_HIDDEN void* ShimCppNewArrayNoThrow(size_t size, const std::nothrow_t&) noexcept { + return __shimCppNewArray(size); +} + SHIM_HIDDEN void ShimCppDelete(void* address) { __shimCppDelete(address); } +SHIM_HIDDEN void ShimCppDeleteNoThrow(void* address, const std::nothrow_t&) noexcept { + __shimCppDelete(address); +} + SHIM_HIDDEN void ShimCppDeleteArray(void* address) { __shimCppDeleteArray(address); } + +SHIM_HIDDEN void ShimCppDeleteArrayNoThrow(void* address, const std::nothrow_t&) noexcept { + __shimCppDeleteArray(address); +} } // extern "C" static void* __shimCppNew(size_t size) { diff --git a/src/core/chromium_overrides.cpp b/src/core/chromium_overrides.cpp index 4920540a0..9d3e3f08a 100644 --- a/src/core/chromium_overrides.cpp +++ b/src/core/chromium_overrides.cpp @@ -118,7 +118,7 @@ std::unique_ptr<base::ListValue> GetFontList_SlowBlocking() // TODO(yusukes): Support localized family names. font_list->Append(std::move(font_item)); } - return std::move(font_list); + return font_list; } } // namespace content @@ -142,8 +142,8 @@ namespace content { std::vector<AccessibilityTreeFormatter::TestPass> AccessibilityTreeFormatter::GetTestPasses() { return { - {"blink", &AccessibilityTreeFormatterBlink::CreateBlink}, - {"native", &AccessibilityTreeFormatter::Create}, + {"blink", &AccessibilityTreeFormatterBlink::CreateBlink, nullptr}, + {"native", &AccessibilityTreeFormatter::Create, nullptr}, }; } } // namespace content diff --git a/src/core/compositor/compositor_resource_fence.h b/src/core/compositor/compositor_resource_fence.h index 196297f78..574416b8b 100644 --- a/src/core/compositor/compositor_resource_fence.h +++ b/src/core/compositor/compositor_resource_fence.h @@ -52,7 +52,7 @@ public: REQUIRE_ADOPTION_FOR_REFCOUNTED_TYPE(); CompositorResourceFence() {} - CompositorResourceFence(const gl::TransferableFence &sync) : m_sync(sync) {}; + CompositorResourceFence(const gl::TransferableFence &sync) : m_sync(sync) {} ~CompositorResourceFence() { release(); } // May be used only by Qt Quick render thread. diff --git a/src/core/compositor/stream_video_node.cpp b/src/core/compositor/stream_video_node.cpp index 29922f866..fb9501f24 100644 --- a/src/core/compositor/stream_video_node.cpp +++ b/src/core/compositor/stream_video_node.cpp @@ -47,7 +47,7 @@ class StreamVideoMaterialShader : public QSGMaterialShader { public: StreamVideoMaterialShader(TextureTarget target) : m_target(target) { } - virtual void updateState(const RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial); + virtual void updateState(const RenderState &state, QSGMaterial *newMaterial, QSGMaterial *oldMaterial) override; char const *const *attributeNames() const override { static const char *names[] = { @@ -100,7 +100,7 @@ protected: return shader2DRect; } - virtual void initialize() { + virtual void initialize() override { m_id_matrix = program()->uniformLocation("matrix"); m_id_sTexture = program()->uniformLocation("s_texture"); m_id_texMatrix = program()->uniformLocation("texMatrix"); diff --git a/src/core/extensions/mime_handler_view_guest_delegate_qt.cpp b/src/core/extensions/mime_handler_view_guest_delegate_qt.cpp index 438b8a83e..022bc7db6 100644 --- a/src/core/extensions/mime_handler_view_guest_delegate_qt.cpp +++ b/src/core/extensions/mime_handler_view_guest_delegate_qt.cpp @@ -52,7 +52,7 @@ namespace extensions { -MimeHandlerViewGuestDelegateQt::MimeHandlerViewGuestDelegateQt(MimeHandlerViewGuest *guest) +MimeHandlerViewGuestDelegateQt::MimeHandlerViewGuestDelegateQt(MimeHandlerViewGuest *) : MimeHandlerViewGuestDelegate() { } diff --git a/src/core/extensions/mime_handler_view_guest_delegate_qt.h b/src/core/extensions/mime_handler_view_guest_delegate_qt.h index b679c7a38..6cd80689c 100644 --- a/src/core/extensions/mime_handler_view_guest_delegate_qt.h +++ b/src/core/extensions/mime_handler_view_guest_delegate_qt.h @@ -66,8 +66,6 @@ public: const content::ContextMenuParams ¶ms) override; private: - MimeHandlerViewGuest *guest_; // Owns us. - DISALLOW_COPY_AND_ASSIGN(MimeHandlerViewGuestDelegateQt); }; diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp index e721cba3b..e2fd074ae 100644 --- a/src/core/render_widget_host_view_qt.cpp +++ b/src/core/render_widget_host_view_qt.cpp @@ -538,6 +538,7 @@ void RenderWidgetHostViewQt::DisplayCursor(const content::WebCursor &webCursor) ui::CursorType auraType = ui::CursorType::kNull; #endif switch (cursorInfo.type) { + case ui::CursorType::kNull: case ui::CursorType::kPointer: shape = Qt::ArrowCursor; break; @@ -561,6 +562,7 @@ void RenderWidgetHostViewQt::DisplayCursor(const content::WebCursor &webCursor) case ui::CursorType::kEastWestResize: case ui::CursorType::kEastPanning: case ui::CursorType::kWestPanning: + case ui::CursorType::kMiddlePanningHorizontal: shape = Qt::SizeHorCursor; break; case ui::CursorType::kNorthResize: @@ -568,6 +570,7 @@ void RenderWidgetHostViewQt::DisplayCursor(const content::WebCursor &webCursor) case ui::CursorType::kNorthSouthResize: case ui::CursorType::kNorthPanning: case ui::CursorType::kSouthPanning: + case ui::CursorType::kMiddlePanningVertical: shape = Qt::SizeVerCursor; break; case ui::CursorType::kNorthEastResize: @@ -597,9 +600,15 @@ void RenderWidgetHostViewQt::DisplayCursor(const content::WebCursor &webCursor) case ui::CursorType::kProgress: shape = Qt::BusyCursor; break; + case ui::CursorType::kDndNone: + case ui::CursorType::kDndMove: + shape = Qt::DragMoveCursor; + break; + case ui::CursorType::kDndCopy: case ui::CursorType::kCopy: shape = Qt::DragCopyCursor; break; + case ui::CursorType::kDndLink: case ui::CursorType::kAlias: shape = Qt::DragLinkCursor; break; diff --git a/src/core/renderer/extensions/renderer_permissions_policy_delegate_qt.cpp b/src/core/renderer/extensions/renderer_permissions_policy_delegate_qt.cpp index 39412b76c..aef4903b7 100644 --- a/src/core/renderer/extensions/renderer_permissions_policy_delegate_qt.cpp +++ b/src/core/renderer/extensions/renderer_permissions_policy_delegate_qt.cpp @@ -47,8 +47,7 @@ namespace QtWebEngineCore { -RendererPermissionsPolicyDelegateQt::RendererPermissionsPolicyDelegateQt(extensions::Dispatcher *dispatcher) - : m_dispatcher(dispatcher) +RendererPermissionsPolicyDelegateQt::RendererPermissionsPolicyDelegateQt(extensions::Dispatcher *) { extensions::PermissionsData::SetPolicyDelegate(this); } diff --git a/src/core/renderer/extensions/renderer_permissions_policy_delegate_qt.h b/src/core/renderer/extensions/renderer_permissions_policy_delegate_qt.h index e2af47657..385b7a4b0 100644 --- a/src/core/renderer/extensions/renderer_permissions_policy_delegate_qt.h +++ b/src/core/renderer/extensions/renderer_permissions_policy_delegate_qt.h @@ -58,8 +58,6 @@ public: bool IsRestrictedUrl(const GURL &, std::string *) override; private: - extensions::Dispatcher *m_dispatcher; - DISALLOW_COPY_AND_ASSIGN(RendererPermissionsPolicyDelegateQt); }; diff --git a/src/core/renderer/extensions/resource_request_policy_qt.cpp b/src/core/renderer/extensions/resource_request_policy_qt.cpp index a64b1fef8..efe44521d 100644 --- a/src/core/renderer/extensions/resource_request_policy_qt.cpp +++ b/src/core/renderer/extensions/resource_request_policy_qt.cpp @@ -154,9 +154,9 @@ bool ResourceRequestPolicyQt::CanRequestResource(const GURL &resource_url, // hybrid hosted/packaged apps. The one exception is access to icons, since // some extensions want to be able to do things like create their own // launchers. - base::StringPiece resource_root_relative_path = + /*base::StringPiece resource_root_relative_path = resource_url.path_piece().empty() ? base::StringPiece() - : resource_url.path_piece().substr(1); + : resource_url.path_piece().substr(1);*/ if (extension->is_hosted_app() /*&& !IconsInfo::GetIcons(extension).ContainsPath(resource_root_relative_path)*/) { LOG(ERROR) << "Denying load of " << resource_url.spec() << " from " << "hosted app."; diff --git a/src/core/renderer/render_frame_observer_qt.h b/src/core/renderer/render_frame_observer_qt.h index 3c54761f3..fb9fd3869 100644 --- a/src/core/renderer/render_frame_observer_qt.h +++ b/src/core/renderer/render_frame_observer_qt.h @@ -78,7 +78,7 @@ public: private: DISALLOW_COPY_AND_ASSIGN(RenderFrameObserverQt); - void ReadyToCommitNavigation(blink::WebDocumentLoader *); + void ReadyToCommitNavigation(blink::WebDocumentLoader *) override; bool m_isFrameDetached; service_manager::BinderRegistry registry_; diff --git a/src/core/renderer_host/web_channel_ipc_transport_host.cpp b/src/core/renderer_host/web_channel_ipc_transport_host.cpp index e1929e4cd..b1aab00a1 100644 --- a/src/core/renderer_host/web_channel_ipc_transport_host.cpp +++ b/src/core/renderer_host/web_channel_ipc_transport_host.cpp @@ -56,7 +56,7 @@ namespace QtWebEngineCore { -Q_LOGGING_CATEGORY(log, "qt.webengine.webchanneltransport"); +Q_LOGGING_CATEGORY(log, "qt.webengine.webchanneltransport") inline QDebug operator<<(QDebug stream, content::RenderFrameHost *frame) { diff --git a/src/core/type_conversion.cpp b/src/core/type_conversion.cpp index ddadeb9f2..aea924dbd 100644 --- a/src/core/type_conversion.cpp +++ b/src/core/type_conversion.cpp @@ -58,6 +58,7 @@ QImage toQImage(const SkBitmap &bitmap) case kUnknown_SkColorType: case kRGBA_F16_SkColorType: case kRGBA_F32_SkColorType: + case kRGBA_F16Norm_SkColorType: qWarning("Unknown or unsupported skia image format"); break; case kAlpha_8_SkColorType: diff --git a/src/core/web_event_factory.cpp b/src/core/web_event_factory.cpp index 3598c1c78..ba04806d5 100644 --- a/src/core/web_event_factory.cpp +++ b/src/core/web_event_factory.cpp @@ -1292,6 +1292,7 @@ static inline WebInputEvent::Modifiers modifiersForEvent(const QInputEvent* even if (keyEvent->isAutoRepeat()) result |= WebInputEvent::kIsAutoRepeat; result |= modifierForKeyCode(qtKeyForKeyEvent(keyEvent)); + break; } default: break; |