Replace old-style signal/slots with new-style signal/slots

Author: Fayvel Victor

src/m64py/core/vidext.py

@@ -16,7 +16,6 @@
 
 import ctypes
 
-from PyQt4.QtCore import SIGNAL
 from PyQt4.QtOpenGL import QGLFormat
 
 try:
@@ -116,13 +115,13 @@ def set_caption(self, title):
         """Sets the caption text of the
         emulator rendering window. """
         title = "M64Py :: %s" % title
-        self.parent.emit(SIGNAL("set_caption(PyQt_PyObject)"), title)
+        self.parent.set_caption.emit(title)
         return M64ERR_SUCCESS
 
     def toggle_fs(self):
         """Toggles between fullscreen and
         windowed rendering modes. """
-        self.widget.emit(SIGNAL("toggle_fs()"))
+        self.widget.toggle_fs.emit()
         return M64ERR_SUCCESS
 
     def gl_get_proc(self, proc):

src/m64py/frontend/glwidget.py

@@ -34,7 +34,7 @@ def __init__(self, parent):
         self.setContentsMargins(QMargins())
         self.setFocusPolicy(Qt.StrongFocus)
         self.setFocus(True)
-        self.connect(self, SIGNAL("toggle_fs()"), self.toggle_fullscreen)
+        self.toggle_fs.connect(self.toggle_fullscreen)
 
     def showEvent(self, event):
         self.setFocus(True)
@@ -47,15 +47,15 @@ def paintEvent(self, event):
         pass
 
     def mouseDoubleClickEvent(self, event):
-        self.emit(SIGNAL("toggle_fs()"))
+        self.toggle_fs.emit()
 
     def keyPressEvent(self, event):
         if self.worker.state == M64EMU_RUNNING:
             key = event.key()
             modifiers = event.modifiers()
             if modifiers & Qt.AltModifier and \
                     (key == Qt.Key_Enter or key == Qt.Key_Return):
-                self.emit(SIGNAL("toggle_fs()"))
+                self.toggle_fs.emit()
             elif key == Qt.Key_F3:
                 self.worker.save_title()
             elif key == Qt.Key_F4:

src/m64py/frontend/joystick.py

@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from PyQt4.QtCore import QObject, pyqtSignal, QTime, QTimer, SIGNAL
+from PyQt4.QtCore import QObject, pyqtSignal, QTime, QTimer
 
 from m64py.opts import SDL2
 from m64py.frontend.log import log
@@ -81,7 +81,7 @@ def init(self):
                         self.joystick_names.append(SDL_JoystickNameForIndex(i))
                     else:
                         self.joystick_names.append(SDL_JoystickName(i))
-                self.connect(self.joystick_timer, SIGNAL("timeout()"), self.process_events)
+                self.joystick_timer.timeout.connect(self.process_events)
             else:
                 log.info("couldn't initialize SDL joystick support")
 
@@ -139,60 +139,45 @@ def process_events(self):
                 if moved != self.axes[i]:
                     delta_moved = abs(self.axes[i] - moved)
                     if delta_moved >= self.sensitivities[i]:
-                        self.emit(SIGNAL(
-                            "axis_value_changed(PyQt_PyObject, PyQt_PyObject)"),
-                            i, moved)
+                        self.axis_value_changed.emit(i, moved)
                     self.axes[i] = moved
                     self.axis_repeat_timers[i].restart()
                 elif self.auto_repeat and moved != 0:
                     if self.axis_repeat_timers[i].elapsed() >= self.auto_repeat_delay:
-                        self.emit(SIGNAL(
-                            "axis_value_changed(PyQt_PyObject, PyQt_PyObject)"),
-                            i, moved)
+                        self.axis_value_changed.emit(i, moved)
                         self.axes[i] = moved
                 else:
                     self.axis_repeat_timers[i].restart()
             else:
-                self.emit(SIGNAL(
-                    "axis_value_changed(int, int)"), i, 0)
+                self.axis_value_changed.emit(i, 0)
 
         for i in range(self.num_buttons):
             changed = SDL_JoystickGetButton(self.joystick, i)
             if changed != self.buttons[i]:
-                self.emit(SIGNAL(
-                    "button_value_changed(PyQt_PyObject, PyQt_PyObject)"),
-                    i, changed)
+                self.button_value_changed.emit(i, changed)
                 self.buttons[i] = changed
                 self.button_repeat_timers[i].restart()
             elif self.auto_repeat and changed != 0:
                 if self.button_repeat_timers[i].elapsed() >= self.auto_repeat_delay:
-                    self.emit(SIGNAL(
-                        "button_value_changed(PyQt_PyObject, PyQt_PyObject)"),
-                        i, changed)
+                    self.button_value_changed.emit(i, changed)
                     self.buttons[i] = changed
             else:
                 self.button_repeat_timers[i].restart()
 
         for i in range(self.num_hats):
             changed = SDL_JoystickGetHat(self.joystick, i)
             if changed != self.hats[i]:
-                self.emit(SIGNAL(
-                    "hat_value_changed(PyQt_PyObject, PyQt_PyObject)"),
-                    i, changed)
+                self.hat_value_changed.emit(i, changed)
                 self.hats[i] = changed
                 self.hat_repeat_timers[i].restart()
             elif self.auto_repeat and changed != 0:
                 if self.hat_repeat_timers[i].elapsed() >= self.auto_repeat_delay:
-                    self.emit(SIGNAL(
-                        "hat_value_changed(PyQt_PyObject, PyQt_PyObject)"),
-                        i, changed)
+                    self.hat_value_changed.emit(i, changed)
                     self.hats[i] = changed
             else:
                 self.hat_repeat_timers[i].restart()
 
         for i in range(self.num_trackballs):
             dx, dy = self.joystick.get_ball(i)
             if dx != 0 or dy != 0:
-                self.emit(SIGNAL(
-                    "trackball_value_changed(int, int, int)"),
-                    i, dx, dy)
+                self.trackball_value_changed.emit(i, dx, dy)

src/m64py/frontend/log.py

@@ -17,7 +17,7 @@
 import sys
 import logging
 
-from PyQt4.QtCore import pyqtSignal, SIGNAL
+from PyQt4.QtCore import pyqtSignal
 from PyQt4.QtGui import QDialog, QTextCursor
 
 from m64py.ui.logview_ui import Ui_LogView
@@ -32,8 +32,7 @@ def write(self, msg):
         if self.out:
             self.out.write(msg)
         if self.logview:
-            self.logview.emit(SIGNAL(
-                "msg_written(PyQt_PyObject)"), msg)
+            self.logview.msg_written.emit(msg)
 
 
 class LogView(QDialog, Ui_LogView):
@@ -43,8 +42,7 @@ def __init__(self, parent=None):
         QDialog.__init__(self, parent)
         self.setupUi(self)
         self.textEdit.setReadOnly(True)
-        self.connect(self, SIGNAL(
-            "msg_written(PyQt_PyObject)"), self.on_msg_written)
+        self.msg_written.connect(self.on_msg_written)
 
     def on_msg_written(self, msg):
         self.textEdit.moveCursor(QTextCursor.End)

src/m64py/frontend/mainwindow.py

@@ -179,15 +179,15 @@ def center_widget(self):
 
     def connect_signals(self):
         """Connects signals."""
-        self.connect(self, SIGNAL("rom_opened()"), self.on_rom_opened)
-        self.connect(self, SIGNAL("rom_closed()"), self.on_rom_closed)
-        self.connect(self, SIGNAL("file_open(PyQt_PyObject, PyQt_PyObject)"), self.file_open)
-        self.connect(self, SIGNAL("file_opening(PyQt_PyObject)"), self.on_file_opening)
-        self.connect(self, SIGNAL("set_caption(PyQt_PyObject)"), self.on_set_caption)
-        self.connect(self, SIGNAL("state_changed(PyQt_PyObject)"), self.on_state_changed)
-        self.connect(self, SIGNAL("save_image(PyQt_PyObject)"), self.on_save_image)
-        self.connect(self, SIGNAL("info_dialog(PyQt_PyObject)"), self.on_info_dialog)
-        self.connect(self, SIGNAL("archive_dialog(PyQt_PyObject)"), self.on_archive_dialog)
+        self.rom_opened.connect(self.on_rom_opened)
+        self.rom_closed.connect(self.on_rom_closed)
+        self.file_open.connect(self.on_file_open)
+        self.file_opening.connect(self.on_file_opening)
+        self.set_caption.connect(self.on_set_caption)
+        self.state_changed.connect(self.on_state_changed)
+        self.save_image.connect(self.on_save_image)
+        self.info_dialog.connect(self.on_info_dialog)
+        self.archive_dialog.connect(self.on_archive_dialog)
 
     def create_widgets(self):
         """Creates central widgets."""
@@ -214,8 +214,7 @@ def create_state_slots(self):
             self.menuStateSlot.addAction(self.slots[slot])
         self.slots[0].setChecked(True)
         for slot, action in self.slots.items():
-            self.connect(action, SIGNAL("triggered()"),
-                         lambda s=slot: self.worker.state_set_slot(s))
+            action.triggered.connect(lambda t, s=slot: self.worker.state_set_slot(s))
 
     def create_size_actions(self):
         """Creates window size actions."""
@@ -229,10 +228,9 @@ def create_size_actions(self):
             w, h = width, height+self.widgets_height
             action.setText("%dX" % num)
             action.setToolTip("%sx%s" % (width, height))
-            self.connect(action, SIGNAL("triggered()"),
-                         lambda wi=w, he=h: self.resize(wi, he))
+            action.triggered.connect(lambda t, wi=w, he=h: self.resize(wi, he))
 
-    def file_open(self, filepath=None, filename=None):
+    def on_file_open(self, filepath=None, filename=None):
         """Opens ROM file."""
         if not filepath:
             action = self.sender()
@@ -314,7 +312,7 @@ def on_rom_opened(self):
 
     def on_rom_closed(self):
         if self.vidext and self.isFullScreen():
-            self.glwidget.emit(SIGNAL("toggle_fs()"))
+            self.glwidget.toggle_fs.emit()
         self.stack.setCurrentWidget(self.view)
         self.actionMute.setChecked(False)
         self.actionPause.setChecked(False)
@@ -334,7 +332,7 @@ def on_actionManually_triggered(self):
                 self, self.tr("Load ROM Image"), last_dir,
                 "Nintendo64 ROM (%s);;All files (*)" % EXT_FILTER)
         if filepath:
-            self.emit(SIGNAL("file_open(PyQt_PyObject, PyQt_PyObject)"), filepath, None)
+            self.file_open.emit(filepath, None)
             last_dir = QFileInfo(filepath).path()
             self.settings.qset.setValue("last_dir", last_dir)
 

src/m64py/frontend/recentfiles.py

@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from PyQt4.QtGui import QAction, QIcon, QPixmap
-from PyQt4.QtCore import QFileInfo, SIGNAL
+from PyQt4.QtCore import QFileInfo
 
 
 class RecentFiles():
@@ -38,17 +38,15 @@ def create(self):
             action.setIcon(QIcon(QPixmap(":/icons/action_rom.png")))
             self.recent_actions.append(action)
             self.recent_actions[i].setVisible(False)
-            self.parent.connect(
-                self.recent_actions[i], SIGNAL("triggered()"), self.parent.file_open)
+            self.recent_actions[i].triggered.connect(self.parent.on_file_open)
             self.parent.menuRecent.addAction(self.recent_actions[i])
         self.parent.menuRecent.addSeparator()
         self.action_clear_history.setText("&Clear history")
         self.action_clear_history.setEnabled(False)
         self.action_clear_history.setVisible(True)
         self.action_clear_history.setIcon(
             QIcon(QPixmap(":/icons/action_clear.png")))
-        self.parent.connect(
-            self.action_clear_history, SIGNAL("triggered()"), self.clear)
+        self.action_clear_history.triggered.connect(self.clear)
         self.parent.menuRecent.addAction(self.action_clear_history)
 
     def update(self):

src/m64py/frontend/romlist.py

@@ -83,7 +83,7 @@ def connect_signals(self):
         self.progressBar.valueChanged.connect(self.on_progress_bar_changed)
         self.pushRefresh.clicked.connect(self.read_items)
         self.pushOpen.clicked.connect(self.on_item_open)
-        self.connect(self.reader, SIGNAL("finished()"), self.on_finished)
+        self.reader.finished.connect(self.on_finished)
 
     def add_items(self):
         """Adds available ROMs"""
@@ -104,9 +104,7 @@ def read_items(self):
         """Read available ROMs"""
         path_roms = str(self.qset.value("Paths/ROM"))
         if not path_roms or path_roms == "None":
-            self.parent.emit(SIGNAL(
-                "info_dialog(PyQt_PyObject)"),
-                self.tr("ROMs directory not found."))
+            self.parent.info_dialog.emit(self.tr("ROMs directory not found."))
             self.labelAvailable.setText("")
             self.progressBar.hide()
             self.pushOpen.setEnabled(False)
@@ -121,8 +119,7 @@ def file_open(self, path, fname):
         self.close()
         if self.parent.isMinimized():
             self.parent.activateWindow()
-        self.parent.emit(SIGNAL(
-            "file_open(PyQt_PyObject, PyQt_PyObject)"), path, fname)
+        self.parent.file_open.emit(path, fname)
 
     def on_finished(self):
         self.rom_list = self.reader.get_roms()
@@ -233,7 +230,7 @@ def read_files(self):
                 log.warn(str(err))
                 continue
             percent = float(filenum) / float(num_files) * 100
-            self.parent.progressBar.emit(SIGNAL("valueChanged(int)"), percent)
+            self.parent.progressBar.valueChanged.emit(percent)
         self.exit()
 
     def stop(self):

src/m64py/frontend/settings.py

@@ -141,9 +141,7 @@ def browse_dialog(self, args):
                     self.set_video()
                     size = self.qset.value("size", SIZE_1X)
                     self.parent.window_size_triggered(size)
-                    self.parent.emit(SIGNAL(
-                        "state_changed(PyQt_PyObject)"),
-                        (True, False, False, False))
+                    self.parent.state_changed.emit((True, False, False, False))
         elif widget == self.pathPlugins:
             if self.parent.worker.core.get_handle():
                 self.parent.worker.plugins_unload()

src/m64py/frontend/worker.py

@@ -58,13 +58,10 @@ def init(self, path=None):
 
             self.parent.settings.core = self.core
             if self.parent.args:
-                self.parent.emit(SIGNAL(
-                    "file_open(PyQt_PyObject, PyQt_PyObject)"), self.parent.args[0], None)
+                self.parent.file_open.emit(self.parent.args[0], None)
         else:
-            self.parent.emit(SIGNAL(
-                "state_changed(PyQt_PyObject)"), (False, False, False, False))
-            self.parent.emit(SIGNAL(
-                "info_dialog(PyQt_PyObject)"), self.tr("Mupen64Plus library not found."))
+            self.parent.state_changed.emit((False, False, False, False))
+            self.parent.info_dialog.emit(self.tr("Mupen64Plus library not found."))
 
     def quit(self):
         if self.state in [M64EMU_RUNNING, M64EMU_PAUSED]:
@@ -81,8 +78,7 @@ def set_filepath(self, filepath, filename=None):
         self.filename = filename
         self.archive = Archive(self.filepath)
         if len(self.archive.namelist) > 1 and not self.filename:
-            self.parent.emit(SIGNAL(
-                "archive_dialog(PyQt_PyObject)"), self.archive.namelist)
+            self.parent.archive_dialog.emit(self.archive.namelist)
 
     def core_load(self, path=None):
         """Loads core library."""
@@ -170,8 +166,7 @@ def plugins_shutdown(self):
     def rom_open(self):
         """Opens ROM."""
         try:
-            self.parent.emit(SIGNAL(
-                "file_opening(PyQt_PyObject)"), self.filepath)
+            self.parent.file_opening.emit(self.filepath)
             romfile = self.archive.read(self.filename)
             self.archive.close()
         except Exception:
@@ -187,7 +182,7 @@ def rom_open(self):
             if bool(int(self.settings.qset.value(
                     "disable_screensaver", 1))):
                 screensaver.disable()
-            self.parent.emit(SIGNAL("rom_opened()"))
+            self.parent.rom_opened.emit()
             self.parent.recent_files.add(self.filepath)
 
     def rom_close(self):
@@ -196,7 +191,7 @@ def rom_close(self):
         if bool(int(self.settings.qset.value(
                 "disable_screensaver", 1))):
             screensaver.enable()
-        self.parent.emit(SIGNAL("rom_closed()"))
+        self.parent.rom_closed.emit()
 
     def core_state_query(self, state):
         """Query emulator state."""
@@ -252,12 +247,10 @@ def save_snapshot(self):
         QTimer.singleShot(1500, self.save_snapshot_image)
 
     def save_title_image(self):
-        self.parent.emit(SIGNAL(
-            "save_image(PyQt_PyObject)"), True)
+        self.parent.save_image.emit(True)
 
     def save_snapshot_image(self):
-        self.parent.emit(SIGNAL(
-            "save_image(PyQt_PyObject)"), False)
+        self.parent.save_image.emit(False)
 
     def state_load(self, state_path=None):
         """Loads state."""
@@ -349,8 +342,7 @@ def toggle_actions(self):
             (load, pause, action, cheats) = True, True, True, cheat
         elif self.state == M64EMU_RUNNING:
             (load, pause, action, cheats) = True, True, True, cheat
-        self.parent.emit(SIGNAL(
-            "state_changed(PyQt_PyObject)"), (load, pause, action, cheats))
+        self.parent.state_changed.emit((load, pause, action, cheats))
 
     def stop(self):
         """Stops thread."""