Skip to content

Commit f70df14

Browse files
committed
fix(migration): remove const from legacyData().
legacyData() calls setDiscoveredLegacyConfigPath() and setLegacyData() on this, which are non const methods. Marking the function const was wrong since it has side effects and GCC/Clang both reject it with -Werror. Remove the const qualifier. Signed-off-by: Camila Ayres <hello@camilasan.com>
1 parent cc6fda6 commit f70df14

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

src/libsync/settings/migration.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ void Migration::resetForTesting()
141141
_legacyData = {};
142142
}
143143

144-
Migration::LegacyData Migration::legacyData() const
144+
Migration::LegacyData Migration::legacyData()
145145
{
146146
qCInfo(lcMigration) << "Migrate: restoreFromLegacySettings, checking settings group" << Theme::instance()->appName();
147147

src/libsync/settings/migration.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ class OWNCLOUDSYNC_EXPORT Migration
9090
void setUpgradeType(const UpgradeType type);
9191

9292
/// Returns QSettings from a legacy config file
93-
[[nodiscard]] LegacyData legacyData() const;
93+
[[nodiscard]] LegacyData legacyData();
9494
void setLegacyData(const LegacyData legacyData);
9595

9696
/// Set during first time migration of legacy accounts in AccountManager

0 commit comments

Comments
 (0)