summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2022-03-24 18:18:29 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2022-03-30 10:00:56 +0100
commit4cd74a7c81652869f6943c21da13074b83bc3aeb (patch)
tree01a04baa115f1644ff502a4b7de7ba9294271508
parentcb65a5a4354e50e5833b12a975254a725e8af704 (diff)
Fix a few code checker warnings
Change-Id: I0eb2cb362759e9a02a61993574906fc1e4b8ffeb Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
-rw-r--r--src/core/api/qwebenginepage.cpp2
-rw-r--r--src/core/resource_bundle_qt.cpp4
-rw-r--r--src/webenginequick/api/qquickwebengineview.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/core/api/qwebenginepage.cpp b/src/core/api/qwebenginepage.cpp
index 783101a10..0f4f09059 100644
--- a/src/core/api/qwebenginepage.cpp
+++ b/src/core/api/qwebenginepage.cpp
@@ -506,7 +506,7 @@ void QWebEnginePagePrivate::releaseProfile()
{
qWarning("Release of profile requested but WebEnginePage still not deleted. Expect troubles !");
// this is not the way to go, but might avoid the crash if user code does not make any calls to page.
- delete q_ptr->d_ptr.take();
+ q_ptr->d_ptr.reset();
}
void QWebEnginePagePrivate::showColorDialog(QSharedPointer<ColorChooserController> controller)
diff --git a/src/core/resource_bundle_qt.cpp b/src/core/resource_bundle_qt.cpp
index f81498bdd..0a06303de 100644
--- a/src/core/resource_bundle_qt.cpp
+++ b/src/core/resource_bundle_qt.cpp
@@ -105,7 +105,7 @@ std::string ResourceBundle::LoadLocaleResources(const std::string &pref_locale,
if (locale_fd > -1) {
std::unique_ptr<DataPack> data_pack(new DataPack(ui::k100Percent));
data_pack->LoadFromFile(base::File(locale_fd));
- locale_resources_data_.reset(data_pack.release());
+ locale_resources_data_ = std::move(data_pack);
return app_locale;
}
#endif
@@ -129,7 +129,7 @@ std::string ResourceBundle::LoadLocaleResources(const std::string &pref_locale,
return std::string();
}
- locale_resources_data_.reset(data_pack.release());
+ locale_resources_data_ = std::move(data_pack);
return app_locale;
}
diff --git a/src/webenginequick/api/qquickwebengineview.cpp b/src/webenginequick/api/qquickwebengineview.cpp
index 1588a8d6f..3aca79672 100644
--- a/src/webenginequick/api/qquickwebengineview.cpp
+++ b/src/webenginequick/api/qquickwebengineview.cpp
@@ -218,7 +218,7 @@ void QQuickWebEngineViewPrivate::releaseProfile()
// garbage collected, delete WebContents first and
// let the QQuickWebEngineView be collected later by gc.
bindViewAndWidget(q_ptr, nullptr);
- delete q_ptr->d_ptr.take();
+ q_ptr->d_ptr.reset();
}
UIDelegatesManager *QQuickWebEngineViewPrivate::ui()