summaryrefslogtreecommitdiffstats
path: root/src/tools/moc/moc.cpp
diff options
context:
space:
mode:
authorJan-Arve Saether <jan-arve.saether@nokia.com>2011-09-07 06:20:24 (GMT)
committerJan-Arve Saether <jan-arve.saether@nokia.com>2011-09-07 06:20:24 (GMT)
commit9d34e9d705cf2f054a668d9e6aafb2efcd500913 (patch)
tree68f2b626e84ba9772c0e7c81e48a1e300421f145 /src/tools/moc/moc.cpp
parent80f9451b605aa2eb181d76b79bc1869a3cd9e513 (diff)
parent3927585b3c74c8ccf61b84a525947237f02ea485 (diff)
downloadQt-9d34e9d705cf2f054a668d9e6aafb2efcd500913.zip
Qt-9d34e9d705cf2f054a668d9e6aafb2efcd500913.tar.gz
Qt-9d34e9d705cf2f054a668d9e6aafb2efcd500913.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-team
Diffstat (limited to 'src/tools/moc/moc.cpp')
-rw-r--r--src/tools/moc/moc.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/moc/moc.cpp b/src/tools/moc/moc.cpp
index 13f57f5..9309db1 100644
--- a/src/tools/moc/moc.cpp
+++ b/src/tools/moc/moc.cpp
@@ -216,8 +216,8 @@ Type Moc::parseType()
QByteArray templ = lexemUntil(RANGLE);
for (int i = 0; i < templ.size(); ++i) {
type.name += templ.at(i);
- if ((templ.at(i) == '<' && i < templ.size()-1 && templ.at(i+1) == ':')
- || (templ.at(i) == '>' && i < templ.size()-1 && templ.at(i+1) == '>')) {
+ if ((templ.at(i) == '<' && i+1 < templ.size() && templ.at(i+1) == ':')
+ || (templ.at(i) == '>' && i+1 < templ.size() && templ.at(i+1) == '>')) {
type.name += ' ';
}
}