--- a/Plugins/VcsPlugins/vcsPySvn/subversion.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Plugins/VcsPlugins/vcsPySvn/subversion.py Tue Jan 12 18:36:05 2010 +0000 @@ -16,7 +16,7 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from VCS.VersionControl import VersionControl @@ -877,11 +877,11 @@ names = [name] for nam in names: if os.path.isfile(nam): - editor = e4App().getObject("ViewManager").getOpenEditor(nam) + editor = e5App().getObject("ViewManager").getOpenEditor(nam) if editor and not editor.checkDirty() : return else: - project = e4App().getObject("Project") + project = e5App().getObject("Project") if nam == project.ppath and not project.saveAllScripts(): return self.diff = SvnDiffDialog(self) @@ -1663,11 +1663,11 @@ names = [name] for nam in names: if os.path.isfile(nam): - editor = e4App().getObject("ViewManager").getOpenEditor(nam) + editor = e5App().getObject("ViewManager").getOpenEditor(nam) if editor and not editor.checkDirty() : return else: - project = e4App().getObject("Project") + project = e5App().getObject("Project") if nam == project.ppath and not project.saveAllScripts(): return dlg = SvnRevisionSelectionDialog() @@ -1697,11 +1697,11 @@ names = [name] for nam in names: if os.path.isfile(nam): - editor = e4App().getObject("ViewManager").getOpenEditor(nam) + editor = e5App().getObject("ViewManager").getOpenEditor(nam) if editor and not editor.checkDirty() : return else: - project = e4App().getObject("Project") + project = e5App().getObject("Project") if nam == project.ppath and not project.saveAllScripts(): return