This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via 1c27e7df4e033f981dde15f7731913ffd6750b03 (commit) via b732f72a3dcda862b16e3b7a775f9d2b34e0d5be (commit) from b2ae6a309c8e5cc729fc5269aa04f38b46311f53 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1c27e7df4e033f981dde15f7731913ffd6750b03 commit 1c27e7df4e033f981dde15f7731913ffd6750b03 Merge: b2ae6a3 b732f72 Author: Gregor Jasny <gja...@googlemail.com> AuthorDate: Wed Dec 2 12:10:32 2015 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Wed Dec 2 12:10:32 2015 -0500 Merge topic 'regex-explorer' into next b732f72a fixup! cmake-gui: Add regex explorer window https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b732f72a3dcda862b16e3b7a775f9d2b34e0d5be commit b732f72a3dcda862b16e3b7a775f9d2b34e0d5be Author: Gregor Jasny <gja...@googlemail.com> AuthorDate: Wed Dec 2 18:09:53 2015 +0100 Commit: Gregor Jasny <gja...@googlemail.com> CommitDate: Wed Dec 2 18:09:53 2015 +0100 fixup! cmake-gui: Add regex explorer window diff --git a/Help/release/dev/regex-explorer.rst b/Help/release/dev/regex-explorer.rst index 5c7ae3a..2147816 100644 --- a/Help/release/dev/regex-explorer.rst +++ b/Help/release/dev/regex-explorer.rst @@ -3,4 +3,4 @@ regex-explorer * The Qt base CMake GUI got a Regular Expression Explorer which could be used to create and evaluate regular expressions in real-time. The explorer window - is available via the ``Tools``menu. + is available via the ``Tools`` menu. diff --git a/Source/QtDialog/RegexExplorer.cxx b/Source/QtDialog/RegexExplorer.cxx index b583d70..dfcf048 100644 --- a/Source/QtDialog/RegexExplorer.cxx +++ b/Source/QtDialog/RegexExplorer.cxx @@ -12,7 +12,7 @@ #include "RegexExplorer.h" -RegexExplorer::RegexExplorer(QWidget* p) : m_matched(false) +RegexExplorer::RegexExplorer(QWidget* p) : QDialog(p), m_matched(false) { this->setupUi(this); @@ -96,8 +96,8 @@ void RegexExplorer::on_matchNumber_currentIndexChanged(int index) return; } - QVariant data = matchNumber->itemData(index); - int idx = data.toInt(); + QVariant itemData = matchNumber->itemData(index); + int idx = itemData.toInt(); if(idx < 1 || idx >= cmsys::RegularExpression::NSUBEXP) { ----------------------------------------------------------------------- Summary of changes: Help/release/dev/regex-explorer.rst | 2 +- Source/QtDialog/RegexExplorer.cxx | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits