Mercurial Repositories > eric / file comparison
comparison: Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py
Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py
- changeset 3656
- 441956d8fce5
- parent 3591
- 2f2a4a76dd22
- child 4021
- 195a471c327b
equal
deleted
inserted
replaced
| 3654:ffeb85cdc72d | 3656:441956d8fce5 |
|---|---|
| 13 except NameError: | 13 except NameError: |
| 14 pass | 14 pass |
| 15 | 15 |
| 16 import os | 16 import os |
| 17 | 17 |
| 18 from PyQt4.QtCore import pyqtSlot, QProcess, QTimer, QFileInfo, Qt | 18 from PyQt5.QtCore import pyqtSlot, QProcess, QTimer, QFileInfo, Qt |
| 19 from PyQt4.QtGui import QWidget, QDialogButtonBox, QBrush, QColor, \ | 19 from PyQt5.QtGui import QBrush, QColor, QTextCursor, QCursor |
| 20 QTextCursor, QLineEdit, QApplication, QCursor | 20 from PyQt5.QtWidgets import QWidget, QDialogButtonBox, QLineEdit, QApplication |
| 21 | 21 |
| 22 from E5Gui import E5MessageBox, E5FileDialog | 22 from E5Gui import E5MessageBox, E5FileDialog |
| 23 from E5Gui.E5Application import e5App | 23 from E5Gui.E5Application import e5App |
| 24 | 24 |
| 25 from .Ui_HgDiffDialog import Ui_HgDiffDialog | 25 from .Ui_HgDiffDialog import Ui_HgDiffDialog |
