Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 1.9, 1.9.1, and 1.9.2

repotreemodel: use wildcard import for Qt things

Changeset 69222862b75f…

Parent 566cd99c2146…

by Adrian Buehlmann

Changes to one file · Browse files at 69222862b75f Showing diff from parent 566cd99c2146 Diff from another changeset...

Change 1 of 7 Show Entire File tortoisehg/​hgqt/​repotreemodel.py Stacked
 
5
6
7
8
9
10
11
12
13
14
15
16
17
 
 
18
19
20
 
23
24
25
26
 
27
28
29
 
34
35
36
37
 
38
39
40
 
51
52
53
54
 
55
56
 
57
58
59
 
62
63
64
65
66
 
 
67
68
69
 
156
157
158
159
 
160
161
162
163
164
 
165
166
 
167
168
169
 
213
214
215
216
217
 
 
218
219
 
5
6
7
 
 
 
 
 
8
9
10
11
12
13
14
15
16
17
 
20
21
22
 
23
24
25
26
 
31
32
33
 
34
35
36
37
 
48
49
50
 
51
52
 
53
54
55
56
 
59
60
61
 
 
62
63
64
65
66
 
153
154
155
 
156
157
158
159
160
 
161
162
 
163
164
165
166
 
210
211
212
 
 
213
214
215
216
@@ -5,16 +5,13 @@
 # This software may be used and distributed according to the terms of the  # GNU General Public License version 2 or any later version.   -from PyQt4 import QtCore - -from PyQt4.QtCore import Qt, QVariant, SIGNAL, SLOT -from PyQt4.QtCore import QModelIndex, QString -  from tortoisehg.hgqt.i18n import _    from repotreeitem import undumpObject, AllRepoGroupItem, RepoGroupItem  from repotreeitem import RepoItem, RepoTreeItem   +from PyQt4.QtCore import * +    extractXmlElementName = 'reporegextract'  reporegistryXmlElementName = 'reporegistry' @@ -23,7 +20,7 @@
     def writeXml(target, item, rootElementName): - xw = QtCore.QXmlStreamWriter(target) + xw = QXmlStreamWriter(target)   xw.setAutoFormatting(True)   xw.setAutoFormattingIndent(2)   xw.writeStartDocument() @@ -34,7 +31,7 @@
   def readXml(source, rootElementName, model):   itemread = None - xr = QtCore.QXmlStreamReader(source) + xr = QXmlStreamReader(source)   if xr.readNextStartElement():   ele = str(xr.name().toString())   if ele != rootElementName: @@ -51,9 +48,9 @@
  return itemread     -class RepoTreeModel(QtCore.QAbstractItemModel): +class RepoTreeModel(QAbstractItemModel):   def __init__(self, openrepofunc, ui, filename=None, parent=None): - QtCore.QAbstractItemModel.__init__(self, parent) + QAbstractItemModel.__init__(self, parent)     self.openrepofunc = openrepofunc   self.ui = ui @@ -62,8 +59,8 @@
  all = None     if filename: - f = QtCore.QFile(filename) - if f.open(QtCore.QIODevice.ReadOnly): + f = QFile(filename) + if f.open(QIODevice.ReadOnly):   root = readXml(f, reporegistryXmlElementName, self)   f.close()   if root: @@ -156,14 +153,14 @@
  return res     def mimeTypes(self): - return QtCore.QStringList(repoRegMimeType) + return QStringList(repoRegMimeType)     def mimeData(self, indexes):   i = indexes[0]   item = i.internalPointer() - buf = QtCore.QByteArray() + buf = QByteArray()   writeXml(buf, item, extractXmlElementName) - d = QtCore.QMimeData() + d = QMimeData()   d.setData(repoRegMimeType, buf)   return d   @@ -213,7 +210,7 @@
  self.endInsertRows()     def write(self, fn): - f = QtCore.QFile(fn) - f.open(QtCore.QIODevice.WriteOnly) + f = QFile(fn) + f.open(QIODevice.WriteOnly)   writeXml(f, self.rootItem, reporegistryXmlElementName)   f.close()