feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
83,458 Commits 108 Branches 368 Tags
d3b9b9b2d14eebf932a8c94e57a584fac06e486d
Commit Graph

92 Commits

Author SHA1 Message Date
Orgad Shaneh
29a93998df Remove braces for single lines of conditions 
#!/usr/bin/env ruby

Dir.glob('**/*.cpp') { |file|
  # skip ast (excluding paste, astpath, and canv'ast'imer)
  next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i
  s = File.read(file)
  next if s.include?('qlalr')
  orig = s.dup
  s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m|
    res = $&
    if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces
      res
    else
      res.gsub!('} else', 'else')
      res.gsub!(/\n +} *\n/m, "\n")
      res.gsub(/ *{$/, '')
    end
  }
  s.gsub!(/ *$/, '')
  File.open(file, 'wb').write(s) if s != orig
}

Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc
Reviewed-by: hjk <qthjk@ovi.com>
 2013-01-08 10:48:18 +01:00
Lukas Holecek
f31da9ac55 fakevim: Show current command in minibuffer (showcmd option) 
Use showcmd Vim option to show current partial command.

Removed unneeded updateMiniBuffer() calls.

Change-Id: Iddacd364b7c92882b6169a6894c89cdb202a32bf
Reviewed-by: hjk <qthjk@ovi.com>
 2012-11-20 08:29:37 +01:00
Eike Ziller
6fd252b0a5 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessageloghandler.h
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/madde/maemodeployconfigurationwidget.h
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentinfo.h
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/ichecklib_global.h
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h
	tests/manual/ssh/tunnel/tunnel.h

Change-Id: I04d7761df6bd936ad00e0547974284c967d39580
 2012-10-05 21:20:50 +02:00
hjk
386ca7c8dd Adjust license headers 
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-10-05 17:12:56 +02:00
Lukas Holecek
4503ce663a fakevim: Improved searching 
Reset cursor position if search is canceled and always search from
initial cursor position if search expression changes.

Implemented Vim's wrapscan (ws) option.

Task-number: QTCREATORBUG-7251

Change-Id: Ic709cc4fb9dacdb94fbd17f85ac9b75738d5578c
Reviewed-by: hjk <qthjk@ovi.com>
 2012-09-04 09:41:28 +02:00
Lukas Holecek
7e7460ad33 fakevim: Added support for smartcase searching 
Change-Id: I85a83aff0886282a6eac2dc9cc4662087c3b0b95
Reviewed-by: hjk <qthjk@ovi.com>
 2012-08-01 16:17:03 +02:00
Lukas Holecek
d0dcd40635 fakevim: Implement special clipboard buffers 
Introduces Vim's special registers "+ and "* and partial support for
"clipboard" option - only values "unnamed" and "unnamedplus" and the
behaviour is only similar.

Task-number: QTCREATORBUG-6342
Change-Id: I1fa95b681edadacfe9690a2fd6eb2e98e7cc5dca
Reviewed-by: hjk <qthjk@ovi.com>
 2012-08-01 13:25:04 +02:00
Eike Ziller
e0e8cf3ada Contact -> qt-project.org 
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-07-19 13:23:21 +02:00
hjk
8b37921bc5 fakevim: don't allow non-positive numbers for tabstop and shiftwidth 
Task-number: QTCREATORBUG-7375
Change-Id: I947dd903a5e7d09e367afbc771582793e6c008f1
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
 2012-05-03 11:41:24 +02:00
Erik Verbruggen
3fa55b7ab9 Removed module names from #include directives. 
Getting the #include directives ready for Qt5. This includes the
new-project wizards.

Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-02-15 16:24:46 +01:00
hjk
2931a499e6 Long live the king! 
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-26 19:55:36 +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
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
04e32b0049 License headers. 2010-12-17 16:03:42 +01:00
hjk
74cf70deaf fakevim: add an option to pass Control + <x> directly to Creator core 
Original code by dcarr.
 2010-09-24 13:05:15 +02:00
hjk
80bc682d2e fakevim: more selection refactoring 2010-09-14 17:18:44 +02:00
hjk
495c3f52fa fakevim: improve selection interaction with main text editor 2010-08-11 13:42:22 +02:00
hjk
2f99706031 fakevim: prepare for better integration with creator core 
For :ex commands, the plugin is now asked first unconditionally.
The handler only provides fallbacks for the standalone case.
 2010-05-19 12:00:52 +02:00
con
38f6379f39 Merge remote branch 'origin/2.0' 
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/find/currentdocumentfind.cpp
	src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
 2010-05-17 17:40:40 +02:00
Leena Miettinen
cf233161fa Doc - UI - Fix UI text capitalization to follow the KDE Style Guide rules. 
Reviewed-by: ossi
 2010-05-14 15:53:56 +02:00
hjk
034ee0a947 fakevim: add option to show positions of marks in the main text editor 2010-05-11 14:26:59 +02:00
hjk
1662eade7e fakevim: improve handling of iskeyword 2010-04-29 12:07:59 +02:00
hjk
5dba164823 fakevim: add IsKeyword configuration option 2010-04-28 11:35:07 +02:00
hjk
b5b29532f3 fakevim: add a setting for (rudimentary) reading of .vimrc on startup 2010-04-16 17:47:28 +02:00
hjk
0a93ca9259 fakevim: split 'IncSearch' into 'IncSearch' and 'UseCoreDialog' 2010-04-08 14:08:40 +02:00
hjk
f29e70ecdc fakevim: rename 'Toggle vim-style editing' into 'Use vim-style editing' 2010-03-26 14:53:12 +01:00
Martin Aumüller
f12753a499 fakevim: by default, startofline is on in vim 
Merge-request: 126
Reviewed-by: hjk <qtc-committer@nokia.com>
 2010-03-08 11:44:43 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Oswald Buddenhagen
75b42f18d8 Merge remote branch 'origin/1.3' 
Trailing whitespace removal re-applied manually.
 2010-01-29 22:50:23 +01:00
Oswald Buddenhagen
a6ca348636 remove trailing whitespace 
doing it in 1.3 as well to avoid possible later conflicts
 2010-01-29 21:33:57 +01:00
Martin Aumüller
0b49fb310f fakevim: creator auto indent is more like vim's smartindent 
Merge-request: 98
Reviewed-by: hjk <qtc-committer@nokia.com>
 2010-01-06 15:21:17 +01:00
hjk
c7850c3f98 fakevim: improve some basic tab/space/indentation handling 2009-12-11 13:25:36 +01:00
Friedemann Kleint
5948e284bb Rename namespace Core::Utils into Utils 
Also move Designer::Internal::FormWindowEditor ->
Designer::FormWindowEditor.
 2009-10-05 11:06:05 +02:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
Jason McDonald
884b7af769 Update license headers and sales contact details. 
Reviewed-by: Trust Me
 2009-06-17 00:01:27 +10:00
hjk
fb58a9ed39 fakevim: let the "IncSearch" option toggle between using the Creator 
core Find dialog and the "old" minibuffer based search.

A hot fix for the recent regression that 'n' and 'N' do not work and
the positioning of the cursor after the search is wrong.
 2009-06-02 11:56:58 +02:00
Friedemann Kleint
5150089738 Fixed translation glitches. 2009-05-13 14:39:55 +02:00
hjk
3fe66ea628 fakevim: make Alt-V Alt-V a global toggle 2009-03-30 16:54:25 +02:00
hjk
f7c3b552af fakevim: progress on settings 2009-03-30 15:39:13 +02:00
hjk
e346c0d725 fakevim: move settings/action related code to files of their own 2009-03-30 15:39:13 +02:00