Mercurial Repositories > eric / changeset
changeset
Made the fourth set of Qt5 compatibility changes.
Sun, 30 Sep 2012 19:08:45 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Sun, 30 Sep 2012 19:08:45 +0200
- changeset 2081
- b7ccd563eeb6
- parent 2080
- 4b33165dd55b
- child 2082
- 5d72ca2fbeab
Made the fourth set of Qt5 compatibility changes.
--- a/Debugger/BreakPointModel.py Sun Sep 30 17:23:16 2012 +0200 +++ b/Debugger/BreakPointModel.py Sun Sep 30 19:08:45 2012 +0200 @@ -7,7 +7,7 @@ Module implementing the Breakpoint model. """ -from PyQt4.QtCore import pyqtSignal, Qt, QAbstractItemModel, QModelIndex +from PyQt4.QtCore import pyqtSignal, Qt, QAbstractItemModel, QModelIndex, qVersion class BreakPointModel(QAbstractItemModel): @@ -107,7 +107,10 @@ self.dataAboutToBeChanged.emit(index, index) self.breakpoints[index.row()][index.column()] = value - self.dataChanged.emit(index, index) + if qVersion() >= "5.0.0": + self.dataChanged.emit(index, index, []) + else: + self.dataChanged.emit(index, index) return True def flags(self, index): @@ -212,7 +215,10 @@ self.breakpoints[row]) self.dataAboutToBeChanged.emit(index1, index2) self.breakpoints[row] = [fn, line] + list(properties) - self.dataChanged.emit(index1, index2) + if qVersion() >= "5.0.0": + self.dataChanged.emit(index1, index2, []) + else: + self.dataChanged.emit(index1, index2) def setBreakPointEnabledByIndex(self, index, enabled): """ @@ -227,7 +233,10 @@ index1 = self.createIndex(row, col, self.breakpoints[row]) self.dataAboutToBeChanged.emit(index1, index1) self.breakpoints[row][col] = enabled - self.dataChanged.emit(index1, index1) + if qVersion() >= "5.0.0": + self.dataChanged.emit(index1, index1, []) + else: + self.dataChanged.emit(index1, index1) def deleteBreakPointByIndex(self, index): """
--- a/Debugger/WatchPointModel.py Sun Sep 30 17:23:16 2012 +0200 +++ b/Debugger/WatchPointModel.py Sun Sep 30 19:08:45 2012 +0200 @@ -7,7 +7,7 @@ Module implementing the Watch expression model. """ -from PyQt4.QtCore import pyqtSignal, Qt, QAbstractItemModel, QModelIndex +from PyQt4.QtCore import pyqtSignal, Qt, QAbstractItemModel, QModelIndex, qVersion class WatchPointModel(QAbstractItemModel): @@ -191,7 +191,10 @@ for value in [cond, special] + list(properties): self.watchpoints[row][i] = value i += 1 - self.dataChanged.emit(index1, index2) + if qVersion() >= "5.0.0": + self.dataChanged.emit(index1, index2, []) + else: + self.dataChanged.emit(index1, index2) def setWatchPointEnabledByIndex(self, index, enabled): """ @@ -206,7 +209,10 @@ index1 = self.createIndex(row, col, self.watchpoints[row]) self.dataAboutToBeChanged.emit(index1, index1) self.watchpoints[row][col] = enabled - self.dataChanged.emit(index1, index1) + if qVersion() >= "5.0.0": + self.dataChanged.emit(index1, index1, []) + else: + self.dataChanged.emit(index1, index1) def deleteWatchPointByIndex(self, index): """
--- a/Helpviewer/Bookmarks/BookmarksModel.py Sun Sep 30 17:23:16 2012 +0200 +++ b/Helpviewer/Bookmarks/BookmarksModel.py Sun Sep 30 19:08:45 2012 +0200 @@ -8,7 +8,7 @@ """ from PyQt4.QtCore import Qt, QAbstractItemModel, QModelIndex, QUrl, QByteArray, \ - QDataStream, QIODevice, QBuffer, QMimeData + QDataStream, QIODevice, QBuffer, QMimeData, qVersion from .BookmarkNode import BookmarkNode from .XbelWriter import XbelWriter @@ -109,7 +109,10 @@ @param node reference to the bookmark node to change (BookmarkNode) """ idx = self.nodeIndex(node) - self.dataChanged.emit(idx, idx) + if qVersion() >= "5.0.0": + self.dataChanged.emit(idx, idx, []) + else: + self.dataChanged.emit(idx, idx) def removeRows(self, row, count, parent=QModelIndex()): """
--- a/Helpviewer/History/HistoryCompleter.py Sun Sep 30 17:23:16 2012 +0200 +++ b/Helpviewer/History/HistoryCompleter.py Sun Sep 30 19:08:45 2012 +0200 @@ -7,7 +7,7 @@ Module implementing a special completer for the history. """ -from PyQt4.QtCore import Qt, QRegExp, QTimer +from PyQt4.QtCore import Qt, QRegExp, QTimer, qVersion from PyQt4.QtGui import QTableView, QAbstractItemView, QSortFilterProxyModel, \ QCompleter @@ -147,7 +147,11 @@ self.__isValid = valid # tell the history completer that the model has changed - self.dataChanged.emit(self.index(0, 0), self.index(0, self.rowCount() - 1)) + if qVersion() >= "5.0.0": + self.dataChanged.emit(self.index(0, 0), + self.index(0, self.rowCount() - 1), []) + else: + self.dataChanged.emit(self.index(0, 0), self.index(0, self.rowCount() - 1)) def filterAcceptsRow(self, sourceRow, sourceParent): """
--- a/Helpviewer/History/HistoryFilterModel.py Sun Sep 30 17:23:16 2012 +0200 +++ b/Helpviewer/History/HistoryFilterModel.py Sun Sep 30 19:08:45 2012 +0200 @@ -7,7 +7,7 @@ Module implementing the history filter model. """ -from PyQt4.QtCore import Qt, QDateTime, QModelIndex +from PyQt4.QtCore import Qt, QDateTime, QModelIndex, qVersion from PyQt4.QtGui import QAbstractProxyModel from .HistoryModel import HistoryModel @@ -139,8 +139,12 @@ @param topLeft index of top left data element (QModelIndex) @param bottomRight index of bottom right data element (QModelIndex) """ - self.dataChanged.emit( - self.mapFromSource(topLeft), self.mapFromSource(bottomRight)) + if qVersion() >= "5.0.0": + self.dataChanged.emit( + self.mapFromSource(topLeft), self.mapFromSource(bottomRight), []) + else: + self.dataChanged.emit( + self.mapFromSource(topLeft), self.mapFromSource(bottomRight)) def headerData(self, section, orientation, role=Qt.DisplayRole): """
--- a/Helpviewer/History/HistoryModel.py Sun Sep 30 17:23:16 2012 +0200 +++ b/Helpviewer/History/HistoryModel.py Sun Sep 30 19:08:45 2012 +0200 @@ -7,7 +7,7 @@ Module implementing the history model. """ -from PyQt4.QtCore import Qt, QAbstractTableModel, QModelIndex, QUrl +from PyQt4.QtCore import Qt, QAbstractTableModel, QModelIndex, QUrl, qVersion import Helpviewer.HelpWindow @@ -64,7 +64,10 @@ @param row row number of the updated entry (integer) """ idx = self.index(row, 0) - self.dataChanged.emit(idx, idx) + if qVersion() >= "5.0.0": + self.dataChanged.emit(idx, idx, []) + else: + self.dataChanged.emit(idx, idx) def headerData(self, section, orientation, role=Qt.DisplayRole): """
--- a/Project/ProjectBrowserModel.py Sun Sep 30 17:23:16 2012 +0200 +++ b/Project/ProjectBrowserModel.py Sun Sep 30 19:08:45 2012 +0200 @@ -10,7 +10,7 @@ import os import re -from PyQt4.QtCore import QDir, QModelIndex, pyqtSignal, QFileSystemWatcher, Qt +from PyQt4.QtCore import QDir, QModelIndex, pyqtSignal, QFileSystemWatcher, Qt, qVersion from PyQt4.QtGui import QColor from UI.BrowserModel import BrowserModel, BrowserItem, BrowserDirectoryItem, \ @@ -473,7 +473,10 @@ if type_ and type_ not in itm.getProjectTypes(): itm.addProjectType(type_) index = self.createIndex(itm.row(), 0, itm) - self.dataChanged.emit(index, index) + if qVersion() >= "5.0.0": + self.dataChanged.emit(index, index, []) + else: + self.dataChanged.emit(index, index) olditem = itm return (itm, pathlist[-1]) else: @@ -549,7 +552,10 @@ index = self.createIndex(itm.row(), 0, itm) itm.setName(newFilename) - self.dataChanged.emit(index, index) + if qVersion() >= "5.0.0": + self.dataChanged.emit(index, index, []) + else: + self.dataChanged.emit(index, index) self.repopulateItem(newFilename) def findItem(self, name): @@ -704,7 +710,10 @@ item.setVcsStatus("") index = self.createIndex(item.row(), 0, item) - self.dataChanged.emit(index, index) + if qVersion() >= "5.0.0": + self.dataChanged.emit(index, index, []) + else: + self.dataChanged.emit(index, index) def updateVCSStatus(self, name, recursive=True): """ @@ -813,7 +822,10 @@ index1 = self.createIndex(itm.row(), 0, itm) index2 = self.createIndex(itm.row(), self.rootItem.columnCount(), itm) - self.dataChanged.emit(index1, index2) + if qVersion() >= "5.0.0": + self.dataChanged.emit(index1, index2, []) + else: + self.dataChanged.emit(index1, index2) head, tail = os.path.split(name) if head != lastHead: @@ -853,7 +865,10 @@ index1 = self.createIndex(itm.row(), 0, itm) index2 = self.createIndex(itm.row(), self.rootItem.columnCount(), itm) - self.dataChanged.emit(index1, index2) + if qVersion() >= "5.0.0": + self.dataChanged.emit(index1, index2, []) + else: + self.dataChanged.emit(index1, index2) path, tail = os.path.split(path) def preferencesChanged(self):
--- a/UI/NumbersWidget.py Sun Sep 30 17:23:16 2012 +0200 +++ b/UI/NumbersWidget.py Sun Sep 30 19:08:45 2012 +0200 @@ -7,7 +7,7 @@ Module implementing a widget to show numbers in different formats. """ -from PyQt4.QtCore import pyqtSlot, pyqtSignal, Qt, QAbstractTableModel +from PyQt4.QtCore import pyqtSlot, pyqtSignal, Qt, QAbstractTableModel, qVersion from PyQt4.QtGui import QWidget, QHeaderView from E5Gui.E5Application import e5App @@ -141,7 +141,10 @@ self.__value |= (1 << self.__bits - index.column() - 1) else: self.__value &= ~(1 << self.__bits - index.column() - 1) - self.dataChanged.emit(index, index) + if qVersion() >= "5.0.0": + self.dataChanged.emit(index, index, []) + else: + self.dataChanged.emit(index, index) return True return False
