Utils: Modernize

modernize-use-auto
modernize-use-nullptr
modernize-use-override
modernize-use-using
modernize-use-default-member-init
modernize-use-equals-default

Change-Id: I8d44d9405011a1878353baf9325f7af90b89db02
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Alessandro Portale
2018-07-19 16:39:41 +02:00
parent 1d894c0f7a
commit e38410b76c
58 changed files with 274 additions and 315 deletions

View File

@@ -49,11 +49,9 @@ const char kFileBaseNamePostfix[] = ":FileBaseName";
class MacroExpanderPrivate : public AbstractMacroExpander
{
public:
MacroExpanderPrivate()
: m_accumulating(false), m_aborted(false), m_lockDepth(0)
{}
MacroExpanderPrivate() = default;
bool resolveMacro(const QString &name, QString *ret, QSet<AbstractMacroExpander *> &seen)
bool resolveMacro(const QString &name, QString *ret, QSet<AbstractMacroExpander *> &seen) override
{
// Prevent loops:
const int count = seen.count();
@@ -113,10 +111,10 @@ public:
QMap<QByteArray, QString> m_descriptions;
QString m_displayName;
QVector<MacroExpanderProvider> m_subProviders;
bool m_accumulating;
bool m_accumulating = false;
bool m_aborted;
int m_lockDepth;
bool m_aborted = false;
int m_lockDepth = 0;
};
} // Internal