Fix imports for SettingLevel to point at new file

src/settings/SettingsStore.js

@@ -28,12 +28,6 @@ import dis from '../dispatcher/dispatcher';
 import {SETTINGS} from "./Settings";
 import LocalEchoWrapper from "./handlers/LocalEchoWrapper";
 import {WatchManager} from "./WatchManager";
-import {SettingLevel as SL2} from "./SettingLevel";
-
-/**
- * @deprecated Use SettingLevel directly
- */
-export const SettingLevel = SL2;
 
 const defaultWatchManager = new WatchManager();
 

src/settings/handlers/AccountSettingsHandler.js

@@ -17,8 +17,8 @@ limitations under the License.
 
 import {MatrixClientPeg} from '../../MatrixClientPeg';
 import MatrixClientBackedSettingsHandler from "./MatrixClientBackedSettingsHandler";
-import {SettingLevel} from "../SettingsStore";
 import {objectClone, objectKeyChanges} from "../../utils/objects";
+import {SettingLevel} from "../SettingLevel";
 
 const BREADCRUMBS_LEGACY_EVENT_TYPE = "im.vector.riot.breadcrumb_rooms";
 const BREADCRUMBS_EVENT_TYPE = "im.vector.setting.breadcrumbs";

src/settings/handlers/DeviceSettingsHandler.js

@@ -18,7 +18,7 @@ limitations under the License.
 
 import SettingsHandler from "./SettingsHandler";
 import {MatrixClientPeg} from "../../MatrixClientPeg";
-import {SettingLevel} from "../SettingsStore";
+import {SettingLevel} from "../SettingLevel";
 
 /**
  * Gets and sets settings at the "device" level for the current device.

src/settings/handlers/RoomAccountSettingsHandler.js

@@ -17,8 +17,8 @@ limitations under the License.
 
 import {MatrixClientPeg} from '../../MatrixClientPeg';
 import MatrixClientBackedSettingsHandler from "./MatrixClientBackedSettingsHandler";
-import {SettingLevel} from "../SettingsStore";
 import {objectClone, objectKeyChanges} from "../../utils/objects";
+import {SettingLevel} from "../SettingLevel";
 
 const ALLOWED_WIDGETS_EVENT_TYPE = "im.vector.setting.allowed_widgets";
 

src/settings/handlers/RoomDeviceSettingsHandler.js

@@ -16,7 +16,7 @@ limitations under the License.
 */
 
 import SettingsHandler from "./SettingsHandler";
-import {SettingLevel} from "../SettingsStore";
+import {SettingLevel} from "../SettingLevel";
 
 /**
  * Gets and sets settings at the "room-device" level for the current device in a particular

src/settings/handlers/RoomSettingsHandler.js

@@ -17,8 +17,8 @@ limitations under the License.
 
 import {MatrixClientPeg} from '../../MatrixClientPeg';
 import MatrixClientBackedSettingsHandler from "./MatrixClientBackedSettingsHandler";
-import {SettingLevel} from "../SettingsStore";
 import {objectClone, objectKeyChanges} from "../../utils/objects";
+import {SettingLevel} from "../SettingLevel";
 
 /**
  * Gets and sets settings at the "room" level.

src/settings/watchers/FontWatcher.ts

@@ -15,10 +15,11 @@ limitations under the License.
 */
 
 import dis from '../../dispatcher/dispatcher';
-import SettingsStore, {SettingLevel} from '../SettingsStore';
+import SettingsStore from '../SettingsStore';
 import IWatcher from "./Watcher";
 import { toPx } from '../../utils/units';
 import { Action } from '../../dispatcher/actions';
+import { SettingLevel } from "../SettingLevel";
 
 export class FontWatcher implements IWatcher {
     public static readonly MIN_SIZE = 8;

src/settings/watchers/ThemeWatcher.ts

@@ -15,12 +15,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import SettingsStore, { SettingLevel } from '../SettingsStore';
+import SettingsStore  from '../SettingsStore';
 import dis from '../../dispatcher/dispatcher';
 import { Action } from '../../dispatcher/actions';
 import ThemeController from "../controllers/ThemeController";
 import { setTheme } from "../../theme";
 import { ActionPayload } from '../../dispatcher/payloads';
+import { SettingLevel } from "../SettingLevel";
 
 export default class ThemeWatcher {
     // XXX: I think this is unused.