[Cmake-commits] CMake branch, next, updated. v3.4.1-1669-g75501dd

[Brad King]

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  75501ddf13fcfcef4f59de31d0cfdbd3665640f2 (commit)
       via  42232ce47b1378e7576fb66cff27e79ce9b1fed5 (commit)
      from  91798eb761176a082e692411e981404474f48276 (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=75501ddf13fcfcef4f59de31d0cfdbd3665640f2
commit 75501ddf13fcfcef4f59de31d0cfdbd3665640f2
Merge: 91798eb 42232ce
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 10 09:28:23 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Dec 10 09:28:23 2015 -0500

    Merge topic 'cmake-W-options' into next
    
    42232ce4 fixup! cmake-gui: Add options to control warning messages


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=42232ce47b1378e7576fb66cff27e79ce9b1fed5
commit 42232ce47b1378e7576fb66cff27e79ce9b1fed5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 10 09:27:55 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Dec 10 09:27:55 2015 -0500

    fixup! cmake-gui: Add options to control warning messages

diff --git a/Source/QtDialog/WarningMessagesDialog.cxx b/Source/QtDialog/WarningMessagesDialog.cxx
index e2f4bbc..735b71c 100644
--- a/Source/QtDialog/WarningMessagesDialog.cxx
+++ b/Source/QtDialog/WarningMessagesDialog.cxx
@@ -12,8 +12,8 @@
 
 #include "WarningMessagesDialog.h"
 
-WarningMessagesDialog::WarningMessagesDialog(QWidget* parent, QCMake* instance)
-  : QDialog(parent), cmakeInstance(instance)
+WarningMessagesDialog::WarningMessagesDialog(QWidget* prnt, QCMake* instance)
+  : QDialog(prnt), cmakeInstance(instance)
 {
   this->setupUi(this);
   this->setInitialValues();
diff --git a/Source/QtDialog/WarningMessagesDialog.h b/Source/QtDialog/WarningMessagesDialog.h
index dee572c..028ec10 100644
--- a/Source/QtDialog/WarningMessagesDialog.h
+++ b/Source/QtDialog/WarningMessagesDialog.h
@@ -27,7 +27,7 @@ class WarningMessagesDialog : public QDialog, public Ui_MessagesDialog
   Q_OBJECT
 
 public:
-  WarningMessagesDialog(QWidget* parent, QCMake* instance);
+  WarningMessagesDialog(QWidget* prnt, QCMake* instance);
 
 private slots:
   /**

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

Summary of changes:
 Source/QtDialog/WarningMessagesDialog.cxx |    4 ++--
 Source/QtDialog/WarningMessagesDialog.h   |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake