Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
PIM
Akonadi
Commits
45404d85
Commit
45404d85
authored
Jul 30, 2020
by
Antonio Larrosa Jimenez
Committed by
Antonio Larrosa Jimenez
Aug 03, 2020
Browse files
Use std::unique_ptr to get the DbConfig... temporary object deleted automatically
As suggested by
@dvratil
parent
fa094b56
Pipeline
#29536
passed with stage
in 46 minutes and 20 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/server/storage/dbconfig.cpp
View file @
45404d85
...
...
@@ -53,11 +53,11 @@ QString DbConfig::defaultAvailableDatabaseBackend(QSettings &settings)
{
QString
driverName
=
QStringLiteral
(
AKONADI_DATABASE_BACKEND
);
DbConfig
*
dbConfigFallbackTest
=
nullptr
;
std
::
unique_ptr
<
DbConfig
>
dbConfigFallbackTest
;
if
(
driverName
==
QLatin1String
(
"QMYSQL"
))
{
dbConfigFallbackTest
=
new
DbConfigMysql
;
dbConfigFallbackTest
.
reset
(
new
DbConfigMysql
)
;
}
else
if
(
driverName
==
QLatin1String
(
"QPSQL"
))
{
dbConfigFallbackTest
=
new
DbConfigPostgresql
;
dbConfigFallbackTest
.
reset
(
new
DbConfigPostgresql
)
;
}
if
(
dbConfigFallbackTest
&&
!
dbConfigFallbackTest
->
isAvailable
(
settings
)
...
...
@@ -65,7 +65,6 @@ QString DbConfig::defaultAvailableDatabaseBackend(QSettings &settings)
qCWarning
(
AKONADISERVER_LOG
)
<<
driverName
<<
" requirements not available. Falling back to using QSQLITE3."
;
driverName
=
QStringLiteral
(
"QSQLITE3"
);
}
delete
dbConfigFallbackTest
;
return
driverName
;
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment