summaryrefslogtreecommitdiff
path: root/src/plugins/projectexplorer/projectfilewizardextension.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Use new mime databaseEike Ziller2015-02-171-4/+4
| | | | | Change-Id: I4305872b6b11ef3e8a364280ffa5209a5a793600 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* ProjectExplorer: Use FileName for Node::pathOrgad Shaneh2015-02-131-2/+2
| | | | | | Change-Id: I4a41cfb629be8bb06b4b0616cd4475525e617a51 Reviewed-by: BogDan Vatra <bogdan@kde.org> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Update LicenseEike Ziller2015-01-161-6/+6
| | | | | Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Merge "Merge remote-tracking branch 'origin/3.2'"Eike Ziller2014-10-141-7/+8
|\
| * Merge remote-tracking branch 'origin/3.2'Eike Ziller2014-10-141-7/+8
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/utils/ipaddresslineedit.cpp src/libs/utils/logging.h src/plugins/analyzerbase/AnalyzerBase.pluginspec.in src/plugins/android/Android.pluginspec.in src/plugins/android/androiddeploystep.cpp src/plugins/android/androiddeploystep.h src/plugins/android/androiddeploystepfactory.cpp src/plugins/android/androiddeploystepwidget.cpp src/plugins/android/androidpackagecreationfactory.cpp src/plugins/android/androidpackagecreationstep.cpp src/plugins/android/androidpackagecreationstep.h src/plugins/android/androidpackagecreationwidget.cpp src/plugins/android/androidpackagecreationwidget.h src/plugins/android/javafilewizard.cpp src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in src/plugins/baremetal/BareMetal.pluginspec.in src/plugins/bazaar/Bazaar.pluginspec.in src/plugins/beautifier/Beautifier.pluginspec.in src/plugins/bineditor/BinEditor.pluginspec.in src/plugins/bookmarks/Bookmarks.pluginspec.in src/plugins/clangcodemodel/ClangCodeModel.pluginspec.in src/plugins/clangcodemodel/clanghighlightingsupport.cpp src/plugins/clangcodemodel/clangsymbolsearcher.cpp src/plugins/classview/ClassView.pluginspec.in src/plugins/clearcase/ClearCase.pluginspec.in src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in src/plugins/cmakeprojectmanager/cmakeeditorfactory.cpp src/plugins/cmakeprojectmanager/cmakehighlighter.cpp src/plugins/coreplugin/Core.pluginspec.in src/plugins/cpaster/CodePaster.pluginspec.in src/plugins/cppeditor/CppEditor.pluginspec.in src/plugins/cppeditor/cppfilewizard.cpp src/plugins/cpptools/CppTools.pluginspec.in src/plugins/cpptools/cpphighlightingsupportinternal.cpp src/plugins/cpptools/cppmodelmanagerinterface.cpp src/plugins/cpptools/cppmodelmanagerinterface.h src/plugins/cvs/CVS.pluginspec.in src/plugins/debugger/Debugger.pluginspec.in src/plugins/designer/Designer.pluginspec.in src/plugins/diffeditor/DiffEditor.pluginspec.in src/plugins/emacskeys/EmacsKeys.pluginspec.in src/plugins/fakevim/FakeVim.pluginspec.in src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in src/plugins/git/Git.pluginspec.in src/plugins/git/gitorious/gitorious.cpp src/plugins/git/gitorious/gitorious.h src/plugins/git/gitorious/gitoriousclonewizard.cpp src/plugins/git/gitorious/gitorioushostwidget.cpp src/plugins/git/gitorious/gitorioushostwidget.h src/plugins/git/gitorious/gitorioushostwizardpage.cpp src/plugins/git/gitorious/gitoriousprojectwidget.cpp src/plugins/git/gitorious/gitoriousprojectwidget.h src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp src/plugins/git/gitorious/gitoriousprojectwizardpage.h src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp src/plugins/git/gitorious/gitoriousrepositorywizardpage.h src/plugins/glsleditor/GLSLEditor.pluginspec.in src/plugins/glsleditor/glsleditorfactory.cpp src/plugins/glsleditor/glslfilewizard.cpp src/plugins/helloworld/HelloWorld.pluginspec.in src/plugins/help/Help.pluginspec.in src/plugins/imageviewer/ImageViewer.pluginspec.in src/plugins/ios/Ios.pluginspec.in src/plugins/macros/Macros.pluginspec.in src/plugins/mercurial/Mercurial.pluginspec.in src/plugins/perforce/Perforce.pluginspec.in src/plugins/projectexplorer/ProjectExplorer.pluginspec.in src/plugins/pythoneditor/PythonEditor.pluginspec.in src/plugins/pythoneditor/pythoneditorwidget.cpp src/plugins/pythoneditor/wizard/pythonfilewizard.cpp src/plugins/qbsprojectmanager/QbsProjectManager.pluginspec.in src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp src/plugins/qmakeprojectmanager/QmakeProjectManager.pluginspec.in src/plugins/qmakeprojectmanager/profileeditorfactory.cpp src/plugins/qmldesigner/QmlDesigner.pluginspec.in src/plugins/qmljseditor/QmlJSEditor.pluginspec.in src/plugins/qmljseditor/qmljseditorfactory.cpp src/plugins/qmljstools/QmlJSTools.pluginspec.in src/plugins/qmlprofiler/QmlProfiler.pluginspec.in src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in src/plugins/qnx/Qnx.pluginspec.in src/plugins/qtsupport/QtSupport.pluginspec.in src/plugins/remotelinux/RemoteLinux.pluginspec.in src/plugins/resourceeditor/ResourceEditor.pluginspec.in src/plugins/resourceeditor/resourcewizard.h src/plugins/subversion/Subversion.pluginspec.in src/plugins/tasklist/TaskList.pluginspec.in src/plugins/texteditor/TextEditor.pluginspec.in src/plugins/texteditor/basetexteditor_p.h src/plugins/texteditor/basetextmark.cpp src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h src/plugins/texteditor/codeassist/defaultassistinterface.h src/plugins/texteditor/codeassist/iassistproposalitem.cpp src/plugins/texteditor/itexteditor.cpp src/plugins/texteditor/itexteditor.h src/plugins/texteditor/itextmark.cpp src/plugins/texteditor/plaintexteditor.cpp src/plugins/texteditor/plaintexteditor.h src/plugins/texteditor/texteditoractionhandler.cpp src/plugins/todo/Todo.pluginspec.in src/plugins/updateinfo/UpdateInfo.pluginspec.in src/plugins/valgrind/Valgrind.pluginspec.in src/plugins/vcsbase/VcsBase.pluginspec.in src/plugins/welcome/Welcome.pluginspec.in src/plugins/winrt/WinRt.pluginspec.in tests/auto/debugger/temporarydir.h Change-Id: I254af8be8119fe9855287909e17d4b8ca9d2fc2f
| | * License updateEike Ziller2014-10-091-7/+8
| | | | | | | | | | | | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
| | * New File Dialog: Tweak default node on Projct PageDaniel Teske2014-08-151-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The case from the bug report is: / --> project.pro --> src --> foo.qrc --> folder --> file added here Since the .qrc file is nearer then the .pro file, it was selected as the default node. This patch makes the priority for the .qrc node -1 if it's a unmatched mime type. That means a .qrc node will only be the default if it's either a image, a .qml or a .js file. Task-number: QTCREATORBUG-12793 Change-Id: I7328fd6359cc2e1959ab0bda831bd77de117baff Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | | ProjectExplorer: Remove redundant namespace qualificationsOrgad Shaneh2014-10-141-3/+3
|/ / | | | | | | | | Change-Id: Id9034e31f3f61c38894111951534dd0d59b746dc Reviewed-by: hjk <hjk121@nokiamail.com>
* | Use Qt 5's QStringList::join(QChar)hjk2014-08-251-1/+1
| | | | | | | | | | | | | | Less typing and less cycles than join(QString) where appropriate Change-Id: I6ebc0e17e4d7fd9845864dd95b7de4ba4dad6906 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Even more algorithm usage in ProjectExplorerDaniel Teske2014-07-161-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | Add Utils::transform and anyOf that take a member function pointer. Remove bestElementOr it's unused. Use declval<T> in transform's return type, because msvc does evaluate T() and for types that don't have simple constructor this fails. Add std::remove_reference since decltype returns a reference for lvalues. Change-Id: I22248b226748eeb27af0d300182d574438d7f756 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | ProjectWizardPage: Move code populating the Project dropdownTobias Hunger2014-07-151-180/+3
| | | | | | | | | | | | | | | | ... from the ProjectWizardExtension into the ProjectWizardPage. It is easier to reuse that way. Change-Id: Id9d32735cb695358a9bc283bc7545ecb28c4e04e Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | ProjectWizardPage: Refactor code a littleTobias Hunger2014-07-151-97/+5
|/ | | | | | | | | Move functionality from the projectfilewizardextension into the projectwizardpage itself and reduce the size of the context shared between the extension and the page to a bare minimum. Change-Id: I785fc103ea7d12e1da4bfdaf1d4664ed83a9989b Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* CleanUp usage of QtAlgorithmsNikita Baryshnikov2014-06-171-1/+0
| | | | | | Change-Id: I61be20554014f90c2e1313167a3e3c869e26c35e Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* Replace internal struct with classTobias Hunger2014-06-061-1/+2
| | | | | | | Coding style fix Change-Id: If7b0d1154094084a9be0276f1d8fd9e32a44eb92 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* IWizardFactory: Rename BaseFileWizard to BaseFileWizardFactoryTobias Hunger2014-06-051-1/+1
| | | | | Change-Id: I92977422bf8088b53e920370737907d60cf8708b Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* IWizard->IWizardFactoryTobias Hunger2014-05-261-6/+6
| | | | | | | | | | | Start at splitting up the wizard functionality a bit. Currently it is a factory but also contains a lot of logic that is invoked by the real wizard dialogs. This change renames/moves a couple of things only. Change-Id: I1fa114ee3ee262f7c0690841f361bbf09e674725 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Remove unused field and its initialization.Erik Verbruggen2014-05-191-5/+3
| | | | | Change-Id: Id44197a4556fba2e5fc4ec6b9a4cdd659389ad69 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* ProjectExtensionsPage: Rework project combo boxDaniel Teske2014-05-131-250/+150
| | | | | | | | | Show a actual tree in the combobox. Task-number: QTCREATORBUG-12002 Change-Id: I22b62f444923193972109a096bc6eef26a31bf9f Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* ProjectExplorer: Pass const values by referenceOrgad Shaneh2014-05-061-1/+1
| | | | | Change-Id: I985aced32b95cfe4bc1bbbf7c917dc04b1d94f2d Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* New File Wizard: Pay more attention to common path lengthDaniel Teske2014-04-291-13/+10
| | | | | | | | | | | For qmake project some projects use .pri files in subdirectotires to structure their project files. Those should be preferred to .pro files higher up in the tree. While there are also .pri files that set common variables between multiple .pro files, those are unlikely to be in the leafs. Change-Id: Ida6b4fc887fd8c273988ca71f2ead9d4e5929ae5 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* ProjectWizard: Remove unused method hideProjectComboBoxDaniel Teske2014-04-241-5/+0
| | | | | | | Was never used, not even by the commit introducing this function. Change-Id: Ic6e68ebde71e981b59df63d2c283442ac17838a5 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Use double quotes instead of single quotes as per our guidelines.Christian Kandeler2014-04-221-4/+4
| | | | | Change-Id: Ib608bb49e26781aef1914085a5d801fcdcd5eb56 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Fix typo in PREFERED_PROJECT_MODEKai Koehne2014-03-191-1/+1
| | | | | | | | | | Replace PREFERED_PROJECT_NODE with PREFERRED_PROJECT_NODE. This changes public API. The constant text does not seem to be stored on disk anywhere, though ... Change-Id: Id5393e597ed491b59075ff3687aaa4738fb3870c Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* ProjectExplorer::New File Use addNewInformation also for context menuDaniel Teske2014-03-101-20/+13
| | | | | | | So that the resourcenode can steal from it's parent Change-Id: I97a21d94c0ddb0d217c48fd69dc808446763837b Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Fix text on Project Management wizard pageEike Ziller2014-02-241-2/+2
| | | | | | | | | Broke with a23b34988282008820bfca1afec5ad79c0d769ac Task-number: QTCREATORBUG-11527 Change-Id: I523456ea805aa476552a9686ac620b8f204a732a Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* ProjectExplorer: Make "Add New File" work on FolderNodesDaniel Teske2014-02-191-90/+144
| | | | | | | | The ResoureceNode will be a folder node, this enables that to work for add new file. Change-Id: Ifb4827d0900ce550be164c44979c5b72ab947c42 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* ProjectNodes: Move supportedActions to NodeDaniel Teske2014-02-191-11/+11
| | | | | | | | | By default this simply calls the parent's supportedActions. Most changes are due to the enum moving. Change-Id: I25bf21b712cca48450014dbb0f748ac0c461e029 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* ProjectFileWizardExtension:: Remove dead codeDaniel Teske2014-02-131-24/+0
| | | | | Change-Id: I08c74afc07268b661079844cb5b1325606afdd99 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Incremented year in copyright infoRobert Loehning2014-01-081-1/+1
| | | | | | Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Remove most trailing newlines from translated messages.Friedemann Kleint2013-10-221-1/+2
| | | | | | | | | They are a hassle for translators and reviewers alike. Change-Id: I07c1b61e8b6719e54fdc1f69cf63f573119a6776 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Robert Loehning <robert.loehning@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* ProjectExplorer: de-noise projectfilewizardextension.cpphjk2013-10-101-37/+39
| | | | | Change-Id: I44b1955c3da43f4c27ef1ed82200a14c5e1afc93 Reviewed-by: David Schulz <david.schulz@digia.com>
* Merge remote-tracking branch 'origin/2.8'Eike Ziller2013-09-271-2/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/extensionsystem/pluginmanager.cpp src/libs/extensionsystem/pluginspec.cpp src/plugins/coreplugin/basefilewizard.cpp src/plugins/coreplugin/coreplugin.pro src/plugins/coreplugin/coreplugin.qbs src/plugins/coreplugin/editormanager/ieditor.cpp src/plugins/coreplugin/externaltool.cpp src/plugins/coreplugin/icore.cpp src/plugins/cpptools/cppmodelmanager.cpp src/plugins/fakevim/fakevimhandler.cpp src/plugins/find/ifindfilter.cpp src/plugins/projectexplorer/buildstep.cpp src/plugins/projectexplorer/devicesupport/idevice.cpp src/plugins/projectexplorer/runconfiguration.cpp src/plugins/vcsbase/vcsbaseeditor.cpp tests/system/suite_debugger/tst_simple_analyze/test.py Change-Id: I11dc9e60bfc14bad4f8af747d041fc7678a07c17
| * Doc: edit projectexplorer API docsLeena Miettinen2013-09-111-2/+2
| | | | | | | | | | | | | | | | | | | | Fix grammar, punctuation, and style issues. Use standard wording for QDoc commands. Remove \brief commands from function descriptions. Move some function descriptions directly above the functions, so that the \fn command can be removed. Change-Id: Iedf4f0041af24541a982241f99bd4906e86af916 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* | Apply static pattern to TextEditorSettinghjk2013-09-201-4/+4
| | | | | | | | | | Change-Id: I4e6f573d893c0aa2bb4ca9812fc8db2961dac172 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | SessionManager: Apply 'static' patternhjk2013-09-051-3/+2
| | | | | | | | | | Change-Id: I370f72fcf7a24216ee189979ce6b5c8bfc5f4140 Reviewed-by: David Schulz <david.schulz@digia.com>
* | Apply 'static' pattern to VcsManagerhjk2013-09-031-1/+1
| | | | | | | | | | | | | | Adapt user and surrounding code. Change-Id: Id2648f82a9cbbd0ad0bfb91f6958b8cee7ea29cc Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Apply 'static' pattern to MimeDatabasehjk2013-09-031-2/+1
| | | | | | | | | | | | | | | | Also adjust and streamline using and surrounding code. Change-Id: I6a8b05126bdcbb74ff611b21c7cb3c5902a2d5ca Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* | Merge remote-tracking branch 'origin/2.8'Oswald Buddenhagen2013-08-211-2/+9
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: src/plugins/cpptools/cppcompletion_test.cpp src/plugins/cpptools/cpptoolsplugin.h src/plugins/projectexplorer/customtoolchain.cpp src/plugins/vcsbase/command.cpp Change-Id: Ie7b3c9e136c0748b41320227c757471259339b48
| * Editor: Remove trailing whitespaces in generated files.David Schulz2013-08-121-2/+9
| | | | | | | | | | | | | | | | Task-number: QTCREATORBUG-9833 Change-Id: I7440d1e7c8ef303db1b6abfa8cd12325b934b0d2 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
* | Project: Simplfy file adding/removing interfaceDaniel Teske2013-07-081-16/+7
|/ | | | | | | | | | | | | The filetype is only relevant for Qt4 projects. But even for Qt4 projects the file type is insufficient to decide where the file should be added. So remove the file type from the interface and let the projectmanagers themselves figure out what they want to do. Also fix Task-number: QTCREATORBUG-9688 Change-Id: I02f7b1cd2e05efaf76e36fb9af34b109d4482f88 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Doc: use standard wording in \brief commandsLeena Miettinen2013-06-201-1/+2
| | | | | | | | | QDoc does some magic with the \class and \namespaces and \brief commands, so the following wording must be used: "The xxx class yyy ..." Change-Id: Id231f30e8464898b776888d5423523de404aae34 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* ProjectExplorer: Compile fix for Qt 4.Friedemann Kleint2013-06-051-1/+2
| | | | | | | | Introduced by e967049f5b68ff3e8f0170afaa6508c3147f5656 . Change-Id: I11f9b76f50e2343d499c7df4bd4cdd98cdb6be10 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* ProjectWizard: Prevent crash on changes to VCS settingsTobias Hunger2013-06-051-2/+5
| | | | | | | | | | The ProjectExtension kept a pointer to a page which is destroyed once the wizard is done and accessed it whenever VCS settings were touched. Task-number: QTCREATORBUG-9412 Change-Id: Iabe33d877a3d614ab7470c5e11fe26f7de1bb69c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Open project if it was not added to VC system.Petar Perisin2013-04-021-2/+16
| | | | | | | | | Currently project will be created, but if it fails to add it to VC system, it asks user to open project anyway. Task-number: QTCREATORBUG-8892 Change-Id: I8d6cfad4a5d6b4810491d355f916dfe031e82a52 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Clean headers in ProjectExplorer.Friedemann Kleint2013-03-261-3/+0
| | | | | | Change-Id: If61a8a91d2a39c5c97974a5bfcef91892b68d3f1 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Doc: replace deprecated QDoc commandsLeena Miettinen2013-02-061-2/+2
| | | | | | | | | | The \i and \o commands were replaced with \li and \bold was replaced with \b in QDoc for Qt 5. The \input command was replaced with \include in the docs. Change-Id: I257d1bebb8ebc739ca20e0d29fcf0406ecb14534 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Merge remote-tracking branch 'origin/2.6'Oswald Buddenhagen2013-01-311-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in src/plugins/debugger/qtmessageloghandler.cpp src/plugins/debugger/qtmessagelogwindow.cpp src/plugins/madde/maemodeployconfigurationwidget.cpp src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp src/plugins/qmldesigner/designercore/include/widgetqueryview.h src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp src/plugins/qnx/bardescriptormagicmatcher.h src/plugins/qt4projectmanager/profilekeywords.cpp src/plugins/remotelinux/deployablefilesperprofile.cpp src/plugins/remotelinux/deployablefilesperprofile.h src/plugins/remotelinux/deploymentinfo.cpp src/plugins/remotelinux/deploymentsettingsassistant.cpp src/plugins/remotelinux/profilesupdatedialog.cpp tests/auto/icheckbuild/ichecklib.cpp tests/auto/icheckbuild/parsemanager.cpp tests/auto/icheckbuild/parsemanager.h Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
| * Incremented year in copyright infov2.6.2Robert Loehning2013-01-291-1/+1
| | | | | | | | | | Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Remove braces for single lines of conditionsOrgad Shaneh2013-01-081-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #!/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>
* | Add whitespace after control keywordsOrgad Shaneh2012-11-281-1/+1
| | | | | | | | | | | | | | | | find -name \*.cpp -o -name \*.h | \ xargs sed -Ei 's/ (for|foreach|if|switch|while)\(/ \1 (/g' Change-Id: I9efdff4bf0c8c01a52baaaeb75198483c77b0390 Reviewed-by: hjk <qthjk@ovi.com>