[Cmake-commits] CMake branch, next, updated. v3.6.1-1788-g425a124

[Daniel Pfeifer]

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  425a1248b7c91f3bd1d2a4facbfca2b7889878a6 (commit)
       via  8d52b94262c0201b37aab554d306a037a48e0ca3 (commit)
      from  cb33be0a1655e5b9bd8abd609ac3c463182ac586 (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=425a1248b7c91f3bd1d2a4facbfca2b7889878a6
commit 425a1248b7c91f3bd1d2a4facbfca2b7889878a6
Merge: cb33be0 8d52b94
Author:     Daniel Pfeifer <dan...@pfeifer-mail.de>
AuthorDate: Mon Sep 5 16:35:49 2016 -0400
Commit:     CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Sep 5 16:35:49 2016 -0400

    Merge topic 'qtdialog-tidy' into next
    
    8d52b942 fixup! QtDialog: fix clang-tidy warnings


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8d52b94262c0201b37aab554d306a037a48e0ca3
commit 8d52b94262c0201b37aab554d306a037a48e0ca3
Author:     Daniel Pfeifer <dan...@pfeifer-mail.de>
AuthorDate: Mon Sep 5 22:35:31 2016 +0200
Commit:     Daniel Pfeifer <dan...@pfeifer-mail.de>
CommitDate: Mon Sep 5 22:35:31 2016 +0200

    fixup! QtDialog: fix clang-tidy warnings

diff --git a/Source/QtDialog/Compilers.h b/Source/QtDialog/Compilers.h
index bdb1962..276e2a5 100644
--- a/Source/QtDialog/Compilers.h
+++ b/Source/QtDialog/Compilers.h
@@ -3,6 +3,8 @@
 #ifndef COMPILERS_HPP
 #define COMPILERS_HPP
 
+#include <cmConfigure.h>
+
 #include <QWidget>
 
 #include <ui_Compilers.h>
@@ -11,7 +13,7 @@ class Compilers : public QWidget, public Ui::Compilers
 {
   Q_OBJECT
 public:
-  Compilers(QWidget* p = NULL)
+  Compilers(QWidget* p = CM_NULLPTR)
     : QWidget(p)
   {
     this->setupUi(this);
diff --git a/Source/QtDialog/QCMake.h b/Source/QtDialog/QCMake.h
index a818c6b..7eadb09 100644
--- a/Source/QtDialog/QCMake.h
+++ b/Source/QtDialog/QCMake.h
@@ -13,6 +13,8 @@
 #ifndef QCMake_h
 #define QCMake_h
 
+#include <cmConfigure.h>
+
 #include "cmake.h"
 
 #ifdef _MSC_VER
@@ -71,7 +73,7 @@ class QCMake : public QObject
 {
   Q_OBJECT
 public:
-  QCMake(QObject* p = 0);
+  QCMake(QObject* p = CM_NULLPTR);
   ~QCMake();
 public slots:
   /// load the cache file in a directory
diff --git a/Source/QtDialog/QCMakeWidgets.h b/Source/QtDialog/QCMakeWidgets.h
index f1e87ce..0d95e63 100644
--- a/Source/QtDialog/QCMakeWidgets.h
+++ b/Source/QtDialog/QCMakeWidgets.h
@@ -13,6 +13,8 @@
 #ifndef QCMakeWidgets_h
 #define QCMakeWidgets_h
 
+#include <cmConfigure.h>
+
 #include <QComboBox>
 #include <QCompleter>
 #include <QLineEdit>
@@ -43,7 +45,7 @@ class QCMakePathEditor : public QCMakeFileEditor
 {
   Q_OBJECT
 public:
-  QCMakePathEditor(QWidget* p = NULL, const QString& var = QString());
+  QCMakePathEditor(QWidget* p = CM_NULLPTR, const QString& var = QString());
   void chooseFile();
 };
 
@@ -52,7 +54,8 @@ class QCMakeFilePathEditor : public QCMakeFileEditor
 {
   Q_OBJECT
 public:
-  QCMakeFilePathEditor(QWidget* p = NULL, const QString& var = QString());
+  QCMakeFilePathEditor(QWidget* p = CM_NULLPTR,
+                       const QString& var = QString());
   void chooseFile();
 };
 

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

Summary of changes:
 Source/QtDialog/Compilers.h     |    4 +++-
 Source/QtDialog/QCMake.h        |    4 +++-
 Source/QtDialog/QCMakeWidgets.h |    7 +++++--
 3 files changed, 11 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits