Fixed a few QUrlQuery related issues.

Mon, 15 Sep 2014 20:08:12 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Mon, 15 Sep 2014 20:08:12 +0200
changeset 3788
195dd519bf29
parent 3787
d7bb01f8e083
child 3793
bdaf1b220a36

Fixed a few QUrlQuery related issues.

Helpviewer/Download/DownloadItem.py file | annotate | diff | comparison | revisions
Helpviewer/HelpBrowserWV.py file | annotate | diff | comparison | revisions
Helpviewer/OpenSearch/OpenSearchEngine.py file | annotate | diff | comparison | revisions
UI/UserInterface.py file | annotate | diff | comparison | revisions
--- a/Helpviewer/Download/DownloadItem.py	Mon Sep 15 20:07:17 2014 +0200
+++ b/Helpviewer/Download/DownloadItem.py	Mon Sep 15 20:08:12 2014 +0200
@@ -212,7 +212,7 @@
             self.__autoOpen = dlg.getAction() == "open"
             if PYQT_VERSION_STR >= "5.0.0":
                 from PyQt5.QtCore import QStandardPaths
-                tempLocation = QStandardPaths.storageLocation(
+                tempLocation = QStandardPaths.storageLocations(
                     QStandardPaths.TempLocation)
             else:
                 from PyQt5.QtGui import QDesktopServices
--- a/Helpviewer/HelpBrowserWV.py	Mon Sep 15 20:07:17 2014 +0200
+++ b/Helpviewer/HelpBrowserWV.py	Mon Sep 15 20:08:12 2014 +0200
@@ -1533,7 +1533,7 @@
         
         if qVersion() >= "5.0.0":
             from PyQt5.QtCore import QUrlQuery
-            searchUrlQuery = QUrlQuery()
+            searchUrlQuery = QUrlQuery(searchUrl)
         searchEngines = {}
         inputFields = formElement.findAll("input")
         for inputField in inputFields.toList():
--- a/Helpviewer/OpenSearch/OpenSearchEngine.py	Mon Sep 15 20:07:17 2014 +0200
+++ b/Helpviewer/OpenSearch/OpenSearchEngine.py	Mon Sep 15 20:08:12 2014 +0200
@@ -155,7 +155,7 @@
         if self.__searchMethod != "post":
             if qVersion() >= "5.0.0":
                 from PyQt5.QtCore import QUrlQuery
-                urlQuery = QUrlQuery()
+                urlQuery = QUrlQuery(ret)
                 for parameter in self._searchParameters:
                     urlQuery.addQueryItem(
                         parameter[0],
@@ -210,7 +210,7 @@
         if self.__searchMethod != "post":
             if qVersion() >= "5.0.0":
                 from PyQt5.QtCore import QUrlQuery
-                urlQuery = QUrlQuery()
+                urlQuery = QUrlQuery(ret)
                 for parameter in self._suggestionsParameters:
                     urlQuery.addQueryItem(
                         parameter[0],
--- a/UI/UserInterface.py	Mon Sep 15 20:07:17 2014 +0200
+++ b/UI/UserInterface.py	Mon Sep 15 20:08:12 2014 +0200
@@ -3035,7 +3035,7 @@
         url = QUrl("mailto:{0}".format(address))
         if qVersion() >= "5.0.0":
             from PyQt5.QtCore import QUrlQuery
-            urlQuery = QUrlQuery()
+            urlQuery = QUrlQuery(url)
             urlQuery.addQueryItem("subject", subject)
             urlQuery.addQueryItem("body", body)
             url.setQuery(urlQuery)

eric ide

mercurial