Mercurial Repositories > eric / changeset

Binary file Documentation/Help/source.qch has changed

--- a/Documentation/Source/eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleFixer.html	Sat Apr 21 17:43:41 2018 +0200
+++ b/Documentation/Source/eric6.Plugins.CheckerPlugins.CodeStyleChecker.CodeStyleFixer.html	Sat Apr 21 18:02:04 2018 +0200
@@ -253,7 +253,7 @@
 </dd><dt><i>maxLineLength</i> (int)</dt>
 <dd>
 maximum allowed line length
-</dd><dt><i>blanklines</i> (tuple of (int, int))</dt>
+</dd><dt><i>blankLines</i> (tuple of (int, int))</dt>
 <dd>
 tuple containg the number of blank lines before
             a top level class or function and before a method or nested class

--- a/Documentation/Source/eric6.Project.Project.html	Sat Apr 21 17:43:41 2018 +0200
+++ b/Documentation/Source/eric6.Project.Project.html	Sat Apr 21 18:02:04 2018 +0200
@@ -605,7 +605,7 @@
 <td>Public slot used to handle the preferencesChanged signal.</td>
 </tr><tr>
 <td><a href="#Project.hasDefaultMakeParameters">hasDefaultMakeParameters</a></td>
-<td>Private method to test, if the project contains the default make parameters.</td>
+<td>Public method to test, if the project contains the default make parameters.</td>
 </tr><tr>
 <td><a href="#Project.hasEntry">hasEntry</a></td>
 <td>Public method to check the project for a file.</td>
@@ -2133,7 +2133,7 @@
 <h4>Project.hasDefaultMakeParameters</h4>
 <b>hasDefaultMakeParameters</b>(<i></i>)
 <p>
-        Private method to test, if the project contains the default make
+        Public method to test, if the project contains the default make
         parameters.
 </p><dl>
 <dt>Returns:</dt>

--- a/E5XML/Config.py	Sat Apr 21 17:43:41 2018 +0200
+++ b/E5XML/Config.py	Sat Apr 21 18:02:04 2018 +0200
@@ -11,7 +11,7 @@
 multiProjectFileFormatVersion = "5.1"
 
 # version numbers of the project file
-projectFileFormatVersion ="6.1"
+projectFileFormatVersion = "6.1"
 projectFileFormatVersionProto = "6.0"
 projectFileFormatVersionAlt = "5.1"
 

--- a/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py	Sat Apr 21 17:43:41 2018 +0200
+++ b/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py	Sat Apr 21 18:02:04 2018 +0200
@@ -966,10 +966,10 @@
             "PEP8/MaxLineLength", pycodestyle.MAX_LINE_LENGTH)))
         self.blankBeforeTopLevelSpinBox.setValue(
             int(Preferences.Prefs.settings.value(
-            "PEP8/BlankLinesBeforeTopLevel", 2)))
+                "PEP8/BlankLinesBeforeTopLevel", 2)))
         self.blankBeforeMethodSpinBox.setValue(
             int(Preferences.Prefs.settings.value(
-            "PEP8/BlankLinesBeforeMethod", 1)))
+                "PEP8/BlankLinesBeforeMethod", 1)))
         self.hangClosingCheckBox.setChecked(Preferences.toBool(
             Preferences.Prefs.settings.value("PEP8/HangClosing", False)))
         self.docTypeComboBox.setCurrentIndex(self.docTypeComboBox.findData(

--- a/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleFixer.py	Sat Apr 21 17:43:41 2018 +0200
+++ b/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleFixer.py	Sat Apr 21 18:02:04 2018 +0200
@@ -65,7 +65,7 @@
         @type str
         @param maxLineLength maximum allowed line length
         @type int
-        @param blanklines tuple containg the number of blank lines before
+        @param blankLines tuple containg the number of blank lines before
             a top level class or function and before a method or nested class
             or function
         @type tuple of (int, int)

--- a/Project/Project.py	Sat Apr 21 17:43:41 2018 +0200
+++ b/Project/Project.py	Sat Apr 21 18:02:04 2018 +0200
@@ -5411,7 +5411,7 @@
     
     def hasDefaultMakeParameters(self):
         """
-        Private method to test, if the project contains the default make
+        Public method to test, if the project contains the default make
         parameters.
         
         @return flag indicating default parameter set
@@ -5550,7 +5550,7 @@
                     message = self.tr(
                         """<p>There are changes that require the configured"""
                         """ make target <b>{0}</b> to be rebuilt.</p>""")\
-                    .format(self.pdata["MAKEPARAMS"]["MakeTarget"])
+                        .format(self.pdata["MAKEPARAMS"]["MakeTarget"])
                 else:
                     message = self.tr(
                         """<p>There are changes that require the default"""