summaryrefslogtreecommitdiff
path: root/src/plugins/imageviewer
Commit message (Collapse)AuthorAgeFilesLines
* Always pass Core::Id by value.Christian Kandeler2014-07-012-2/+2
| | | | | | | | | | | Currently we pass in some places by value, elsewhere by const ref and for some weird reason also by const value in a lot of places. The latter is particularly annoying, as it is also used in interfaces and therefore forces all implementors to do the same, since leaving the "const" off is causing compiler warnings with MSVC. Change-Id: I65b87dc3cce0986b8a55ff6119cb752361027803 Reviewed-by: hjk <hjk121@nokiamail.com>
* IDocument: Make mimeType a value memberhjk2014-07-012-15/+1
| | | | | Change-Id: I2e90ccf0a45ae8d00bcd00ec77fe0d9776f2f119 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* ImageViewerPlugin: Remove useless codeDaniel Teske2014-05-081-3/+0
| | | | | Change-Id: I4e475df102638d5c8895b14b8bdecfacd94a565b Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Merge remote-tracking branch 'origin/3.1'Oswald Buddenhagen2014-03-181-1/+1
|\ | | | | | | | | | | | | | | | | Conflicts: qbs/imports/QtcTool.qbs src/plugins/git/giteditor.cpp src/plugins/qmldesigner/qmldesignerplugin.cpp Change-Id: Icafd32f713effb1479480a0d1f61a01e429fbec0
| * use new base import style in qbs filesJoerg Bornemann2014-03-111-1/+1
| | | | | | | | | | | | Change-Id: Iecf32122df41f304ec6df538bb0dd8a263238a86 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Editors: Move id() from editor to document.Eike Ziller2014-03-052-2/+2
|/ | | | | | Change-Id: Ib81076842ab1c16832224790194b001206404d64 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* ImageViewer: De-pimpl two internal classeshjk2014-02-255-46/+19
| | | | | Change-Id: I3302463157f757fbb5190f25052fad1506d10612 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Core: Make IEditor::id a value member and adjust usershjk2014-02-252-6/+2
| | | | | | Change-Id: I47e457c4a1821c515cd8a740d27bfe005a0c09e6 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Qbs/qmake: Fix dependencies of pluginsTobias Hunger2014-02-112-0/+5
| | | | | | | | | ... based on output from dependencyinfo.py script Change-Id: I9532f6d259f15c16b62fae0ca18f8a8cad95bd11 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Editors: Remove useless parent widget argument from create/duplicateEike Ziller2014-01-082-3/+3
| | | | | | | It was never called with a sensible value anyhow, and only complicates things. Change-Id: I005848700b6c00114d91495670d4a0e15a2d2e64 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Incremented year in copyright infoRobert Loehning2014-01-0814-27/+27
| | | | | | Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* qbs project files: Make use of new qbsSearchPaths property.Christian Kandeler2013-10-091-1/+1
| | | | | Change-Id: I396d970fafea1fd0b4c4d73883796662a1d0064b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix some include statements.Christian Kandeler2013-09-041-1/+1
| | | | | | | | In several places, it says '#include "..."' for headers from different libraries/plugins. Change-Id: I96cd74fef9b30163adefe3e1720e0847bed9553a Reviewed-by: hjk <hjk121@nokiamail.com>
* Apply 'static' pattern to MimeDatabasehjk2013-09-031-1/+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>
* EditorFactory: Replace some virtual functions with data membershjk2013-08-022-39/+22
| | | | | Change-Id: I014cb57460c4e3a36bf7403960908b5ffec867ff Reviewed-by: David Schulz <david.schulz@digia.com>
* Move IEditor::createNew to IDocument::setContentsEike Ziller2013-07-174-7/+7
| | | | | | | | | 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>
* Move IEditor::isTemporary to IDocumentEike Ziller2013-07-122-6/+0
| | | | | | | | | 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>
* Move displayName from IEditor to IDocumentEike Ziller2013-07-104-24/+0
| | | | | | | | The display name is not editor instance specific, but belongs to the document. Change-Id: I3c936f04a86e10e6ca30063d85036d85b4b5880e Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Add QTCREATOR_COMPAT_VERSIONEike Ziller2013-07-091-1/+1
| | | | | | | | | | | Necessary for keeping compatibility within a minor series. When bumping versions, the compatVersion now needs to be taken into account too. Change-Id: I588947f885480889ff2f58481f72db76e3f1a9f1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Rename IDocument::fileName --> filePathEike Ziller2013-07-093-5/+5
| | | | | | | That is what it actually is, wrt how Qt API calls it. Change-Id: Ied02055debf6aad75556b0d9d22e8ba2f72be555 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Make IDocument::fileName a member with setter.Eike Ziller2013-07-092-22/+5
| | | | | | | | | | 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>
* Streamline mimetypes.xml filesOrgad Shaneh2013-06-072-4/+0
| | | | | Change-Id: I4f2a28d4732ea496f574e5f51fb1e1633ebca99d Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Doc: move imageviewer docs from headers to cpp filesLeena Miettinen2013-06-074-13/+13
| | | | | | | | Use standard wording for function docs. Use valid QDoc commands (\a instead of \param, for example). Change-Id: I556fdbf686f2f54138617d6784c650a1d973513c Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Remove unneeded IEditorFactor::open re-implementations.Eike Ziller2013-05-312-6/+0
| | | | | | Change-Id: I261bc1ee09a2c22155e4874a4429a868d837c256 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: David Schulz <david.schulz@digia.com>
* PNG: Fix warning about sRGB informationTobias Hunger2013-05-272-0/+0
| | | | | | | | | | | | | | | | libpng 1.6 prints a line warning about this whenever loading any of these files. Remove color mangement related sections as well as time information from the PNG files using: pngcrush -rem gAMA -rem cHRM -rem iCCP -rem sRGB -rem time -force -ow FileName PNGcrush is losslessly recompressing the files, too. Change-Id: I483dfb98414c4914840bd5ee9318153a599747b1 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Editors: Provide a base implementation for {save,restore}Statehjk2013-05-272-29/+0
| | | | | Change-Id: Iedfc0d59ecfe257ad5823cff39977bce82ada3a5 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Editors: Provide a base implementation for duplicate{,Supported}hjk2013-05-272-14/+0
| | | | | | | Helps avoiding trivial re-implementations. Change-Id: Iaa2e6b92503a2b9553432568c2047c28899c7ea6 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* ImageViewer: De-pimpl ImageViewerFilehjk2013-05-272-35/+15
| | | | | | Change-Id: I418394a106deac682b8c4ce6e8ecaac28324386d Reviewed-by: Denis Mingulov <denis@mingulov.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* auto-generate <dependencyList> in .pluginspec filesOswald Buddenhagen2013-04-111-3/+1
| | | | | | Change-Id: I8bb9b4eb0ae5ed9b283da422be882603ae0e1b49 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* derive TARGET from QTC_{LIB,PLUGIN}_NAMEOswald Buddenhagen2013-04-031-1/+0
| | | | | | | | the information is redundant now Change-Id: Icc8c8b4ace11538d45c6c9e1dbe5a7976f4743e1 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* make library and plugin dependencies declarativeOswald Buddenhagen2013-04-031-2/+5
| | | | | | | | | | | | instead of directly including the respective pri files in *_dependencies.pri, set variables and let qtcreator.pri resolve them to includes. this will allow us to re-use the dependency info elsewhere. Change-Id: Iaa33924e428ac0409660f42df2f98a7978452d3e Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* centralize assignment of TEMPLATE = libOswald Buddenhagen2013-04-021-1/+0
| | | | | Change-Id: I4025539f3875e79f03743ba9ed3fd09cd31b998d Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* automatically include libs' and plugins' _dependencies.pri filesOswald Buddenhagen2013-04-021-1/+0
| | | | | Change-Id: I25645bb625b467c6f9d895ff89a70acd6a25683e Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Merge remote-tracking branch 'origin/2.6'Oswald Buddenhagen2013-01-3114-27/+27
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2914-27/+27
| | | | | | | | | | Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Fixed warnings from clang -WdocumentationSergey Shambir2013-01-181-3/+1
| | | | | | | | | | Change-Id: Ib3ed1d3733ccfd78780640d70e14313d0cbb101f Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* | Generalize QT_NO_CAST_FROM_ASCIIOrgad Shaneh2013-01-162-4/+0
| | | | | | | | | | Change-Id: I2b6c5876cafb7cf19fc3040bc84fd88a90b6c0e0 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>
* | ImageViewer: Compile with QT_NO_CAST_FROM_ASCIIOrgad Shaneh2012-11-273-6/+10
| | | | | | | | | | Change-Id: Ic5d255095f29b26a5b3567a95a30e987fd763f9a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Id: Add QByteArray constructorOrgad Shaneh2012-11-201-1/+1
| | | | | | | | | | | | | | | | | | Distinguish from const char * one. QString ctor is yet to be removed Change-Id: I2da231036c6417353b0566d39666d918ad141c6d Reviewed-by: hjk <qthjk@ovi.com>
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-10-0514-258/+241
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Adjust license headershjk2012-10-0514-258/+241
| | | | | | | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | qbs files: Consolidate includePaths in QtcLibrary and QtcPluginOrgad Shaneh2012-10-051-9/+0
| | | | | | | | | | | | | | Avoid using "." as includePath when it is unneeded Change-Id: I9bc6f4ebe50409f49782520033fd5f098aed10d0 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | qbs files: Sort filesOrgad Shaneh2012-10-031-11/+11
|/ | | | | Change-Id: I6514deb70162bd52687e6143813bcf1325a797db Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Fix building without svg (Qt 5)Eike Ziller2012-09-191-1/+2
| | | | | Change-Id: Ic109cb574986eeec39057d81ebb35de7639bfdcb Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* rename QtDebug to QDebughjk2012-08-063-3/+3
| | | | | | | More uniform. Change-Id: I1c6057981f4c2b3170a4e69f0674fe4caf1143a2 Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
* Changed URL to qt-project.org in pluginspecs.Konstantin Tokarev2012-07-301-1/+1
| | | | | | | Also, it's 2012 now. Change-Id: I69a8d1d77658b2bb2cb547362d5e3163385cab3b Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Contact -> qt-project.orgEike Ziller2012-07-1913-35/+13
| | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fixed qbs build.Konstantin Tokarev2012-07-091-2/+0
| | | | | Change-Id: I043b60b55ab39742b599e7f0d70a444366f03bef Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Moved CommandButton to Core and made some improvements to it.Konstantin Tokarev2012-07-094-171/+9
| | | | | | | | Added constructor taking Id, use command description if toolTipBase is not set. Change-Id: I56d774e9c194c6f1eb90583f4a13ed75db540ba3 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
View Lorry Controller Status