summaryrefslogtreecommitdiff
path: root/src/plugins/vcsbase/submiteditorfile.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Replace virtual isModified method with a getter/setter/notifier"Jarek Kobus2016-10-211-0/+9
| | | | | | | | | | This doesn't fix the issue with cleaning the clear state of undo stack. This introduced the issue when ui file is opened it's marked as modified. It reverts 59c90e00c1e8b18d120f5b5c15b331b1ee427ace and d0c537ca759aa7facfdd0efedac5f5385d16ddb9 Change-Id: Ifd4ff8483d6c297461632de500a4502b1fd0871f Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Replace virtual isModified method with a getter/setter/notifierJarek Kobus2016-10-171-9/+0
| | | | | | | We have lacked the setter and dedicated notifier before. Change-Id: I58845a48259d260c5cc90ae94b173c79cddcfef9 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Core: Make IDocument concreteOrgad Shaneh2016-03-171-8/+0
| | | | | Change-Id: I8290943614ea4a2060cf09a71fb4f957852ab705 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* VCS: Properly support contents() on commit descriptionsUlf Hermann2016-01-221-0/+7
| | | | | | Change-Id: Ia10a646b49d442c5c8027c744ded003189645283 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Update License according to agreement with Free Qt FoundationTobias Hunger2016-01-191-17/+12
| | | | | | | * Update files in src/plugins Change-Id: Ia5d77fad7d19d4bb3498e78661982f68729adb22 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Editor manager: Abort with a single message if file is not readable.Eike Ziller2015-06-101-5/+6
| | | | | | | | | | | | | | We show a dialog that offers opening a file in a different editor type if opening a file fails, but we should not do that if opening the file fails because it is not readable. With this change, documents now specify if they failed to open a file because reading failed, or because they could not handle the file contents. Task-number: QTCREATORBUG-14495 Change-Id: I5d4b7cfa74b87ef21b9b55bc30b3ebe2f8238dfa Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Move "open" from IEditor to IDocumentEike Ziller2015-06-101-0/+18
| | | | | | | | | | For non-editor documents it currently is not used, but for editors it makes more sense to have that on the document instead of the editor. Most actual implementations of "open" were done in the documents already anyhow, because it is needed for reloading. Change-Id: I29d4df2078995cbe80172b51a9bebeecb3afad3c Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'Eike Ziller2015-02-121-6/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/utils/tooltip/tipcontents.cpp src/libs/utils/tooltip/tipcontents.h src/plugins/android/androiddeployqtstep.cpp src/plugins/baremetal/baremetalconstants.h src/plugins/baremetal/baremetaldevice.cpp src/plugins/baremetal/baremetaldevice.h src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp src/plugins/baremetal/baremetaldeviceconfigurationwidget.h src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h src/plugins/baremetal/baremetalplugin.cpp src/plugins/baremetal/baremetalplugin.h src/plugins/baremetal/baremetalruncontrolfactory.cpp src/plugins/baremetal/baremetalruncontrolfactory.h src/plugins/cppeditor/cppcodemodelinspectordialog.cpp src/plugins/cppeditor/cppdoxygen_test.cpp src/plugins/cppeditor/cppdoxygen_test.h src/plugins/debugger/breakpointmarker.cpp src/plugins/debugger/debuggeritemmodel.cpp src/plugins/debugger/debuggeritemmodel.h src/plugins/debugger/loadcoredialog.cpp src/plugins/genericprojectmanager/cppmodelmanagerhelper.cpp src/plugins/projectexplorer/addnewmodel.cpp src/plugins/projectexplorer/addnewmodel.h src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp src/plugins/qmlprofiler/abstracttimelinemodel.cpp src/plugins/qmlprofiler/abstracttimelinemodel.h src/plugins/qmlprofiler/notesmodel.cpp src/plugins/qmlprofiler/qml/CategoryLabel.qml src/plugins/qmlprofiler/qml/MainView.qml src/plugins/qmlprofiler/qml/Overview.js src/plugins/qmlprofiler/qml/Overview.qml src/plugins/qmlprofiler/qml/TimeDisplay.qml src/plugins/qmlprofiler/qml/TimeMarks.qml src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp src/plugins/qmlprofiler/sortedtimelinemodel.cpp src/plugins/qmlprofiler/sortedtimelinemodel.h src/plugins/qmlprofiler/timelinemodelaggregator.cpp src/plugins/qmlprofiler/timelinemodelaggregator.h src/plugins/qmlprofiler/timelinerenderer.cpp src/plugins/qmlprofiler/timelinerenderer.h src/plugins/qmlprojectmanager/QmlProjectManager.json.in src/plugins/texteditor/findinfiles.cpp src/plugins/vcsbase/vcsconfigurationpage.cpp src/shared/qbs src/shared/scriptwrapper/interface_wrap_helpers.h src/shared/scriptwrapper/wrap_helpers.h tests/auto/qmlprofiler/abstracttimelinemodel/tst_abstracttimelinemodel.cpp tests/system/suite_debugger/tst_debug_empty_main/test.py tests/system/suite_debugger/tst_qml_js_console/test.py tests/system/suite_debugger/tst_qml_locals/test.py Change-Id: I67540b648f8b162496f4aa606b04d50c7c9125c6
| * Update LicenseEike Ziller2015-01-161-6/+6
| | | | | | | | | | Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* | Core: Use FileName for file path in IDocumentOrgad Shaneh2015-01-121-4/+5
|/ | | | | Change-Id: I85f7398aee59d0d36f0e5c3bf88ff3c96002e394 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* License updateEike Ziller2014-10-091-7/+8
| | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* IDocument: Make mimeType a value memberhjk2014-07-011-6/+1
| | | | | Change-Id: I2e90ccf0a45ae8d00bcd00ec77fe0d9776f2f119 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Editors: Move id() from editor to document.Eike Ziller2014-03-051-2/+3
| | | | | | Change-Id: Ib81076842ab1c16832224790194b001206404d64 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Eike Ziller <eike.ziller@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>
* Move IEditor::createNew to IDocument::setContentsEike Ziller2013-07-171-0/+5
| | | | | | | | | The method is for setting the contents, so it belongs to the document, and should be named correspondingly. Change-Id: I40363dc08f11268f530885b512e4a88e8b10d096 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Make SubmitEditorFile dependency on VcsBaseSubmitEditor explicitEike Ziller2013-07-151-3/+19
| | | | | | | No use trying to hide it. Change-Id: Id81fdf1eef704dec6d4e83ee69bec10b1244b202 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Move IEditor::isTemporary to IDocumentEike Ziller2013-07-121-0/+1
| | | | | | | | | It's a property of the document implementation, not of the specific editor instance working on it. Change-Id: I5c3dd054e21b646e2d94b891916a096d045923f8 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Make IDocument::fileName a member with setter.Eike Ziller2013-07-091-15/+0
| | | | | | | | | | Instead of requiring subclasses to implement a method. Also renames IDocument::rename to IDocument::setFileName, since it doesn't really rename any files or such. Change-Id: I1344025c24d2f74a6a983e04fb0a5245f1f37aad Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: Eike Ziller <eike.ziller@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>
* Incremented year in copyright infov2.6.2Robert Loehning2013-01-291-1/+1
| | | | | Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Adjust license headershjk2012-10-051-21/+20
| | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Avoid sending signals if nothing changedTobias Hunger2012-09-261-2/+4
| | | | | Change-Id: Ie34a39f7d5035ebb7c9bbec199680605c072181d Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Contact -> qt-project.orgEike Ziller2012-07-191-3/+1
| | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Rename IFile->IDocument and FileManager->DocumentManagerEike Ziller2012-02-201-3/+3
| | | | | | | | And adapt the other API respectively. Change-Id: I1e04e555409be09242db6890f9e013396f83aeed Reviewed-by: Bill King <bill.king@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Long live the king!hjk2012-01-261-1/+1
| | | | | Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* vcs: s/VCS/Vcs/hjk2012-01-091-3/+3
| | | | | | | | According to style guide. Change-Id: I05c1d4f50ddbf2876ab7e0835f4abec95fd573b2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
* vcsbase: stylehjk2012-01-091-1/+1
| | | | | Change-Id: I139d9d46605383f03215c80bd9e9fd965021b435 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* all: s/info@qt.nokia.com/qt-info@nokia.com/hjk2011-11-031-2/+2
| | | | | Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* add auto-saving of modified editorsOswald Buddenhagen2011-05-121-2/+2
| | | | Task-number: QTCREATORBUG-2847
* don't emit changed() when saving failedOswald Buddenhagen2011-05-121-0/+2
|
* Fix/add copyright headersTobias Hunger2011-05-061-1/+1
| | | | Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
* add errorString output argument to IFile::reload() & IEditor::open()Oswald Buddenhagen2011-04-181-1/+3
| | | | add/unify read error handling in all affected classes
* add errorString output argument to IFile::save()Oswald Buddenhagen2011-04-181-2/+2
| | | | | | | this centralizes error reporting (in fact, in most cases it adds any in the first place). Task-number: QTCREATORBUG-1619
* Merge branch '2.2'Oswald Buddenhagen2011-04-141-14/+13
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Update license.hjk2011-04-131-14/+13
| |
* | API Documentation: Add VCSBase.Friedemann Kleint2011-03-281-0/+6
|/
* It's 2011 now.con2011-01-121-1/+1
| | | | Reviewed-by: hjk
* License headers.con2010-12-171-7/+11
|
* File renamingdt2010-05-121-0/+7
| | | | | | | | | | | | | | | | | | | | Reviewed-By: con Reviewed-By: Friedemann Kleint We now support renaming files. The version control system tries first to rename, if that doesn't support or can't rename the file we do a normal rename. (Note: git, hg, perforce > 2009.02 support renaming, cvs not. (perforce untested)). We correctly notify all editors of the renamed file and tell the project manager to rename the file in the project. Note: Only the qt4projectmanager knows how to rename files. Note: renaming folders, moving files to different folders, renaming .pro/.pri files is not supported. Those things can be later added after this has proven to work correctly in the simple case. Also we don't do any actions based on the renaming like renaming classes, changing include guards or #include lines.
* Refactor the externally modified file handlingcon2010-03-221-0/+13
| | | | Reviewed-by: dt
* SubmitFileEditor should emit signalsdt2010-03-051-0/+2
|
* Long live the king!hjk2010-03-051-1/+1
|
* long live the kinghjk2009-08-141-1/+1
|
* Update license headers and sales contact details.Jason McDonald2009-06-171-2/+2
| | | | Reviewed-by: Trust Me
* Fixes: change file license headers to include LGPLhjk2009-02-251-21/+17
|
* Bump year in licence header.Daniel Molkentin2009-01-131-1/+1
|
* chancge Nokia GPL exception version from 1.2 to 1.3hjk2008-12-161-1/+1
|
* more code cosmeticshjk2008-12-021-7/+4
|
* off-by-one in headershjk2008-12-021-1/+0
|
* end-of-line whitespace correction of the new headershjk2008-12-021-10/+11
|
View Lorry Controller Status