feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
48,948 Commits 108 Branches 368 Tags
b002e87ca46413d15d697fa18ddc34795a7ad4b7
Commit Graph

345 Commits

Author SHA1 Message Date
Rainer Keller
8f20646309 Add commands :AS and :AV 
Change-Id: I1f4111fe1b613d78ead4928b48a37cf39882bbb5
Reviewed-by: hjk <qthjk@ovi.com>
 2011-12-12 14:36:31 +01:00
Eike Ziller
e2b0835b58 Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	qtcreator.pri
	src/libs/qmljs/qmljstypedescriptionreader.cpp
	src/plugins/analyzerbase/startremotedialog.ui
	src/plugins/qmldesigner/designercore/include/rewriterview.h
	src/plugins/qt4projectmanager/makestep.cpp

Change-Id: If9d15a8c8f73106585fd8ce6ac47c253a40af6b1
 2011-11-25 09:48:25 +01:00
Robert Loehning
b8d2e49729 tr() fix in fakevimplugin 
Change-Id: I6d25c508f62cbbaaac2ec525aea74f8c7946aa6a
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-18 09:37:01 +01:00
hjk
8e236db9f5 mostly core and analyzer: more id-fication 
Change-Id: Ic794fdc6a582f4a03d84b6220c59111044c753b9
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-15 18:25:19 +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
hjk
82f5573626 more Id type fixes 
Change-Id: I3720946ba5485696822976567d83b4d6cb1fb283

x

Change-Id: Iab58bc34bc56371405d132315573b484a533b77c
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-10 15:57:09 +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
Jarek Kobus
2244911826 Implement Code Style schemes 
Task-number: QTCREATORBUG-5092

Change-Id: I218cef02f7c242e4dfae59b1b8021ea618e60d07
Reviewed-on: http://codereview.qt-project.org/5160
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-09-23 10:23:15 +02:00
hjk
3347b3512c fakevim: string literals 
Change-Id: I17b78751a161a25b1b1de7018c47e07274f0f438
Reviewed-on: http://codereview.qt-project.org/4756
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-13 12:51:38 +02:00
hjk
f70233fe48 fakevim: make toggle action scriptable 
Change-Id: Ic089b91db144389bac4967a6c4f8be361b1a3bda
Reviewed-on: http://codereview.qt-project.org/4730
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-09-13 09:44:01 +02:00
hjk
488330255d core: rename uniqueidmanager.{cpp,h} as the class UniqueIdManager is gone 
Change-Id: Iffe04bc3bb0103cbac605f0734bbfd66eb7fd854
Reviewed-on: http://codereview.qt.nokia.com/4215
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-05 18:04:55 +02:00
hjk
38298bf229 fakevim: save a few string->int->string roundtrips 
Change-Id: Id21ce47ecf267f37f2433f2423dccfd9dcee6c42
(cherry picked from commit 1a503d867c34ced26fa8ca8ca12d2fc22b2f0d81)
Reviewed-on: http://codereview.qt.nokia.com/4198
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-05 15:56:02 +02:00
hjk
df2858bb6c core: progress on the QString->QByteArray for Core::Id, remove UniqueIDManager 
Change-Id: I94bec127866822b790a6e45a4201a7a5fe71d6ce
Reviewed-on: http://codereview.qt.nokia.com/4208
Reviewed-by: hjk <qthjk@ovi.com>
 2011-09-05 15:28:46 +02:00
Leandro Melo
3b0a43802e Editors: Enhance smart backspace behavior 
Adds a new smart backspace behavior option. Now it's also possible
to simply unindent (like a backtab). This is particularly useful
when the cursor is not inside an "indentation area" but the user
still wants to go backwards by indent levels when possible (for
example before a comment that appears after the code line). The
option also allows the user to reach a new indent level which has
not been seen so far in previous lines.

The original follows indentation user setting will be lost with this
patch, but we consider this ok for not very "significant" settings.

Change-Id: I49efb6b0309d9b7d7ff2a589413446bc16fb753c
Reviewed-on: http://codereview.qt.nokia.com/3105
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-08-18 10:09:17 +02:00
Eike Ziller
bf8cb5d4fc Merge remote-tracking branch 'origin/2.3' 
Conflicts:
	qtcreator.pri

Change-Id: Iaca68084799ae9aec257742c395609d6e8aa72cd
 2011-08-16 10:21:55 +02:00
hjk
4274439d45 fakevim: fix action used in Edit->Advanced 
Variable was uses in wrong scope.

Change-Id: I0c9343742cf75b118c14cbf8bf4cec9f983c32d5
Reviewed-on: http://codereview.qt.nokia.com/2941
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-08-15 11:02:45 +02:00
hjk
258d168a91 fakevim: remove now unneeded oldTabSettings 
Change-Id: I61c817bf1efa16fda88b71bfbbf8d6f4cd8644f0
Reviewed-on: http://codereview.qt.nokia.com/2674
Reviewed-by: hjk <qthjk@ovi.com>
 2011-08-05 10:37:52 +02:00
Jarek Kobus
0c8df0597f Refactor: Get rid of BaseTextEditorWidget from Indenter 
Provide directly TabSettings instead.
This will be used for indenting a text for which
there is no editor instance.

Change-Id: Ia5f11a481f42464cf4820efdf2c7c4c32166f55e
Reviewed-on: http://codereview.qt.nokia.com/2622
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
 2011-08-05 10:29:41 +02:00
hjk
be4d9b946f fakevim: more interaction for entering ex commands 
Change-Id: I64e4d662fa9c89d4ac6a6d8b83711f01780ceaa6
Reviewed-on: http://codereview.qt.nokia.com/1700
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-08-01 09:34:21 +02:00
Friedemann Kleint
ac9a3bc924 tr()-fixes for 2.3. 
Change-Id: I38345500156ce6fa4eb747562a3f9434040615ff
Reviewed-on: http://codereview.qt.nokia.com/473
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-06-14 12:24:40 +02:00
Christian Kamm
779fafcbfe Make C++ code style configurable. 
Change-Id: Iaf08edb2361146e6b5e1cbafdb716a23c938875b
Done-with: Jarek Kobus
Task-number: QTCREATORBUG-2670
Task-number: QTCREATORBUG-4310
Task-number: QTCREATORBUG-2763
Task-number: QTCREATORBUG-3623
Task-number: QTCREATORBUG-567
Reviewed-on: http://codereview.qt.nokia.com/74
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
 2011-05-24 12:45:07 +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
Oswald Buddenhagen
096a7aa72b remove superfluous argument 
no need to pass in the current file name
 2011-04-18 14:10:13 +02:00
Oswald Buddenhagen
e35fe2a770 file manager: introduce saveFile() and remove blockFileChange() & unblockFileChange() 
this replaces the ever-repeating idiom block/save/unblock with a single
call.
 2011-04-18 14:10:12 +02:00
Oswald Buddenhagen
dc3c156cac Merge branch '2.2' 
Conflicts:
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
	src/plugins/qt4projectmanager/qt4target.cpp
	src/plugins/qt4projectmanager/qt4target.h
	src/plugins/qt4projectmanager/qtoptionspage.h
	src/plugins/qt4projectmanager/qtversionmanager.cpp
	src/plugins/welcome/welcomemode.cpp
 2011-04-14 12:39:31 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Friedemann Kleint
7e949c5afb Compile fix 2011-04-06 13:31:37 +02:00
dt
22dca2f913 FakeVim: Add missing endArray() to settings reading 
Reviewed-By: hjk
 2011-04-06 13:14:46 +02:00
hjk
e1ba3d0b89 fakevim: allow main texteditor to call into fakevim 2011-04-05 17:08:19 +02:00
hjk
d1f62507d3 fakevim: fix crash in ex command mapping 
Task-number: QTCREATORBUG-4084
 2011-03-17 18:15:34 +01:00
hjk
5f8987d467 fakevim: simplify pointer handling in ex command mapping 
Not yet sufficent to fix the crash.

Task-number: QTCREATORBUG-4084
 2011-03-17 17:47:51 +01:00
hjk
a2bb4ac211 fakevim: fix persistence of user defined :ex commands 2011-03-02 13:38:03 +01:00
hjk
0c9914b17e fakevim: fix leaking commanditems 2011-02-24 14:27:48 +01:00
hjk
f576ad9f2c texteditor: merge ITextEditable into ITextEditor 
rename BastTextEditor->BaseTextEditorWidget, BaseTextEditorEditable->BaseTextEditor
rename BaseTextEditor{,Widget} subclasses
rename editableInterface->editorInterface
rename createEditableInterface->createEditor
minor cleanups after renamings
 2011-02-22 11:23:53 +01:00
Leandro Melo
ea313f3ec8 Text editor: Introduce per project settings 
With some refactorings to make the code look better.

Reviewed-by: con
 2011-02-21 17:22:24 +01:00
hjk
9a6c4a42f7 completion: enable multiple completors for different use cases. 
Introduce CompletionPolicy enum, use 'TextCompletion' for the new plain
text completion, and 'SemanticCompletion' or 'QuickFixCompletion' for
the existing cases.

Reviewed-by: Erik Verbruggen
 2011-02-21 14:04:43 +01:00
hjk
77fba3205e fakevim: work on 'dumb' completion 2011-02-18 15:44:16 +01:00
con
d1023c7614 It's 2011 now. 
Reviewed-by: hjk
 2011-01-12 09:46:24 +01:00
con
793d1cba77 Start on some cleanup of EditorManager API and usage. 2011-01-05 10:41:34 +01:00
hjk
6159e5b860 fakevim: start with work on Ctrl-N/Ctrl-P 2010-12-21 12:30:50 +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
Roberto Raggi
8df7fbc67a Compile fix for pedantic C++ compilers. 
Get rid of all those ugly stray semicolons. They are not valid C++.
 2010-12-16 11:29:24 +01:00
hjk
5bcf849ee5 fakevim: add infrastructure for Ctrl-W + <Right> etc 
Not functional due to missing public API in the editor manager.
 2010-12-13 16:59:55 +01:00
con
c598118d5b Update the filter matches for the settings dialog. 
Task-number: QTCREATORBUG-2936
 2010-12-01 18:48:40 +01:00
Leandro Melo
c8a53a66ad Editors: Continue refactoring indenters out of the editors. 
This is pretty much a complement of commit 3a684586fa,
which is an attempt to make editors and indenters a bit more decoupled.

Reviewed-by: Thorbjorn Lindeijer
 2010-11-09 11:01:48 +01:00
Friedemann Kleint
6063fb84c2 Fix exported headers in Core and TextEditor. 
- Unexport Core::Internal::MainWindow and remove its includes.
- Move RssFetcher from Core::Internal to Core.
- Unexport CopyTaskHandler.
- Move TextEditor's completion support and Refactor Overlay
  helper classes from TextEditor::Internal to TextEditor as they
  are exported.
- Move internal BaseTextBlockSelection into private header.
- Unexport TextEditorOverlay as they are not used.
 2010-11-01 16:29:45 +01:00
Martin Aumüller
2a97605b24 fakevim: ':set noic'/':set ic' was inverted 
QAction::trigger toggles the action, thus set inverse state before triggering

Merge-request: 190
Reviewed-by: hjk <qtc-committer@nokia.com>
 2010-10-26 10:56:32 +02:00
Martin Aumüller
c12c9635cd fakevim: don't send ':set ic' and ':set noic' to handler in order to avoid warning about unsupported option 
Merge-request: 190
Reviewed-by: hjk <qtc-committer@nokia.com>
 2010-10-26 10:56:32 +02:00