diff options
author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2013-01-08 03:32:53 +0200 |
---|---|---|
committer | hjk <qthjk@ovi.com> | 2013-01-08 10:48:18 +0100 |
commit | 29a93998df8405e8799ad23934a56cd99fb36403 (patch) | |
tree | c0e4a341efeef78fbe530a618caaa50254daad59 /src/plugins/qmlprojectmanager/fileformat | |
parent | 73a2717bed511cffd0163195c314f7d919e5128b (diff) | |
download | qt-creator-29a93998df8405e8799ad23934a56cd99fb36403.tar.gz |
Remove braces for single lines of conditions
#!/usr/bin/env ruby
Dir.glob('**/*.cpp') { |file|
# skip ast (excluding paste, astpath, and canv'ast'imer)
next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i
s = File.read(file)
next if s.include?('qlalr')
orig = s.dup
s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m|
res = $&
if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces
res
else
res.gsub!('} else', 'else')
res.gsub!(/\n +} *\n/m, "\n")
res.gsub(/ *{$/, '')
end
}
s.gsub!(/ *$/, '')
File.open(file, 'wb').write(s) if s != orig
}
Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc
Reviewed-by: hjk <qthjk@ovi.com>
Diffstat (limited to 'src/plugins/qmlprojectmanager/fileformat')
-rw-r--r-- | src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp | 21 | ||||
-rw-r--r-- | src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.cpp | 3 |
2 files changed, 9 insertions, 15 deletions
diff --git a/src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp b/src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp index 57ef21ea34..489443dd11 100644 --- a/src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp +++ b/src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp @@ -129,11 +129,10 @@ bool FileFilterBaseItem::recursive() const } else if (m_recurse == DoNotRecurse) { recursive = false; } else { // RecurseDefault - if (m_explicitFiles.isEmpty()) { + if (m_explicitFiles.isEmpty()) recursive = true; - } else { + else recursive = false; - } } return recursive; } @@ -142,11 +141,10 @@ void FileFilterBaseItem::setRecursive(bool recurse) { bool oldRecursive = recursive(); - if (recurse) { + if (recurse) m_recurse = Recurse; - } else { + else m_recurse = DoNotRecurse; - } if (recurse != oldRecursive) updateFileList(); @@ -204,11 +202,10 @@ QString FileFilterBaseItem::absolutePath(const QString &path) const QString FileFilterBaseItem::absoluteDir() const { QString absoluteDir; - if (QFileInfo(m_rootDir).isAbsolute()) { + if (QFileInfo(m_rootDir).isAbsolute()) absoluteDir = m_rootDir; - } else if (!m_defaultDir.isEmpty()) { + else if (!m_defaultDir.isEmpty()) absoluteDir = m_defaultDir + QLatin1Char('/') + m_rootDir; - } return QDir::cleanPath(absoluteDir); } @@ -264,15 +261,13 @@ void FileFilterBaseItem::updateFileListNow() bool FileFilterBaseItem::fileMatches(const QString &fileName) const { foreach (const QString &suffix, m_fileSuffixes) { - if (fileName.endsWith(suffix, Qt::CaseInsensitive)) { + if (fileName.endsWith(suffix, Qt::CaseInsensitive)) return true; - } } foreach (QRegExp filter, m_regExpList) { - if (filter.exactMatch(fileName)) { + if (filter.exactMatch(fileName)) return true; - } } return false; diff --git a/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.cpp b/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.cpp index bb9f1006fd..2dbdd7d372 100644 --- a/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.cpp +++ b/src/plugins/qmlprojectmanager/fileformat/qmlprojectitem.cpp @@ -56,9 +56,8 @@ QList<QmlFileFilterItem*> QmlProjectItemPrivate::qmlFileFilters() const for (int i = 0; i < content.size(); ++i) { QmlProjectContentItem *contentElement = content.at(i); QmlFileFilterItem *qmlFileFilter = qobject_cast<QmlFileFilterItem*>(contentElement); - if (qmlFileFilter) { + if (qmlFileFilter) qmlFilters << qmlFileFilter; - } } return qmlFilters; } |