Commit 78abf540 authored by Adam Reichold's avatar Adam Reichold Committed by Albert Astals Cid

Worlds -> Words

parent 027eac4e
......@@ -508,7 +508,7 @@ bool Page::search(const QString &text, double &sLeft, double &sTop, double &sRig
bool Page::search(const QString &text, double &sLeft, double &sTop, double &sRight, double &sBottom, SearchDirection direction, SearchFlags flags, Rotation rotate) const
{
const GBool sCase = flags.testFlag(IgnoreCase) ? gFalse : gTrue;
const GBool sWords = flags.testFlag(WholeWorlds) ? gTrue : gFalse;
const GBool sWords = flags.testFlag(WholeWords) ? gTrue : gFalse;
QVector<Unicode> u;
TextPage *textPage = m_page->prepareTextSearch(text, rotate, &u);
......@@ -555,7 +555,7 @@ QList<QRectF> Page::search(const QString &text, SearchMode caseSensitive, Rotati
QList<QRectF> Page::search(const QString &text, SearchFlags flags, Rotation rotate) const
{
const GBool sCase = flags.testFlag(IgnoreCase) ? gFalse : gTrue;
const GBool sWords = flags.testFlag(WholeWorlds) ? gTrue : gFalse;
const GBool sWords = flags.testFlag(WholeWords) ? gTrue : gFalse;
QVector<Unicode> u;
TextPage *textPage = m_page->prepareTextSearch(text, rotate, &u);
......
......@@ -586,7 +586,7 @@ delete it;
enum SearchFlag
{
IgnoreCase = 0x00000001, ///< Case differences are ignored
WholeWorlds = 0x00000002 ///< Only whole words are matched
WholeWords = 0x00000002 ///< Only whole words are matched
};
Q_DECLARE_FLAGS( SearchFlags, SearchFlag )
......
......@@ -152,8 +152,8 @@ void TestSearch::testWholeWordsOnly()
const Poppler::Page::SearchFlags mode0 = 0;
const Poppler::Page::SearchFlags mode1 = Poppler::Page::IgnoreCase;
const Poppler::Page::SearchFlags mode2 = Poppler::Page::WholeWorlds;
const Poppler::Page::SearchFlags mode3 = Poppler::Page::IgnoreCase | Poppler::Page::WholeWorlds;
const Poppler::Page::SearchFlags mode2 = Poppler::Page::WholeWords;
const Poppler::Page::SearchFlags mode3 = Poppler::Page::IgnoreCase | Poppler::Page::WholeWords;
double left, top, right, bottom;
......
......@@ -508,7 +508,7 @@ bool Page::search(const QString &text, double &sLeft, double &sTop, double &sRig
bool Page::search(const QString &text, double &sLeft, double &sTop, double &sRight, double &sBottom, SearchDirection direction, SearchFlags flags, Rotation rotate) const
{
const GBool sCase = flags.testFlag(IgnoreCase) ? gFalse : gTrue;
const GBool sWords = flags.testFlag(WholeWorlds) ? gTrue : gFalse;
const GBool sWords = flags.testFlag(WholeWords) ? gTrue : gFalse;
QVector<Unicode> u;
TextPage *textPage = m_page->prepareTextSearch(text, rotate, &u);
......@@ -537,7 +537,7 @@ QList<QRectF> Page::search(const QString &text, SearchMode caseSensitive, Rotati
QList<QRectF> Page::search(const QString &text, SearchFlags flags, Rotation rotate) const
{
const GBool sCase = flags.testFlag(IgnoreCase) ? gFalse : gTrue;
const GBool sWords = flags.testFlag(WholeWorlds) ? gTrue : gFalse;
const GBool sWords = flags.testFlag(WholeWords) ? gTrue : gFalse;
QVector<Unicode> u;
TextPage *textPage = m_page->prepareTextSearch(text, rotate, &u);
......
......@@ -587,7 +587,7 @@ delete it;
enum SearchFlag
{
IgnoreCase = 0x00000001, ///< Case differences are ignored
WholeWorlds = 0x00000002 ///< Only whole words are matched
WholeWords = 0x00000002 ///< Only whole words are matched
};
Q_DECLARE_FLAGS( SearchFlags, SearchFlag )
......
......@@ -151,8 +151,8 @@ void TestSearch::testWholeWordsOnly()
const Poppler::Page::SearchFlags mode0 = 0;
const Poppler::Page::SearchFlags mode1 = Poppler::Page::IgnoreCase;
const Poppler::Page::SearchFlags mode2 = Poppler::Page::WholeWorlds;
const Poppler::Page::SearchFlags mode3 = Poppler::Page::IgnoreCase | Poppler::Page::WholeWorlds;
const Poppler::Page::SearchFlags mode2 = Poppler::Page::WholeWords;
const Poppler::Page::SearchFlags mode3 = Poppler::Page::IgnoreCase | Poppler::Page::WholeWords;
double left, top, right, bottom;
......
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