diff -r ba69827929ee -r c3eb7cc1ff8b Plugins/VcsPlugins/vcsSubversion/subversion.py
--- a/Plugins/VcsPlugins/vcsSubversion/subversion.py Tue Jan 12 18:33:34 2010 +0000
+++ b/Plugins/VcsPlugins/vcsSubversion/subversion.py Tue Jan 12 18:36:05 2010 +0000
@@ -15,7 +15,7 @@
from PyQt4.QtCore import *
from PyQt4.QtGui import *
-from E4Gui.E4Application import e4App
+from E4Gui.E4Application import e5App
from VCS.VersionControl import VersionControl
@@ -770,11 +770,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)
@@ -1504,11 +1504,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()
@@ -1537,11 +1537,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
@@ -1818,4 +1818,4 @@
@param interval check interval for the monitor thread in seconds (integer)
@return reference to the monitor thread (QThread)
"""
- return SvnStatusMonitorThread(interval, project.ppath, self)
+ return SvnStatusMonitorThread(interval, project.ppath, self)
\ No newline at end of file
