feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
27,243 Commits 108 Branches 368 Tags
5e7cf3f062a0c0342bc774f3ac9ff746bde01417
Commit Graph

51 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
hjk
78beacd7b4 Use Core::Id for IOptionPage::category 
Change-Id: I63433edd9118a7aa4ecaef28f40bfc729d90f512
Reviewed-by: hjk <qthjk@ovi.com>
 2012-12-29 19:10:59 +01:00
Eike Ziller
03717cf7ef Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	src/plugins/debugger/gdb/gdboptionspage.cpp
	src/plugins/fakevim/fakevimoptions.ui
	src/share/share.qbs

Change-Id: Ic45b68ba7b1cc1b780be4271ba4ee939e6055b80
 2012-12-18 17:42:04 +01:00
Eike Ziller
2013223a66 Smaller general help options page. 
Task-number: QTCREATORBUG-8345

Change-Id: I83308e07fede50b74e4c806ea970953518269967
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
 2012-12-17 08:48:21 +01:00
Orgad Shaneh
c37420eeb3 Help: Compile with QT_NO_CAST_FROM_ASCII 
Change-Id: Iba24d4f2d02de790f31d9606c7f9b85faf4670ce
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
 2012-11-27 13:18:22 +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
Christian Kandeler
1b3d637c1b Replace qVariantValue() with qvariant_cast(). 
qVariantvalue() is deprecated in Qt 5. qvariant_cast() does
the same thing and works in Qt 4 and Qt 5.

Change-Id: I922329d3a47fe394669f5d97a25f0825d3d2dea5
Reviewed-by: hjk <qthjk@ovi.com>
 2012-09-20 09:41:37 +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
kh1
e1e65f6e56 Skip calling set custom value if nothing has changed. 
The call will trigger a setup of the local help manager,
which is rather heavy and should be avoided if possible.

Change-Id: I03fbe6a30fba6ac48361c7e2b5aa6d45dad5126b
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
 2012-05-31 14:55:58 +02:00
kh1
b6b2441e55 Return a valid URL from a user supplied input. 
Change-Id: If69577caa4a5a7ea024f80c8ac995807d6d14fbd
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-05-24 20:26:39 +02:00
hjk
f77cd29e54 IOptionsPage: replace virtual fuctions by data members 
Change-Id: I8297df85109b67b79f90c33263a5dc7b89efbb60
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-05-23 10:48:04 +02:00
Marco Bubke
56cf850b21 Fix wrong names in the UI 
Change-Id: I6635b3a91eed4d34bb477aaeac37709e15059e06
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
 2012-04-18 13:32:57 +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
4a21f0c3c8 Use new static ICore interface. 
Change-Id: I9b690d9b150c8d162b15370f9f8986267c9128f1
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-01-24 18:48:47 +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
Leena Miettinen
f1889864db UI text: check capitalization and tooltips 
Change-Id: I3686ac83e5fdc009b03e84ab3c7b24a052d119c4
Reviewed-on: http://codereview.qt.nokia.com/569
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-06-22 10:05:33 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +02:00
Oswald Buddenhagen
45c9cf7a12 add/unify i/o error handling 
lots of use of Utils::FileSaver and Utils::FileReader

Task-number: QTCREATORBUG-1619
 2011-04-18 14:10:14 +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
con
773343f396 Delay widget creation of options pages till their category is shown 
Also add the alternative way: IOptionsPageProvider, which states
a category, and is asked for a list of options pages for that
category when it is shown.

Task-number: QTCREATORBUG-3131
 2010-12-06 11:18:58 +01:00
kh1
0985f9c1c4 Fix ambiguity with help manager by renaming the file to match class. 
Task-number: QTCREATORBUG-3090
Reviewed-by: ck
 2010-11-16 16:25:55 +01:00
kh1
55fe83c291 Make it possible to return editor mode if the last help page was closed. 2010-09-21 17:01:36 +02:00
Victor Ostashevsky
ea354f258c Wrong messages/contexts in help plugin 
Merge-request: 172
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2010-09-01 10:32:46 +02:00
kh1
dc3f33890c Make use of the custom value settings functionality. 2010-08-02 16:32:18 +02:00
kh1
de040e80fc Initial support for showing help in external window. 
Task-number: QTCREATORBUG-1473
 2010-07-23 16:37:29 +02:00
kh1
8c0223f874 Some preparations for externel help support. 2010-07-23 16:37:29 +02:00
kh1
1b6ad08795 Move help manager into core. 
- lessens open file handles
 - improves help plugin startup further

Task-number: QTCREATORBUG-337
Reviewed-by: ck
 2010-06-11 13:11:37 +02:00
Thorbjørn Lindeijer
50ccecee2e Some initialization and removed redundant member variables 
Reviewed-by: kh1
 2010-06-02 14:53:44 +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
kh1
edcefd69ad Implement tabless help mode, behaves now like edit mode. 2010-03-30 17:51:46 +02:00
kh1
89d20924c8 Add some more constants and make use where possible. More to come. 2010-03-30 17:51:38 +02:00
Thorbjørn Lindeijer
2d21060bc9 Added icons to options dialog categories 
Some categories do not have icons yet, unfortunately.
 2010-03-26 17:47:31 +01:00
kh1
6ac6be5db2 Rewrite of the whole help modul initialization. 
We now do as much as possible lazy initialisation, e.g only start the
full text search indexer if we really access the search widget. Also
moved the QFutur progress into the search widget. Changed all ctors to
be called without an argument, since we share the help engines from
help manager all over the place. Make use of the fact that we only need
to call setupData on the gui engine if we access the help mode, otherwise
all data is fetched thru the core engine whichs setupData is really fast.
 2010-03-23 18:13:12 +01:00
kh1
3cd98b3387 Make use of the core engine in the general settings page. 
Reviewed-by: ck
 2010-03-16 15:54:38 +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
Tobias Hunger
a6ad773722 Make method naming more consistent. 
* Use id() for methods returning a string used to represent
    some type of object.
  * Use displayName() for strings that are meant to be user
    visible.
  * Quieten some warnings while touching the files anyway.
  * Move Factories to their products in the plugins where that
    was not done before.

Reviewed-by: dt
 2010-01-07 18:17:24 +01:00
Friedemann Kleint
a8ac34c347 Options: Sort by category, id. 
Separate category and trCategory and introduce sorting characters
to the categories. Same for id/name.
 2009-11-27 16:12:12 +01:00
Friedemann Kleint
65e11062bb Polish the settings dialog. 
Add a title label to the pages. Use QGroupBoxes throughout.
Extend SavedAction to work with checkable QGroupBoxes. Polish UI files,
use common layout for VCS plugins. Performance: Apply only visited
settings pages. Add search keywords.

Task-number: QTCREATOR-26
 2009-11-24 15:05:02 +01:00
ck
d208a3acc8 Help plugin: Fix handling of oblique font style. 
Reviewed-by: kh1
 2009-11-16 17:58:59 +01:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
mae
35be3a3b02 customize context help. The three modes are: 
- show side-by-side if possible
 - always show side-by-side
 - always show full help

The default is "show side-by-side if possible". It's currently considered
possible if the editor is at least 800 pixels wide.
 2009-07-14 13:21:51 +02:00
kh
e4b0bd28cb Implement import - export of help bookmarks. 
Task-number: 254695
 2009-07-08 15:03:40 +02:00
kh
a175a5f6ee Implement home page settings and help startup options. 2009-06-26 16:50:50 +02:00