From 29a93998df8405e8799ad23934a56cd99fb36403 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Tue, 8 Jan 2013 03:32:53 +0200 Subject: 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 --- src/plugins/texteditor/codeassist/genericproposalwidget.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/plugins/texteditor/codeassist/genericproposalwidget.cpp') diff --git a/src/plugins/texteditor/codeassist/genericproposalwidget.cpp b/src/plugins/texteditor/codeassist/genericproposalwidget.cpp index 07c52597b6..2a58eb93bd 100644 --- a/src/plugins/texteditor/codeassist/genericproposalwidget.cpp +++ b/src/plugins/texteditor/codeassist/genericproposalwidget.cpp @@ -136,13 +136,12 @@ QVariant ModelAdapter::data(const QModelIndex &index, int role) const if (index.row() >= m_completionModel->size()) return QVariant(); - if (role == Qt::DisplayRole) { + if (role == Qt::DisplayRole) return m_completionModel->text(index.row()); - } else if (role == Qt::DecorationRole) { + else if (role == Qt::DecorationRole) return m_completionModel->icon(index.row()); - } else if (role == Qt::WhatsThisRole) { + else if (role == Qt::WhatsThisRole) return m_completionModel->detail(index.row()); - } return QVariant(); } -- cgit v1.2.1