feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
22,424 Commits 108 Branches 368 Tags
0c9af57dbdc99d567ec0125419b5916eeccb74b0
Commit Graph

34 Commits

Author SHA1 Message Date
Leandro Melo
f04be782ab C++: Preserve original indentation in extract function 
Also extend the refactoring changes to allow for reindenting.

Task-number: QTCREATORBUG-6797
Change-Id: I515c9a37d9e62e1d5de52ff99bd492e739a81885
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2012-01-12 15:32:02 +01:00
Friedemann Kleint
9128fc2ab0 CppEditor: Compile with QT_NO_CAST_FROM_ASCII. 
- Avoid unnecessary conversions
- Add missing tr().

Change-Id: I3c0dd627a3621929c9c6fc71db6924fa513e34a7
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
 2012-01-12 13:50:30 +01:00
Leandro Melo
6aa06579c2 C++: Fix identifier used when finding symbol for matching class 
Inside declaration from definition quickfix.

Change-Id: Iaf1bb3c70b4c8343a04aaaaedc8416e8be55aa4d
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2012-01-11 15:23:28 +01:00
Leandro Melo
c25f0585d1 C++: Extract function quickfix 
Task-number: QTCREATORBUG-5485

Change-Id: Ib6aaeaadad4b421480d22399392768d4bad85bda
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2012-01-10 15:31:03 +01:00
Eike Ziller
85cf2b661e Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/plugins/debugger/qml/scriptconsole.cpp
	src/plugins/git/gitplugin.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h

Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
 2011-11-11 09:46:25 +01:00
Christian Kamm
c2eb453228 QuickFixes: Sort by priority. 
* Generally changes the BasicProposalItemListModel's sort to take the
  BasicProposalItem::order member into account.
* Currently only the QML completion and quick fixes set the order.
* This means the 'Apply signature changes' quick fix is now further up
  than the 'add definition' quick fix.

Change-Id: I7b5bc82aa37fca232fddd630ab3273437e1bcc09
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
 2011-11-04 12:16:41 +01:00
hjk
31600758de all: s/info@qt.nokia.com/qt-info@nokia.com/ 
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-11-03 10:33:19 +01:00
Christian Kamm
0021c4c3ee C++ insert def: Fix bug when minimizing name. 
Constructors would not get the correct name before. Now rewriting the
function's name is not done by going through the 'rewrite type' func-
tionality but rather by minimizing the symbol's name directly.

Task-number: QTCREATORBUG-6223
Change-Id: I3c25e414337937f5dd0f54570c899ca2ca21d2ef
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-10-31 14:00:27 +01:00
Nicolas Arnaud-Cormos
9ceabbacfb Create definition is available on the whole declaration line. 
Merge-request: 390
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>

Change-Id: I046b3046d3d0148b0fad694181f17737e12a85b6
Reviewed-on: http://codereview.qt-project.org/5529
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
 2011-09-26 11:10:20 +02:00
Christian Kamm
8a6d767a8f Refactoring changes: Cleanup and improvements. 
Previously RefactoringFiles were usually passed around by value.
However, since a RefactoringFile may sometimes own a QTextDocument
(when it was read from a file), that's not great and caused the
file to be reread after every copy.

With this change RefactoringFile becomes noncopyable and is always
owned by a shared pointer.

This change also allowed having const RefactoringFiles which is
useful because they can be safely used from other threads. See
CppRefactoringChanges::fileNoEditor.

Change-Id: I9045921d6d0f6349f9558ff2a3d8317ea172193b
Reviewed-on: http://codereview.qt.nokia.com/3084
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-08-19 11:12:09 +02:00
Christian Kamm
a4e85dda53 C++ insert definition: Use minimally qualified names. 
Change-Id: I633dbc77557fc2b6563888103350612a262536ee
Reviewed-on: http://codereview.qt.nokia.com/2731
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-08-08 14:47:49 +02:00
Leandro Melo
bec4f02495 New code assist API 
This is a re-work of our completion engine. Primary goals are:

- Allow the computation to run in a separate thread so the GUI is not locked.
- Support a model-based approach. QStrings are still needed (filtering, etc), but
internal structures are free to use more efficient representations.
- Unifiy all kinds of *assist* into a more reusable and extensible framework.
- Remove unnecessary dependencies on the text editor so we have more generic
and easily "plugable" components (still things to be resolved).
 2011-05-18 10:46:20 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
con
d1023c7614 It's 2011 now. 
Reviewed-by: hjk
 2011-01-12 09:46:24 +01:00
con
b1bcf081d8 Merge branch '2.1' 
Conflicts:
	src/plugins/coreplugin/basemode.cpp
	src/plugins/coreplugin/basemode.h
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h
	src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp
	src/plugins/debugger/debuggeragents.cpp
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/debugger/debuggeruiswitcher.h
	src/plugins/projectexplorer/buildconfigdialog.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
	src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h
	src/plugins/qmldesigner/designercore/include/modelutilities.h
	src/plugins/qmldesigner/designercore/include/nodeinstance.h
	src/plugins/qmldesigner/designercore/include/propertymetainfo.h
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h
	src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h
	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp
	src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp
	src/plugins/qmldesigner/designercore/model/modelutilities.cpp
	src/plugins/snippets/inputwidget.cpp
	src/plugins/snippets/snippetscompletion.cpp
	src/plugins/snippets/snippetscompletion.h
	src/plugins/snippets/snippetspec.cpp
	src/plugins/snippets/snippetsplugin.cpp
	src/plugins/snippets/snippetswindow.cpp
	src/plugins/snippets/snippetswindow.h
	src/plugins/texteditor/snippetsparser.cpp
	src/tools/qml/qmldom/main.cpp
	tests/manual/trk/runner.cpp
	tests/manual/trk/trkolddevice.cpp
	tests/manual/trk/trkolddevice.h
	tests/manual/trk/trkserver.cpp
 2010-12-17 17:00:53 +01:00
con
04e32b0049 License headers. 2010-12-17 16:03:42 +01:00
Friedemann Kleint
0ad2d077b9 Exported header cleanup: Separate out CppQuickFixCollector. 2010-11-01 17:04:48 +01:00
Erik Verbruggen
e57297f6ee C++: disable definition generation for pure virtual methods. 2010-10-08 13:15:21 +02:00
Erik Verbruggen
7334ed9ec4 C++: fixed translatable quick-fix strings. 2010-10-08 13:15:21 +02:00
Erik Verbruggen
ac9fc40645 C++ Editor: check for method existing decl/def when inserting new ones. 2010-10-08 13:15:20 +02:00
Erik Verbruggen
0555837c7f C++ Editor: prevent insertion of method definitions in header files. 2010-10-08 13:15:20 +02:00
Erik Verbruggen
9deccd3176 C++ Editor: only show quickfix to insert a public declaration. 
Reviewed-by: Roberto Raggi
 2010-10-08 13:15:20 +02:00
Christian Kamm
f0f623bcb8 Fix crash related to 'add definition from declaration' quickfix. 
Reviewed-by: hjk
Reviewed-by: Erik Verbruggen
 2010-10-07 14:54:04 +02:00
Friedemann Kleint
520c936a45 L10n: tr()-Fixes 2010-10-05 09:44:33 +02:00
Thorbjørn Lindeijer
9248e2cf46 Fixed compile on case-sensitive file systems 2010-09-30 14:02:35 +02:00
Erik Verbruggen
3ebc328498 C++: added quickfix to insert a method definition. 
Reviewed-by: Christian Kamm
 2010-09-30 12:19:39 +02:00
Erik Verbruggen
588bc1f78c CPPEditor: Fixed invalid location in refactoring action. 
Reviewed-by: Roberto Raggi
 2010-09-29 11:35:21 +02:00
Friedemann Kleint
bf8dedaade Debugger: Handle synchronous startup fail (Windows). 
Make DebuggerRunner handle QProcess::startFailed
correctly on Windows (synchronous signal emission
within startDebugger()).
Remove debug output/warnings.

Reviewed-by: hjk
 2010-09-29 10:32:41 +02:00
Erik Verbruggen
f39494e4c2 C++: make InsertionPointLocator ready for re-use. 
(cherry picked from commit 519f1d11947ff3109850e559fae868c4a55deb43)
 2010-09-27 19:07:15 +02:00
Erik Verbruggen
f1de90c872 C++ Editor: fixed cursor positioning after quickfix action. 2010-09-24 10:05:29 +02:00
Erik Verbruggen
4623f11f4f C++: only activate insert-declaration quickfix only on the declaration-id. 2010-09-22 16:43:29 +02:00
Erik Verbruggen
5c925db0d8 C++: shortened quick-fix descriptions. 2010-09-15 16:47:30 +02:00
Erik Verbruggen
9a00b8ba27 C++: Renamed cppdeclfromdef.{cpp,h} to cppinsertdecldef.{cpp,h} 2010-09-09 15:26:43 +02:00