From 17f4307fa40411b070b37ea69b6daf749db6afcf Mon Sep 17 00:00:00 2001
From: Anton Khirnov <wyskas@gmail.com>
Date: Sat, 28 Aug 2010 07:28:49 +0200
Subject: import pyqtSignal as Signal, for easier future compatibility with
 PySide

---
 nephilim/common.py             | 3 ++-
 nephilim/mpclient.py           | 2 +-
 nephilim/plugins/AlbumCover.py | 5 +++--
 nephilim/plugins/Library.py    | 5 +++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/nephilim/common.py b/nephilim/common.py
index 3bf9ff9..35e041f 100644
--- a/nephilim/common.py
+++ b/nephilim/common.py
@@ -17,6 +17,7 @@
 #
 
 from PyQt4 import QtCore, QtGui, QtNetwork
+from PyQt4.QtCore import pyqtSignal as Signal
 import socket
 import logging
 import os
@@ -119,7 +120,7 @@ class MetadataFetcher(QtCore.QObject):
     song = None  # current song
 
     # SIGNALS
-    finished = QtCore.pyqtSignal(['song', 'metadata'])
+    finished = Signal(['song', 'metadata'])
 
     #### private ####
     def __init__(self, plugin):
diff --git a/nephilim/mpclient.py b/nephilim/mpclient.py
index e26f3a3..8badbcb 100644
--- a/nephilim/mpclient.py
+++ b/nephilim/mpclient.py
@@ -33,7 +33,7 @@ class AudioOutput(QtCore.QObject):
     state    = None
 
     # SIGNALS
-    state_changed = QtCore.pyqtSignal(bool)
+    state_changed = Signal(bool)
 
     #### public ####
     def __init__(self, data, set_state, parent = None):
diff --git a/nephilim/plugins/AlbumCover.py b/nephilim/plugins/AlbumCover.py
index c700f17..8a26bc8 100644
--- a/nephilim/plugins/AlbumCover.py
+++ b/nephilim/plugins/AlbumCover.py
@@ -16,6 +16,7 @@
 #
 
 from PyQt4        import QtGui, QtCore, QtNetwork
+from PyQt4.QtCore import pyqtSignal as Signal
 
 import os
 
@@ -116,7 +117,7 @@ class AlbumCover(Plugin):
     __cover_path     = None
 
     # SIGNALS
-    cover_changed = QtCore.pyqtSignal(QtGui.QPixmap)
+    cover_changed = Signal(QtGui.QPixmap)
 
     #### private ####
     def __init__(self, parent, mpclient, name):
@@ -370,7 +371,7 @@ class FetcherLocal(QtCore.QObject):
     settings = None
 
     # SIGNALS
-    finished = QtCore.pyqtSignal('song', 'metadata')
+    finished = Signal('song', 'metadata')
 
     def __init__(self, plugin):
         QtCore.QObject.__init__(self, plugin)
diff --git a/nephilim/plugins/Library.py b/nephilim/plugins/Library.py
index 05b8a81..6e6550e 100644
--- a/nephilim/plugins/Library.py
+++ b/nephilim/plugins/Library.py
@@ -16,6 +16,7 @@
 #
 
 from PyQt4 import QtGui, QtCore
+from PyQt4.QtCore import pyqtSlot as Slot
 
 from ..plugin import Plugin
 from ..common import MIMETYPES, SongsMimeData
@@ -204,7 +205,7 @@ class LibraryWidget(QtGui.QWidget):
         self.grouping.setText('/'.join(self.settings.value('grouping')))
         self.plugin.mpclient.database(lambda songs: self.library_model.fill(songs, self.settings.value('grouping')))
 
-    @QtCore.pyqtSlot(unicode)
+    @Slot(unicode)
     def filter_library(self, text):
         """Hide all items that don't contain text."""
         to_hide        = []
@@ -249,7 +250,7 @@ class LibraryWidget(QtGui.QWidget):
         self.filtered_items = filtered_items
         self.filter         = text
 
-    @QtCore.pyqtSlot()
+    @Slot()
     def add_filtered(self):
         self.add_indices([self.library_model.indexFromItem(index) for index in self.filtered_items])
         self.search_txt.clear()
-- 
cgit v1.2.3