summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-10-16 15:23:12 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-10-17 08:25:47 +0200
commitccb2a1f650bc505f8a4f1abebf8ce4f9396562a8 (patch)
tree2ee2fd4f300ae95cf23bade1f242e02f9b276c07 /desktop
parentda5c3a1ee43dd1a07cbd1b8005488bf05432593d (diff)
clang-tidy readability-redundant-smartptr-get
redundant get() call on smart pointer Change-Id: Icb5a03bbc15e79a30d3d135a507d22914d15c2bd Reviewed-on: https://gerrit.libreoffice.org/61837 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/deployment/gui/dp_gui_service.cxx3
-rw-r--r--desktop/source/deployment/registry/component/dp_component.cxx8
-rw-r--r--desktop/source/deployment/registry/configuration/dp_configuration.cxx12
-rw-r--r--desktop/source/deployment/registry/executable/dp_executable.cxx8
-rw-r--r--desktop/source/deployment/registry/help/dp_help.cxx12
-rw-r--r--desktop/source/deployment/registry/package/dp_package.cxx8
-rw-r--r--desktop/source/deployment/registry/script/dp_script.cxx8
7 files changed, 30 insertions, 29 deletions
diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx
index 17bbd81131df..c9f125779e7b 100644
--- a/desktop/source/deployment/gui/dp_gui_service.cxx
+++ b/desktop/source/deployment/gui/dp_gui_service.cxx
@@ -270,7 +270,8 @@ void ServiceImpl::startExecuteModal(
}
}
- if (app.get() != nullptr) {
+ if (app != nullptr)
+ {
Application::Execute();
DeInitVCL();
}
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx
index e92dffe5c52d..f56c1da379c0 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -554,21 +554,21 @@ BackendImpl::BackendImpl(
void BackendImpl::addDataToDb(
OUString const & url, ComponentBackendDb::Data const & data)
{
- if (m_backendDb.get())
+ if (m_backendDb)
m_backendDb->addEntry(url, data);
}
ComponentBackendDb::Data BackendImpl::readDataFromDb(OUString const & url)
{
ComponentBackendDb::Data data;
- if (m_backendDb.get())
+ if (m_backendDb)
data = m_backendDb->getEntry(url);
return data;
}
void BackendImpl::revokeEntryFromDb(OUString const & url)
{
- if (m_backendDb.get())
+ if (m_backendDb)
m_backendDb->revokeEntry(url);
}
@@ -582,7 +582,7 @@ BackendImpl::getSupportedPackageTypes()
void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaType*/)
{
- if (m_backendDb.get())
+ if (m_backendDb)
m_backendDb->removeEntry(url);
}
diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
index b9b8645dfc44..a30bf994c7f3 100644
--- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx
+++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx
@@ -242,7 +242,7 @@ BackendImpl::BackendImpl(
void BackendImpl::addDataToDb(
OUString const & url, ConfigurationBackendDb::Data const & data)
{
- if (m_backendDb.get())
+ if (m_backendDb)
m_backendDb->addEntry(url, data);
}
@@ -250,27 +250,27 @@ void BackendImpl::addDataToDb(
OUString const & url)
{
::boost::optional<ConfigurationBackendDb::Data> data;
- if (m_backendDb.get())
+ if (m_backendDb)
data = m_backendDb->getEntry(url);
return data;
}
void BackendImpl::revokeEntryFromDb(OUString const & url)
{
- if (m_backendDb.get())
+ if (m_backendDb)
m_backendDb->revokeEntry(url);
}
bool BackendImpl::hasActiveEntry(OUString const & url)
{
- if (m_backendDb.get())
+ if (m_backendDb)
return m_backendDb->hasActiveEntry(url);
return false;
}
bool BackendImpl::activateEntry(OUString const & url)
{
- if (m_backendDb.get())
+ if (m_backendDb)
return m_backendDb->activateEntry(url);
return false;
}
@@ -285,7 +285,7 @@ BackendImpl::getSupportedPackageTypes()
}
void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaType*/)
{
- if (m_backendDb.get())
+ if (m_backendDb)
m_backendDb->removeEntry(url);
}
diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx
index 64be7a09992e..e312369328dd 100644
--- a/desktop/source/deployment/registry/executable/dp_executable.cxx
+++ b/desktop/source/deployment/registry/executable/dp_executable.cxx
@@ -118,19 +118,19 @@ BackendImpl::BackendImpl(
void BackendImpl::addDataToDb(OUString const & url)
{
- if (m_backendDb.get())
+ if (m_backendDb)
m_backendDb->addEntry(url);
}
void BackendImpl::revokeEntryFromDb(OUString const & url)
{
- if (m_backendDb.get())
+ if (m_backendDb)
m_backendDb->revokeEntry(url);
}
bool BackendImpl::hasActiveEntry(OUString const & url)
{
- if (m_backendDb.get())
+ if (m_backendDb)
return m_backendDb->hasActiveEntry(url);
return false;
}
@@ -146,7 +146,7 @@ BackendImpl::getSupportedPackageTypes()
void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaType*/)
{
- if (m_backendDb.get())
+ if (m_backendDb)
m_backendDb->removeEntry(url);
}
diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx
index d5df148aeec9..0ac91ff197c6 100644
--- a/desktop/source/deployment/registry/help/dp_help.cxx
+++ b/desktop/source/deployment/registry/help/dp_help.cxx
@@ -159,7 +159,7 @@ BackendImpl::getSupportedPackageTypes()
void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaType*/)
{
- if (m_backendDb.get())
+ if (m_backendDb)
m_backendDb->removeEntry(url);
}
@@ -208,21 +208,21 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
OUString const & url)
{
::boost::optional<HelpBackendDb::Data> data;
- if (m_backendDb.get())
+ if (m_backendDb)
data = m_backendDb->getEntry(url);
return data;
}
bool BackendImpl::hasActiveEntry(OUString const & url)
{
- if (m_backendDb.get())
+ if (m_backendDb)
return m_backendDb->hasActiveEntry(url);
return false;
}
bool BackendImpl::activateEntry(OUString const & url)
{
- if (m_backendDb.get())
+ if (m_backendDb)
return m_backendDb->activateEntry(url);
return false;
}
@@ -533,13 +533,13 @@ void BackendImpl::implProcessHelp(
}
// Writing the data entry replaces writing the flag file. If we got to this
// point the registration was successful.
- if (m_backendDb.get())
+ if (m_backendDb)
m_backendDb->addEntry(xPackage->getURL(), data);
}
} //if (doRegisterPackage)
else
{
- if (m_backendDb.get())
+ if (m_backendDb)
m_backendDb->revokeEntry(xPackage->getURL());
}
}
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index c2ca9b0ca4c1..fb6ce8668582 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -334,7 +334,7 @@ void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaT
m_xRootRegistry->packageRemoved(item.first, item.second);
}
- if (m_backendDb.get())
+ if (m_backendDb)
m_backendDb->removeEntry(url);
}
@@ -420,7 +420,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_(
void BackendImpl::addDataToDb(
OUString const & url, ExtensionBackendDb::Data const & data)
{
- if (m_backendDb.get())
+ if (m_backendDb)
m_backendDb->addEntry(url, data);
}
@@ -428,14 +428,14 @@ ExtensionBackendDb::Data BackendImpl::readDataFromDb(
OUString const & url)
{
ExtensionBackendDb::Data data;
- if (m_backendDb.get())
+ if (m_backendDb)
data = m_backendDb->getEntry(url);
return data;
}
void BackendImpl::revokeEntryFromDb(OUString const & url)
{
- if (m_backendDb.get())
+ if (m_backendDb)
m_backendDb->revokeEntry(url);
}
diff --git a/desktop/source/deployment/registry/script/dp_script.cxx b/desktop/source/deployment/registry/script/dp_script.cxx
index f3e5998f214c..68977d72a01c 100644
--- a/desktop/source/deployment/registry/script/dp_script.cxx
+++ b/desktop/source/deployment/registry/script/dp_script.cxx
@@ -168,13 +168,13 @@ BackendImpl::BackendImpl(
}
void BackendImpl::addDataToDb(OUString const & url)
{
- if (m_backendDb.get())
+ if (m_backendDb)
m_backendDb->addEntry(url);
}
bool BackendImpl::hasActiveEntry(OUString const & url)
{
- if (m_backendDb.get())
+ if (m_backendDb)
return m_backendDb->hasActiveEntry(url);
return false;
}
@@ -195,13 +195,13 @@ BackendImpl::getSupportedPackageTypes()
}
void BackendImpl::revokeEntryFromDb(OUString const & url)
{
- if (m_backendDb.get())
+ if (m_backendDb)
m_backendDb->revokeEntry(url);
}
void BackendImpl::packageRemoved(OUString const & url, OUString const & /*mediaType*/)
{
- if (m_backendDb.get())
+ if (m_backendDb)
m_backendDb->removeEntry(url);
}