--- a/calendar/base/content/agenda-listbox.js
+++ b/calendar/base/content/agenda-listbox.js
@@ -590,17 +590,17 @@ agendaListbox.setupContextMenu = functio
  *
  * @param aStart        (optional) The start date for the item query.
  * @param aEnd          (optional) The end date for the item query.
  * @param aCalendar     (optional) If specified, the single calendar from
  *                                   which the refresh will occur.
  */
 agendaListbox.refreshCalendarQuery = function(aStart, aEnd, aCalendar) {
     let refreshJob = {
-        QueryInterface: XPCOMUtils.generateQI([Components.interfaces.calIOperationListener]),
+        QueryInterface: ChromeUtils.generateQI([Ci.calIOperationListener]),
         agendaListbox: this,
         calendar: null,
         calId: null,
         operation: null,
         cancelled: false,
 
         onOperationComplete: function(aOpCalendar, aStatus, aOperationType, aId, aDateTime) {
             if (this.agendaListbox.mPendingRefreshJobs.has(this.calId)) {
@@ -863,24 +863,20 @@ agendaListbox.calendarOpListener = { age
 
 /**
  * Calendar and composite observer, used to keep agenda listbox up to date.
  * @see calIObserver
  * @see calICompositeObserver
  */
 agendaListbox.calendarObserver = { agendaListbox: agendaListbox };
 
-agendaListbox.calendarObserver.QueryInterface = function(aIID) {
-    if (!aIID.equals(Components.interfaces.calIObserver) &&
-        !aIID.equals(Components.interfaces.calICompositeObserver) &&
-        !aIID.equals(Components.interfaces.nsISupports)) {
-        throw Components.results.NS_ERROR_NO_INTERFACE;
-    }
-    return this;
-};
+agendaListbox.calendarObserver.QueryInterface = cal.generateQI([
+    Ci.calIObserver,
+    Ci.calICompositeObserver
+]);
 
 // calIObserver:
 agendaListbox.calendarObserver.onStartBatch = function() {
 };
 
 agendaListbox.calendarObserver.onEndBatch = function() {
 };
 

--- a/calendar/base/content/calendar-dnd-listener.js
+++ b/calendar/base/content/calendar-dnd-listener.js
@@ -604,12 +604,14 @@ function invokeEventDragSession(aItem, a
         if (e.result != Components.results.NS_ERROR_FAILURE) {
             // Pressing Escape on some platforms results in NS_ERROR_FAILURE
             // being thrown. Catch this exception, but throw anything else.
             throw e;
         }
     }
 }
 
+/* exported calendarViewDNDObserver, calendarMailButtonDNDObserver,
+   calendarCalendarButtonDNDObserver, calendarTaskButtonDNDObserver */
 var calendarViewDNDObserver = new calViewDNDObserver();
 var calendarMailButtonDNDObserver = new calMailButtonDNDObserver();
 var calendarCalendarButtonDNDObserver = new calCalendarButtonDNDObserver();
 var calendarTaskButtonDNDObserver = new calTaskButtonDNDObserver();

--- a/calendar/base/content/preferences/categories.js
+++ b/calendar/base/content/preferences/categories.js
@@ -56,17 +56,17 @@ var gCategoriesPane = {
 
         this.mCategoryDialog = "chrome://calendar/content/preferences/editCategory.xul";
 
         // Workaround for Bug 1151440 - the HTML color picker won't work
         // in linux when opened from modal dialog
         this.mWinProp = "centerscreen, chrome, resizable=no";
         if (AppConstants.platform != "linux") {
             this.mWinProp += ", modal";
-        };
+        }
     },
 
     /**
      * Updates the listbox containing the categories from the categories saved
      * in preferences.
      */
 
     updatePrefs: function() {

--- a/calendar/base/src/calCachedCalendar.js
+++ b/calendar/base/src/calCachedCalendar.js
@@ -7,17 +7,17 @@ ChromeUtils.import("resource://gre/modul
 ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
 ChromeUtils.import("resource://gre/modules/Preferences.jsm");
 
 var calICalendar = Components.interfaces.calICalendar;
 var cICL = Components.interfaces.calIChangeLog;
 var cIOL = Components.interfaces.calIOperationListener;
 
 var gNoOpListener = {
-    QueryInterface: XPCOMUtils.generateQI([Components.interfaces.calIOperationListener]),
+    QueryInterface: ChromeUtils.generateQI([Components.interfaces.calIOperationListener]),
     onGetResult: function(calendar, status, itemType, detail, count, items) {
     },
 
     onOperationComplete: function(calendar, status, opType, id, detail) {
     }
 };
 
 /**
@@ -51,17 +51,17 @@ function isUnavailableCode(result) {
     }
 }
 
 function calCachedCalendarObserverHelper(home, isCachedObserver) {
     this.home = home;
     this.isCachedObserver = isCachedObserver;
 }
 calCachedCalendarObserverHelper.prototype = {
-    QueryInterface: XPCOMUtils.generateQI([Components.interfaces.calIObserver]),
+    QueryInterface: ChromeUtils.generateQI([Components.interfaces.calIObserver]),
     isCachedObserver: false,
 
     onStartBatch: function() {
         this.home.mObservers.notify("onStartBatch");
     },
 
     onEndBatch: function() {
         this.home.mObservers.notify("onEndBatch");
@@ -127,28 +127,30 @@ function calCachedCalendar(uncachedCalen
     this.setupCachedCalendar();
     if (this.supportsChangeLog) {
         uncachedCalendar.offlineStorage = this.mCachedCalendar;
     }
     this.offlineCachedItems = {};
     this.offlineCachedItemFlags = {};
 }
 calCachedCalendar.prototype = {
+    /* eslint-disable mozilla/use-chromeutils-generateqi */
     QueryInterface: function(aIID) {
         if (aIID.equals(Components.interfaces.calISchedulingSupport) &&
             this.mUncachedCalendar.QueryInterface(aIID)) {
             // check whether uncached calendar supports it:
             return this;
         } else if (aIID.equals(Components.interfaces.calICalendar) ||
                    aIID.equals(Components.interfaces.nsISupports)) {
             return this;
         } else {
             throw Components.results.NS_ERROR_NO_INTERFACE;
         }
     },
+    /* eslint-enable mozilla/use-chromeutils-generateqi */
 
     mCachedCalendar: null,
     mCachedObserver: null,
     mUncachedCalendar: null,
     mObservers: null,
     mSuperCalendar: null,
     offlineCachedItems: null,
     offlineCachedItemFlags: null,
@@ -224,17 +226,17 @@ calCachedCalendar.prototype = {
             Components.utils.reportError(exc);
         }
     },
 
     getOfflineAddedItems: function(callbackFunc) {
         let self = this;
         self.offlineCachedItems = {};
         let getListener = {
-            QueryInterface: XPCOMUtils.generateQI([Components.interfaces.calIOperationListener]),
+            QueryInterface: ChromeUtils.generateQI([Components.interfaces.calIOperationListener]),
             onGetResult: function(aCalendar, aStatus, aItemType, aDetail, aCount, aItems) {
                 for (let item of aItems) {
                     self.offlineCachedItems[item.hashId] = item;
                     self.offlineCachedItemFlags[item.hashId] = cICL.OFFLINE_FLAG_CREATED_RECORD;
                 }
             },
 
             onOperationComplete: function(aCalendar, aStatus, aOpType, aId, aDetail) {
@@ -243,17 +245,17 @@ calCachedCalendar.prototype = {
         };
         this.mCachedCalendar.getItems(calICalendar.ITEM_FILTER_ALL_ITEMS | calICalendar.ITEM_FILTER_OFFLINE_CREATED,
                                       0, null, null, getListener);
     },
 
     getOfflineModifiedItems: function(callbackFunc) {
         let self = this;
         let getListener = {
-            QueryInterface: XPCOMUtils.generateQI([Components.interfaces.calIOperationListener]),
+            QueryInterface: ChromeUtils.generateQI([Components.interfaces.calIOperationListener]),
             onGetResult: function(aCalendar, aStatus, aItemType, aDetail, aCount, aItems) {
                 for (let item of aItems) {
                     self.offlineCachedItems[item.hashId] = item;
                     self.offlineCachedItemFlags[item.hashId] = cICL.OFFLINE_FLAG_MODIFIED_RECORD;
                 }
             },
 
             onOperationComplete: function(aCalendar, aStatus, aOpType, aId, aDetail) {
@@ -262,17 +264,17 @@ calCachedCalendar.prototype = {
         };
         this.mCachedCalendar.getItems(calICalendar.ITEM_FILTER_OFFLINE_MODIFIED | calICalendar.ITEM_FILTER_ALL_ITEMS,
                                       0, null, null, getListener);
     },
 
     getOfflineDeletedItems: function(callbackFunc) {
         let self = this;
         let getListener = {
-            QueryInterface: XPCOMUtils.generateQI([Components.interfaces.calIOperationListener]),
+            QueryInterface: ChromeUtils.generateQI([Components.interfaces.calIOperationListener]),
             onGetResult: function(aCalendar, aStatus, aItemType, aDetail, aCount, aItems) {
                 for (let item of aItems) {
                     self.offlineCachedItems[item.hashId] = item;
                     self.offlineCachedItemFlags[item.hashId] = cICL.OFFLINE_FLAG_DELETED_RECORD;
                 }
             },
 
             onOperationComplete: function(aCalendar, aStatus, aOpType, aId, aDetail) {
@@ -338,17 +340,17 @@ calCachedCalendar.prototype = {
                 }
             };
             this.mPendingSync = this.mUncachedCalendar.replayChangesOn(opListener);
             return this.mPendingSync;
         }
 
         cal.LOG("[calCachedCalendar] Doing full sync for calendar " + this.uri.spec);
         let completeListener = {
-            QueryInterface: XPCOMUtils.generateQI([Components.interfaces.calIOperationListener]),
+            QueryInterface: ChromeUtils.generateQI([Components.interfaces.calIOperationListener]),
             modifiedTimes: {},
             hasRenewedCalendar: false,
             getsCompleted: 0,
             getsReceived: 0,
             opCompleted: false,
 
             onGetResult: function(aCalendar, aStatus, aItemType, aDetail, aCount, aItems) {
                 if (Components.isSuccessCode(aStatus)) {