diff -r ba69827929ee -r c3eb7cc1ff8b Plugins/PluginEricdoc.py --- a/Plugins/PluginEricdoc.py Tue Jan 12 18:33:34 2010 +0000 +++ b/Plugins/PluginEricdoc.py Tue Jan 12 18:36:05 2010 +0000 @@ -14,7 +14,7 @@ from PyQt4.QtCore import QObject, SIGNAL from PyQt4.QtGui import QDialog, QApplication -from E4Gui.E4Application import e4App +from E4Gui.E4Application import e5App from E4Gui.E4Action import E4Action @@ -91,7 +91,7 @@ @return tuple of None and activation status (boolean) """ - menu = e4App().getObject("Project").getMenu("Apidoc") + menu = e5App().getObject("Project").getMenu("Apidoc") if menu: self.__projectAct = \ E4Action(self.trUtf8('Generate documentation (eric5-doc)'), @@ -104,10 +104,10 @@ """<p>Generate API documentation using eric5-doc.</p>""" )) self.connect(self.__projectAct, SIGNAL('triggered()'), self.__doEricdoc) - e4App().getObject("Project").addE4Actions([self.__projectAct]) + e5App().getObject("Project").addE4Actions([self.__projectAct]) menu.addAction(self.__projectAct) - self.connect(e4App().getObject("Project"), SIGNAL("showMenu"), + self.connect(e5App().getObject("Project"), SIGNAL("showMenu"), self.__projectShowMenu) return None, True @@ -116,13 +116,13 @@ """ Public method to deactivate this plugin. """ - self.disconnect(e4App().getObject("Project"), SIGNAL("showMenu"), + self.disconnect(e5App().getObject("Project"), SIGNAL("showMenu"), self.__projectShowMenu) - menu = e4App().getObject("Project").getMenu("Apidoc") + menu = e5App().getObject("Project").getMenu("Apidoc") if menu: menu.removeAction(self.__projectAct) - e4App().getObject("Project").removeE4Actions([self.__projectAct]) + e5App().getObject("Project").removeE4Actions([self.__projectAct]) self.__initialize() def __projectShowMenu(self, menuName, menu): @@ -136,14 +136,14 @@ if menuName == "Apidoc": if self.__projectAct is not None: self.__projectAct.setEnabled(\ - e4App().getObject("Project").getProjectLanguage() in \ + e5App().getObject("Project").getProjectLanguage() in \ ["Python", "Python3", "Ruby"]) def __doEricdoc(self): """ Private slot to perform the eric5-doc api documentation generation. """ - project = e4App().getObject("Project") + project = e5App().getObject("Project") parms = project.getData('DOCUMENTATIONPARMS', "ERIC4DOC") dlg = EricdocConfigDialog(project.getProjectPath(), parms) if dlg.exec_() == QDialog.Accepted: @@ -177,4 +177,4 @@ if outdir not in project.pdata['OTHERS']: project.pdata['OTHERS'].append(outdir) project.setDirty(True) - project.othersAdded(outdir) + project.othersAdded(outdir) \ No newline at end of file