From 50044a05fa7a132e05cadb718c5dcd2af0e83d2a Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Mon, 26 Oct 2020 15:12:17 -0700 Subject: [PATCH] Remove QVariant, to finish porting from PyQt5 to PySide2 --- dangerzone/settings_widget.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dangerzone/settings_widget.py b/dangerzone/settings_widget.py index 22a15e0..4150653 100644 --- a/dangerzone/settings_widget.py +++ b/dangerzone/settings_widget.py @@ -50,9 +50,7 @@ class SettingsWidget(QtWidgets.QWidget): self.open_checkbox.clicked.connect(self.update_ui) self.open_combobox = QtWidgets.QComboBox() for k in self.global_common.pdf_viewers: - self.open_combobox.addItem( - k, QtCore.QVariant(self.global_common.pdf_viewers[k]) - ) + self.open_combobox.addItem(k, self.global_common.pdf_viewers[k]) open_layout = QtWidgets.QHBoxLayout() open_layout.addWidget(self.open_checkbox) open_layout.addWidget(self.open_combobox) @@ -62,9 +60,7 @@ class SettingsWidget(QtWidgets.QWidget): self.ocr_checkbox = QtWidgets.QCheckBox("OCR document, language") self.ocr_combobox = QtWidgets.QComboBox() for k in self.global_common.ocr_languages: - self.ocr_combobox.addItem( - k, QtCore.QVariant(self.global_common.ocr_languages[k]) - ) + self.ocr_combobox.addItem(k, self.global_common.ocr_languages[k]) ocr_layout = QtWidgets.QHBoxLayout() ocr_layout.addWidget(self.ocr_checkbox) ocr_layout.addWidget(self.ocr_combobox) @@ -143,7 +139,10 @@ class SettingsWidget(QtWidgets.QWidget): self.update_checkbox.hide() else: with self.global_common.exec_dangerzone_container( - ["ls", self.global_common.get_container_name(),] + [ + "ls", + self.global_common.get_container_name(), + ] ) as p: stdout_data, stderror_data = p.communicate()