qt4/src/poppler-page.cc | 4 ++-- qt4/src/poppler-qt4.h | 2 +- qt4/tests/check_search.cpp | 4 ++-- qt5/src/poppler-page.cc | 4 ++-- qt5/src/poppler-qt5.h | 2 +- qt5/tests/check_search.cpp | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-)
New commits: commit 78abf540057181b708c546aee421f81a1dd58331 Author: Adam Reichold <[email protected]> Date: Wed Jan 21 22:30:45 2015 +0100 Worlds -> Words diff --git a/qt4/src/poppler-page.cc b/qt4/src/poppler-page.cc index a4536af..49ad871 100644 --- a/qt4/src/poppler-page.cc +++ b/qt4/src/poppler-page.cc @@ -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); diff --git a/qt4/src/poppler-qt4.h b/qt4/src/poppler-qt4.h index 48c517a..e5e808d 100644 --- a/qt4/src/poppler-qt4.h +++ b/qt4/src/poppler-qt4.h @@ -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 ) diff --git a/qt4/tests/check_search.cpp b/qt4/tests/check_search.cpp index 77e62e3..99659e0 100644 --- a/qt4/tests/check_search.cpp +++ b/qt4/tests/check_search.cpp @@ -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; diff --git a/qt5/src/poppler-page.cc b/qt5/src/poppler-page.cc index 88f2e73..408099c 100644 --- a/qt5/src/poppler-page.cc +++ b/qt5/src/poppler-page.cc @@ -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); diff --git a/qt5/src/poppler-qt5.h b/qt5/src/poppler-qt5.h index 9ffecff..79c3f74 100644 --- a/qt5/src/poppler-qt5.h +++ b/qt5/src/poppler-qt5.h @@ -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 ) diff --git a/qt5/tests/check_search.cpp b/qt5/tests/check_search.cpp index 2f6f022..a24cc72 100644 --- a/qt5/tests/check_search.cpp +++ b/qt5/tests/check_search.cpp @@ -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; _______________________________________________ poppler mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/poppler
