Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
PIM
Akonadi Search
Commits
28612ed0
Commit
28612ed0
authored
Aug 23, 2020
by
Laurent Montel
😁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use toStdString() directly
parent
80bcd1f4
Pipeline
#31425
canceled with stage
Changes
6
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
6 additions
and
6 deletions
+6
-6
lib/collectionquery.cpp
lib/collectionquery.cpp
+1
-1
lib/contactcompleter.cpp
lib/contactcompleter.cpp
+1
-1
lib/contactquery.cpp
lib/contactquery.cpp
+1
-1
lib/emailquery.cpp
lib/emailquery.cpp
+1
-1
lib/indexeditems.cpp
lib/indexeditems.cpp
+1
-1
lib/notequery.cpp
lib/notequery.cpp
+1
-1
No files found.
lib/collectionquery.cpp
View file @
28612ed0
...
...
@@ -80,7 +80,7 @@ ResultIterator CollectionQuery::exec()
{
Xapian
::
Database
db
;
try
{
db
=
Xapian
::
Database
(
QFile
::
encodeName
(
d
->
databaseDir
).
constData
());
db
=
Xapian
::
Database
(
QFile
::
encodeName
(
d
->
databaseDir
).
toStdString
());
}
catch
(
const
Xapian
::
DatabaseError
&
e
)
{
qCWarning
(
AKONADI_SEARCH_PIM_LOG
)
<<
"Failed to open Xapian database:"
<<
d
->
databaseDir
<<
"; error:"
<<
QString
::
fromStdString
(
e
.
get_error_string
());
...
...
lib/contactcompleter.cpp
View file @
28612ed0
...
...
@@ -75,7 +75,7 @@ QStringList ContactCompleter::complete()
const
QString
dir
=
Query
::
defaultLocation
(
QStringLiteral
(
"emailContacts"
));
Xapian
::
Database
db
;
try
{
db
=
Xapian
::
Database
(
QFile
::
encodeName
(
dir
).
constData
());
db
=
Xapian
::
Database
(
QFile
::
encodeName
(
dir
).
toStdString
());
}
catch
(
const
Xapian
::
DatabaseOpeningError
&
)
{
qCWarning
(
AKONADI_SEARCH_PIM_LOG
)
<<
"Xapian Database does not exist at "
<<
dir
;
return
QStringList
();
...
...
lib/contactquery.cpp
View file @
28612ed0
...
...
@@ -95,7 +95,7 @@ ResultIterator ContactQuery::exec()
Xapian
::
Database
db
;
try
{
db
=
Xapian
::
Database
(
QFile
::
encodeName
(
dir
).
constData
());
db
=
Xapian
::
Database
(
QFile
::
encodeName
(
dir
).
toStdString
());
}
catch
(
const
Xapian
::
DatabaseOpeningError
&
)
{
qCWarning
(
AKONADI_SEARCH_PIM_LOG
)
<<
"Xapian Database does not exist at "
<<
dir
;
return
ResultIterator
();
...
...
lib/emailquery.cpp
View file @
28612ed0
...
...
@@ -178,7 +178,7 @@ ResultIterator EmailQuery::exec()
const
QString
dir
=
defaultLocation
(
QStringLiteral
(
"email"
));
Xapian
::
Database
db
;
try
{
db
=
Xapian
::
Database
(
QFile
::
encodeName
(
dir
).
constData
());
db
=
Xapian
::
Database
(
QFile
::
encodeName
(
dir
).
toStdString
());
}
catch
(
const
Xapian
::
DatabaseOpeningError
&
)
{
qCWarning
(
AKONADI_SEARCH_PIM_LOG
)
<<
"Xapian Database does not exist at "
<<
dir
;
return
ResultIterator
();
...
...
lib/indexeditems.cpp
View file @
28612ed0
...
...
@@ -115,7 +115,7 @@ qlonglong IndexedItemsPrivate::indexedItemsInDatabase(const std::string &term, c
{
Xapian
::
Database
db
;
try
{
db
=
Xapian
::
Database
(
QFile
::
encodeName
(
dbPath
).
constData
());
db
=
Xapian
::
Database
(
QFile
::
encodeName
(
dbPath
).
toStdString
());
}
catch
(
const
Xapian
::
DatabaseError
&
e
)
{
qCCritical
(
AKONADI_SEARCH_PIM_LOG
)
<<
"Failed to open database"
<<
dbPath
<<
":"
<<
QString
::
fromStdString
(
e
.
get_msg
());
return
0
;
...
...
lib/notequery.cpp
View file @
28612ed0
...
...
@@ -68,7 +68,7 @@ ResultIterator NoteQuery::exec()
Xapian
::
Database
db
;
try
{
db
=
Xapian
::
Database
(
QFile
::
encodeName
(
dir
).
constData
());
db
=
Xapian
::
Database
(
QFile
::
encodeName
(
dir
).
toStdString
());
}
catch
(
const
Xapian
::
DatabaseOpeningError
&
)
{
qCWarning
(
AKONADI_SEARCH_PIM_LOG
)
<<
"Xapian Database does not exist at "
<<
dir
;
return
ResultIterator
();
...
...
Write
Preview
Markdown
is supported
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