WebBrowser/AdBlock/AdBlockSubscription.py

branch
QtWebEngine
changeset 4858
19dff9c9cf26
parent 4847
a1a8eac81b54
child 4859
36c4b21c9f7b
--- a/WebBrowser/AdBlock/AdBlockSubscription.py	Sun Mar 13 14:56:13 2016 +0100
+++ b/WebBrowser/AdBlock/AdBlockSubscription.py	Sun Mar 13 20:54:42 2016 +0100
@@ -128,10 +128,9 @@
         self.__requiresTitle = QUrl.fromPercentEncoding(
             QByteArray(urlQuery.queryItemValue("requiresTitle").encode()))
         if self.__requiresLocation and self.__requiresTitle:
-            import Helpviewer.HelpWindow
-            Helpviewer.HelpWindow.HelpWindow.adBlockManager()\
-                .loadRequiredSubscription(self.__requiresLocation,
-                                          self.__requiresTitle)
+            from WebBrowser.WebBrowserWindow import WebBrowserWindow
+            WebBrowserWindow.adBlockManager().loadRequiredSubscription(
+                self.__requiresLocation, self.__requiresTitle)
         
         lastUpdateString = urlQuery.queryItemValue("lastUpdate")
         self.__lastUpdate = QDateTime.fromString(lastUpdateString,
@@ -499,7 +498,7 @@
         """
         Public method to check the subscription for a matching rule.
         
-        @param req reference to the network request (QNetworkRequest)
+        @param req reference to the network request (QWebEngineUrlRequestInfo)
         @param urlDomain domain of the URL (string)
         @param urlString URL (string)
         @return reference to the rule object or None (AdBlockRule)

eric ide

mercurial