Mercurial Repositories > eric / changeset
changeset
Changed some code to get rid of obsolete functions.
Sun, 13 Jul 2014 18:40:52 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sun, 13 Jul 2014 18:40:52 +0200
- changeset 3702
- dabc69b82c7c
- parent 3701
- 864226db1abe
- child 3703
- 92ebf7ca99fb
Changed some code to get rid of obsolete functions.
--- a/Debugger/VariablesFilterDialog.py Sun Jul 13 16:33:32 2014 +0200 +++ b/Debugger/VariablesFilterDialog.py Sun Jul 13 18:40:52 2014 +0200 @@ -66,11 +66,11 @@ gList = [] for i in range(self.localsList.count()): itm = self.localsList.item(i) - if self.localsList.isItemSelected(itm): + if itm.isSelected(): lList.append(i) for i in range(self.globalsList.count()): itm = self.globalsList.item(i) - if self.globalsList.isItemSelected(itm): + if itm.isSelected(): gList.append(i) return (lList, gList)
--- a/E5Gui/E5SideBar.py Sun Jul 13 16:33:32 2014 +0200 +++ b/E5Gui/E5SideBar.py Sun Jul 13 18:40:52 2014 +0200 @@ -255,7 +255,7 @@ self.expand() elif evt.type() == QEvent.Wheel and \ not self.__stackedWidget.isHidden(): - if evt.delta() > 0: + if evt.angleDelta().y() > 0: self.prevTab() else: self.nextTab()
--- a/Helpviewer/AdBlock/AdBlockAccessHandler.py Sun Jul 13 16:33:32 2014 +0200 +++ b/Helpviewer/AdBlock/AdBlockAccessHandler.py Sun Jul 13 18:40:52 2014 +0200 @@ -9,7 +9,7 @@ from __future__ import unicode_literals -from PyQt5.QtCore import QUrl +from PyQt5.QtCore import QUrlQuery from PyQt5.QtNetwork import QNetworkAccessManager from E5Gui import E5MessageBox @@ -40,7 +40,7 @@ if url.path() != "subscribe": return None - title = QUrl.fromPercentEncoding(url.encodedQueryItemValue("title")) + title = QUrlQuery(url).queryItemValue("title") if not title: return None res = E5MessageBox.yesNo(
--- a/Helpviewer/AdBlock/AdBlockSubscription.py Sun Jul 13 16:33:32 2014 +0200 +++ b/Helpviewer/AdBlock/AdBlockSubscription.py Sun Jul 13 18:40:52 2014 +0200 @@ -113,26 +113,21 @@ if url.path() != "subscribe": return - self.__title = \ - QUrl.fromPercentEncoding(url.encodedQueryItemValue("title")) - self.__enabled = QUrl.fromPercentEncoding( - url.encodedQueryItemValue("enabled")) != "false" - self.__location = QByteArray(QUrl.fromPercentEncoding( - url.encodedQueryItemValue("location"))) + urlQuery = QUrlQuery(url) + self.__title = urlQuery.queryItemValue("title") + self.__enabled = urlQuery.queryItemValue("enabled") != "false" + self.__location = QByteArray(urlQuery.queryItemValue("location")) # Check for required subscription - self.__requiresLocation = QUrl.fromPercentEncoding( - url.encodedQueryItemValue("requiresLocation")) - self.__requiresTitle = QUrl.fromPercentEncoding( - url.encodedQueryItemValue("requiresTitle")) + self.__requiresLocation = urlQuery.queryItemValue("requiresLocation") + self.__requiresTitle = urlQuery.queryItemValue("requiresTitle") if self.__requiresLocation and self.__requiresTitle: import Helpviewer.HelpWindow Helpviewer.HelpWindow.HelpWindow.adBlockManager()\ .loadRequiredSubscription(self.__requiresLocation, self.__requiresTitle) - lastUpdateByteArray = url.encodedQueryItemValue("lastUpdate") - lastUpdateString = QUrl.fromPercentEncoding(lastUpdateByteArray) + lastUpdateString = urlQuery.queryItemValue("lastUpdate") self.__lastUpdate = QDateTime.fromString(lastUpdateString, Qt.ISODate) self.__loadRules()
--- a/Helpviewer/HelpBrowserWV.py Sun Jul 13 16:33:32 2014 +0200 +++ b/Helpviewer/HelpBrowserWV.py Sun Jul 13 18:40:52 2014 +0200 @@ -1531,6 +1531,7 @@ if searchUrl.scheme() != "http": return + searchUrlQuery = UrlQuery() searchEngines = {} inputFields = formElement.findAll("input") for inputField in inputFields.toList(): @@ -1543,12 +1544,12 @@ elif type_ == "text": if inputField == element: value = "{searchTerms}" - searchUrl.addQueryItem(name, value) + searchUrlQuery.addQueryItem(name, value) elif type_ == "checkbox" or type_ == "radio": if inputField.evaluateJavaScript("this.checked"): - searchUrl.addQueryItem(name, value) + searchUrlQuery.addQueryItem(name, value) elif type_ == "hidden": - searchUrl.addQueryItem(name, value) + searchUrlQuery.addQueryItem(name, value) selectFields = formElement.findAll("select") for selectField in selectFields.toList(): @@ -1560,7 +1561,7 @@ options = selectField.findAll("option") value = options.at(selectedIndex).toPlainText() - searchUrl.addQueryItem(name, value) + searchUrlQuery.addQueryItem(name, value) ok = True if len(searchEngines) > 1: @@ -1574,7 +1575,7 @@ return if searchEngines[searchEngine] != "": - searchUrl.addQueryItem( + searchUrlQuery.addQueryItem( searchEngines[searchEngine], searchEngine) engineName = "" @@ -1591,6 +1592,8 @@ if not ok: return + searchUrl.setQuery(searchUrlQuery) + from .OpenSearch.OpenSearchEngine import OpenSearchEngine engine = OpenSearchEngine() engine.setName(engineName)
--- a/Helpviewer/OpenSearch/OpenSearchEngine.py Sun Jul 13 16:33:32 2014 +0200 +++ b/Helpviewer/OpenSearch/OpenSearchEngine.py Sun Jul 13 18:40:52 2014 +0200 @@ -12,8 +12,8 @@ import re import json -from PyQt5.QtCore import pyqtSignal, pyqtSlot, QLocale, QUrl, QByteArray, \ - QBuffer, QIODevice, QObject +from PyQt5.QtCore import pyqtSignal, pyqtSlot, QLocale, QUrl, QUrlQuery, \ + QByteArray, QBuffer, QIODevice, QObject from PyQt5.QtGui import QImage from PyQt5.QtNetwork import QNetworkRequest, QNetworkAccessManager @@ -153,9 +153,11 @@ self.parseTemplate(searchTerm, self._searchUrlTemplate)) if self.__searchMethod != "post": + urlQuery = QUrlQuery() for parameter in self._searchParameters: - ret.addQueryItem(parameter[0], - self.parseTemplate(searchTerm, parameter[1])) + urlQuery.addQueryItem( + parameter[0], self.parseTemplate(searchTerm, parameter[1])) + ret.setQuery(urlQuery) return ret @@ -198,9 +200,11 @@ searchTerm, self._suggestionsUrlTemplate))) if self.__searchMethod != "post": + urlQuery = QUrlQuery() for parameter in self._suggestionsParameters: - ret.addQueryItem(parameter[0], - self.parseTemplate(searchTerm, parameter[1])) + urlQuery.addQueryItem( + parameter[0], self.parseTemplate(searchTerm, parameter[1])) + ret.setQuery(urlQuery) return ret
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py Sun Jul 13 16:33:32 2014 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py Sun Jul 13 18:40:52 2014 +0200 @@ -15,7 +15,7 @@ import os -from PyQt5.QtCore import pyqtSlot, QProcess, QTimer, QUrl, QByteArray +from PyQt5.QtCore import pyqtSlot, QProcess, QTimer, QUrl from PyQt5.QtGui import QTextCursor from PyQt5.QtWidgets import QWidget, QDialogButtonBox, QApplication, QLineEdit @@ -332,12 +332,10 @@ url = QUrl() url.setScheme("file") url.setPath(self.filename) - query = QByteArray() - query.append(parent.split(":")[0]).append('_').append(rev) - url.setEncodedQuery(query) + query = parent.split(":")[0] + '_' + rev + url.setQuery(query) dstr += ' [<a href="{0}" name="{1}" id="{1}">{2}</a>]'.format( - url.toString(), - str(query, encoding="ascii"), + url.toString(), query, self.tr('diff to {0}').format(parent), ) dstr += '<br />\n' @@ -481,7 +479,7 @@ if Utilities.isWindowsPlatform(): if filename.startswith("/"): filename = filename[1:] - ver = bytes(url.encodedQuery()).decode() + ver = url.query() v1, v2 = ver.split('_') if v1 == "" or v2 == "": return
--- a/Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py Sun Jul 13 16:33:32 2014 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py Sun Jul 13 18:40:52 2014 +0200 @@ -14,7 +14,7 @@ import pysvn -from PyQt5.QtCore import QMutexLocker, QByteArray, QUrl, Qt +from PyQt5.QtCore import QMutexLocker, QUrl, Qt from PyQt5.QtGui import QCursor, QTextCursor from PyQt5.QtWidgets import QWidget, QApplication, QDialogButtonBox @@ -140,9 +140,8 @@ url = QUrl() url.setScheme("file") url.setPath(self.filename) - query = QByteArray() - query.append(lv).append('_').append(ver) - url.setEncodedQuery(query) + query = lv + '_' + ver + url.setQuery(query) dstr += ' [<a href="{0}" name="{1}">{2}</a>]'.format( url.toString(), query, self.tr('diff to {0}').format(lv) @@ -237,7 +236,7 @@ if Utilities.isWindowsPlatform(): if filename.startswith("/"): filename = filename[1:] - ver = bytes(url.encodedQuery()).decode() + ver = url.query() v1 = ver.split('_')[0] v2 = ver.split('_')[1] if not v1 or not v2:
--- a/Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py Sun Jul 13 16:33:32 2014 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py Sun Jul 13 18:40:52 2014 +0200 @@ -15,7 +15,7 @@ import os -from PyQt5.QtCore import QTimer, QByteArray, QProcess, QRegExp, QUrl, pyqtSlot +from PyQt5.QtCore import QTimer, QProcess, QRegExp, QUrl, pyqtSlot from PyQt5.QtGui import QTextCursor from PyQt5.QtWidgets import QWidget, QLineEdit, QApplication, QDialogButtonBox @@ -182,12 +182,10 @@ url = QUrl() url.setScheme("file") url.setPath(self.filename) - query = QByteArray() - query.append(lv).append('_').append(ver) - url.setEncodedQuery(query) + query = lv + '_' + ver + url.setQuery(query) dstr += ' [<a href="{0}" name="{1}">{2}</a>]'.format( - url.toString(), - query, + url.toString(), query, self.tr('diff to {0}').format(lv), ) except IndexError: @@ -274,7 +272,7 @@ if Utilities.isWindowsPlatform(): if filename.startswith("/"): filename = filename[1:] - ver = bytes(url.encodedQuery()).decode() + ver = url.query() v1 = ver.split('_')[0] v2 = ver.split('_')[1] if v1 == "" or v2 == "":
--- a/Project/ProjectBrowserSortFilterProxyModel.py Sun Jul 13 16:33:32 2014 +0200 +++ b/Project/ProjectBrowserSortFilterProxyModel.py Sun Jul 13 18:40:52 2014 +0200 @@ -71,4 +71,4 @@ hideGeneratedForms = Preferences.getProject("HideGeneratedForms") if self.hideGeneratedForms != hideGeneratedForms: self.hideGeneratedForms = hideGeneratedForms - self.filterChanged() + self.invalidateFilter()
--- a/UI/BrowserSortFilterProxyModel.py Sun Jul 13 16:33:32 2014 +0200 +++ b/UI/BrowserSortFilterProxyModel.py Sun Jul 13 18:40:52 2014 +0200 @@ -109,4 +109,4 @@ hideNonPublic = Preferences.getUI("BrowsersHideNonPublic") if self.hideNonPublic != hideNonPublic: self.hideNonPublic = hideNonPublic - self.filterChanged() + self.invalidateFilter()
--- a/UI/UserInterface.py Sun Jul 13 16:33:32 2014 +0200 +++ b/UI/UserInterface.py Sun Jul 13 18:40:52 2014 +0200 @@ -19,7 +19,7 @@ from PyQt5.QtCore import pyqtSlot, QTimer, QFile, QFileInfo, pyqtSignal, \ PYQT_VERSION_STR, QDate, QIODevice, qVersion, QProcess, QSize, QUrl, \ - QObject, Qt + QUrlQuery, QObject, Qt from PyQt5.QtGui import QKeySequence, QDesktopServices from PyQt5.QtWidgets import QSizePolicy, QWidget, QWhatsThis, QToolBar, \ QDialog, QSplitter, QApplication, QMenu, QVBoxLayout, QDockWidget, \ @@ -3033,8 +3033,10 @@ Utilities.generateDistroInfo("\r\n")) url = QUrl("mailto:{0}".format(address)) - url.addQueryItem("subject", subject) - url.addQueryItem("body", body) + urlQuery = QUrlQuery() + urlQuery.addQueryItem("subject", subject) + urlQuery.addQueryItem("body", body) + url.setQuery(urlQuery) QDesktopServices.openUrl(url) def checkForErrorLog(self):
