aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs/utils/settingsaccessor.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Utils: Replace some QRegExp to QRegularExpressionChristian Stenger2020-06-191-1/+0
| | | | | | Task-number: QTCREATORBUG-24098 Change-Id: I7d12992506bbe33306c0ab750f73c7db1626abc3 Reviewed-by: hjk <hjk@qt.io>
* Utils: Replace foreach with range-based forOrgad Shaneh2020-06-161-1/+1
| | | | | Change-Id: I9aeea9c029ffc56cbadc04edd20e9b35b154f986 Reviewed-by: hjk <hjk@qt.io>
* Utils: Rename FilePathList to simply FilePathshjk2019-12-181-5/+5
| | | | | | | The exact storage type does not really matter here. Change-Id: Iefec40f0f5909c8e7ba3415db4a11962694e1b38 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Avoid warning on empty expressionshjk2019-07-231-5/+5
| | | | | | | | For some reason, Q_UNUSED includes already a semicolon, adding one on the user side creates an additional empty statement. Change-Id: I9c5e8fac381345a60792cb75e2938fd53958d3b0 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* ProjectExplorer: Give some possible reasons for not using a .user fileChristian Kandeler2019-07-091-1/+4
| | | | | | | | | In particular, explain that using a different settings path prevents Qt Creator from using the .user file. Task-number: QTCREATORBUG-18294 Change-Id: Iabd4bc0f3819ce458a4777d2cd554d1afe6013c6 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Utils: Rename FileName to FilePathhjk2019-05-281-24/+24
| | | | | | | | More in line with QFileInfo terminonlogy which appears to be best-of-breed within Qt. Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Utils: Replace mutating FileName::appendStringhjk2019-05-151-6/+5
| | | | | | | ... by a non-mutating .stringAppended, doing the same. Change-Id: I7adb6cae3415942cc9a80088bd75cda9d577d4a5 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* SettingsAccessor: Avoid soft assertion for inexistent fileOrgad Shaneh2018-11-191-1/+1
| | | | | | | | abi.xml is optional, but if it is not found, some assertions are triggered. Change-Id: I5255d6070028605cf860eb38ff63d00743a476d9 Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* SettingsAccessor: Relax old version validation for shared filesOrgad Shaneh2018-11-161-1/+8
| | | | | | | | | | | | Settings with older versions will not necessarily fail on upgrade. Let the upgrader assume they're using the oldest supported version, and continue from there. The logic with an appropriate message was already there, but it was never reached due to several bugs. Change-Id: Ie4d840a29d9aec7be7763111269f7bed81a8cbe3 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Utils: Remove superfluous qualificationsOrgad Shaneh2018-07-191-9/+9
| | | | | Change-Id: I36e17dac0cff87f82f0ddaf97bc613389110f218 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* SettingsAccessor: Fix placeholderRobert Loehning2018-07-131-1/+1
| | | | | Change-Id: I3bb6a2646f2c424feb0123ea0aeef07c4c16421a Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* ProjectExplorer: Do not overwrite shared project settingsOrgad Shaneh2018-05-081-2/+2
| | | | | Change-Id: Iecf684677599975e6f44df0d354ce7cd8c7aeeb9 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* ToolChain: Use SettingsAccessor to access XML settingsTobias Hunger2018-04-201-5/+12
| | | | | | | | | This allows for use of the new SettingsAccessor infrastructure for upgrading, backups, etc. Task-number: QTCREATORBUG-20148 Change-Id: I5419c86c0fd576a59ec91c212097c8f987e01da2 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Merge remote-tracking branch 'origin/4.6'Eike Ziller2018-04-131-1/+1
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/utils/settingsaccessor.cpp src/plugins/autotest/autotestplugin.cpp src/plugins/git/gitclient.cpp src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp src/plugins/qbsprojectmanager/qbsrunconfiguration.h Change-Id: I65f143cad18af509a2621d6c5925abbd038ea70f
| * SettingsAccessor: Support user file without EnvironmentIdOrgad Shaneh2018-04-091-1/+1
| | | | | | | | | | | | | | | | Let the users forge a user file without injecting their environment. Task-number: QTCREATORBUG-20097 Change-Id: Ia481f0f6d7c704d26b5f7d0f985f38dd39027f95 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* | SettingsAccessor: Remember last saved stateTobias Hunger2018-04-101-1/+10
| | | | | | | | | | | | | | | | | | Remember last saved data and do not save it again if nothing had changed. Change-Id: I093859ff5edc8d1d6e7b17ecd97985ca6fb0e579 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* | Utils: Purge asConstOrgad Shaneh2018-04-091-1/+0
| | | | | | | | | | | | | | | | Replace by qAsConst. Change-Id: I3301366f73c066c86f08df7188d70dc3b613c55c Reviewed-by: Christian Stenger <christian.stenger@qt.io> Reviewed-by: hjk <hjk@qt.io>
* | SettingsAccessor: Fix logic to decide when to do a backupTobias Hunger2018-03-051-3/+3
| | | | | | | | | | | | | | This fixes spurious *.user.-1 files from popping up. Change-Id: Ia78b99e7c535c085d85673cb310f0806ec4b4fee Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | SettingsAccessor: Rename BasicSettingsAccessor to SettingsAccessorTobias Hunger2018-02-151-50/+49
| | | | | | | | | | | | | | | | Rename BasicSettingsAccessor to SettingsAccessor, now that the name is available again. Change-Id: I49473f0c701976f992209f06d48decf047ab19de Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | SettingsAccessor: Extract functionality to merge settingsTobias Hunger2018-02-141-254/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move functionality related to merging settings into MergingSettingsAccessor, move code specific to the .user-files into UserFileAccessor. Remove SettingsAccessor class, now that all code has been moved out of it. This patch changes the merge mechanism a bit: It used to upgrade the user and tha shared file to the higher version of these two, merge, and then upgrade the merged result to the newest version. Now it upgrades both the user as well as the shared file to the newest version and only merges afterwards. Change-Id: I2a1605cbe9b9fb1404fcfa9954a9f3410da0abb1 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | SettingsAccessor: Extract upgrading functionalityTobias Hunger2018-02-141-271/+304
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upgrading functionality from SettingsAccessor into UpgradingSettingsAccessor. Fixes surprising behavior in test ProjectExplorerPlugin::testUserFileAccessor_prepareToReadSettingsObsoleteVersionNewVersion where the Version was thrown away. Also adds a error/warning distinction to BasicSettingsAccessor::Issue, so that the non-critical ones can be ignored later. Change-Id: Ia38d074f91cd8d8f820f9bec96d3330d748564c7 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | SettingsAccessor: Use optional for return value of BackUpStrategy::backupNameTobias Hunger2018-02-131-13/+18
| | | | | | | | | | Change-Id: I70aacd5804b10ee51c81c3e3d877f7c142d618b4 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | SettingsAccessor: Extract handling of backupsTobias Hunger2018-02-131-231/+203
| | | | | | | | | | | | | | | | | | | | | | Extract the code that handles backups from the SettingsAccessor into a BackingUpSettingsAccessor. Move code up from SettingsAccessor into UserFileAccessor where it belongs. This became possible due to the extraction. Change-Id: Icacaa4e7231b3c0c520154c76f9338227f96a614 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Merge remote-tracking branch 'origin/4.6'Eike Ziller2018-02-071-1/+1
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/coreplugin/locator/locator.cpp src/plugins/imageviewer/imageviewerplugin.cpp src/plugins/remotelinux/remotelinuxplugin.cpp src/tools/clangbackend/source/tokeninfo.cpp tests/unit/unittest/data/highlightingmarks.cpp Change-Id: I74cc3ba3a2836cb9d0e65d3380d8c4f88d720c67
| * Utils: Fix UI textLeena Miettinen2018-02-061-1/+1
| | | | | | | | | | Change-Id: Iae4302f2866abde5a9771ca4c7fc25dedb6dc0b9 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Utils: Fix compile with Qt lesser than 5.10Christian Stenger2018-02-071-3/+6
| | | | | | | | | | | | | | Broke with 79a43b4d86e0c21a0dfebf4a9baaa5ef03760d33. Change-Id: I9e7c9dc02c917b0ec3672b296e673212b16e835d Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | SettingsAccessor: Unify handling of different file locationsTobias Hunger2018-02-061-32/+47
|/ | | | | | | | Unify the code calculating the different file locations used by the SettingsAccessor. Change-Id: I85283f99618143ce1fbdd309bce12529cec442ca Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Settingsaccessor: Extract file access and error reportingTobias Hunger2018-01-151-245/+267
| | | | | | | | Move file access and error reporting out of SettingsAccessor and into BasicSettingsAccessor. Change-Id: If6cc9157c1a532f117c48b929c05f55d89a339eb Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* SettingsAccessor: Remove SettingsAccessorPrivate::Settings::isValidTobias Hunger2017-11-301-11/+0
| | | | | | | It is unused. Change-Id: I9cace756479a2af2a1b96a3e4bde790f31b319ae Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* SettingsAccessor: Move code aroundTobias Hunger2017-11-301-104/+96
| | | | | | | | No change is intended but the moving of entire classes, methods or functions. Change-Id: I18d3462bb97c203aee1b81f3c0d7a429a9aa3e86 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* SettingsAccessor: Add setters to VersionUpgraderTobias Hunger2017-11-301-25/+49
| | | | | | | | Add setters to VersionUpgrader and use them. This shortens the implementation classes a bit. Change-Id: I5ffe6f085752bf39bbcb08c286844cc1088eeea5 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* SettingsAccessor: Factor out basic load/save behaviorTobias Hunger2017-11-221-29/+59
| | | | | Change-Id: I654321167c623b507a9f109e42f77f41df3eccd2 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* SettingsAccessor: More const, more warnings on misuseTobias Hunger2017-11-221-4/+3
| | | | | Change-Id: I667944f041792c72b0cecbd6b2ec252db9a2701d Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* SettingsAccessor: Do not hard-code document typeTobias Hunger2017-11-221-2/+6
| | | | | Change-Id: Ied886eac9fcb4a9c58f088c32ee5ba0646b94fbc Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* SettingsAccessor: Use optional as return value of findIssuesTobias Hunger2017-11-221-27/+35
| | | | | Change-Id: Ib7ef8ec408f812a71735939514d98cf8755d292b Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* SettingsAccessor: Add tests for findIssuesTobias Hunger2017-11-221-3/+4
| | | | | Change-Id: Ib78c2c93dc9404087efe485fdaaad69595aa0125 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* SettingsAccessor: Add methods to upgrade to a specific versionTobias Hunger2017-11-221-1/+10
| | | | | Change-Id: If368f4a35d3702dbf680b1306ca6311070aa9bb5 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* SettingsAccessor: Do not change data on invalid upgrade attemptsTobias Hunger2017-11-221-7/+2
| | | | | | | | | | Make sure that the input data is returned unchanged if an invalid update attempt is attempted. Update tests accordingly. Change-Id: If5c410bf1a757f984593bda871763af64d8dd972 Reviewed-by: Marco Bubke <marco.bubke@qt.io>
* SettingsAccessor: Improve SettingsAccessor::isBetterMatchTobias Hunger2017-11-221-23/+19
| | | | | | | | Improve the behavior of isBetterMatch, so that it now handles invalid versions as well as invalid ids. Simplify code where possible. Change-Id: I2e65c0cc01d32fa77df8b5ec0d62b765e6c458f7 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Move SettingsAccessor from ProjectExplorer into UtilsTobias Hunger2017-11-201-0/+797
Change-Id: I83e9d7ef81f8c0af7220ce2777723db53ef2e02a Reviewed-by: Eike Ziller <eike.ziller@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-17 07:34:10 +0000