#!/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>

Also rename m to model

Change-Id: Ibb283dc2d5d0c306cbac9109a7e5fc6481ac86a8
Reviewed-by: hjk <qthjk@ovi.com>

It might fail because a particular branch points to an invalid commit.
We don't want that to prevent display of all other branches.

Change-Id: I8fe427735351fc458c99396dc1f9d77bc948468e
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: Id11af855460f301b04afcddedbc8a2af6d2f4bd8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: I0ff6ef8c3e6e8f4a02c2135da30be2f03f82c648
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>

Allow user to handle local changes when switching branches.

Task-number: QTCREATORBUG-8417
Change-Id: I62d615aadfbd81c8ae03f3cd292b98773a36e1e7
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Added git functions - "Merge" and "Rebase"
They are in the "Branches" dialog:
- Merge - merge selected branch into current one
- Rebase - rebase current branch on selected one

Task-number: QTCREATORBUG-8367

Change-Id: I9ed306c64d5d4b7bd1d58730a5e1009f0bd4ec0e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Default implementation is between O(n) (for identical models) to
O(n*m) (for disjoint models). If sort order is known, this
can be reduced to O(n+m), like in Git implementation.

Change-Id: I44662a22961311cb882601d20efa9d445f74748b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>

Much cleaner

Change-Id: I090e5d04e5afae1023fa58eca1ef416ddc069165
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

It belongs there

Change-Id: I4b4cdacf32b0eab299d4b2d5258cd4d91a759907
Reviewed-by: hjk <qthjk@ovi.com>

Change-Id: I0ef6e4419596b7cc0f8a574917fec5af94ff8832
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>

Change-Id: Iea772405ecb55a2f556a1b50ec3712ed91de3d9d
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>

Change-Id: If87cd649267cd3a48973580acab2227ad9d5ac44
Reviewed-by: hjk <qthjk@ovi.com>

Change-Id: I90097e11689fbbb964fc4344a1e3ba60c718a1cf
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>

Change-Id: I4dd00dca652c1cb60c952ebc11b3c5f8767d4ecc
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

Change-Id: I68930a302faf056dfa5e67c3ccbe3c43ce1b8c0c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

Without unixutils Creator does not link on Windows anymore.
The reason is FileUtils::showInGraphicalShell()
which calls UnixUtils::fileBrowser() and
UnixUtils::substituteFileBrowserParameters().

Since UnixUtils compile on Windows I added them.
Propably UnixUtils should be merged into FileUtils,
if they are used and make sense on all platforms.

Change-Id: I3fb49fb2c0c54fb9336298f006e2937ae29d413b
Reviewed-by: hjk <qthjk@ovi.com>

The methods Utils::UnixUtils::fileBrowser and
Utils::UnixUtils::substituteFileBrowserParameters are both declared when
compiling on MacOS, but their implementation is not compiled into
libutils. So this gives linker errors.

Change-Id: I0befb607dda0a83d681068f8236167ba88918460
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>

Change-Id: I37a430ba276b849666954bd164c2981aad1b4ee9
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>

To be used in the ClangCodeModel, because there is no other way to find
out if the ProjectParts got changed.

Change-Id: Ie5681b4997adb9103499cf2864c81970cbd2be55
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>

Change-Id: Id258e485a5875a15bf73af4e8cb6a5308227ff0f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>

It's not used otherwise.

Change-Id: I926f5b3d5ea08a5768b61350f2d399eda702aad3
Reviewed-by: hjk <qthjk@ovi.com>

Change-Id: Ic158cf3b88fb0f8c69c1bc5cf45963e2ae9296e5
Reviewed-by: hjk <qthjk@ovi.com>

Change-Id: I551d0f49d6da2555cfe2acbd28ad5f76f20ea29c
Reviewed-by: hjk <qthjk@ovi.com>

Task-number: QTCREATORBUG-8513

Change-Id: I1241c05c18f6fa7e1f22276253419c395ae9013b
Reviewed-by: hjk <qthjk@ovi.com>

Change-Id: Ia241c05c18f6fa7e1f22276253419c395ae9013b
Reviewed-by: Marco Bubke <marco.bubke@digia.com>

Change-Id: I57cd5295f7a3b58906e9b158e88d9128142d4311
Reviewed-by: hjk <qthjk@ovi.com>

It is confusing that save is missing in the context menu
of the editor manager.

Split mode requires to use different actions then the ones
in the File menu, since the editor in question might not be the
current editor.

Change-Id: I47cd5295f7a3b58906e9b158e88d9128142d4311
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>

Those 3 project managers can't easily figure out the right mode for code
parsing. The code we are parsing is predominantly C++98 code. But for
those using C++98 toolchains having valid C++11 code not be marked as a
error is probably not much of a problem, whereas the reverse, using a
C++11 toolchain and having valid code being marked as a error is
annoying.

Change-Id: I8dcc172029045cf591b3ba0adef1585f3f94fd39
Reviewed-by: hjk <qthjk@ovi.com>

Refactor the separate view from directly using a QTabWidget to a subclass
so that the necessary signal can be hooked up.

Change-Id: Ibc2653d554882a36a85162708021422843057bc1
Reviewed-by: hjk <qthjk@ovi.com>

Change-Id: I10c127852aa65958497d2b48af1d52c6a33c57ab
Reviewed-by: hjk <qthjk@ovi.com>

And use a capital D for Detached

Change-Id: I406269c6498be07d18b2febd0635984cff76b122
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Submodules are not stashed and are not considered a conflict after revert

Change-Id: I97a0792db615054622b9b67a7f6b58b5aee05273
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Including Git implementation

Task-number: QTCREATORBUG-5644

Change-Id: Ic5dede99d93b84e5d271292b4694216f51e66882
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: Iaf846c387caed2b6636e5b057dce0b685d07012d
Reviewed-by: hjk <qthjk@ovi.com>

Change-Id: Iabf481486582e61b08baf8d71416ae41984b9cff
Reviewed-by: hjk <qthjk@ovi.com>

Change-Id: I35754e7bcc59232f4fa9be9b0f136de3e5365896
Reviewed-by: hjk <qthjk@ovi.com>

Change-Id: Ia3074053da465b5ce999955f428c970f1b01a265
Reviewed-by: hjk <qthjk@ovi.com>

bool operator<(const CommitData::StateFilePair &a, ...) needs to
be defined _after_ Q_DECLARE_OPERATORS_FOR_FLAGS(Git::Internal::FileStates)

Change-Id: I03d5d79e2b77d0063c588aff1c549afd78a0ee3d
Reviewed-by: hjk <qthjk@ovi.com>

Change-Id: If41dd33952844223788bf0bc54245732b229fe45
Reviewed-by: hjk <qthjk@ovi.com>