[Cmake-commits] CMake branch, next, updated. v3.7.1-1859-g4c3b612

[Gregor Jasny]

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  4c3b6121f4cd46550db6f2e00359b779ba54735e (commit)
       via  fb55dc9d5b7a7e70770a783f41ec21c734f1fce7 (commit)
       via  65fb0fa63279b96035a144fd2f6413d1b2def47f (commit)
       via  2b301e11e2402690c43a7535656cba487559bd1f (commit)
       via  8b623e8a4af7451c718f448c8e27ce2b82347f76 (commit)
       via  df00ed13107ecb5e5b61ec07bb4190de0aaeb6b0 (commit)
      from  1890504c1220777f247462f00d9889a6d242e4bd (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=4c3b6121f4cd46550db6f2e00359b779ba54735e
commit 4c3b6121f4cd46550db6f2e00359b779ba54735e
Merge: 1890504 fb55dc9
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Tue Dec 27 10:43:15 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Dec 27 10:43:15 2016 -0500

    Merge topic '16204-regex-explorer-match-all' into next
    
    fb55dc9d cmake-gui: Add MATCHALL option to Regex Explorer
    65fb0fa6 CMake Nightly Date Stamp
    2b301e11 CMake Nightly Date Stamp
    8b623e8a CMake Nightly Date Stamp
    df00ed13 CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fb55dc9d5b7a7e70770a783f41ec21c734f1fce7
commit fb55dc9d5b7a7e70770a783f41ec21c734f1fce7
Author:     Gregor Jasny <gjasny at googlemail.com>
AuthorDate: Tue Dec 27 16:38:09 2016 +0100
Commit:     Gregor Jasny <gjasny at googlemail.com>
CommitDate: Tue Dec 27 16:38:18 2016 +0100

    cmake-gui: Add MATCHALL option to Regex Explorer
    
    Closes: #16204

diff --git a/Source/QtDialog/RegexExplorer.cxx b/Source/QtDialog/RegexExplorer.cxx
index 1512166..52b0b84 100644
--- a/Source/QtDialog/RegexExplorer.cxx
+++ b/Source/QtDialog/RegexExplorer.cxx
@@ -64,10 +64,32 @@ void RegexExplorer::on_inputText_textChanged()
     return;
   }
 
+  std::string matchingText;
+
+  if (matchAll->isChecked()) {
+    const char* p = m_text.c_str();
+    while (m_regexParser.find(p)) {
+      std::string::size_type l = m_regexParser.start();
+      std::string::size_type r = m_regexParser.end();
+      if (r - l == 0) {
+        // matched empty string
+        clearMatch();
+        return;
+      }
+      if (!matchingText.empty()) {
+        matchingText += ";";
+      }
+      matchingText += std::string(p + l, r - l);
+      p += r;
+    }
+  } else {
+    matchingText = m_regexParser.match(0);
+  }
+
 #ifdef QT_NO_STL
-  QString matchText = m_regexParser.match(0).c_str();
+  QString matchText = matchingText.c_str();
 #else
-  QString matchText = QString::fromStdString(m_regexParser.match(0));
+  QString matchText = QString::fromStdString(matchingText);
 #endif
   match0->setPlainText(matchText);
 
@@ -95,8 +117,14 @@ void RegexExplorer::on_matchNumber_currentIndexChanged(int index)
   matchN->setPlainText(match);
 }
 
+void RegexExplorer::on_matchAll_toggled(bool checked)
+{
+  on_inputText_textChanged();
+}
+
 void RegexExplorer::clearMatch()
 {
+  m_matched = false;
   match0->clear();
   matchN->clear();
 }
diff --git a/Source/QtDialog/RegexExplorer.h b/Source/QtDialog/RegexExplorer.h
index f1c1e5f..caef975 100644
--- a/Source/QtDialog/RegexExplorer.h
+++ b/Source/QtDialog/RegexExplorer.h
@@ -22,6 +22,7 @@ private slots:
   void on_regularExpression_textChanged(const QString& text);
   void on_inputText_textChanged();
   void on_matchNumber_currentIndexChanged(int index);
+  void on_matchAll_toggled(bool checked);
 
 private:
   static void setStatusColor(QWidget* widget, bool successful);
diff --git a/Source/QtDialog/RegexExplorer.ui b/Source/QtDialog/RegexExplorer.ui
index 2c2d761..0af69999 100644
--- a/Source/QtDialog/RegexExplorer.ui
+++ b/Source/QtDialog/RegexExplorer.ui
@@ -104,11 +104,38 @@
     <widget class="QLineEdit" name="regularExpression"/>
    </item>
    <item>
-    <widget class="QLabel" name="label_3">
-     <property name="text">
-      <string>Complete Match</string>
-     </property>
-    </widget>
+    <layout class="QHBoxLayout" name="horizontalLayout_3">
+     <item>
+      <widget class="QLabel" name="label_3">
+       <property name="text">
+        <string>Complete Match</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="horizontalSpacer_5">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="QCheckBox" name="matchAll">
+       <property name="text">
+        <string>Match All</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
    <item>
     <widget class="QPlainTextEdit" name="match0">

-----------------------------------------------------------------------

Summary of changes:
 Source/CMakeVersion.cmake         |    2 +-
 Source/QtDialog/RegexExplorer.cxx |   32 ++++++++++++++++++++++++++++++--
 Source/QtDialog/RegexExplorer.h   |    1 +
 Source/QtDialog/RegexExplorer.ui  |   37 ++++++++++++++++++++++++++++++++-----
 4 files changed, 64 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake