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 905f5f00754d5e3e632b829e4f4f2e4db6f64f52 (commit)
via befb6a645026bd7f64b6dc1dc1d370114f501375 (commit)
via 3dde29bc72ad3b3f4cba6fc300df077fd4dc2a5c (commit)
via 5d3b5bef11bc29bb00a14103433fea81e4dcc340 (commit)
via ad42eb33b61ad262315bfa087dc7f4f0ddbca5fe (commit)
from d803aae6f865545c4cc0702a52f73871aaf1de0e (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=905f5f00754d5e3e632b829e4f4f2e4db6f64f52
commit 905f5f00754d5e3e632b829e4f4f2e4db6f64f52
Merge: d803aae befb6a6
Author: Daniel Pfeifer <dan...@pfeifer-mail.de>
AuthorDate: Thu Sep 8 17:43:58 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Sep 8 17:43:58 2016 -0400
Merge topic 'clang-tidy' into next
befb6a64 cmDependsFortran: simplify boolean expression
3dde29bc cmSystemTools: simplify boolean expressions
5d3b5bef QCMakeCacheView: simplify boolean expression
ad42eb33 QCMakeCacheView: no else after return
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=befb6a645026bd7f64b6dc1dc1d370114f501375
commit befb6a645026bd7f64b6dc1dc1d370114f501375
Author: Daniel Pfeifer <dan...@pfeifer-mail.de>
AuthorDate: Thu Sep 8 23:43:06 2016 +0200
Commit: Daniel Pfeifer <dan...@pfeifer-mail.de>
CommitDate: Thu Sep 8 23:43:06 2016 +0200
cmDependsFortran: simplify boolean expression
diff --git a/Source/cmDependsFortran.cxx b/Source/cmDependsFortran.cxx
index b7e006d..eb4c1ec 100644
--- a/Source/cmDependsFortran.cxx
+++ b/Source/cmDependsFortran.cxx
@@ -712,10 +712,5 @@ bool cmDependsFortran::ModulesDiffer(const char* modFile,
// Compare the remaining content. If no compiler id matched above,
// including the case none was given, this will compare the whole
// content.
- if (!cmFortranStreamsDiffer(finModFile, finStampFile)) {
- return false;
- }
-
- // The modules are different.
- return true;
+ return cmFortranStreamsDiffer(finModFile, finStampFile);
}
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3dde29bc72ad3b3f4cba6fc300df077fd4dc2a5c
commit 3dde29bc72ad3b3f4cba6fc300df077fd4dc2a5c
Author: Daniel Pfeifer <dan...@pfeifer-mail.de>
AuthorDate: Thu Sep 8 23:41:31 2016 +0200
Commit: Daniel Pfeifer <dan...@pfeifer-mail.de>
CommitDate: Thu Sep 8 23:41:31 2016 +0200
cmSystemTools: simplify boolean expressions
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 7da9975..ae0323b 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -1766,9 +1766,7 @@ bool cmSystemTools::CopyFileTime(const char* fromFile,
const char* toFile)
if (!GetFileTime(hFrom, &timeCreation, &timeLastAccess, &timeLastWrite)) {
return false;
}
- if (!SetFileTime(hTo, &timeCreation, &timeLastAccess, &timeLastWrite)) {
- return false;
- }
+ return SetFileTime(hTo, &timeCreation, &timeLastAccess, &timeLastWrite);
#else
struct stat fromStat;
if (stat(fromFile, &fromStat) < 0) {
@@ -1778,11 +1776,8 @@ bool cmSystemTools::CopyFileTime(const char* fromFile,
const char* toFile)
struct utimbuf buf;
buf.actime = fromStat.st_atime;
buf.modtime = fromStat.st_mtime;
- if (utime(toFile, &buf) < 0) {
- return false;
- }
+ return utime(toFile, &buf) >= 0;
#endif
- return true;
}
cmSystemToolsFileTime* cmSystemTools::FileTimeNew()
@@ -1828,16 +1823,11 @@ bool cmSystemTools::FileTimeSet(const char* fname,
cmSystemToolsFileTime* t)
if (!h) {
return false;
}
- if (!SetFileTime(h, &t->timeCreation, &t->timeLastAccess,
- &t->timeLastWrite)) {
- return false;
- }
+ return SetFileTime(h, &t->timeCreation, &t->timeLastAccess,
+ &t->timeLastWrite);
#else
- if (utime(fname, &t->timeBuf) < 0) {
- return false;
- }
+ return utime(fname, &t->timeBuf) >= 0;
#endif
- return true;
}
#ifdef _WIN32
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5d3b5bef11bc29bb00a14103433fea81e4dcc340
commit 5d3b5bef11bc29bb00a14103433fea81e4dcc340
Author: Daniel Pfeifer <dan...@pfeifer-mail.de>
AuthorDate: Thu Sep 8 23:35:59 2016 +0200
Commit: Daniel Pfeifer <dan...@pfeifer-mail.de>
CommitDate: Thu Sep 8 23:35:59 2016 +0200
QCMakeCacheView: simplify boolean expression
diff --git a/Source/QtDialog/QCMakeCacheView.cxx
b/Source/QtDialog/QCMakeCacheView.cxx
index ec7918b..ed11f7b 100644
--- a/Source/QtDialog/QCMakeCacheView.cxx
+++ b/Source/QtDialog/QCMakeCacheView.cxx
@@ -95,10 +95,7 @@ protected:
// if there are no children
if (!m->hasChildren(idx)) {
bool adv = m->data(idx, QCMakeCacheModel::AdvancedRole).toBool();
- if (!adv || (adv && this->ShowAdvanced)) {
- return true;
- }
- return false;
+ return !adv || this->ShowAdvanced;
}
// check children
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ad42eb33b61ad262315bfa087dc7f4f0ddbca5fe
commit ad42eb33b61ad262315bfa087dc7f4f0ddbca5fe
Author: Daniel Pfeifer <dan...@pfeifer-mail.de>
AuthorDate: Thu Sep 8 23:33:08 2016 +0200
Commit: Daniel Pfeifer <dan...@pfeifer-mail.de>
CommitDate: Thu Sep 8 23:33:08 2016 +0200
QCMakeCacheView: no else after return
diff --git a/Source/QtDialog/QCMakeCacheView.cxx
b/Source/QtDialog/QCMakeCacheView.cxx
index 88ea049..ec7918b 100644
--- a/Source/QtDialog/QCMakeCacheView.cxx
+++ b/Source/QtDialog/QCMakeCacheView.cxx
@@ -554,14 +554,16 @@ QWidget* QCMakeCacheModelDelegate::createEditor(
QObject::connect(editor, SIGNAL(fileDialogExists(bool)), this,
SLOT(setFileDialogFlag(bool)));
return editor;
- } else if (type == QCMakeProperty::FILEPATH) {
+ }
+ if (type == QCMakeProperty::FILEPATH) {
QCMakeFilePathEditor* editor =
new QCMakeFilePathEditor(p, var.data(Qt::DisplayRole).toString());
QObject::connect(editor, SIGNAL(fileDialogExists(bool)), this,
SLOT(setFileDialogFlag(bool)));
return editor;
- } else if (type == QCMakeProperty::STRING &&
- var.data(QCMakeCacheModel::StringsRole).isValid()) {
+ }
+ if (type == QCMakeProperty::STRING &&
+ var.data(QCMakeCacheModel::StringsRole).isValid()) {
QCMakeComboBox* editor = new QCMakeComboBox(
p, var.data(QCMakeCacheModel::StringsRole).toStringList());
editor->setFrame(false);
-----------------------------------------------------------------------
Summary of changes:
Source/QtDialog/QCMakeCacheView.cxx | 13 ++++++-------
Source/cmDependsFortran.cxx | 7 +------
Source/cmSystemTools.cxx | 20 +++++---------------
3 files changed, 12 insertions(+), 28 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
