Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit c8697989 authored by Albert Astals Cid's avatar Albert Astals Cid

Do not duplicate the noDialogs storage in two structs

parent 3c3d4373
......@@ -1662,7 +1662,7 @@ void DocumentPrivate::doContinueDirectionMatchSearch(void *doContinueDirectionMa
if ( searchStruct->currentPage >= pageCount || searchStruct->currentPage < 0 )
{
const QString question = forward ? i18n("End of document reached.\nContinue from the beginning?") : i18n("Beginning of document reached.\nContinue from the bottom?");
if ( searchStruct->noDialogs || KMessageBox::questionYesNo(m_widget, question, QString(), KStandardGuiItem::cont(), KStandardGuiItem::cancel()) == KMessageBox::Yes )
if ( search->cachedNoDialogs || KMessageBox::questionYesNo(m_widget, question, QString(), KStandardGuiItem::cont(), KStandardGuiItem::cancel()) == KMessageBox::Yes )
searchStruct->currentPage = forward ? 0 : pageCount - 1;
else
doContinue = false;
......@@ -3360,7 +3360,6 @@ void Document::searchText( int searchID, const QString & text, bool fromStart, Q
searchStruct->match = match;
searchStruct->currentPage = currentPage;
searchStruct->searchID = searchID;
searchStruct->noDialogs = noDialogs;
searchStruct->pagesDone = pagesDone;
QMetaObject::invokeMethod(this, "doContinueDirectionMatchSearch", Qt::QueuedConnection, Q_ARG(void *, searchStruct));
......
......@@ -71,7 +71,6 @@ struct DoContinueDirectionMatchSearchStruct
RegularAreaRect *match;
int currentPage;
int searchID;
bool noDialogs;
int pagesDone;
};
......
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