diff -r 2f70ca07f0af -r 4cd7e5a8b3cf src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html --- a/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html Fri Dec 22 19:45:17 2023 +0100 +++ b/src/eric7/Documentation/Source/eric7.Plugins.VcsPlugins.vcsMercurial.HgConflictsListDialog.html Sat Dec 23 15:40:23 2023 +0100 @@ -148,13 +148,13 @@ </p> <dl> -<dt><i>vcs</i></dt> +<dt><i>vcs</i> (Hg)</dt> <dd> reference to the vcs object </dd> -<dt><i>parent</i></dt> +<dt><i>parent</i> (QWidget)</dt> <dd> -parent widget (QWidget) +parent widget </dd> </dl> <a NAME="HgConflictsListDialog.__finish" ID="HgConflictsListDialog.__finish"></a> @@ -174,13 +174,13 @@ </p> <dl> -<dt><i>status</i></dt> +<dt><i>status</i> (str)</dt> <dd> -status of the file (string) +status of the file </dd> -<dt><i>name</i></dt> +<dt><i>name</i> (str)</dt> <dd> -name of the file (string) +name of the file </dd> </dl> <a NAME="HgConflictsListDialog.__getEntries" ID="HgConflictsListDialog.__getEntries"></a> @@ -199,9 +199,9 @@ </p> <dl> -<dt><i>line</i></dt> +<dt><i>line</i> (str)</dt> <dd> -output line to be processed (string) +output line to be processed </dd> </dl> <a NAME="HgConflictsListDialog.__resizeColumns" ID="HgConflictsListDialog.__resizeColumns"></a> @@ -227,9 +227,9 @@ </p> <dl> -<dt><i>out</i></dt> +<dt><i>out</i> (str)</dt> <dd> -error to be shown (string) +error to be shown </dd> </dl> <a NAME="HgConflictsListDialog.closeEvent" ID="HgConflictsListDialog.closeEvent"></a> @@ -241,9 +241,9 @@ </p> <dl> -<dt><i>e</i></dt> +<dt><i>e</i> (QCloseEvent)</dt> <dd> -close event (QCloseEvent) +close event </dd> </dl> <a NAME="HgConflictsListDialog.on_buttonBox_clicked" ID="HgConflictsListDialog.on_buttonBox_clicked"></a> @@ -255,9 +255,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="HgConflictsListDialog.on_conflictsList_itemDoubleClicked" ID="HgConflictsListDialog.on_conflictsList_itemDoubleClicked"></a> @@ -269,13 +269,13 @@ </p> <dl> -<dt><i>item</i></dt> +<dt><i>item</i> (QTreeWidgetItem)</dt> <dd> -reference to the double clicked item (QTreeWidgetItem) +reference to the double clicked item </dd> -<dt><i>column</i></dt> +<dt><i>column</i> (int)</dt> <dd> -column that was double clicked (integer) +column that was double clicked </dd> </dl> <a NAME="HgConflictsListDialog.on_conflictsList_itemSelectionChanged" ID="HgConflictsListDialog.on_conflictsList_itemSelectionChanged"></a>