Mercurial Repositories > eric / changeset

--- a/APIs/Python3/eric5.api	Sun May 18 14:13:09 2014 +0200
+++ b/APIs/Python3/eric5.api	Sun May 18 16:35:00 2014 +0200
@@ -4558,6 +4558,7 @@
 eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.HgCommitDialog.rejected?7
 eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.HgCommitDialog.showEvent?4(evt)
 eric5.Plugins.VcsPlugins.vcsMercurial.HgCommitDialog.HgCommitDialog?1(vcs, msg, mq, parent=None)
+eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.FilenameRole?7
 eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.StatusRole?7
 eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.closeEvent?4(e)
 eric5.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.HgConflictsListDialog.keyPressEvent?4(evt)
@@ -7620,6 +7621,7 @@
 eric5.QScintilla.SpellChecker.SpellChecker.ignoreAlways?4(word=None)
 eric5.QScintilla.SpellChecker.SpellChecker.initCheck?4(startPos, endPos)
 eric5.QScintilla.SpellChecker.SpellChecker.isAvailable?4()
+eric5.QScintilla.SpellChecker.SpellChecker.next?4()
 eric5.QScintilla.SpellChecker.SpellChecker.remove?4(word)
 eric5.QScintilla.SpellChecker.SpellChecker.replace?4(replacement)
 eric5.QScintilla.SpellChecker.SpellChecker.replaceAlways?4(replacement)

Binary file Documentation/Help/source.qch has changed

--- a/Documentation/Help/source.qhp	Sun May 18 14:13:09 2014 +0200
+++ b/Documentation/Help/source.qhp	Sun May 18 16:35:00 2014 +0200
@@ -10164,6 +10164,7 @@
       <keyword name="SpellChecker.ignoreAlways" id="SpellChecker.ignoreAlways" ref="eric5.QScintilla.SpellChecker.html#SpellChecker.ignoreAlways" />
       <keyword name="SpellChecker.initCheck" id="SpellChecker.initCheck" ref="eric5.QScintilla.SpellChecker.html#SpellChecker.initCheck" />
       <keyword name="SpellChecker.isAvailable" id="SpellChecker.isAvailable" ref="eric5.QScintilla.SpellChecker.html#SpellChecker.isAvailable" />
+      <keyword name="SpellChecker.next" id="SpellChecker.next" ref="eric5.QScintilla.SpellChecker.html#SpellChecker.next" />
       <keyword name="SpellChecker.remove" id="SpellChecker.remove" ref="eric5.QScintilla.SpellChecker.html#SpellChecker.remove" />
       <keyword name="SpellChecker.replace" id="SpellChecker.replace" ref="eric5.QScintilla.SpellChecker.html#SpellChecker.replace" />
       <keyword name="SpellChecker.replaceAlways" id="SpellChecker.replaceAlways" ref="eric5.QScintilla.SpellChecker.html#SpellChecker.replaceAlways" />

--- a/Documentation/Source/eric5.QScintilla.SpellChecker.html	Sun May 18 14:13:09 2014 +0200
+++ b/Documentation/Source/eric5.QScintilla.SpellChecker.html	Sun May 18 16:35:00 2014 +0200
@@ -137,6 +137,9 @@
 <td><a href="#SpellChecker.initCheck">initCheck</a></td>
 <td>Public method to initialize a spell check.</td>
 </tr><tr>
+<td><a href="#SpellChecker.next">next</a></td>
+<td>Public method to advance to the next error.</td>
+</tr><tr>
 <td><a href="#SpellChecker.remove">remove</a></td>
 <td>Public method to add a word to the personal exclude list.</td>
 </tr><tr>
@@ -478,6 +481,21 @@
 <dd>
 flag indicating successful initialization (boolean)
 </dd>
+</dl><a NAME="SpellChecker.next" ID="SpellChecker.next"></a>
+<h4>SpellChecker.next</h4>
+<b>next</b>(<i></i>)
+<p>
+            Public method to advance to the next error.
+</p><dl>
+<dt>Returns:</dt>
+<dd>
+self
+</dd>
+</dl><dl>
+<dt>Raises <b>StopIteration</b>:</dt>
+<dd>
+raised to indicate the end of the iteration
+</dd>
 </dl><a NAME="SpellChecker.remove" ID="SpellChecker.remove"></a>
 <h4>SpellChecker.remove</h4>
 <b>remove</b>(<i>word</i>)

--- a/QScintilla/SpellChecker.py	Sun May 18 14:13:09 2014 +0200
+++ b/QScintilla/SpellChecker.py	Sun May 18 16:35:00 2014 +0200
@@ -12,6 +12,7 @@
 from __future__ import unicode_literals
 
 import os
+import sys
 
 from PyQt4.QtCore import QTimer, QObject
 
@@ -537,3 +538,13 @@
                     return self
         
         raise StopIteration
+    
+    if sys.version_info.major == 2:
+        def next(self):
+            """
+            Public method to advance to the next error.
+            
+            @return self
+            @exception StopIteration raised to indicate the end of the iteration
+            """
+            return self.__next__()