changed most of the signals to our new style

openlp/core/ui/advancedtab.py

@@ -243,40 +243,23 @@ class AdvancedTab(SettingsTab):
         self.rightLayout.addWidget(self.display_workaround_group_box)
         self.rightLayout.addStretch()
         self.should_update_service_name_example = False
-        QtCore.QObject.connect(self.service_name_check_box, QtCore.SIGNAL(u'toggled(bool)'),
+        self.service_name_check_box.toggled.connect(self.service_name_check_box_toggled)
-            self.service_name_check_box_toggled)
+        self.service_name_day.currentIndexChanged.connect(self.on_service_name_day_changed)
-        QtCore.QObject.connect(self.service_name_day, QtCore.SIGNAL(u'currentIndexChanged(int)'),
+        self.service_name_time.timeChanged.connect(self.update_service_name_example)
-            self.on_service_name_day_changed)
+        self.service_name_edit.textChanged.connect(self.update_service_name_example)
-        QtCore.QObject.connect(self.service_name_time, QtCore.SIGNAL(u'timeChanged(QTime)'),
+        self.service_name_revert_button.clicked.connect(self.on_service_name_revert_button_clicked)
-            self.update_service_name_example)
+        self.default_color_button.clicked.connect(self.on_default_color_button_clicked)
-        QtCore.QObject.connect(self.service_name_edit, QtCore.SIGNAL(u'textChanged(QString)'),
+        self.default_browse_button.clicked.connect(self.on_default_browse_button_clicked)
-            self.update_service_name_example)
+        self.default_revert_button.clicked.connect(self.on_default_revert_button_clicked)
-        QtCore.QObject.connect(self.service_name_revert_button, QtCore.SIGNAL(u'clicked()'),
+        self.x11_bypass_check_box.toggled.connect(self.on_X11_bypass_check_box_toggled)
-            self.on_service_name_revert_button_clicked)
+        self.alternate_rows_check_box.toggled.connect(self.on_alternate_rows_check_box_toggled)
-        QtCore.QObject.connect(self.default_color_button, QtCore.SIGNAL(u'clicked()'),
+        self.data_directory_browse_button.clicked.connect(self.on_data_directory_browse_button_clicked)
-            self.on_default_color_button_clicked)
+        self.data_directory_default_button.clicked.connect(self.on_data_directory_default_button_clicked)
-        QtCore.QObject.connect(self.default_browse_button, QtCore.SIGNAL(u'clicked()'),
+        self.data_directory_cancel_button.clicked.connect(self.on_data_directory_cancel_button_clicked)
-            self.on_default_browse_button_clicked)
+        self.data_directory_copy_check_box.toggled.connect(self.on_data_directory_copy_check_box_toggled)
-        QtCore.QObject.connect(self.default_revert_button, QtCore.SIGNAL(u'clicked()'),
+        self.end_slide_radio_button.clicked.connect(self.on_end_slide_button_clicked)
-            self.on_default_revert_button_clicked)
+        self.wrap_slide_radio_button.clicked.connect(self.on_wrap_slide_button_clicked)
-        QtCore.QObject.connect(self.x11_bypass_check_box, QtCore.SIGNAL(u'toggled(bool)'),
+        self.next_item_radio_button.clicked.connect(self.on_next_item_button_clicked)
-            self.on_X11_bypass_check_box_toggled)
-        QtCore.QObject.connect(self.alternate_rows_check_box,QtCore.SIGNAL(u'toggled(bool)'),
-            self.on_alternate_rows_check_box_toggled)
-        QtCore.QObject.connect(self.data_directory_browse_button, QtCore.SIGNAL(u'clicked()'),
-            self.on_data_directory_browse_button_clicked)
-        QtCore.QObject.connect(self.data_directory_default_button, QtCore.SIGNAL(u'clicked()'),
-            self.on_data_directory_default_button_clicked)
-        QtCore.QObject.connect(self.data_directory_cancel_button, QtCore.SIGNAL(u'clicked()'),
-            self.on_data_directory_cancel_button_clicked)
-        QtCore.QObject.connect(self.data_directory_copy_check_box, QtCore.SIGNAL(u'toggled(bool)'),
-            self.on_data_directory_copy_check_box_toggled)
-        QtCore.QObject.connect(self.end_slide_radio_button, QtCore.SIGNAL(u'clicked()'),
-            self.on_end_slide_button_clicked)
-        QtCore.QObject.connect(self.wrap_slide_radio_button, QtCore.SIGNAL(u'clicked()'),
-            self.on_wrap_slide_button_clicked)
-        QtCore.QObject.connect(self.next_item_radio_button, QtCore.SIGNAL(u'clicked()'),
-            self.on_next_item_button_clicked)
 
 
     def retranslateUi(self):

openlp/core/ui/generaltab.py

@@ -191,13 +191,12 @@ class GeneralTab(SettingsTab):
         self.rightLayout.addWidget(self.settingsGroupBox)
         self.rightLayout.addStretch()
         # Signals and slots
-        QtCore.QObject.connect(self.overrideRadioButton, QtCore.SIGNAL(u'toggled(bool)'),
+        self.overrideRadioButton.toggled.connect(self.onOverrideRadioButtonPressed)
-            self.onOverrideRadioButtonPressed)
+        self.customHeightValueEdit.valueChanged.connect(self.onDisplayChanged)
-        QtCore.QObject.connect(self.customHeightValueEdit, QtCore.SIGNAL(u'valueChanged(int)'), self.onDisplayChanged)
+        self.customWidthValueEdit.valueChanged.connect(self.onDisplayChanged)
-        QtCore.QObject.connect(self.customWidthValueEdit, QtCore.SIGNAL(u'valueChanged(int)'), self.onDisplayChanged)
+        self.customYValueEdit.valueChanged.connect(self.onDisplayChanged)
-        QtCore.QObject.connect(self.customYValueEdit, QtCore.SIGNAL(u'valueChanged(int)'), self.onDisplayChanged)
+        self.customXValueEdit.valueChanged.connect(self.onDisplayChanged)
-        QtCore.QObject.connect(self.customXValueEdit, QtCore.SIGNAL(u'valueChanged(int)'), self.onDisplayChanged)
+        self.monitorComboBox.currentIndexChanged.connect(self.onDisplayChanged)
-        QtCore.QObject.connect(self.monitorComboBox, QtCore.SIGNAL(u'currentIndexChanged(int)'), self.onDisplayChanged)
         # Reload the tab, as the screen resolution/count may have changed.
         Registry().register_function(u'config_screen_changed', self.load)
         # Remove for now

openlp/core/ui/mainwindow.py

@@ -346,7 +346,7 @@ class Ui_MainWindow(object):
         self.retranslateUi(main_window)
         self.mediaToolBox.setCurrentIndex(0)
         # Connect up some signals and slots
-        QtCore.QObject.connect(self.fileMenu, QtCore.SIGNAL(u'aboutToShow()'), self.updateRecentFilesMenu)
+        self.fileMenu.aboutToShow.connect(self.updateRecentFilesMenu)
         # Hide the entry, as it does not have any functionality yet.
         self.toolsAddToolItem.setVisible(False)
         self.importLanguageItem.setVisible(False)
@@ -506,12 +506,9 @@ class MainWindow(QtGui.QMainWindow, Ui_MainWindow):
         self.updateRecentFilesMenu()
         self.pluginForm = PluginForm(self)
         # Set up signals and slots
-        QtCore.QObject.connect(self.mediaManagerDock, QtCore.SIGNAL(u'visibilityChanged(bool)'),
+        self.mediaManagerDock.visibilityChanged.connect(self.viewMediaManagerItem.setChecked)
-                               self.viewMediaManagerItem.setChecked)
+        self.serviceManagerDock.visibilityChanged.connect(self.viewServiceManagerItem.setChecked)
-        QtCore.QObject.connect(self.serviceManagerDock, QtCore.SIGNAL(u'visibilityChanged(bool)'),
+        self.themeManagerDock.visibilityChanged.connect(self.viewThemeManagerItem.setChecked)
-                               self.viewServiceManagerItem.setChecked)
-        QtCore.QObject.connect(self.themeManagerDock, QtCore.SIGNAL(u'visibilityChanged(bool)'),
-                               self.viewThemeManagerItem.setChecked)
         self.importThemeItem.triggered.connect(self.themeManagerContents.on_import_theme)
         self.exportThemeItem.triggered.connect(self.themeManagerContents.on_export_theme)
         self.webSiteItem.triggered.connect(self.onHelpWebSiteClicked)

openlp/core/ui/media/playertab.py

@@ -122,8 +122,7 @@ class PlayerTab(SettingsTab):
         self.leftLayout.addStretch()
         self.rightLayout.addStretch()
         # Signals and slots
-        QtCore.QObject.connect(self.backgroundColorButton, QtCore.SIGNAL(u'clicked()'),
+        self.backgroundColorButton.clicked.connect(self.onbackgroundColorButtonClicked)
-            self.onbackgroundColorButtonClicked)
 
     def retranslateUi(self):
         """
@@ -245,7 +244,7 @@ class PlayerTab(SettingsTab):
             checkbox.setToolTip(player.get_info())
             checkbox.setPlayerName(player.name)
             self.playerCheckBoxes[player.name] = checkbox
-            QtCore.QObject.connect(checkbox, QtCore.SIGNAL(u'stateChanged(int)'), self.onPlayerCheckBoxChanged)
+            checkbox.stateChanged.connect(self.onPlayerCheckBoxChanged)
             self.mediaPlayerLayout.addWidget(checkbox)
             if player.available and player.name in self.usedPlayers:
                 checkbox.setChecked(True)

openlp/core/ui/pluginform.py

@@ -54,10 +54,8 @@ class PluginForm(QtGui.QDialog, Ui_PluginViewDialog):
         self.load()
         self._clearDetails()
         # Right, now let's put some signals and slots together!
-        QtCore.QObject.connect(self.pluginListWidget, QtCore.SIGNAL(u'itemSelectionChanged()'),
+        self.pluginListWidget.itemSelectionChanged.connect(self.onPluginListWidgetSelectionChanged)
-            self.onPluginListWidgetSelectionChanged)
+        self.statusComboBox.currentIndexChanged.connect(self.onStatusComboBoxChanged)
-        QtCore.QObject.connect(self.statusComboBox, QtCore.SIGNAL(u'currentIndexChanged(int)'),
-            self.onStatusComboBoxChanged)
 
     def load(self):
         """

openlp/core/ui/settingsdialog.py

@@ -61,7 +61,7 @@ class Ui_SettingsDialog(object):
         self.button_box = create_button_box(settingsDialog, u'button_box', [u'cancel', u'ok'])
         self.dialogLayout.addWidget(self.button_box, 1, 1, 1, 1)
         self.retranslateUi(settingsDialog)
-        QtCore.QObject.connect(self.settingListWidget, QtCore.SIGNAL(u'currentRowChanged(int)'), self.tabChanged)
+        self.settingListWidget.currentRowChanged.connect(self.tabChanged)
 
     def retranslateUi(self, settingsDialog):
         """

openlp/core/ui/shortcutlistform.py

@@ -57,22 +57,15 @@ class ShortcutListForm(QtGui.QDialog, Ui_ShortcutListDialog):
         self.changedActions = {}
         self.action_list = ActionList.get_instance()
         self.dialog_was_shown = False
-        QtCore.QObject.connect(self.primaryPushButton, QtCore.SIGNAL(u'toggled(bool)'), self.onPrimaryPushButtonClicked)
+        self.primaryPushButton.toggled.connect(self.onPrimaryPushButtonClicked)
-        QtCore.QObject.connect(self.alternatePushButton, QtCore.SIGNAL(u'toggled(bool)'),
+        self.alternatePushButton.toggled.connect(self.onAlternatePushButtonClicked)
-            self.onAlternatePushButtonClicked)
+        self.treeWidget.currentItemChanged.connect(self.onCurrentItemChanged)
-        QtCore.QObject.connect(self.treeWidget,
+        self.treeWidget.itemDoubleClicked.connect(self.onItemDoubleClicked)
-            QtCore.SIGNAL(u'currentItemChanged(QTreeWidgetItem*, QTreeWidgetItem*)'), self.onCurrentItemChanged)
+        self.clearPrimaryButton.clicked.connect(self.onClearPrimaryButtonClicked)
-        QtCore.QObject.connect(self.treeWidget, QtCore.SIGNAL(u'itemDoubleClicked(QTreeWidgetItem*, int)'),
+        self.clearAlternateButton.clicked.connect(self.onClearAlternateButtonClicked)
-            self.onItemDoubleClicked)
+        self.button_box.clicked.connect(self.onRestoreDefaultsClicked)
-        QtCore.QObject.connect(self.clearPrimaryButton, QtCore.SIGNAL(u'clicked(bool)'),
+        self.defaultRadioButton.clicked.connect(self.onDefaultRadioButtonClicked)
-            self.onClearPrimaryButtonClicked)
+        self.customRadioButton.clicked.connect(self.onCustomRadioButtonClicked)
-        QtCore.QObject.connect(self.clearAlternateButton, QtCore.SIGNAL(u'clicked(bool)'),
-            self.onClearAlternateButtonClicked)
-        QtCore.QObject.connect(self.button_box, QtCore.SIGNAL(u'clicked(QAbstractButton*)'),
-            self.onRestoreDefaultsClicked)
-        QtCore.QObject.connect(self.defaultRadioButton, QtCore.SIGNAL(u'clicked(bool)'),
-            self.onDefaultRadioButtonClicked)
-        QtCore.QObject.connect(self.customRadioButton, QtCore.SIGNAL(u'clicked(bool)'), self.onCustomRadioButtonClicked)
 
     def keyPressEvent(self, event):
         """

openlp/core/ui/slidecontroller.py

@@ -353,11 +353,9 @@ class SlideController(DisplayController):
                 context=QtCore.Qt.WidgetWithChildrenShortcut,
                 category=self.category if s.get(u'configurable') else None,
                 triggers=self._slideShortcutActivated) for s in shortcuts])
-            QtCore.QObject.connect(
+            self.shortcutTimer.timeout.connect(self._slideShortcutActivated)
-                self.shortcutTimer, QtCore.SIGNAL(u'timeout()'),
-                self._slideShortcutActivated)
         # Signals
-        QtCore.QObject.connect(self.preview_list_widget, QtCore.SIGNAL(u'clicked(QModelIndex)'), self.onSlideSelected)
+        self.preview_list_widget.clicked.connect(self.onSlideSelected)
         if self.is_live:
             Registry().register_function(u'slidecontroller_live_spin_delay', self.receive_spin_delay)
             Registry().register_function(u'slidecontroller_toggle_display', self.toggle_display)

openlp/core/ui/themeform.py

@@ -64,38 +64,31 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard):
         self.updateThemeAllowed = True
         self.temp_background_filename = u''
         self.themeLayoutForm = ThemeLayoutForm(self)
-        QtCore.QObject.connect(self.backgroundComboBox, QtCore.SIGNAL(u'currentIndexChanged(int)'),
+        self.backgroundComboBox.currentIndexChanged.connect(self.onBackgroundComboBoxCurrentIndexChanged)
-            self.onBackgroundComboBoxCurrentIndexChanged)
+        self.gradientComboBox.currentIndexChanged.connect(self.onGradientComboBoxCurrentIndexChanged)
-        QtCore.QObject.connect(self.gradientComboBox, QtCore.SIGNAL(u'currentIndexChanged(int)'),
+        self.colorButton.clicked.connect(self.onColorButtonClicked)
-            self.onGradientComboBoxCurrentIndexChanged)
+        self.imageColorButton.clicked.connect(self.onImageColorButtonClicked)
-        QtCore.QObject.connect(self.colorButton, QtCore.SIGNAL(u'clicked()'), self.onColorButtonClicked)
+        self.gradientStartButton.clicked.connect(self.onGradientStartButtonClicked)
-        QtCore.QObject.connect(self.imageColorButton, QtCore.SIGNAL(u'clicked()'), self.onImageColorButtonClicked)
+        self.gradientEndButton.clicked.connect(self.onGradientEndButtonClicked)
-        QtCore.QObject.connect(self.gradientStartButton, QtCore.SIGNAL(u'clicked()'),
+        self.imageBrowseButton.clicked.connect(self.onImageBrowseButtonClicked)
-            self.onGradientStartButtonClicked)
+        self.mainColorButton.clicked.connect(self.onMainColorButtonClicked)
-        QtCore.QObject.connect(self.gradientEndButton, QtCore.SIGNAL(u'clicked()'), self.onGradientEndButtonClicked)
+        self.outlineColorButton.clicked.connect(self.onOutlineColorButtonClicked)
-        QtCore.QObject.connect(self.imageBrowseButton, QtCore.SIGNAL(u'clicked()'), self.onImageBrowseButtonClicked)
+        self.shadowColorButton.clicked.connect(self.onShadowColorButtonClicked)
-        QtCore.QObject.connect(self.mainColorButton, QtCore.SIGNAL(u'clicked()'), self.onMainColorButtonClicked)
+        self.outlineCheckBox.stateChanged.connect(self.onOutlineCheckCheckBoxStateChanged)
-        QtCore.QObject.connect(self.outlineColorButton, QtCore.SIGNAL(u'clicked()'), self.onOutlineColorButtonClicked)
+        self.shadowCheckBox.stateChanged.connect(self.onShadowCheckCheckBoxStateChanged)
-        QtCore.QObject.connect(self.shadowColorButton, QtCore.SIGNAL(u'clicked()'), self.onShadowColorButtonClicked)
+        self.footerColorButton.clicked.connect(self.onFooterColorButtonClicked)
-        QtCore.QObject.connect(self.outlineCheckBox, QtCore.SIGNAL(u'stateChanged(int)'),
+        self.customButtonClicked.connect(self.onCustom1ButtonClicked)
-            self.onOutlineCheckCheckBoxStateChanged)
+        self.mainPositionCheckBox.stateChanged.connect(self.onMainPositionCheckBoxStateChanged)
-        QtCore.QObject.connect(self.shadowCheckBox, QtCore.SIGNAL(u'stateChanged(int)'),
+        self.footerPositionCheckBox.stateChanged.connect(self.onFooterPositionCheckBoxStateChanged)
-            self.onShadowCheckCheckBoxStateChanged)
+        self.currentIdChanged.connect(self.onCurrentIdChanged)
-        QtCore.QObject.connect(self.footerColorButton, QtCore.SIGNAL(u'clicked()'), self.onFooterColorButtonClicked)
-        QtCore.QObject.connect(self, QtCore.SIGNAL(u'customButtonClicked(int)'), self.onCustom1ButtonClicked)
-        QtCore.QObject.connect(self.mainPositionCheckBox, QtCore.SIGNAL(u'stateChanged(int)'),
-            self.onMainPositionCheckBoxStateChanged)
-        QtCore.QObject.connect(self.footerPositionCheckBox, QtCore.SIGNAL(u'stateChanged(int)'),
-            self.onFooterPositionCheckBoxStateChanged)
-        QtCore.QObject.connect(self, QtCore.SIGNAL(u'currentIdChanged(int)'), self.onCurrentIdChanged)
         Registry().register_function(u'theme_line_count', self.updateLinesText)
-        QtCore.QObject.connect(self.mainSizeSpinBox, QtCore.SIGNAL(u'valueChanged(int)'), self.calculateLines)
+        self.mainSizeSpinBox.valueChanged.connect(self.calculateLines)
-        QtCore.QObject.connect(self.lineSpacingSpinBox, QtCore.SIGNAL(u'valueChanged(int)'), self.calculateLines)
+        self.lineSpacingSpinBox.valueChanged.connect(self.calculateLines)
-        QtCore.QObject.connect(self.outlineSizeSpinBox, QtCore.SIGNAL(u'valueChanged(int)'), self.calculateLines)
+        self.outlineSizeSpinBox.valueChanged.connect(self.calculateLines)
-        QtCore.QObject.connect(self.shadowSizeSpinBox, QtCore.SIGNAL(u'valueChanged(int)'), self.calculateLines)
+        self.shadowSizeSpinBox.valueChanged.connect(self.calculateLines)
-        QtCore.QObject.connect(self.mainFontComboBox, QtCore.SIGNAL(u'activated(int)'), self.calculateLines)
+        self.mainFontComboBox.activated.connect(self.calculateLines)
-        QtCore.QObject.connect(self.footerFontComboBox, QtCore.SIGNAL(u'activated(int)'), self.updateTheme)
+        self.footerFontComboBox.activated.connect(self.updateTheme)
-        QtCore.QObject.connect(self.footerSizeSpinBox, QtCore.SIGNAL(u'valueChanged(int)'), self.updateTheme)
+        self.footerSizeSpinBox.valueChanged.connect(self.updateTheme)
 
     def setDefaults(self):
         """

openlp/core/ui/themestab.py

@@ -98,12 +98,10 @@ class ThemesTab(SettingsTab):
             label.setWordWrap(True)
         self.rightLayout.addWidget(self.LevelGroupBox)
         self.rightLayout.addStretch()
-        QtCore.QObject.connect(self.SongLevelRadioButton, QtCore.SIGNAL(u'clicked()'), self.onSongLevelButtonClicked)
+        self.SongLevelRadioButton.clicked.connect(self.onSongLevelButtonClicked)
-        QtCore.QObject.connect(self.ServiceLevelRadioButton, QtCore.SIGNAL(u'clicked()'),
+        self.ServiceLevelRadioButton.clicked.connect(self.onServiceLevelButtonClicked)
-            self.onServiceLevelButtonClicked)
+        self.GlobalLevelRadioButton.clicked.connect(self.onGlobalLevelButtonClicked)
-        QtCore.QObject.connect(self.GlobalLevelRadioButton, QtCore.SIGNAL(u'clicked()'),
+        self.DefaultComboBox.activated.connect(self.onDefaultComboBoxChanged)
-            self.onGlobalLevelButtonClicked)
-        QtCore.QObject.connect(self.DefaultComboBox, QtCore.SIGNAL(u'activated(int)'), self.onDefaultComboBoxChanged)
         Registry().register_function(u'theme_update_list', self.update_theme_list)
 
     def retranslateUi(self):

openlp/plugins/alerts/lib/alertstab.py

@@ -93,12 +93,11 @@ class AlertsTab(SettingsTab):
         self.rightLayout.addWidget(self.previewGroupBox)
         self.rightLayout.addStretch()
         # Signals and slots
-        QtCore.QObject.connect(self.backgroundColorButton, QtCore.SIGNAL(u'clicked()'),
+        self.backgroundColorButton.clicked.connect(self.onBackgroundColorButtonClicked)
-            self.onBackgroundColorButtonClicked)
+        self.fontColorButton.clicked.connect(self.onFontColorButtonClicked)
-        QtCore.QObject.connect(self.fontColorButton, QtCore.SIGNAL(u'clicked()'), self.onFontColorButtonClicked)
+        self.fontComboBox.activated.connect(self.onFontComboBoxClicked)
-        QtCore.QObject.connect(self.fontComboBox, QtCore.SIGNAL(u'activated(int)'), self.onFontComboBoxClicked)
+        self.timeoutSpinBox.valueChanged.connect(self.onTimeoutSpinBoxChanged)
-        QtCore.QObject.connect(self.timeoutSpinBox, QtCore.SIGNAL(u'valueChanged(int)'), self.onTimeoutSpinBoxChanged)
+        self.fontSizeSpinBox.valueChanged.connect(self.onFontSizeSpinBoxChanged)
-        QtCore.QObject.connect(self.fontSizeSpinBox, QtCore.SIGNAL(u'valueChanged(int)'), self.onFontSizeSpinBoxChanged)
 
     def retranslateUi(self):
         self.fontGroupBox.setTitle(translate('AlertsPlugin.AlertsTab', 'Font'))

openlp/plugins/bibles/forms/bibleimportform.py

@@ -85,8 +85,7 @@ class BibleImportForm(OpenLPWizard):
         Set up the UI for the bible wizard.
         """
         OpenLPWizard.setupUi(self, image)
-        QtCore.QObject.connect(self.formatComboBox,QtCore.SIGNAL(u'currentIndexChanged(int)'),
+        self.formatComboBoxcurrentIndexChanged.connect(self.onCurrentIndexChanged)
-            self.onCurrentIndexChanged)
 
     def onCurrentIndexChanged(self, index):
         """
@@ -117,18 +116,12 @@ class BibleImportForm(OpenLPWizard):
         """
         Set up the signals used in the bible importer.
         """
-        QtCore.QObject.connect(self.webSourceComboBox, QtCore.SIGNAL(u'currentIndexChanged(int)'),
+        self.webSourceComboBox.currentIndexChanged.connect(self.onWebSourceComboBoxIndexChanged)
-            self.onWebSourceComboBoxIndexChanged)
+        self.osisBrowseButton.clicked.connect(self.onOsisBrowseButtonClicked)
-        QtCore.QObject.connect(self.osisBrowseButton, QtCore.SIGNAL(u'clicked()'),
+        self.csvBooksButton.clicked.connect(self.onCsvBooksBrowseButtonClicked)
-            self.onOsisBrowseButtonClicked)
+        self.csvVersesButton.clicked.connect(self.onCsvVersesBrowseButtonClicked)
-        QtCore.QObject.connect(self.csvBooksButton, QtCore.SIGNAL(u'clicked()'),
+        self.openSongBrowseButton.clicked.connect(self.onOpenSongBrowseButtonClicked)
-            self.onCsvBooksBrowseButtonClicked)
+        self.openlp1BrowseButton.clicked.connect(self.onOpenlp1BrowseButtonClicked)
-        QtCore.QObject.connect(self.csvVersesButton, QtCore.SIGNAL(u'clicked()'),
-            self.onCsvVersesBrowseButtonClicked)
-        QtCore.QObject.connect(self.openSongBrowseButton, QtCore.SIGNAL(u'clicked()'),
-            self.onOpenSongBrowseButtonClicked)
-        QtCore.QObject.connect(self.openlp1BrowseButton, QtCore.SIGNAL(u'clicked()'),
-            self.onOpenlp1BrowseButtonClicked)
 
     def addCustomPages(self):
         """

openlp/plugins/bibles/forms/bibleupgradeform.py

@@ -151,8 +151,8 @@ class BibleUpgradeForm(OpenLPWizard):
         """
         Set up the signals used in the bible importer.
         """
-        QtCore.QObject.connect(self.backupBrowseButton, QtCore.SIGNAL(u'clicked()'), self.onBackupBrowseButtonClicked)
+        self.backupBrowseButton.clicked.connect(self.onBackupBrowseButtonClicked)
-        QtCore.QObject.connect(self.noBackupCheckBox, QtCore.SIGNAL(u'toggled(bool)'), self.onNoBackupCheckBoxToggled)
+        self.noBackupCheckBox.toggled.connect(self.onNoBackupCheckBoxToggled)
 
     def addCustomPages(self):
         """

openlp/plugins/bibles/forms/booknameform.py

@@ -65,12 +65,9 @@ class BookNameForm(QDialog, Ui_BookNameDialog):
         """
         Set up the signals used in the booknameform.
         """
-        QtCore.QObject.connect(self.oldTestamentCheckBox, QtCore.SIGNAL(u'stateChanged(int)'),
+        self.oldTestamentCheckBox.stateChanged.connect(self.onCheckBoxIndexChanged)
-            self.onCheckBoxIndexChanged)
+        self.newTestamentCheckBox.stateChanged.connect(self.onCheckBoxIndexChanged)
-        QtCore.QObject.connect(self.newTestamentCheckBox, QtCore.SIGNAL(u'stateChanged(int)'),
+        self.apocryphaCheckBox.stateChanged.connect(self.onCheckBoxIndexChanged)
-            self.onCheckBoxIndexChanged)
-        QtCore.QObject.connect(self.apocryphaCheckBox, QtCore.SIGNAL(u'stateChanged(int)'),
-            self.onCheckBoxIndexChanged)
 
     def onCheckBoxIndexChanged(self, index):
         """

openlp/plugins/bibles/lib/biblestab.py

@@ -134,43 +134,25 @@ class BiblesTab(SettingsTab):
         self.leftLayout.addStretch()
         self.rightLayout.addStretch()
         # Signals and slots
-        QtCore.QObject.connect(self.newChaptersCheckBox, QtCore.SIGNAL(u'stateChanged(int)'),
+        self.newChaptersCheckBox.stateChanged.connect(self.onNewChaptersCheckBoxChanged)
-            self.onNewChaptersCheckBoxChanged)
+        self.displayStyleComboBox.activated.connect(self.onDisplayStyleComboBoxChanged)
-        QtCore.QObject.connect(self.displayStyleComboBox, QtCore.SIGNAL(u'activated(int)'),
+        self.bibleThemeComboBox.activated.connect(self.onBibleThemeComboBoxChanged)
-            self.onDisplayStyleComboBoxChanged)
+        self.layoutStyleComboBox.activated.connect(self.onLayoutStyleComboBoxChanged)
-        QtCore.QObject.connect(self.bibleThemeComboBox, QtCore.SIGNAL(u'activated(int)'),
+        self.bibleSecondCheckBox.stateChanged.connect(self.onBibleSecondCheckBox)
-            self.onBibleThemeComboBoxChanged)
+        self.verseSeparatorCheckBox.clicked.connect(self.onVerseSeparatorCheckBoxClicked)
-        QtCore.QObject.connect(self.layoutStyleComboBox, QtCore.SIGNAL(u'activated(int)'),
+        self.verseSeparatorLineEdit.textEdited.connect(self.onVerseSeparatorLineEditEdited)
-            self.onLayoutStyleComboBoxChanged)
+        self.verseSeparatorLineEdit.editingFinished.connect(self.onVerseSeparatorLineEditFinished)
-        QtCore.QObject.connect(self.bibleSecondCheckBox, QtCore.SIGNAL(u'stateChanged(int)'),
+        self.rangeSeparatorCheckBox.clicked.connect(self.onRangeSeparatorCheckBoxClicked)
-            self.onBibleSecondCheckBox)
+        self.rangeSeparatorLineEdit.textEdited.connect(self.onRangeSeparatorLineEditEdited)
-        QtCore.QObject.connect(self.verseSeparatorCheckBox, QtCore.SIGNAL(u'clicked(bool)'),
+        self.rangeSeparatorLineEdit.editingFinished.connect(self.onRangeSeparatorLineEditFinished)
-            self.onVerseSeparatorCheckBoxClicked)
+        self.listSeparatorCheckBox.clicked.connect(self.onListSeparatorCheckBoxClicked)
-        QtCore.QObject.connect(self.verseSeparatorLineEdit, QtCore.SIGNAL(u'textEdited(QString)'),
+        self.listSeparatorLineEdit.textEdited.connect(self.onListSeparatorLineEditEdited)
-            self.onVerseSeparatorLineEditEdited)
+        self.listSeparatorLineEdit.editingFinished.connect(self.onListSeparatorLineEditFinished)
-        QtCore.QObject.connect(self.verseSeparatorLineEdit, QtCore.SIGNAL(u'editingFinished()'),
+        self.endSeparatorCheckBox.clicked.connect(self.onEndSeparatorCheckBoxClicked)
-            self.onVerseSeparatorLineEditFinished)
+        self.endSeparatorLineEdit.textEdited.connect(self.onEndSeparatorLineEditEdited)
-        QtCore.QObject.connect(self.rangeSeparatorCheckBox, QtCore.SIGNAL(u'clicked(bool)'),
+        self.endSeparatorLineEdit.editingFinished.connect(self.onEndSeparatorLineEditFinished)
-            self.onRangeSeparatorCheckBoxClicked)
-        QtCore.QObject.connect(self.rangeSeparatorLineEdit, QtCore.SIGNAL(u'textEdited(QString)'),
-            self.onRangeSeparatorLineEditEdited)
-        QtCore.QObject.connect(self.rangeSeparatorLineEdit, QtCore.SIGNAL(u'editingFinished()'),
-            self.onRangeSeparatorLineEditFinished)
-        QtCore.QObject.connect(self.listSeparatorCheckBox, QtCore.SIGNAL(u'clicked(bool)'),
-            self.onListSeparatorCheckBoxClicked)
-        QtCore.QObject.connect(self.listSeparatorLineEdit, QtCore.SIGNAL(u'textEdited(QString)'),
-            self.onListSeparatorLineEditEdited)
-        QtCore.QObject.connect(self.listSeparatorLineEdit, QtCore.SIGNAL(u'editingFinished()'),
-            self.onListSeparatorLineEditFinished)
-        QtCore.QObject.connect(self.endSeparatorCheckBox, QtCore.SIGNAL(u'clicked(bool)'),
-            self.onEndSeparatorCheckBoxClicked)
-        QtCore.QObject.connect(self.endSeparatorLineEdit, QtCore.SIGNAL(u'textEdited(QString)'),
-            self.onEndSeparatorLineEditEdited)
-        QtCore.QObject.connect(self.endSeparatorLineEdit, QtCore.SIGNAL(u'editingFinished()'),
-            self.onEndSeparatorLineEditFinished)
         Registry().register_function(u'theme_update_list', self.update_theme_list)
-        QtCore.QObject.connect(self.languageSelectionComboBox, QtCore.SIGNAL(u'activated(int)'),
+        self.languageSelectionComboBox.activated.connect(self.onLanguageSelectionComboBoxChanged)
-            self.onLanguageSelectionComboBoxChanged)
 
     def retranslateUi(self):
         self.verseDisplayGroupBox.setTitle(translate('BiblesPlugin.BiblesTab', 'Verse Display'))

openlp/plugins/bibles/lib/mediaitem.py

@@ -166,7 +166,7 @@ class BibleMediaItem(MediaManagerItem):
         layout.addLayout(searchButtonLayout, idx + 3, 1, 1, 2)
         self.pageLayout.addWidget(tab)
         tab.setVisible(False)
-        QtCore.QObject.connect(lockButton, QtCore.SIGNAL(u'toggled(bool)'), self.onLockButtonToggled)
+        lockButton.toggled.connect(self.onLockButtonToggled)
         setattr(self, prefix + u'VersionLabel', versionLabel)
         setattr(self, prefix + u'VersionComboBox', versionComboBox)
         setattr(self, prefix + u'SecondLabel', secondLabel)
@@ -228,29 +228,24 @@ class BibleMediaItem(MediaManagerItem):
         self.advancedLayout.addWidget(self.advancedToVerse, 4, 2)
         self.addSearchFields(u'advanced', UiStrings().Advanced)
         # Combo Boxes
-        QtCore.QObject.connect(self.quickVersionComboBox, QtCore.SIGNAL(u'activated(int)'), self.updateAutoCompleter)
+        self.quickVersionComboBox.activated.connect(self.updateAutoCompleter)
-        QtCore.QObject.connect(self.quickSecondComboBox, QtCore.SIGNAL(u'activated(int)'), self.updateAutoCompleter)
+        self.quickSecondComboBox.activated.connect(self.updateAutoCompleter)
-        QtCore.QObject.connect(self.advancedVersionComboBox,QtCore.SIGNAL(u'activated(int)'),
+        self.advancedVersionComboBox.activated.connect(self.onAdvancedVersionComboBox)
-            self.onAdvancedVersionComboBox)
+        self.advancedSecondComboBox.activated.connect(self.onAdvancedSecondComboBox)
-        QtCore.QObject.connect(self.advancedSecondComboBox, QtCore.SIGNAL(u'activated(int)'),
+        self.advancedBookComboBox.activated.connect(self.onAdvancedBookComboBox)
-            self.onAdvancedSecondComboBox)
+        self.advancedFromChapter.activated.connect(self.onAdvancedFromChapter)
-        QtCore.QObject.connect(self.advancedBookComboBox, QtCore.SIGNAL(u'activated(int)'), self.onAdvancedBookComboBox)
+        self.advancedFromVerse.activated.connect(self.onAdvancedFromVerse)
-        QtCore.QObject.connect(self.advancedFromChapter, QtCore.SIGNAL(u'activated(int)'), self.onAdvancedFromChapter)
+        self.advancedToChapter.activated.connect(self.onAdvancedToChapter)
-        QtCore.QObject.connect(self.advancedFromVerse, QtCore.SIGNAL(u'activated(int)'), self.onAdvancedFromVerse)
-        QtCore.QObject.connect(self.advancedToChapter, QtCore.SIGNAL(u'activated(int)'), self.onAdvancedToChapter)
         QtCore.QObject.connect(self.quickSearchEdit, QtCore.SIGNAL(u'searchTypeChanged(int)'), self.updateAutoCompleter)
-        QtCore.QObject.connect(self.quickVersionComboBox, QtCore.SIGNAL(u'activated(int)'), self.updateAutoCompleter)
+        self.quickVersionComboBox.activated.connect(self.updateAutoCompleter)
-        QtCore.QObject.connect(self.quickStyleComboBox, QtCore.SIGNAL(u'activated(int)'),
+        self.quickStyleComboBox.activated.connect(self.onQuickStyleComboBoxChanged)
-            self.onQuickStyleComboBoxChanged)
+        self.advancedStyleComboBox.activated.connect(self.onAdvancedStyleComboBoxChanged)
-        QtCore.QObject.connect( self.advancedStyleComboBox, QtCore.SIGNAL(u'activated(int)'),
-            self.onAdvancedStyleComboBoxChanged)
         # Buttons
-        QtCore.QObject.connect(self.advancedSearchButton, QtCore.SIGNAL(u'clicked()'), self.onAdvancedSearchButton)
+        self.advancedSearchButton.clicked.connect(self.onAdvancedSearchButton)
-        QtCore.QObject.connect(self.quickSearchButton, QtCore.SIGNAL(u'clicked()'), self.onQuickSearchButton)
+        self.quickSearchButton.clicked.connect(self.onQuickSearchButton)
         # Other stuff
-        QtCore.QObject.connect(self.quickSearchEdit, QtCore.SIGNAL(u'returnPressed()'), self.onQuickSearchButton)
+        self.quickSearchEdit.returnPressed.connect(self.onQuickSearchButton)
-        QtCore.QObject.connect(self.searchTabBar, QtCore.SIGNAL(u'currentChanged(int)'),
+        self.searchTabBar.currentChanged.connect(self.onSearchTabBarCurrentChanged)
-            self.onSearchTabBarCurrentChanged)
 
     def onFocus(self):
         if self.quickTab.isVisible():

openlp/plugins/images/lib/imagetab.py

@@ -62,8 +62,7 @@ class ImageTab(SettingsTab):
         self.rightColumn.setSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Preferred)
         self.rightLayout.addStretch()
         # Signals and slots
-        QtCore.QObject.connect(self.backgroundColorButton, QtCore.SIGNAL(u'clicked()'),
+        self.backgroundColorButton.clicked.connect(self.onbackgroundColorButtonClicked)
-            self.onbackgroundColorButtonClicked)
 
     def retranslateUi(self):
         self.bgColorGroupBox.setTitle(UiStrings().BackgroundColor)

openlp/plugins/media/lib/mediaitem.py

@@ -115,8 +115,7 @@ class MediaMediaItem(MediaManagerItem):
         self.displayLayout.addRow(self.displayTypeLabel, self.displayTypeComboBox)
         # Add the Media widget to the page layout
         self.pageLayout.addWidget(self.mediaWidget)
-        QtCore.QObject.connect(self.displayTypeComboBox, QtCore.SIGNAL(u'currentIndexChanged (int)'),
+        self.displayTypeComboBox.currentIndexChanged.connect(self.overridePlayerChanged)
-            self.overridePlayerChanged)
 
     def overridePlayerChanged(self, index):
         player = get_media_players()[0]

openlp/plugins/presentations/lib/messagelistener.py

@@ -306,7 +306,7 @@ class MessageListener(object):
         Registry().register_function(u'presentations_unblank', self.unblank)
         self.timer = QtCore.QTimer()
         self.timer.setInterval(500)
-        QtCore.QObject.connect(self.timer, QtCore.SIGNAL(u'timeout()'), self.timeout)
+        self.timer.timeout.connect(self.timeout)
 
     def startup(self, message):
         """

openlp/plugins/songs/forms/editsongform.py

@@ -68,41 +68,32 @@ class EditSongForm(QtGui.QDialog, Ui_EditSongDialog):
         self.width = 400
         self.setupUi(self)
         # Connecting signals and slots
-        QtCore.QObject.connect(self.authorAddButton, QtCore.SIGNAL(u'clicked()'), self.onAuthorAddButtonClicked)
+        self.authorAddButton.clicked.connect(self.onAuthorAddButtonClicked)
-        QtCore.QObject.connect(self.authorRemoveButton, QtCore.SIGNAL(u'clicked()'), self.onAuthorRemoveButtonClicked)
+        self.authorRemoveButton.clicked.connect(self.onAuthorRemoveButtonClicked)
-        QtCore.QObject.connect(self.authorsListView, QtCore.SIGNAL(u'itemClicked(QListWidgetItem*)'),
+        self.authorsListView.itemClicked.connect(self.onAuthorsListViewClicked)
-            self.onAuthorsListViewClicked)
+        self.topicAddButton.clicked.connect(self.onTopicAddButtonClicked)
-        QtCore.QObject.connect(self.topicAddButton, QtCore.SIGNAL(u'clicked()'), self.onTopicAddButtonClicked)
+        self.topicRemoveButton.clicked.connect(self.onTopicRemoveButtonClicked)
-        QtCore.QObject.connect(self.topicRemoveButton, QtCore.SIGNAL(u'clicked()'), self.onTopicRemoveButtonClicked)
+        self.topicsListView.itemClicked.connect(self.onTopicListViewClicked)
-        QtCore.QObject.connect(self.topicsListView, QtCore.SIGNAL(u'itemClicked(QListWidgetItem*)'),
+        self.copyrightInsertButton.clicked.connect(self.onCopyrightInsertButtonTriggered)
-            self.onTopicListViewClicked)
+        self.verseAddButton.clicked.connect(self.onVerseAddButtonClicked)
-        QtCore.QObject.connect(self.copyrightInsertButton, QtCore.SIGNAL(u'clicked()'),
+        self.verseListWidget.doubleClicked.connect(self.onVerseEditButtonClicked)
-            self.onCopyrightInsertButtonTriggered)
+        self.verseEditButton.clicked.connect(self.onVerseEditButtonClicked)
-        QtCore.QObject.connect(self.verseAddButton, QtCore.SIGNAL(u'clicked()'), self.onVerseAddButtonClicked)
+        self.verseEditAllButton.clicked.connect(self.onVerseEditAllButtonClicked)
-        QtCore.QObject.connect(self.verseListWidget, QtCore.SIGNAL(u'doubleClicked(QModelIndex)'),
+        self.verseDeleteButton.clicked.connect(self.onVerseDeleteButtonClicked)
-            self.onVerseEditButtonClicked)
+        self.verseListWidget.itemClicked.connect(self.onVerseListViewClicked)
-        QtCore.QObject.connect(self.verseEditButton, QtCore.SIGNAL(u'clicked()'), self.onVerseEditButtonClicked)
+        self.verseOrderEdit.textChanged.connect(self.onVerseOrderTextChanged)
-        QtCore.QObject.connect(self.verseEditAllButton, QtCore.SIGNAL(u'clicked()'), self.onVerseEditAllButtonClicked)
+        self.themeAddButton.clicked.connect(self.theme_manager.onAddTheme)
-        QtCore.QObject.connect(self.verseDeleteButton, QtCore.SIGNAL(u'clicked()'), self.onVerseDeleteButtonClicked)
+        self.maintenanceButton.clicked.connect(self.onMaintenanceButtonClicked)
-        QtCore.QObject.connect(self.verseListWidget, QtCore.SIGNAL(u'itemClicked(QTableWidgetItem*)'),
+        self.audioAddFromFileButton.clicked.connect(self.onAudioAddFromFileButtonClicked)
-            self.onVerseListViewClicked)
+        self.audioAddFromMediaButton.clicked.connect(self.onAudioAddFromMediaButtonClicked)
-        QtCore.QObject.connect(self.verseOrderEdit, QtCore.SIGNAL(u'textChanged(QString)'),
+        self.audioRemoveButton.clicked.connect(self.onAudioRemoveButtonClicked)
-            self.onVerseOrderTextChanged)
+        self.audioRemoveAllButton.clicked.connect(self.onAudioRemoveAllButtonClicked)
-        QtCore.QObject.connect(self.themeAddButton, QtCore.SIGNAL(u'clicked()'), self.theme_manager.onAddTheme)
-        QtCore.QObject.connect(self.maintenanceButton, QtCore.SIGNAL(u'clicked()'), self.onMaintenanceButtonClicked)
-        QtCore.QObject.connect(self.audioAddFromFileButton, QtCore.SIGNAL(u'clicked()'),
-            self.onAudioAddFromFileButtonClicked)
-        QtCore.QObject.connect(self.audioAddFromMediaButton, QtCore.SIGNAL(u'clicked()'),
-            self.onAudioAddFromMediaButtonClicked)
-        QtCore.QObject.connect(self.audioRemoveButton, QtCore.SIGNAL(u'clicked()'), self.onAudioRemoveButtonClicked)
-        QtCore.QObject.connect(self.audioRemoveAllButton, QtCore.SIGNAL(u'clicked()'),
-            self.onAudioRemoveAllButtonClicked)
         Registry().register_function(u'theme_update_list', self.load_themes)
         self.previewButton = QtGui.QPushButton()
         self.previewButton.setObjectName(u'previewButton')
         self.previewButton.setText(UiStrings().SaveAndPreview)
         self.button_box.addButton(self.previewButton, QtGui.QDialogButtonBox.ActionRole)
-        QtCore.QObject.connect(self.button_box, QtCore.SIGNAL(u'clicked(QAbstractButton*)'), self.onPreview)
+        self.button_box.clicked.connect(self.onPreview)
         # Create other objects and forms
         self.manager = manager
         self.verseForm = EditVerseForm(self)

openlp/plugins/songs/forms/editverseform.py

@@ -50,14 +50,11 @@ class EditVerseForm(QtGui.QDialog, Ui_EditVerseDialog):
         """
         QtGui.QDialog.__init__(self, parent)
         self.setupUi(self)
-        QtCore.QObject.connect(self.verseTextEdit, QtCore.SIGNAL('customContextMenuRequested(QPoint)'),
+        self.verseTextEdit.customContextMenuRequested.connect(self.contextMenu)
-            self.contextMenu)
+        self.insertButton.clicked.connect(self.onInsertButtonClicked)
-        QtCore.QObject.connect(self.insertButton, QtCore.SIGNAL(u'clicked()'), self.onInsertButtonClicked)
+        self.splitButton.clicked.connect(self.onSplitButtonClicked)
-        QtCore.QObject.connect(self.splitButton, QtCore.SIGNAL(u'clicked()'), self.onSplitButtonClicked)
+        self.verseTextEdit.cursorPositionChanged.connect(self.onCursorPositionChanged)
-        QtCore.QObject.connect(self.verseTextEdit, QtCore.SIGNAL(u'cursorPositionChanged()'),
+        self.verseTypeComboBox.currentIndexChanged.connect(self.onVerseTypeComboBoxChanged)
-            self.onCursorPositionChanged)
-        QtCore.QObject.connect(self.verseTypeComboBox, QtCore.SIGNAL(u'currentIndexChanged(int)'),
-            self.onVerseTypeComboBoxChanged)
 
     def contextMenu(self, point):
         item = self.serviceManagerList.itemAt(point)

openlp/plugins/songs/forms/songexportform.py

@@ -87,13 +87,11 @@ class SongExportForm(OpenLPWizard):
         """
         Song wizard specific signals.
         """
-        QtCore.QObject.connect(self.availableListWidget, QtCore.SIGNAL(u'itemActivated(QListWidgetItem*)'),
+        self.availableListWidget.itemActivated.connect(self.onItemActivated)
-            self.onItemActivated)
+        self.searchLineEdit.textEdited.connect(self.onSearchLineEditChanged)
-        QtCore.QObject.connect(self.searchLineEdit, QtCore.SIGNAL(u'textEdited(const QString&)'),
+        self.uncheckButton.clicked.connect(self.onUncheckButtonClicked)
-            self.onSearchLineEditChanged)
+        self.checkButton.clicked.connect(self.onCheckButtonClicked)
-        QtCore.QObject.connect(self.uncheckButton, QtCore.SIGNAL(u'clicked()'), self.onUncheckButtonClicked)
+        self.directoryButton.clicked.connect(self.onDirectoryButtonClicked)
-        QtCore.QObject.connect(self.checkButton, QtCore.SIGNAL(u'clicked()'), self.onCheckButtonClicked)
-        QtCore.QObject.connect(self.directoryButton, QtCore.SIGNAL(u'clicked()'), self.onDirectoryButtonClicked)
 
     def addCustomPages(self):
         """

openlp/plugins/songs/forms/songmaintenanceform.py

@@ -62,21 +62,18 @@ class SongMaintenanceForm(QtGui.QDialog, Ui_SongMaintenanceDialog):
         self.booksDeleteButton.setEnabled(False)
         self.booksEditButton.setEnabled(False)
         # Signals
-        QtCore.QObject.connect(self.authorsAddButton, QtCore.SIGNAL(u'clicked()'), self.onAuthorAddButtonClicked)
+        self.authorsAddButton.clicked.connect(self.onAuthorAddButtonClicked)
-        QtCore.QObject.connect(self.topicsAddButton, QtCore.SIGNAL(u'clicked()'), self.onTopicAddButtonClicked)
+        self.topicsAddButton.clicked.connect(self.onTopicAddButtonClicked)
-        QtCore.QObject.connect(self.booksAddButton, QtCore.SIGNAL(u'clicked()'), self.onBookAddButtonClicked)
+        self.booksAddButton.clicked.connect(self.onBookAddButtonClicked)
-        QtCore.QObject.connect(self.authorsEditButton, QtCore.SIGNAL(u'clicked()'), self.onAuthorEditButtonClicked)
+        self.authorsEditButton.clicked.connect(self.onAuthorEditButtonClicked)
-        QtCore.QObject.connect(self.topicsEditButton, QtCore.SIGNAL(u'clicked()'), self.onTopicEditButtonClicked)
+        self.topicsEditButton.clicked.connect(self.onTopicEditButtonClicked)
-        QtCore.QObject.connect(self.booksEditButton, QtCore.SIGNAL(u'clicked()'), self.onBookEditButtonClicked)
+        self.booksEditButton.clicked.connect(self.onBookEditButtonClicked)
-        QtCore.QObject.connect(self.authorsDeleteButton, QtCore.SIGNAL(u'clicked()'), self.onAuthorDeleteButtonClicked)
+        self.authorsDeleteButton.clicked.connect(self.onAuthorDeleteButtonClicked)
-        QtCore.QObject.connect(self.topicsDeleteButton, QtCore.SIGNAL(u'clicked()'), self.onTopicDeleteButtonClicked)
+        self.topicsDeleteButton.clicked.connect(self.onTopicDeleteButtonClicked)
-        QtCore.QObject.connect(self.booksDeleteButton, QtCore.SIGNAL(u'clicked()'), self.onBookDeleteButtonClicked)
+        self.booksDeleteButton.clicked.connect(self.onBookDeleteButtonClicked)
-        QtCore.QObject.connect(self.authorsListWidget, QtCore.SIGNAL(u'currentRowChanged(int)'),
+        self.authorsListWidget.currentRowChanged.connect(self.onAuthorsListRowChanged)
-            self.onAuthorsListRowChanged)
+        self.topicsListWidget.currentRowChanged.connect(self.onTopicsListRowChanged)
-        QtCore.QObject.connect(self.topicsListWidget, QtCore.SIGNAL(u'currentRowChanged(int)'),
+        self.booksListWidget.currentRowChanged.connect(self.onBooksListRowChanged)
-            self.onTopicsListRowChanged)
-        QtCore.QObject.connect(self.booksListWidget, QtCore.SIGNAL(u'currentRowChanged(int)'),
-            self.onBooksListRowChanged)
 
     def exec_(self, fromSongEdit=False):
         """

openlp/plugins/songs/lib/songstab.py

@@ -61,14 +61,10 @@ class SongsTab(SettingsTab):
         self.leftLayout.addWidget(self.modeGroupBox)
         self.leftLayout.addStretch()
         self.rightLayout.addStretch()
-        QtCore.QObject.connect(self.searchAsTypeCheckBox, QtCore.SIGNAL(u'stateChanged(int)'),
+        self.searchAsTypeCheckBox.stateChanged.connect(self.onSearchAsTypeCheckBoxChanged)
-            self.onSearchAsTypeCheckBoxChanged)
+        self.toolBarActiveCheckBox.stateChanged.connect(self.onToolBarActiveCheckBoxChanged)
-        QtCore.QObject.connect(self.toolBarActiveCheckBox, QtCore.SIGNAL(u'stateChanged(int)'),
+        self.updateOnEditCheckBox.stateChanged.connect(self.onUpdateOnEditCheckBoxChanged)
-            self.onToolBarActiveCheckBoxChanged)
+        self.addFromServiceCheckBox.stateChanged.connect(self.onAddFromServiceCheckBoxChanged)
-        QtCore.QObject.connect(self.updateOnEditCheckBox, QtCore.SIGNAL(u'stateChanged(int)'),
-            self.onUpdateOnEditCheckBoxChanged)
-        QtCore.QObject.connect(self.addFromServiceCheckBox, QtCore.SIGNAL(u'stateChanged(int)'),
-            self.onAddFromServiceCheckBoxChanged)
 
     def retranslateUi(self):
         self.modeGroupBox.setTitle(translate('SongsPlugin.SongsTab', 'Songs Mode'))