Mercurial Repositories > eric / file diff

--- a/ViewManager/ViewManager.py	Tue Mar 07 18:53:18 2017 +0100
+++ b/ViewManager/ViewManager.py	Tue Mar 07 19:46:57 2017 +0100
@@ -384,14 +384,14 @@
         """
         raise RuntimeError('Not implemented')
         
-    def _addView(self, win, fn=None, noName="", next=False):
+    def _addView(self, win, fn=None, noName="", addNext=False):
         """
         Protected method to add a view (i.e. window).
         
         @param win editor assembly to be added
         @param fn filename of this editor
         @param noName name to be used for an unnamed editor (string)
-        @param next flag indicating to add the view next to the current
+        @param addNext flag indicating to add the view next to the current
             view (bool)
         @exception RuntimeError Not implemented
         """
@@ -509,11 +509,11 @@
         """
         pass
         
-    def eventFilter(self, object, event):
+    def eventFilter(self, qobject, event):
         """
         Public method called to filter an event.
         
-        @param object object, that generated the event (QObject)
+        @param qobject object, that generated the event (QObject)
         @param event the event, that was generated by object (QEvent)
         @return flag indicating if event was filtered out
         """
@@ -4261,13 +4261,13 @@
         #     2: Directory of currently active project
         #     3: CWD
         import QScintilla.Lexers
-        filter = self._getOpenFileFilter()
+        fileFilter = self._getOpenFileFilter()
         progs = E5FileDialog.getOpenFileNamesAndFilter(
             self.ui,
             QCoreApplication.translate('ViewManager', "Open files"),
             self._getOpenStartDir(),
             QScintilla.Lexers.getOpenFileFiltersList(True, True),
-            filter)[0]
+            fileFilter)[0]
         for prog in progs:
             self.openFiles(prog)
     
@@ -4432,7 +4432,7 @@
         self.__setSbFile()
         
     def openSourceFile(self, fn, lineno=-1, filetype="",
-                       selStart=0, selEnd=0, pos=0, next=False):
+                       selStart=0, selEnd=0, pos=0, addNext=False):
         """
         Public slot to display a file in an editor.
         
@@ -4444,11 +4444,12 @@
         @param selStart start of an area to be selected (integer)
         @param selEnd end of an area to be selected (integer)
         @param pos position within the line to place the cursor at (integer)
-        @param next flag indicating to add the file next to the current
+        @param addNext flag indicating to add the file next to the current
             editor (bool)
         """
         try:
-            newWin, editor = self.getEditor(fn, filetype=filetype, next=next)
+            newWin, editor = self.getEditor(fn, filetype=filetype,
+                                            addNext=addNext)
         except (IOError, UnicodeDecodeError):
             return
         
@@ -4733,7 +4734,7 @@
         
         return filenames
         
-    def getEditor(self, fn, filetype="", next=False):
+    def getEditor(self, fn, filetype="", addNext=False):
         """
         Public method to return the editor displaying the given file.
         
@@ -4742,8 +4743,8 @@
         
         @param fn filename to look for
         @param filetype type of the source file (string)
-        @param next flag indicating that if a new editor needs to be created,
-            it should be added next to the current editor (bool)
+        @param addNext flag indicating that if a new editor needs to be
+            created, it should be added next to the current editor (bool)
         @return tuple of two values giving a flag indicating a new window
             creation and a reference to the editor displaying this file
         """
@@ -4767,7 +4768,7 @@
                 newWin = True
         
         if newWin:
-            self._addView(assembly, fn, next=next)
+            self._addView(assembly, fn, addNext=addNext)
         else:
             self._showView(editor.parent(), fn)
         
@@ -6609,18 +6610,17 @@
         """
         self.breakpointToggled.emit(editor)
         
-    def getActions(self, type):
+    def getActions(self, actionSetType):
         """
         Public method to get a list of all actions.
         
-        @param type string denoting the action set to get.
-                It must be one of "edit", "file", "search",
-                "view", "window", "macro", "bookmark" or
-                "spelling".
+        @param actionSetType string denoting the action set to get.
+            It must be one of "edit", "file", "search", "view", "window",
+            "macro", "bookmark" or "spelling".
         @return list of all actions (list of E5Action)
         """
         try:
-            return self.__actions[type][:]
+            return self.__actions[actionSetType][:]
         except KeyError:
             return []
         
@@ -6795,16 +6795,16 @@
                 message
             )
     
-    def receive(self, hash, fileName, command):
+    def receive(self, projectHash, fileName, command):
         """
         Public slot to handle received editor commands.
         
-        @param hash hash of the project (string)
+        @param projectHash hash of the project (string)
         @param fileName project relative file name of the editor (string)
         @param command command string (string)
         """
         project = e5App().getObject("Project")
-        if hash == project.getHash():
+        if projectHash == project.getHash():
             fn = project.getAbsoluteUniversalPath(fileName)
             editor = self.getOpenEditor(fn)
             if editor: