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

9
src/plugins/updateinfo/updateinfoplugin.cpp
View File

@@ -98,9 +98,8 @@ UpdateInfoPlugin::~UpdateInfoPlugin()
void UpdateInfoPlugin::startCheckTimer(uint milliseconds)
{
if (d->currentTimerId != 0) {
if (d->currentTimerId != 0)
stopCurrentCheckTimer();
}
d->currentTimerId = startTimer(milliseconds);
}
@@ -150,9 +149,8 @@ bool UpdateInfoPlugin::initialize(const QStringList & /* arguments */, QString *
QDomDocument UpdateInfoPlugin::checkForUpdates()
{
if (QThread::currentThread() == QCoreApplication::instance()->thread()) {
if (QThread::currentThread() == QCoreApplication::instance()->thread())
qWarning() << Q_FUNC_INFO << " Was not designed to run in main/gui thread -> it is using updaterProcess.waitForFinished()";
}
//starting
QProcess updaterProcess;
@@ -203,9 +201,8 @@ void UpdateInfoPlugin::reactOnUpdaterOutput()
void UpdateInfoPlugin::startUpdaterUiApplication()
{
QProcess::startDetached(d->updaterProgram, QStringList() << d->updaterRunUiArgument);
if (!d->updateInfoProgress.isNull()) {
if (!d->updateInfoProgress.isNull())
d->updateInfoProgress->setKeepOnFinish(Core::FutureProgress::HideOnFinish); //this is fading out the last updateinfo
}
startCheckTimer(OneMinute);
}