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