diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2017-12-04 11:10:27 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-12-07 09:32:41 +0000 |
| commit | 281f8519f4bde3dcf59c23fa9c7e1b2739506c74 (patch) | |
| tree | c31906762428709e4478a8d7a75937c25b43fda3 /src/app | |
| parent | 27c9b480769fd2447907cd6ab25f750ca79aa955 (diff) | |
Do not use the set class outside corelib
It was and is meant for internal use only.
Change-Id: Ibe15f5838f9b728ec397a668a94128abe4ef5efa
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/qbs/parser/parsercommand.cpp | 5 | ||||
| -rw-r--r-- | src/app/qbs/parser/parsercommand.h | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/app/qbs/parser/parsercommand.cpp b/src/app/qbs/parser/parsercommand.cpp index 3649b6cf1..b85e98540 100644 --- a/src/app/qbs/parser/parsercommand.cpp +++ b/src/app/qbs/parser/parsercommand.cpp @@ -45,6 +45,7 @@ #include <tools/error.h> #include <tools/hostosinfo.h> #include <tools/qbsassert.h> +#include <tools/stlutils.h> #include <tools/qttools.h> #include <QtCore/qmap.h> @@ -136,10 +137,10 @@ void Command::parseOption(QStringList &input) && option->longRepresentation() != optionString) { continue; } - if (m_usedOptions.contains(option) && !option->canAppearMoreThanOnce()) + if (contains(m_usedOptions, option) && !option->canAppearMoreThanOnce()) throwError(Tr::tr("Option '%1' cannot appear more than once.").arg(optionString)); option->parse(type(), optionString, input); - m_usedOptions << option; + m_usedOptions.insert(option); matchFound = true; break; } diff --git a/src/app/qbs/parser/parsercommand.h b/src/app/qbs/parser/parsercommand.h index 11b589a2e..649563ba1 100644 --- a/src/app/qbs/parser/parsercommand.h +++ b/src/app/qbs/parser/parsercommand.h @@ -42,7 +42,7 @@ #include "commandlineoption.h" #include "commandtype.h" -#include <tools/set.h> +#include <set> namespace qbs { class CommandLineOptionPool; @@ -78,7 +78,7 @@ private: virtual QList<CommandLineOption::Type> supportedOptions() const = 0; QStringList m_additionalArguments; - Internal::Set<CommandLineOption *> m_usedOptions; + std::set<CommandLineOption *> m_usedOptions; const CommandLineOptionPool &m_optionPool; }; |