Remove conflict

Author: sprintr

src/LiveDevelopment/main.js

@@ -363,11 +363,6 @@ define(function main(require, exports, module) {
             _updateHighlightCheckmark();
         });
 
-    PreferencesManager.convertPreferences(module, {
-        "highlight": "user livedev.highlight",
-        "afterFirstLaunch": "user livedev.afterFirstLaunch"
-    }, true);
-
     config.highlight = PreferencesManager.getViewState("livedev.highlight");
 
     // init commands

src/document/DocumentManager.js

@@ -612,28 +612,6 @@ define(function (require, exports, module) {
             exports.trigger("documentSaved", doc);
         });
 
-    /**
-     * @private
-     * Examine each preference key for migration of the working set files.
-     * If the key has a prefix of "files_/", then it is a working set files
-     * preference from old preference model.
-     *
-     * @param {string} key The key of the preference to be examined
-     *      for migration of working set files.
-     * @return {?string} - the scope to which the preference is to be migrated
-     */
-    function _checkPreferencePrefix(key) {
-        var pathPrefix = "files_";
-        if (key.indexOf(pathPrefix) === 0) {
-            // Get the project path from the old preference key by stripping "files_".
-            var projectPath = key.substr(pathPrefix.length);
-            return "user project.files " + projectPath;
-        }
-
-        return null;
-    }
-
-
     // Set up event dispatch
     EventDispatcher.makeEventDispatcher(exports);
 
@@ -672,9 +650,6 @@ define(function (require, exports, module) {
         _proxyDeprecatedEvent("workingSetSort");
     });
 
-
-    PreferencesManager.convertPreferences(module, {"files_": "user"}, true, _checkPreferencePrefix);
-
     // Handle file saves that may affect preferences
     exports.on("documentSaved", function (e, doc) {
         PreferencesManager.fileChanged(doc.file.fullPath);

src/editor/Editor.js

@@ -2594,21 +2594,6 @@ define(function (require, exports, module) {
         });
     });
 
-    /**
-     * @private
-     *
-     * Manage the conversion from old-style localStorage prefs to the new file-based ones.
-     */
-    function _convertPreferences() {
-        var rules = {};
-        editorOptions.forEach(function (setting) {
-            rules[setting] = "user";
-        });
-        PreferencesManager.convertPreferences(module, rules);
-    }
-
-    _convertPreferences();
-
     // Define public API
     exports.Editor                  = Editor;
     exports.BOUNDARY_CHECK_NORMAL   = BOUNDARY_CHECK_NORMAL;

src/extensions/default/QuickView/main.js

@@ -819,11 +819,6 @@ define(function (require, exports, module) {
     CommandManager.register(Strings.CMD_ENABLE_QUICK_VIEW, CMD_ENABLE_QUICK_VIEW, toggleEnableQuickView);
     Menus.getMenu(Menus.AppMenuBar.VIEW_MENU).addMenuItem(CMD_ENABLE_QUICK_VIEW, null, Menus.AFTER, Commands.VIEW_TOGGLE_INSPECTION);
 
-    // Convert old preferences
-    PreferencesManager.convertPreferences(module, {
-        "enabled": "user quickview.enabled"
-    });
-
     // Setup initial UI state
     setEnabled(prefs.get("enabled"), true);
     setExtensionlessImagePreview(prefs.get("extensionlessImagePreview"), true);

src/extensions/default/RecentProjects/main.js

@@ -439,8 +439,6 @@ define(function (require, exports, module) {
         }
     }
 
-    PreferencesManager.convertPreferences(module, {"recentProjects": "user"}, true);
-
     // Register command handlers
     CommandManager.register(Strings.CMD_TOGGLE_RECENT_PROJECTS, TOGGLE_DROPDOWN, handleKeyEvent);
     KeyBindingManager.addBinding(TOGGLE_DROPDOWN, KeyboardPrefs.recentProjects);

src/language/CodeInspection.js

@@ -80,11 +80,6 @@ define(function (require, exports, module) {
 
     var prefs = PreferencesManager.getExtensionPrefs("linting");
 
-    PreferencesManager.convertPreferences(module, {
-        "enabled": "user linting.enabled",
-        "collapsed": "user linting.collapsed"
-    });
-
     /**
      * When disabled, the errors panel is closed and the status bar icon is grayed out.
      * Takes precedence over _collapsed.