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
b308caee
Commit
b308caee
authored
Jul 30, 2020
by
Antonio Larrosa Jimenez
Committed by
Antonio Larrosa Jimenez
Aug 03, 2020
Browse files
Add curly braces around single line blocks and spaces around =
parent
01534f7f
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/server/storage/dbconfig.h
View file @
b308caee
...
...
@@ -53,7 +53,7 @@ public:
* At this point the default settings should be determined, merged
* with the given @p settings and written back if @p storeSettings is true.
*/
virtual
bool
init
(
QSettings
&
settings
,
bool
storeSettings
=
true
)
=
0
;
virtual
bool
init
(
QSettings
&
settings
,
bool
storeSettings
=
true
)
=
0
;
/**
* This method checks if the requirements for this database connection are met
...
...
src/server/storage/dbconfigmysql.cpp
View file @
b308caee
...
...
@@ -160,14 +160,17 @@ bool DbConfigMysql::init(QSettings &settings, bool storeSettings)
bool
DbConfigMysql
::
isAvailable
(
QSettings
&
settings
)
{
if
(
!
QSqlDatabase
::
drivers
().
contains
(
driverName
()))
if
(
!
QSqlDatabase
::
drivers
().
contains
(
driverName
()))
{
return
false
;
}
if
(
!
init
(
settings
,
false
))
if
(
!
init
(
settings
,
false
))
{
return
false
;
}
if
(
mInternalServer
&&
(
mMysqldPath
.
isEmpty
()
||
!
QFile
::
exists
(
mMysqldPath
)))
if
(
mInternalServer
&&
(
mMysqldPath
.
isEmpty
()
||
!
QFile
::
exists
(
mMysqldPath
)))
{
return
false
;
}
return
true
;
}
...
...
src/server/storage/dbconfigmysql.h
View file @
b308caee
...
...
@@ -40,7 +40,7 @@ public:
* At this point the default settings should be determined, merged
* with the given @p settings and written back if @p storeSettings is true.
*/
bool
init
(
QSettings
&
settings
,
bool
storeSettings
=
true
)
override
;
bool
init
(
QSettings
&
settings
,
bool
storeSettings
=
true
)
override
;
/**
* This method checks if the requirements for this database connection are met
...
...
src/server/storage/dbconfigpostgresql.h
View file @
b308caee
...
...
@@ -38,7 +38,7 @@ public:
* At this point the default settings should be determined, merged
* with the given @p settings and written back if @p storeSettings is true.
*/
bool
init
(
QSettings
&
settings
,
bool
storeSettings
=
true
)
override
;
bool
init
(
QSettings
&
settings
,
bool
storeSettings
=
true
)
override
;
/**
* This method checks if the requirements for this database connection are
...
...
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