Commit Graph

36222 Commits

Author SHA1 Message Date
Przemyslaw Gorszkowski 9b6d4573aa C++: fix 'using' in separate block of scope
Task-number: QTCREATORBUG-12357
Change-Id: I7397b0e66783d3249daa5a8ee422bfd5f5bc7bea
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-06-13 23:32:07 +02:00
Nikolai Kosjar 6a700ff057 CppEditor: Extract CanonicalSymbol
Change-Id: I42c55f844c4228725251df8c985bfc275925f2ff
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-06-13 18:21:48 +02:00
Nikolai Kosjar 3d849e377e CppEditor: Clean up CanonicalSymbol
* Remove the static function since it's not really needed
* Make it independent of SemanticInfo

Change-Id: I8d8ea5578f5f9364a26c543277e56bdb5b947049
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-06-13 18:21:30 +02:00
Nikolai Kosjar d34654c1aa CppEditor: Extract CppDocumentationCommentHelper
Change-Id: Iefaff837565f0aaf7e52263daa40a58fc391df36
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-06-13 18:05:14 +02:00
Nikolai Kosjar a2bec569e9 CppEditor: Respect navigation history when using cppeditor outline
Task-number: QTCREATORBUG-12281
Change-Id: I95aef60943ec76dd035914e0d13aef7b8db8e211
Reviewed-by: David Schulz <david.schulz@digia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-06-13 18:05:03 +02:00
Nikolai Kosjar 4ecadb38a0 CppEditor: Extract CppEditorOutline
Change-Id: I3b41f91f17ce9fb24796f2f6bff353fb3c6177ec
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-06-13 18:04:52 +02:00
Nikolai Kosjar eaecac2fd9 CppEditor: Extract CppLocalRenaming
Now CppEditorWidget is much less convoluted with the local rename mode.

This class can be reused since there is no dependency on
CPPEditorWidget.

Change-Id: If513e59a03214cf9f2e3831f7e3616c001e1f036
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-06-13 18:04:40 +02:00
Eike Ziller 98ae1bf67b Make document model API more consistent with entry vs document
Change-Id: Iae2fe480d9fcb564d566f1dcca142c21c99c2d5b
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-06-13 17:37:31 +02:00
Nikolai Kosjar e828f60c90 CppEditor: Use BaseTextEditor{Widget} if possible
Change-Id: I59c420c6469717e552469d176bbeac3a455f3bb0
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-06-13 17:36:18 +02:00
Nikolai Kosjar 4e8b1544b7 CppEditor: Further cleanup
* Kill duplicate code
* Kill useless forwarding function
* Regroup some declarations
* Replace include by declaration

Change-Id: I54656e4e97b1fbdf7cf2f4a87d17955128f3825e
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-06-13 17:33:42 +02:00
Nikolai Kosjar fd5da10b66 CppEditor: Pimpl CppEditorWidget
...to cut some build depedencies.

Change-Id: I11b7e5f3c12b6821d0825a94ad74a7e4b69c4b12
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-06-13 17:33:28 +02:00
Tim Sander 870e58bfd1 qbs build fix: add selectabletexteditorwidget.cpp/h files
Change-Id: Ic0c61924b3a39f6147565b31103807584e7a9598
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-06-13 17:24:23 +02:00
Robert Loehning ec91d3cb4c debugger: Added project for testing CLI I/O
Change-Id: I0240ec0a258ad52a3b65ae320a8630a9711538cc
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-06-13 16:52:43 +02:00
Eike Ziller ad6648cc81 Add search functionality to include hierarchy
Change-Id: Ia21486bc64d4a7433934039d788ff45eb039b11c
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-06-13 16:42:22 +02:00
Eike Ziller df47e5f689 Add search to class view
Change-Id: I7796a5856b4d299c6593df8a8af762dec4da60f2
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-06-13 16:42:09 +02:00
Alessandro Portale ce250a7ba6 DiffEditor: Remake of the toolbar icons incl. @2x variants
The icons now have consistent positions and shadows, anti
alias and a HiDPI variant.

Change-Id: I7d3a9512113788c95a132a79a58c8f559f46d00e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-06-13 16:05:45 +02:00
Eike Ziller b99f10246e Add search functionality to outline panes
Change-Id: I816f4305c6c09ccbf4ffec8b5071c9b52693e98b
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-06-13 15:53:28 +02:00
David Schulz 6144a0b32f Editor: Don't show help popups when alt was part of a shortcut.
Task-number: QTCREATORBUG-12382
Change-Id: I2825f8197dbac1f1ef805892dc1191df86b84dbb
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-06-13 14:40:41 +02:00
Eike Ziller c1b20ade80 TreeViewFind: Fix endless loop if tree view has nothing selected
If the tree view has nothing selected, the search would wrap endlessly
because the current index is invalid, but wrapping restarted at the
first toplevel index.

Change-Id: I31badb2038c8752d2c91e6fcaff69138c846383e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-06-13 13:13:15 +02:00
Daniel Teske 0f518a7dfe TreeViewFind: Optimize speed by not creating a QTextDocument per index
Change-Id: I74027b051d85698d95f92cb212182281013d256c
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-06-13 13:06:33 +02:00
Eike Ziller a16bab0e9d Fix escape logic for closing find tool bar in mode with editor view
E.g. open context help, press ctrl+f to search in help, press escape
(focus moves to help viewer), press escape: find tool bar should be
hidden, instead it was moving focus to the editor.

Change-Id: Ia5d8563458582e2871afd9e3107e49e71d03b3f5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-06-13 12:59:52 +02:00
Alessandro Portale 23d3ada73f Move reload icon from diff editor to core
It is a generic icon, and will for example also be used
in the Help plugin. Also make it more round and add a 2x variant
for HiDPI.

Change-Id: I2ad4fc1e2d2766042646a47483f129447c2c3c25
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-06-13 12:15:54 +02:00
Robert Loehning a56fc82b0a Squish: Close QMessageBox using "OK" button
Change-Id: Iead4267d0919ce4a8d7f9f5fdec61cd9ba8dd0db
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-06-13 11:33:39 +02:00
Eike Ziller 2786250c17 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/shared/qbs

Change-Id: Iba59e41db72e2afdf594f1f7003215d7d8d1e6d3
2014-06-13 10:51:51 +02:00
Leena Miettinen 27cc89eb4a Doc: OTHER_FILES variable
Task-number: QTCREATORBUG-12054
Change-Id: I994098197514217522fe288f7e2a83e66ffd795e
Sanity-Review: Qt Sanity Bot <qt_sanitybot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-06-13 10:42:19 +02:00
Eike Ziller 5933136b19 Fix crash when adding files from window menu
Introduced by 2ad3147542

Task-number: QTCREATORBUG-12409
Change-Id: I422d315c5b9d22052251a0869d314adff7741af0
Sanity-Review: Qt Sanity Bot <qt_sanitybot@qt-project.org>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-06-13 09:10:47 +02:00
Przemyslaw Gorszkowski 21007a6b5d C++: add test for anonymous with __attribute__
Change-Id: I1938ed1bf45523ec62f35bc3324f6553c0dafe22
Sanity-Review: Qt Sanity Bot <qt_sanitybot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-06-13 08:04:37 +02:00
Orgad Shaneh e9d433a99a ClassView: Includes cleanup
Change-Id: Ifb5752e01c45008080be2ca9e094dd24aa054be6
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-06-12 21:41:07 +02:00
Lorenz Haas 76a0897308 CppEditor: Remove unneeded QString::fromLatin1 in GenerateGetterSetter
Change-Id: I47e8948980e3edb361c29b8976c5644dc696fd78
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-06-12 18:33:23 +02:00
Daniel Teske edf47e93ae ProjectTreeView: Find all nodes
Change-Id: I5c28c7f05b8e4766a5e04e00d9c8cd7e48b8cd95
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-06-12 18:31:56 +02:00
Thomas Hartmann d97ef903a1 QmlDesigner.DocumentManager: Support component property of Tab
Change-Id: Iaf2d1160904023db3c66c6e536c5cf812a71e3fb
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-06-12 18:27:22 +02:00
Thomas Hartmann fa91e7b8ff QmlDesigner.Rewriter: Supporting Tab contents as implicit component
Because of the alias we get the cpp type.

Change-Id: Iad82fa702940978b555734af4496c1c49b49f3f8
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-06-12 18:18:02 +02:00
Thomas Hartmann 3afc9f56a9 QmlDesigner.model: Remove unused code
Change-Id: Id4b8a2c9f1bc687fea48094d92763261a385bcf4
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-06-12 18:15:27 +02:00
Thomas Hartmann f3270472ee QmlDesigner.NodeInstances: blacklist QtMultimedia/Audio
Change-Id: I7d16ae74ea848e848ac6dc2d8c8bb9c468681889
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-06-12 18:07:03 +02:00
Thomas Hartmann 0ae78f8db3 QmlDesigner.Model: Remove unused code
Change-Id: I313c9d5180493d4ea77360c1bf8a5cbb725241e2
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-06-12 18:03:38 +02:00
Daniel Teske cb8d6c0c9e Show "Open containing folder" also for files of qrc nodes.
Task-number: QTCREATORBUG-12374
Change-Id: I9dd8bbf9134bac65fbaa70b0614b27365377b0bf
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-06-12 18:00:21 +02:00
Thomas Hartmann 4df72c0879 QmlDesigner.Model: Crash fix
We have to check if the currentNode is actually valid.

Change-Id: I7a36758e96cbb4ae2a17755fc841ee2518a01ca2
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-06-12 17:49:34 +02:00
Eike Ziller dc3b826955 ClassView: Remove unnecessary ui file
It was just containing a tree view anyhow

Change-Id: Ied34e370be4dca0a113a861cafc0a8dac5689db7
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-06-12 17:15:50 +02:00
Eike Ziller fe5f159e4b ClassView: Remove unnecessary private class
Change-Id: Ib0b67b01604d3abc7d2a30dd3841fa4a46775a4e
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-06-12 17:14:58 +02:00
Daniel Teske 2ad3147542 QmakeNodes::addNewInformation: Be responsible subfolder nodes
And increase the priority for those too. Fixes the case:

a.pro
 b.pri
   test
 c.pri

Right click on test and add new file. In that case b.pri should be the
node to which the file is added.

Task-number: QTCREATORBUG-12272
Change-Id: I54d144861bc06545db8e71ed33513a0df971dae2
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-06-12 17:14:34 +02:00
Eike Ziller 7addeb00fe Make tree view find work with models that use (can)fetchMore
As opt-in functionality. Only works if fetching is synchronous.

Change-Id: Ie13d722e97188663e2a1fe992ef039dbac7fe2c6
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-06-12 17:04:01 +02:00
Nikolai Kosjar 9beb8ea5a3 CppEditor: Make test_FollowSymbolUnderCursor_QObject_connect more realistic
...by providing the necessary definitions.

Currently this does not has any effect since function-like macros are
not expanded for the semantic document. This might change, therefore we
adapt this test.

Change-Id: I7de4fdecac7b7504da7389ab216b7349ea53d7be
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-06-12 17:03:55 +02:00
Nikolai Kosjar ea55d627d7 CppTools: Start to use editor document
This is only a small refactoring step towards a editor-free
CppEditorSupport.

Left are m_editor references that need to be addressed.

No functional change.

Change-Id: I9fc7b0abfe88f5b9a6ce3f57a5c4a922ae953ddf
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-06-12 17:03:07 +02:00
Nikolai Kosjar a6e04c363f CppTools: CppHighlightingSupport takes a BaseTextDocument
...instead an ITextEditor.

The ITextEditor was only used to access the file path and QTextDocument
via the BaseTextEditorWidget.

Change-Id: Idef2b8162b992fe3718e16e2a046e2ff214846f2
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-06-12 17:02:52 +02:00
Nikolai Kosjar fc7f5ba364 CppTools: CMM::completionAssistProvider takes a mimeType
No need to pass more than needed.

Change-Id: I047cc44f17342999e0809d022df35ba9a4a8dfb8
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-06-12 17:02:36 +02:00
Daniel Teske cf3d47ccd8 Remove AppOutputPane::runControls()
The function is unused

Change-Id: If12869fd51014a06d3feeb5f147e070f5f1ce463
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-06-12 16:47:55 +02:00
Tobias Hunger 9ba8040254 Utils: Remove FileWizard class altogether
This fixes the regression where two Location pages were added
before.

Change-Id: Ic3241d707ad8dcf6fc3063bb4613dce49001e196
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-06-12 16:30:26 +02:00
Tobias Hunger b229231239 Add helper method to Utils::Wizard
Add method to Utils::Wizard that allows to retrieve the first page
of a given type.

Change-Id: Id92496d09bf89cee6f6e8ef584409125b218ec83
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-06-12 16:30:19 +02:00
Tobias Hunger 68cca186f6 s/struct/class/ for private class of filewizardpage
Change-Id: Ie7b96b0309e1291f4bb002a1f01e0473b8e15239
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-06-12 16:30:12 +02:00
Tobias Hunger e684143a35 Make private class internal
Get rid of a couple of useless Internal:: namespace prefixes

Change-Id: I99f44082a2ba0ec39b51d3f89db6697834414a99
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-06-12 16:30:05 +02:00