Commit 44900640 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Merge remote-tracking branch 'origin/release/19.12'

parents 104d2757 4d23c0a2
......@@ -35,7 +35,7 @@ FindBarSourceView::~FindBarSourceView()
void FindBarSourceView::searchText(bool backward, bool isAutoSearch)
{
QTextDocument::FindFlags searchOptions = nullptr;
QTextDocument::FindFlags searchOptions = {};
if (backward) {
searchOptions |= QTextDocument::FindBackward;
}
......@@ -73,7 +73,7 @@ void FindBarSourceView::updateHighLight(bool)
void FindBarSourceView::updateSensitivity(bool)
{
QTextDocument::FindFlags searchOptions = nullptr;
QTextDocument::FindFlags searchOptions = {};
if (mCaseSensitiveAct->isChecked()) {
searchOptions |= QTextDocument::FindCaseSensitively;
}
......
......@@ -82,8 +82,7 @@ int AttachmentDialog::exec()
QMessageBox::Question, text,
QStringList(),
i18n(
"Do not ask again"), &again,
nullptr);
"Do not ask again"), &again, KMessageBox::Option());
if (ret == QDialogButtonBox::Cancel) {
return Cancel;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment