feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
17,084 Commits 108 Branches 368 Tags
e32cf192f7ba34dda96b61507b440c6a17b51a0c
Commit Graph

337 Commits

Author SHA1 Message Date
Leandro Melo
cb9cc8dca6 C++ editor: Better control to stop the semantic highlighter 
Done-by: Roberto Raggi
Reviewed-by: Leandro Melo
Reviewed-by: mae
 2011-02-04 17:04:56 +01:00
con
d1023c7614 It's 2011 now. 
Reviewed-by: hjk
 2011-01-12 09:46:24 +01:00
Christian Kamm
5f50a6ae34 C++: Move the ModelManagerInterface from CppTools to CPlusPlus. 2011-01-04 15:58:21 +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
Konstantin Tokarev
06d44df731 Internationalized "Refactor" menu item 
Merge-request: 227
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2010-12-10 15:51:25 +01:00
Roberto Raggi
4d6b7c4eb3 Improved follow symbol under cursor when searching for macro definitions. 
Reviewed-by: Christian Kamm
 2010-12-10 11:51:15 +01:00
Roberto Raggi
3a4765e276 Try to get the right overload when switching from a declaration to its definition. 2010-12-10 10:47:57 +01:00
Roberto Raggi
63138eb808 Added some initial support for function overloading. 2010-12-10 10:32:46 +01:00
Leandro Melo
7528c6d617 Snippets: Feature enhancement start... 
Provide an interface so users can create/edit/remove snippets.
 2010-12-08 17:22:07 +01:00
Erik Verbruggen
ad53fa42b0 Improved switching between method declarationand definition. 
Reviewed-by: Roberto Raggi
 2010-12-07 16:21:09 +01:00
dt
4ac7253205 Merge remote branch 'origin/2.1' 
Conflicts:
	share/qtcreator/static.pro
	src/plugins/cppeditor/cppeditor.cpp
	src/plugins/qmljseditor/qmljseditor.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystepwidget.ui
	src/plugins/qt4projectmanager/qtoutputformatter.cpp
	src/plugins/texteditor/generichighlighter/highlightersettings.cpp
 2010-11-10 17:02:40 +01:00
Leandro Melo
fb46c31934 Plain text editor: Make sure user setting about folding markers is used 
It was being reset based on the highlighter definitions.

Consider some refactoring with the related options as well to avoid
overriding user's settings.

Done-with: Thorbjorn Lindeijer
 2010-11-10 16:05:10 +01:00
Leandro Melo
36fa1de4c6 Editors: Refactor auto-complete code out of the editors for better reusability. 
Reviewed-by: Thorbjorn Lindeijer
 2010-11-09 11:01:47 +01:00
Leandro Melo
3a684586fa Editors: Refactor indenters out of the editors for better reusability. 
Reviewed-by: ckamm
 2010-11-05 14:28:38 +01:00
Friedemann Kleint
68d4d35cae Coreplugin: Header cleanup. 
Clean icore.h.
 2010-11-02 16:53:56 +01:00
Friedemann Kleint
0ad2d077b9 Exported header cleanup: Separate out CppQuickFixCollector. 2010-11-01 17:04:48 +01:00
Friedemann Kleint
722e48c2b3 TextEditor: Some exported header cleanup. 
Remove internal markers from exported headers,
introduce private class for BaseTextDocument.

Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2010-10-29 15:20:10 +02:00
Christian Kamm
49bfb964d6 C++ editor: Fix 'follow symbol' to work on several core Qt macros. 
Task-number: QTCREATORBUG-2240
Reviewed-by: Erik Verbruggen
 2010-10-27 17:13:59 +02:00
con
0d5211cc45 Prevent crash when closing Qt Creator while cdb session is running. 
The debugger plugin opens an editor in this case, leading to fakevim and
cppeditor crashing.
This commit doesn't fix the problem's source, but adds safeguards that
are sensible anyhow: FakeVim should not register with editors during
shutdown, and CppEditor should not unconditionally assume an existing
editor manager in the destructor.

Reviewed-by: Friedemann Kleint
 2010-10-20 17:10:47 +02:00
Erik Verbruggen
aa11eb8973 Fixed jumping internally-defined symbols ("<configuration>" file). 
Reviewed-by: Christian Kamm
 2010-10-19 16:19:14 +02:00
Christian Kamm
22130aae27 C++ editor: Fix performance problem when using the mouse to find links. 
It is unnecessary to try hard to resolve a class forward declaration
when all you want to know is whether it is a valid link or not.

Task-number: QTCREATORBUG-2688
Reviewed-by: Thorbjorn Lindeijer
 2010-10-11 15:36:40 +02:00
Roberto Raggi
32fff3f6cd Disabled the semantic highlighter when using Qt 4.7.0. 2010-09-29 12:15:11 +02:00
Erik Verbruggen
0c98d830b8 QML: brought context menu in sync with C++ editor. 2010-09-16 12:57:45 +02:00
Erik Verbruggen
39a03d2505 C++ Editor: Moved refactoring actions into sub-menu. 2010-09-15 14:35:12 +02:00
Christian Kamm
642b6fb0d3 C++ indenter: Separate indent into logical indent and padding. 2010-09-13 12:38:34 +02:00
Christian Kamm
5cd6ebfdfd C++: Only reindent on electric characters if indent wasn't user-changed. 
This should make the indenter less strict and annoying for non-standard
indentation styles.

Reviewed-by: Roberto Raggi
 2010-09-08 16:22:23 +02:00
Roberto Raggi
86799309aa Keep the locator database in sync with the current snapshot. 
Thanks to this patch we can move the filtering of C++ symbols
in a background thread.

Done-with: Erik Verbruggen
 2010-09-06 16:53:46 +02:00
Roberto Raggi
05f2fd6669 Renamed Symbol::scope() to Symbol::enclosingScope(). 2010-08-26 16:16:22 +02:00
Roberto Raggi
44a5e29246 Check the editormanager's current document before to request a new highlight. 2010-08-18 11:40:55 +02:00
Roberto Raggi
4eb40af9a8 Skip constructors and destructors when searching for the canonical symbol. 2010-08-17 16:09:52 +02:00
Roberto Raggi
03b626c80c Move the cursor at the character before the delimiter. 2010-08-17 14:50:32 +02:00
Roberto Raggi
644544185f Restore the old behaviour when switching between function declaration/definition symbols. 
That is, we don't look at the column position anymore when searching
the function under cursor.
 2010-08-17 14:30:11 +02:00
Roberto Raggi
5308a4a266 Fixed CppEditor::findLinkAt() to use the correct line and column positions from the editor. 2010-08-17 13:42:30 +02:00
Roberto Raggi
0540aa362d Get rid of the old Semantic pass. 2010-08-13 16:55:43 +02:00
Leandro Melo
f79187ca97 Create type hierarchy widget; Refactor code from C++ hover into a simple reusable model. 
Hierarchy information removed from tooltips now.
 2010-08-13 16:44:59 +02:00
Christian Kamm
538f611503 Indenters: Move style setup into the QtStyleCodeFormatter constructors. 
This makes sure styles are consistent for the editor and the quick fix
engine.
 2010-08-12 14:21:35 +02:00
Roberto Raggi
354b9712e4 Merged ScopedSymbol and Scope. 2010-08-11 15:25:18 +02:00
Roberto Raggi
0f301f8679 New implementation of CPlusPlus::FindUsages 2010-08-10 15:19:32 +02:00
Roberto Raggi
0d35f2f7bc Ignore empty chunks. 2010-08-10 12:28:41 +02:00
Roberto Raggi
da5d6d7db2 Get rid of the old deprecated indenter. 2010-08-10 10:50:00 +02:00
Roberto Raggi
254aff3978 Highlight the enumerators using the Static `char format'. 
The new `Static' format will be used to mark all the static members, e.g. enumerators,
static functions, and static class members, but right now, it is used only for enumerators.
 2010-08-09 18:07:09 +02:00
Roberto Raggi
3ab927ed74 Made the highlighting for virtual methods configurable 2010-08-09 14:34:57 +02:00
Roberto Raggi
df1770ff55 Use LowestPriority instead of IdlePriority. 2010-08-09 12:00:31 +02:00
Roberto Raggi
480ae95c43 Renamed CPPEditor::highlightTypeUsages() 2010-08-09 12:00:31 +02:00
Roberto Raggi
649559ade3 Store the QTextCharFormat used to mark virtual methods. 2010-08-09 10:34:31 +02:00
Roberto Raggi
4ff3ee2ff0 Use Prototype instead of Function. 2010-08-05 17:53:14 +02:00
Roberto Raggi
366b4c2ed7 Look at the virtual methods. 2010-08-05 14:14:16 +02:00
Roberto Raggi
672274378b Use the most recent snapshot when searching for the usages of a symbol. 2010-08-05 13:59:09 +02:00
Roberto Raggi
1932ffd1c6 Highlight the virtual methods. 2010-08-03 17:35:02 +02:00