diff options
| author | aavit <qt-info@nokia.com> | 2010-02-08 10:10:57 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2010-02-08 10:10:57 (GMT) |
| commit | dd1a2ad2eb40afd29d418cdf54544d110d39dc25 (patch) | |
| tree | 2d17f5a85f6bc38e1dd80d3ea09800aff0af29b0 /src/tools/uic/cpp/cppwriteinitialization.cpp | |
| parent | 76bcd00f74b0977b5f6ce12295aae987ea9ad4c1 (diff) | |
| parent | fd30747b5b54a760ca280ad1e75ce87026478f5e (diff) | |
| download | Qt-dd1a2ad2eb40afd29d418cdf54544d110d39dc25.zip Qt-dd1a2ad2eb40afd29d418cdf54544d110d39dc25.tar.gz Qt-dd1a2ad2eb40afd29d418cdf54544d110d39dc25.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2
Diffstat (limited to 'src/tools/uic/cpp/cppwriteinitialization.cpp')
| -rw-r--r-- | src/tools/uic/cpp/cppwriteinitialization.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp index d9aff1b..8099ffa 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.cpp +++ b/src/tools/uic/cpp/cppwriteinitialization.cpp @@ -2787,8 +2787,8 @@ static void generateMultiDirectiveBegin(QTextStream &outputStream, const QSet<QS return; QMap<QString, bool> map; // bool is dummy. The idea is to sort that (always generate in the same order) by putting a set into a map - foreach (QString str, directives) - map[str] = true; + foreach (const QString &str, directives) + map.insert(str, true); if (map.size() == 1) { outputStream << "#ifndef " << map.constBegin().key() << endl; @@ -2797,7 +2797,7 @@ static void generateMultiDirectiveBegin(QTextStream &outputStream, const QSet<QS outputStream << "#if"; bool doOr = false; - foreach (QString str, map.keys()) { + foreach (const QString &str, map.keys()) { if (doOr) outputStream << " ||"; outputStream << " !defined(" << str << ')'; |