Mercurial Repositories > eric / file diff

--- a/src/eric7/Documentation/Source/eric7.UI.DiffDialog.html	Thu Dec 21 15:46:22 2023 +0100
+++ b/src/eric7/Documentation/Source/eric7.UI.DiffDialog.html	Thu Dec 21 19:50:01 2023 +0100
@@ -110,7 +110,7 @@
 </p>
 <dl>
 
-<dt><i>files</i> (list of two str)</dt>
+<dt><i>files</i> (list of [str, str])</dt>
 <dd>
 list of two file names to be diffed
 </dd>
@@ -128,9 +128,9 @@
 </p>
 <dl>
 
-<dt><i>txt</i></dt>
+<dt><i>txt</i> (str)</dt>
 <dd>
-text to insert (string)
+text to insert
 </dd>
 </dl>
 <a NAME="DiffDialog.__fileChanged" ID="DiffDialog.__fileChanged"></a>
@@ -149,29 +149,29 @@
 </p>
 <dl>
 
-<dt><i>a</i></dt>
+<dt><i>a</i> (list of str)</dt>
 <dd>
-first sequence of lines (list of strings)
+first sequence of lines
 </dd>
-<dt><i>b</i></dt>
+<dt><i>b</i> (list of str)</dt>
 <dd>
-second sequence of lines (list of strings)
+second sequence of lines
 </dd>
-<dt><i>fromfile</i></dt>
+<dt><i>fromfile</i> (str)</dt>
 <dd>
-filename of the first file (string)
+filename of the first file
 </dd>
-<dt><i>tofile</i></dt>
+<dt><i>tofile</i> (str)</dt>
 <dd>
-filename of the second file (string)
+filename of the second file
 </dd>
-<dt><i>fromfiledate</i></dt>
+<dt><i>fromfiledate</i> (str)</dt>
 <dd>
-modification time of the first file (string)
+modification time of the first file
 </dd>
-<dt><i>tofiledate</i></dt>
+<dt><i>tofiledate</i> (str)</dt>
 <dd>
-modification time of the second file (string)
+modification time of the second file
 </dd>
 </dl>
 <a NAME="DiffDialog.__generateUnifiedDiff" ID="DiffDialog.__generateUnifiedDiff"></a>
@@ -183,29 +183,29 @@
 </p>
 <dl>
 
-<dt><i>a</i></dt>
+<dt><i>a</i> (list of str)</dt>
 <dd>
-first sequence of lines (list of strings)
+first sequence of lines
 </dd>
-<dt><i>b</i></dt>
+<dt><i>b</i> (list of str)</dt>
 <dd>
-second sequence of lines (list of strings)
+second sequence of lines
 </dd>
-<dt><i>fromfile</i></dt>
+<dt><i>fromfile</i> (str)</dt>
 <dd>
-filename of the first file (string)
+filename of the first file
 </dd>
-<dt><i>tofile</i></dt>
+<dt><i>tofile</i> (str)</dt>
 <dd>
-filename of the second file (string)
+filename of the second file
 </dd>
-<dt><i>fromfiledate</i></dt>
+<dt><i>fromfiledate</i> (str)</dt>
 <dd>
-modification time of the first file (string)
+modification time of the first file
 </dd>
-<dt><i>tofiledate</i></dt>
+<dt><i>tofiledate</i> (str)</dt>
 <dd>
-modification time of the second file (string)
+modification time of the second file
 </dd>
 </dl>
 <a NAME="DiffDialog.on_buttonBox_clicked" ID="DiffDialog.on_buttonBox_clicked"></a>
@@ -217,9 +217,9 @@
 </p>
 <dl>
 
-<dt><i>button</i></dt>
+<dt><i>button</i> (QAbstractButton)</dt>
 <dd>
-button that was clicked (QAbstractButton)
+button that was clicked
 </dd>
 </dl>
 <a NAME="DiffDialog.on_diffButton_clicked" ID="DiffDialog.on_diffButton_clicked"></a>
@@ -249,9 +249,9 @@
 </p>
 <dl>
 
-<dt><i>filename</i></dt>
+<dt><i>filename</i> (str)</dt>
 <dd>
-name of a file to use as the first file (string)
+name of a file to use as the first file
 </dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>
@@ -303,7 +303,7 @@
 </p>
 <dl>
 
-<dt><i>files</i> (list of two str)</dt>
+<dt><i>files</i> (list of [str, str])</dt>
 <dd>
 list of two file names to be diffed
 </dd>
@@ -321,19 +321,25 @@
 </p>
 <dl>
 
-<dt><i>obj</i></dt>
+<dt><i>obj</i> (QObject)</dt>
 <dd>
-reference to the object the event is meant for (QObject)
+reference to the object the event is meant for
 </dd>
-<dt><i>event</i></dt>
+<dt><i>event</i> (QEvent)</dt>
 <dd>
-reference to the event object (QEvent)
+reference to the event object
 </dd>
 </dl>
 <dl>
 <dt>Return:</dt>
 <dd>
-flag indicating, whether the event was handled (boolean)
+flag indicating, whether the event was handled
+</dd>
+</dl>
+<dl>
+<dt>Return Type:</dt>
+<dd>
+bool
 </dd>
 </dl>
 <div align="right"><a href="#top">Up</a></div>