Commit Graph

27340 Commits

Author SHA1 Message Date
Nikolai Kosjar
8fe25d0a4a C++: Add settings dialog for pointer declaration formatting
The dialog is at Tools > Options > C++ > Code Style > Edit... > Pointers
and References.

Currently the settings are referenced when applying the following
QuickFixes:
 - Adapting function signature in declaration/definition
   (FunctionDeclDefLink)
 - Inserting declaration from definition (InsertDeclOperation)
 - Inserting definition from declaration (InsertDefOperation)
 - Extracting a function (ExtractFunctionOperation)
 - Add Local Declaration (AddLocalDeclarationOp::Operation)

In these cases the code style of the current project is used. If there
is no current project open, the current global code style is used.

Task-number: QTCREATORBUG-6169

Change-Id: I3e4e502b3103f7f754ac9b39594ad461d89d9304
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-01-24 11:59:40 +01:00
Nikolai Kosjar
138066792e C++: Introduce PointerDeclarationFormatter
For a given AST, CppRefactoringFile and Overview this will create a
ChangeSet for rewriting the pointer or reference declaration according
to the Overview.

Task-number: QTCREATORBUG-6169

Change-Id: If6f824c1ea5e9f53a11a58ec8b6d696d01f0723e
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-01-24 11:59:14 +01:00
Erik Verbruggen
fa7ab13f30 C++: test for walking includes in frameworks.
Change-Id: Id31ce6b40d72351cfaefa5035469b87662526853
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-01-24 11:36:22 +01:00
Orgad Shaneh
fcf586974f InfoBar: Suppress warning on close
Change-Id: Ie8c19db3e7569c20c1f8d5c6651f1b9b0f7db9dd
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-01-24 11:32:50 +01:00
David Schulz
d7d4346af3 Editor: Added documentation and comments to BaseTextDocument::save.
Change-Id: Ia1ccf30209ca2e802268afea6bc1dfeed421007d
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-01-24 11:26:50 +01:00
hjk
e52a35a239 Debugger: rename gdb/gdbmi.{h,cpp} into debuggerprotocol.{h,cpp}
The scope is a bit broader nowadays.

Change-Id: I9578da94f06df199be5668c1751fd7bfb37f1c5b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-01-24 11:05:36 +01:00
Daniel Teske
09cd8bf4e6 AbstractProcessStep: Remove pure virtual function declarations
Those don't add anything since those functions are already virtual in
BuildStep. Also immutable() is not pure in BuildStep.

Change-Id: I068e703de444581ac4c053fed6f1793bddcd56e3
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-01-24 10:45:49 +01:00
Orgad Shaneh
bd31f2ad38 VCSBaseEditor: Make diffFileBrowse more generic
Log entries can also be displayed in this combo box...

Change-Id: Ibd75f436013f58d18963a675ce01a20385cc7dfd
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-01-24 10:44:27 +01:00
Daniel Teske
a4b8dabbf4 AbstractRemoteLinuxDeployService: Remove unecessary checks
Change-Id: I769a2f514843a3825d3d5a2f8a61b9e9f5f9f537
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-01-24 10:44:06 +01:00
hjk
52be02d1cb QMakeParser: save one ByteArray construction
Change-Id: I2845fdefb8b32de227f08017e0e3ad98923d1c87
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-01-24 10:41:24 +01:00
Daniel Teske
6804b52030 TarPackageCreationStep: Use static_cast not qobject_cast
Change-Id: Ief5a5835eb43a7e24db04315166fc3723b9ed997
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-01-24 10:40:50 +01:00
Friedemann Kleint
1bb0a7f174 Fix compilation with Qt 5.
Q_GLOBAL_STATIC_WITH_INITIALIZER was removed.

Change-Id: Ie030f2fa66c97ae1bfd8ede95c573453a7f03d2a
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-01-24 08:57:14 +01:00
Orgad Shaneh
b53d398e2c Git: Add context-menu actions for cherry-pick and revert
Change-Id: Ic266fe039423a37df2fc347ead7530322ac47bb8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-01-23 18:50:45 +01:00
Kai Koehne
5e5831bb12 Add a space after "Error:" in tooltip
Change-Id: I0ecefcedf49175abee7a71ddce9ce9630b989a17
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-01-23 17:59:42 +01:00
Tobias Hunger
5e197c8c9d Options Dialog: Move Android, Blackberry and Devices together
Change-Id: Ie91735bc4f9d0c6b84ff7347538906290473e07e
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-01-23 17:59:11 +01:00
Orgad Shaneh
e463c56c32 Git: Fix calls to ensureStash
Change-Id: I581afbe314055796d22f883e501dfb5fd17117fe
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-01-23 17:56:57 +01:00
Tobias Hunger
4e5e6b45fe Core::Id: Fix possible crash in operator ==
Revert a workaround applied earlier

Change-Id: I825bdf6df662a5509166b9b7d12a4fb305cba6cd
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-01-23 15:59:19 +01:00
Marco Bubke
04db5c4479 QmlDesigner: Compile fix
Change-Id: I6e4a557ed1414a737a367ad1194a2e3608316ecc
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-01-23 15:45:13 +01:00
Orgad Shaneh
5afe67a6c0 Fix crash on Id comparison
Task-number: QTCREATORBUG-8600
Change-Id: Ib6993476b503409534314bb1fdf990faa9d9f32a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-01-23 15:44:39 +01:00
Tobias Hunger
a3ebfae11d Fix build
Change-Id: Ie17ac67829d647572f52f51d0a5aea6f3622bbc8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-01-23 15:40:44 +01:00
Fawzi Mohamed
7b166ccc09 Revert "qmljs/parser: update to latest qt5 parser"
error 'QmlJS::Engine' does not have any field named 'directives to be fixed

This reverts commit 7d76f9040a933981ed44b2b4f0a6edcff034be6a

Change-Id: I24dbe6829ed3920af0f53f2ec31eba82ebdf749f
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-01-23 15:20:56 +01:00
Orgad Shaneh
77c606917b VCS: Be less strict when matching diff files
The provided regexps can be partial. They must match
from the beginning of the line, but matching line's
end is not required (for example, CVS pattern matches
until first tab)

Change-Id: I8fdf162aebf6d275a9ef1ed3340c0c7599eb36f8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-01-23 15:14:19 +01:00
Orgad Shaneh
89d16332d1 Git: Replace synchronousStash with ensureStash
When flags are not used. syncStash doesn't return result,
which can be useful for StashGuard

Change-Id: I1327b5d8d10410e7a3b9fdb07a03b476d5abcdc4
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-01-23 15:13:27 +01:00
Orgad Shaneh
8b67ae7395 Git: Write error to error stream in executeSyncStash
Change-Id: I36c70fc3df5958b7bb5378e2529a451c497d6632
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-01-23 15:11:03 +01:00
Friedemann Kleint
3bdf33a732 QNX: Fix compilation with Qt 5.
Change-Id: Ic0a4c0e2e66c52f8acb2a86b656cbc2ca3d0a4bf
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-01-23 15:07:21 +01:00
Orgad Shaneh
246f8e9aaf Git: Fix indentation in ensureStash()
Change-Id: I5243fce895ae21a2b07cb9e0d98a60d69f848b10
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-01-23 15:05:27 +01:00
Orgad Shaneh
daef1fbb88 Git: Use stash pop instead of apply...
... when the stash should be removed on successful pop

Change-Id: I39b2c01b0a518d3c70bcb8dc898191cca6d3e84d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-01-23 14:59:24 +01:00
Orgad Shaneh
53443616e5 Git: Fix pull
regression from 40eecd87c9

Change-Id: Ibbf4082f9949ca25d22d7ba707281ae6652249ce
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-01-23 14:57:27 +01:00
Orgad Shaneh
64018aed8a VCS: Highlight log with diff
Change-Id: I46abd51e5764571138c54df81cc3adbeadb26840
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-01-23 14:55:02 +01:00
Marco Bubke
8d9710c074 Refactoring document handling
The document handling in the qml designer was complicated source
code, which was initially intended for a non creator application.
To integrate new views it has to be changed and cleaned up. This
is the first major step in that direction.

Change-Id: Ie26f0aad7a03946d18bdb4c0759b246c5439d922
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2013-01-23 14:53:28 +01:00
Mehdi Fekari
a4455f3711 Qnx: Do not override IP user input value
Change-Id: I3a697cf1392e1ce13310e2af1c3e7d7af1fdf79d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-01-23 14:53:21 +01:00
Fawzi Mohamed
f0e4df5826 qmljs/parser: update to latest qt5 parser
fix error semicolon insertion of loops, strict mode
Change-Id: I311733ffb34269d1cee7e576d05af78893b2bcbb
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-01-23 14:47:26 +01:00
Orgad Shaneh
111872591e Qnx: Add missing dependency
BarDescriptor editor uses TextEditor objects

Change-Id: I9b8cf7be8cec54f01fbaa41da210496258d8a9df
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-01-23 14:42:04 +01:00
Francois Ferrand
83dff048cf Highlight macro definitions like other uses.
Change-Id: I5a0852e5c1e154b52d712f1dfcfe2fc04e0eb9fb
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-01-23 14:39:05 +01:00
Francois Ferrand
f128a92485 Highlight references to macro under cursor.
Uses to be done only for symbols, implement for macros as well.

Change-Id: I5403527cc8b423e7051c3ce470e2f40ad65e65d5
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-01-23 14:36:59 +01:00
Nikolai Kosjar
8c3794f9d1 C++: Add star binding to TypePrettyPrinter
Now we can specify if we want to print a whitespace before and/or after
'*'/'&' when printing pointer and reference types.

Task-number: QTCREATORBUG-6169

Change-Id: Ida1b035aa4fd79be9108934b75f236db9f7238af
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-01-23 14:30:39 +01:00
Tobias Hunger
b6a9d58f69 Git: Fix issues in the branch dialog
* Split part/next/last into a 'part' node and a 'next/last' node
  instead of 'part/next' and 'last' node. This is closer to what git does.

* Fix some model-issues along the way;)

* Unhighlight remote checked-out branches again once they are no longer
  the current one.

* Remove stale nodes after removing a branch. When removing 'first/next'
  kind of branches, do not keep a empty 'first' in the tree.

Task-number: QTCREATORBUG-8518

Change-Id: Ia5650540aa58354aaab513199c8622392bdbd37f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
2013-01-23 14:11:47 +01:00
Robert Loehning
3898effa68 debugger: compile fix for MSVC in self test
Change-Id: I44304538e18775833a995a50d6b696d666083baa
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-01-23 14:03:16 +01:00
Friedemann Kleint
ec2076c755 Fix lupdate warnings.
Change-Id: Idef345e12223cf6695ea5af8ee7fa1e51c72be0f
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-01-23 10:51:54 +01:00
Friedemann Kleint
e7aded4052 Fix tr()-usage in fakevim.
Change-Id: I21b2fcbe6b638b0b07341c23aac6028607de4fdf
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-01-23 10:49:14 +01:00
hjk
c08da42685 Debugger: fix loading of dumpers when attaching to running process
This was a recent regression trigger by delaying the dumper loading.

Change-Id: Ief9ad8ab21728ba8f1ad743e8b9a410655c47ae1
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-01-23 10:47:46 +01:00
hjk
c74835d519 Tooltip: Remove TipFactory
It's not really used as such.

Change-Id: Ia748cdb5273d661dfea9f8f39a17a872d3ee4de6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-01-23 10:47:27 +01:00
Orgad Shaneh
66985fa8d6 VCS: Use #ifdef WITH_TESTS instead of #if
Change-Id: I8e2003111d620c0f1708c97e6a02cbc921b031d9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-01-22 21:56:18 +01:00
Robert Loehning
ef3647ad43 debugger: Updated self test
Change-Id: Id9eeb62ff336843ce196dfebc771f03ae22d3cbc
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-01-22 17:49:58 +01:00
Eike Ziller
cec327bd4a Close variable chooser when pressing escape.
Even if the variable chooser currently doesn't have focus.

Task-number: QTCREATORBUG-7155
Change-Id: Ie3a7527e13dd6c3f37c1abe86a596753d2b8e286
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-01-22 17:48:19 +01:00
Tobias Nätterlund
ed69c5f9c9 QNX: Add editor for Bar descriptor file
Change-Id: I7ad9bb9448ef467eea353d361b72474fe1b8c8f7
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-01-22 16:14:46 +01:00
Jarek Kobus
d3286c2ce0 Add some methods which will be needed by diff editor
Change-Id: Iae85e123a5b72e85b8b55359267bc1b2810a640b
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-01-22 16:05:15 +01:00
Orgad Shaneh
3b66b11ac4 VCS: Add diff pattern tests for CVS and Mercurial
* Fix Mercurial pattern
* Make fileNameFromDiffSpecification protected again (it was made
  public for running tests, but they are now run from VCSBaseEditor)
* Remove DiffHighlighter::filePattern(). Not used anymore.

Change-Id: Ifc99f761f0ab96cc79f1d018e3f3c8cf4603da10
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-01-22 13:38:01 +01:00
Przemyslaw Gorszkowski
23844410fd C++ editor: support nested class of enclosing template
Fixing:
* highlighting
* tooltips
* find usage
* selecting

Task-number: QTCREATORBUG-8245
Change-Id: I6e900799e43126706125b7e424567fca2b2c223e
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-01-22 11:35:25 +01:00
David Schulz
bc137f36a7 Editor: Removed useless local variable.
No need to create local variables for pointers
which are used just once.

Change-Id: If917689019ac1319b9f9d3aee8fa15ec5a34d751
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-01-21 15:37:42 +01:00