From 11206b5340cf6551d01b266cf096d1641796d300 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 6 Aug 2019 14:35:04 +0200 Subject: Remove QMakeLocalFileName::is_null This is never different from real_name.isNull(). Change-Id: Ic1442f2eec4d7dfb2d3694e85d664f1509d4b68b Reviewed-by: Oliver Wolff --- qmake/generators/makefiledeps.cpp | 6 +++--- qmake/generators/makefiledeps.h | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'qmake/generators') diff --git a/qmake/generators/makefiledeps.cpp b/qmake/generators/makefiledeps.cpp index 1b1b0426bb..7c4be64aa8 100644 --- a/qmake/generators/makefiledeps.cpp +++ b/qmake/generators/makefiledeps.cpp @@ -60,14 +60,14 @@ QT_BEGIN_NAMESPACE inline bool qmake_endOfLine(const char &c) { return (c == '\r' || c == '\n'); } #endif -QMakeLocalFileName::QMakeLocalFileName(const QString &name) : is_null(name.isNull()) - , real_name(name) +QMakeLocalFileName::QMakeLocalFileName(const QString &name) + : real_name(name) { } const QString &QMakeLocalFileName::local() const { - if(!is_null && local_name.isNull()) + if (!isNull() && local_name.isNull()) local_name = Option::normalizePath(real_name); return local_name; } diff --git a/qmake/generators/makefiledeps.h b/qmake/generators/makefiledeps.h index 66b87bf470..7e39396754 100644 --- a/qmake/generators/makefiledeps.h +++ b/qmake/generators/makefiledeps.h @@ -41,14 +41,14 @@ struct SourceFile; struct SourceDependChildren; class SourceFiles; -class QMakeLocalFileName { - bool is_null; +class QMakeLocalFileName +{ QString real_name; mutable QString local_name; public: - QMakeLocalFileName() : is_null(true) {} + QMakeLocalFileName() = default; QMakeLocalFileName(const QString &); - bool isNull() const { return is_null; } + bool isNull() const { return real_name.isNull(); } inline const QString &real() const { return real_name; } const QString &local() const; -- cgit v1.2.3