diff options
author | Alessandro Portale <alessandro.portale@qt.io> | 2018-07-23 10:45:40 +0200 |
---|---|---|
committer | Alessandro Portale <alessandro.portale@qt.io> | 2018-07-24 12:21:42 +0000 |
commit | f6943a712abd5cf1f213aeb5cb984a4ab61ae139 (patch) | |
tree | 5771391e68dd1d10e3af4cc43cf54a9b4e6de629 /src/libs/utils/macroexpander.h | |
parent | 00c926b6b44c78c14095369aa908110a2f9e24a7 (diff) | |
download | qt-creator-f6943a712abd5cf1f213aeb5cb984a4ab61ae139.tar.gz |
Utils: Modernize further
Many issues, mostly in headers, were not addressed in
e38410b76c40ffde33cf1ab405926cd243c4e48c
modernize-use-auto
modernize-use-nullptr
modernize-use-override
modernize-use-using
modernize-use-default-member-init
modernize-use-equals-default
Change-Id: I320a51726db881e582b898948d53735ebb06887a
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/libs/utils/macroexpander.h')
-rw-r--r-- | src/libs/utils/macroexpander.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libs/utils/macroexpander.h b/src/libs/utils/macroexpander.h index ff96eb1089..f17ae86b8c 100644 --- a/src/libs/utils/macroexpander.h +++ b/src/libs/utils/macroexpander.h @@ -38,8 +38,8 @@ namespace Utils { namespace Internal { class MacroExpanderPrivate; } class MacroExpander; -typedef std::function<MacroExpander *()> MacroExpanderProvider; -typedef QVector<MacroExpanderProvider> MacroExpanderProviders; +using MacroExpanderProvider = std::function<MacroExpander *()>; +using MacroExpanderProviders = QVector<MacroExpanderProvider>; class QTCREATOR_UTILS_EXPORT MacroExpander { @@ -59,10 +59,10 @@ public: QString expandProcessArgs(const QString &argsWithVariables) const; - typedef std::function<QString(QString)> PrefixFunction; - typedef std::function<bool(QString, QString *)> ResolverFunction; - typedef std::function<QString()> StringFunction; - typedef std::function<int()> IntFunction; + using PrefixFunction = std::function<QString(QString)>; + using ResolverFunction = std::function<bool(QString, QString *)>; + using StringFunction = std::function<QString()>; + using IntFunction = std::function<int()>; void registerPrefix(const QByteArray &prefix, const QString &description, const PrefixFunction &value); |