feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Remove braces for single lines of conditions

Browse Source 
#!/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>
This commit is contained in:
Orgad Shaneh
2013-01-08 03:32:53 +02:00
committed by hjk
parent 73a2717bed
commit 29a93998df
396 changed files with 1856 additions and 3135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/projectexplorer/taskmodel.cpp
View File

@@ -252,25 +252,24 @@ QVariant TaskModel::data(const QModelIndex &index, int role) const
if (!index.isValid() || index.row() >= m_tasks.count() || index.column() != 0)
return QVariant();
if (role == TaskModel::File) {
if (role == TaskModel::File)
return m_tasks.at(index.row()).file.toString();
} else if (role == TaskModel::Line) {
else if (role == TaskModel::Line)
return m_tasks.at(index.row()).line;
} else if (role == TaskModel::MovedLine) {
else if (role == TaskModel::MovedLine)
return m_tasks.at(index.row()).movedLine;
} else if (role == TaskModel::Description) {
else if (role == TaskModel::Description)
return m_tasks.at(index.row()).description;
} else if (role == TaskModel::FileNotFound) {
else if (role == TaskModel::FileNotFound)
return m_fileNotFound.value(m_tasks.at(index.row()).file.toString());
} else if (role == TaskModel::Type) {
else if (role == TaskModel::Type)
return (int)m_tasks.at(index.row()).type;
} else if (role == TaskModel::Category) {
else if (role == TaskModel::Category)
return m_tasks.at(index.row()).category.uniqueIdentifier();
} else if (role == TaskModel::Icon) {
else if (role == TaskModel::Icon)
return taskTypeIcon(m_tasks.at(index.row()).type);
} else if (role == TaskModel::Task_t) {
else if (role == TaskModel::Task_t)
return QVariant::fromValue(task(index));
}
return QVariant();
}