1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove QMakeLocalFileName::is_null

Browse Source 
This is never different from real_name.isNull().

Change-Id: Ic1442f2eec4d7dfb2d3694e85d664f1509d4b68b
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
This commit is contained in:
Joerg Bornemann 2019-08-06 14:35:04 +02:00
parent 0d6e555778
commit 11206b5340
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qmake/generators/makefiledeps.cpp
View File

@ -60,14 +60,14 @@ QT_BEGIN_NAMESPACE
inline bool qmake_endOfLine(const char &c) { return (c == '\r' || c == '\n'); } inline bool qmake_endOfLine(const char &c) { return (c == '\r' || c == '\n'); }
#endif #endif
QMakeLocalFileName::QMakeLocalFileName(const QString &name) : is_null(name.isNull()) QMakeLocalFileName::QMakeLocalFileName(const QString &name)
, real_name(name) : real_name(name)
{ {
} }
const QString const QString
&QMakeLocalFileName::local() const &QMakeLocalFileName::local() const
{ {
if(!is_null && local_name.isNull()) if (!isNull() && local_name.isNull())
local_name = Option::normalizePath(real_name); local_name = Option::normalizePath(real_name);
return local_name; return local_name;
} }

8
qmake/generators/makefiledeps.h
View File

@ -41,14 +41,14 @@ struct SourceFile;
struct SourceDependChildren; struct SourceDependChildren;
class SourceFiles; class SourceFiles;
class QMakeLocalFileName { class QMakeLocalFileName
bool is_null; {
QString real_name; QString real_name;
mutable QString local_name; mutable QString local_name;
public: public:
QMakeLocalFileName() : is_null(true) {} QMakeLocalFileName() = default;
QMakeLocalFileName(const QString &); QMakeLocalFileName(const QString &);
bool isNull() const { return is_null; } bool isNull() const { return real_name.isNull(); }
inline const QString &real() const { return real_name; } inline const QString &real() const { return real_name; }
const QString &local() const; const QString &local() const;