switch to QVariant API 2

i.e., remove all explicite usage of QVariant

15 files changed, 87 insertions, 98 deletions

diff --git a/nephilim.py b/nephilim.py
index aa86fe6..32c868f 100755
--- a/nephilim.py
+++ b/nephilim.py
@@ -26,7 +26,8 @@ from traceback import print_exc
 from optparse  import OptionParser
 try:
     import sip
-    sip.setapi('QString', 2)
+    sip.setapi('QString',  2)
+    sip.setapi('QVariant', 2)
     from PyQt4     import QtGui
 except ImportError:
     sys.exit('PyQt4 not found. Ensure that it is installed.')
diff --git a/nephilim/connect_wg.py b/nephilim/connect_wg.py
index 9884cd0..e237527 100644
--- a/nephilim/connect_wg.py
+++ b/nephilim/connect_wg.py
@@ -17,7 +17,6 @@
 #
 
 from PyQt4 import QtGui, QtCore
-from PyQt4.QtCore import QVariant
 import time
 
 class ConnectWidget(QtGui.QWidget):
@@ -33,14 +32,14 @@ class ConnectWidget(QtGui.QWidget):
         self.mpclient = QtGui.QApplication.instance().mpclient
         self.settings = QtCore.QSettings()
 
-        self.host_txt = QtGui.QLineEdit(self.settings.value('MPD/host', QVariant('localhost')).toString())
+        self.host_txt = QtGui.QLineEdit(self.settings.value('MPD/host', 'localhost'))
         self.host_txt.setToolTip('Host')
 
-        self.port_txt = QtGui.QLineEdit(self.settings.value('MPD/port', QVariant('6600')).toString())
+        self.port_txt = QtGui.QLineEdit(self.settings.value('MPD/port', '6600'))
         self.port_txt.setValidator(QtGui.QIntValidator(1, 65535, self.port_txt))
         self.port_txt.setToolTip('Port')
 
-        self.pass_txt = QtGui.QLineEdit(self.settings.value('MPD/password').toString())
+        self.pass_txt = QtGui.QLineEdit(self.settings.value('MPD/password'))
         self.pass_txt.setEchoMode(QtGui.QLineEdit.Password)
         self.pass_txt.setToolTip('Password')
 
@@ -80,8 +79,8 @@ class ConnectWidget(QtGui.QWidget):
 
     def on_connected(self, val):
         if val:
-            self.settings.setValue('MPD/host', QVariant(self.host_txt.text()))
-            self.settings.setValue('MPD/port', QVariant(self.port_txt.text()))
-            self.settings.setValue('MPD/password', QVariant(self.pass_txt.text()))
+            self.settings.setValue('MPD/host', self.host_txt.text())
+            self.settings.setValue('MPD/port', self.port_txt.text())
+            self.settings.setValue('MPD/password', self.pass_txt.text())
             self.hide()
 
diff --git a/nephilim/nephilim_app.py b/nephilim/nephilim_app.py
index c56c6f0..2698f67 100644
--- a/nephilim/nephilim_app.py
+++ b/nephilim/nephilim_app.py
@@ -68,7 +68,7 @@ class NephilimApp(QtGui.QApplication):
         for plugin in self.plugins.plugins():
             if self.settings.value(plugin.name + '/load') == None:
                 show_settings = True
-            if self.settings.value(plugin.name + '/load', QtCore.QVariant(True)).toBool():
+            if int(self.settings.value(plugin.name + '/load', 0)):
                 self.plugins.load(plugin.name)
 
         self.aboutToQuit.connect(self.__cleanup)
@@ -101,5 +101,5 @@ class NephilimApp(QtGui.QApplication):
 
     def expand_tags(self, str):
         ret = str
-        ret = ret.replace('${musicdir}', self.settings.value('MPD/music_dir').toString())
+        ret = ret.replace('${musicdir}', self.settings.value('MPD/music_dir'))
         return ret
diff --git a/nephilim/plugin.py b/nephilim/plugin.py
index 37780d7..c993bd7 100644
--- a/nephilim/plugin.py
+++ b/nephilim/plugin.py
@@ -17,7 +17,6 @@
 #
 
 from PyQt4 import QtGui, QtCore
-from PyQt4.QtCore import QVariant
 import logging
 
 import plugins
@@ -53,7 +52,7 @@ class Plugin(QtCore.QObject):
         self.settings.beginGroup(name)
         for key in self.DEFAULTS:
             if not self.settings.contains(key):
-                self.settings.setValue(key, QVariant(self.DEFAULTS[key]))
+                self.settings.setValue(key, self.DEFAULTS[key])
         self.settings.endGroup()
 
     def parent(self):
diff --git a/nephilim/plugins/AlbumCover.py b/nephilim/plugins/AlbumCover.py
index 9d4cf38..01d0182 100644
--- a/nephilim/plugins/AlbumCover.py
+++ b/nephilim/plugins/AlbumCover.py
@@ -16,7 +16,6 @@
 #
 
 from PyQt4        import QtGui, QtCore, QtNetwork
-from PyQt4.QtCore import QVariant
 
 import os
 
@@ -103,7 +102,7 @@ class AlbumCover(Plugin):
 
     # private
     DEFAULTS  = {'coverdir' : '${musicdir}/${songdir}', 'covername' : '.cover_%s_${artist}_${album}'%common.APPNAME,
-                 'fetchers': ['local', 'Last.fm'], 'store' : True}
+                 'fetchers': ['local', 'Last.fm'], 'store' : 1}
     "implemented fetchers"
     available_fetchers = None
     "enabled fetchers, those with higher priority first"
@@ -132,7 +131,7 @@ class AlbumCover(Plugin):
 
         i = self.__fetchers.index(self.sender())
         if cover and i < self.__index:
-            if self.settings.value(self.name + '/store').toBool():
+            if self.settings.value(int(self.name + '/store')):
                 self.save_cover_file(cover)
             self.__index = i
             return self.o.set_cover(song, cover)
@@ -158,17 +157,17 @@ class AlbumCover(Plugin):
             self.store = QtGui.QGroupBox('Store covers.')
             self.store.setToolTip('Should %s store its own copy of covers?'%common.APPNAME)
             self.store.setCheckable(True)
-            self.store.setChecked(self.settings.value('store').toBool())
+            self.store.setChecked(int(self.settings.value('store')))
             self.store.setLayout(QtGui.QGridLayout())
 
             # paths to covers
-            self.coverdir  = QtGui.QLineEdit(self.settings.value('coverdir').toString())
+            self.coverdir  = QtGui.QLineEdit(self.settings.value('coverdir'))
             self.coverdir.setToolTip('Where should %s store covers.\n'
                                      '${musicdir} will be expanded to path to MPD music library (as set by user)\n'
                                      '${songdir} will be expanded to path to the song (relative to ${musicdir}\n'
                                      'other tags same as in covername'
                                       %common.APPNAME)
-            self.covername = QtGui.QLineEdit(self.settings.value('covername').toString())
+            self.covername = QtGui.QLineEdit(self.settings.value('covername'))
             self.covername.setToolTip('Filename for %s cover files.\n'
                                       'All tags supported by MPD will be expanded to their\n'
                                       'values for current song, e.g. ${title}, ${track}, ${artist},\n'
@@ -179,7 +178,7 @@ class AlbumCover(Plugin):
             self.store.layout().addWidget(self.covername, 1, 1)
 
             # sites list
-            fetchers         = self.settings.value('fetchers').toStringList()
+            fetchers         = self.settings.value('fetchers')
             self.fetcherlist = QtGui.QListWidget(self)
             self.fetcherlist.setDragDropMode(QtGui.QAbstractItemView.InternalMove)
             for site in fetchers:
@@ -201,16 +200,16 @@ class AlbumCover(Plugin):
 
         def save_settings(self):
             self.settings.beginGroup(self.plugin.name)
-            self.settings.setValue('coverdir', QVariant(self.coverdir.text()))
-            self.settings.setValue('covername', QVariant(self.covername.text()))
-            self.settings.setValue('store', QVariant(self.store.isChecked()))
+            self.settings.setValue('coverdir',  self.coverdir.text())
+            self.settings.setValue('covername', self.covername.text())
+            self.settings.setValue('store',     int(self.store.isChecked()))
 
             fetchers = []
             for i in range(self.fetcherlist.count()):
                 it = self.fetcherlist.item(i)
                 if it.checkState() == QtCore.Qt.Checked:
                     fetchers.append(it.text())
-            self.settings.setValue('fetchers', QVariant(fetchers))
+            self.settings.setValue('fetchers', fetchers)
             self.settings.endGroup()
             self.plugin.refresh_fetchers()
             self.plugin.refresh()
@@ -237,8 +236,8 @@ class AlbumCover(Plugin):
             return self.o.set_cover(None, None)
 
         (self.__cover_dir, self.__cover_path) = common.generate_metadata_path(song,
-                                                                            self.settings.value(self.name + '/coverdir').toString(),
-                                                                            self.settings.value(self.name + '/covername').toString())
+                                                                            self.settings.value(self.name + '/coverdir'),
+                                                                            self.settings.value(self.name + '/covername'))
         try:
             self.logger.info('Trying to read cover from file %s.'%self.__cover_path)
             cover = QtGui.QPixmap(self.__cover_path)
@@ -254,7 +253,7 @@ class AlbumCover(Plugin):
         """Refresh the list of available fetchers."""
         self.__fetchers = []
         # append fetchers in order they are stored in settings
-        for name in self.settings.value('%s/fetchers'%self.name).toStringList():
+        for name in self.settings.value('%s/fetchers'%self.name):
             for site in self.available_fetchers:
                 if site.name == name:
                     self.__fetchers.append(site(self))
@@ -278,8 +277,8 @@ class AlbumCover(Plugin):
         if not song:
             path = self.__cover_path
         else:
-            path = common.generate_metadata_path(song, self.settings.value(self.name + '/coverdir').toString(),
-                                               self.settings.value(self.name + '/covername').toString())
+            path = common.generate_metadata_path(song, self.settings.value(self.name + '/coverdir'),
+                                               self.settings.value(self.name + '/covername'))
         if not QtCore.QFile.remove(path):
             self.logger.error('Error removing file %s.'%path)
 
@@ -301,7 +300,7 @@ class AlbumCover(Plugin):
             self.logger.error('Error opening cover file.')
             return
 
-        if self.settings.value(self.name + '/store').toBool():
+        if int(self.settings.value(self.name + '/store')):
             self.save_cover_file(cover)
         self.o.set_cover(song, cover)
 
diff --git a/nephilim/plugins/Filebrowser.py b/nephilim/plugins/Filebrowser.py
index 352eb02..cb0a6e7 100644
--- a/nephilim/plugins/Filebrowser.py
+++ b/nephilim/plugins/Filebrowser.py
@@ -16,7 +16,6 @@
 #
 
 from PyQt4 import QtGui, QtCore
-from PyQt4.QtCore import QVariant
 import os
 import shutil
 
@@ -93,9 +92,9 @@ class wgFilebrowser(QtGui.QWidget):
                 path_base = os.path.basename(filepath)
                 try:
                     if os.path.isdir(filepath):
-                        shutil.copytree(filepath, '%s/%s'%(self.plugin.settings.value('MPD/music_dir').toString(), path_base))
+                        shutil.copytree(filepath, '%s/%s'%(self.plugin.settings.value('MPD/music_dir'), path_base))
                     else:
-                        shutil.copy(filepath, self.plugin.settings.value('MPD/music_dir').toString())
+                        shutil.copy(filepath, self.plugin.settings.value('MPD/music_dir'))
                     target_paths.append(path_base)
                 except (OSError, IOError), e:
                     self.logger.error('Error copying to collection: %s.'%e)
diff --git a/nephilim/plugins/Library.py b/nephilim/plugins/Library.py
index 458c88c..05b8a81 100644
--- a/nephilim/plugins/Library.py
+++ b/nephilim/plugins/Library.py
@@ -16,7 +16,6 @@
 #
 
 from PyQt4 import QtGui, QtCore
-from PyQt4.QtCore import QVariant
 
 from ..plugin import Plugin
 from ..common import MIMETYPES, SongsMimeData
@@ -50,7 +49,7 @@ class Library(Plugin):
             Plugin.SettingsWidget.__init__(self, plugin)
             self.settings.beginGroup(self.plugin.name)
 
-            tags_enabled = self.settings.value('grouping').toStringList()
+            tags_enabled = self.settings.value('grouping')
             tags         = self.plugin.mpclient.tagtypes
             self.taglist = QtGui.QListWidget(self)
             self.taglist.setDragDropMode(QtGui.QAbstractItemView.InternalMove)
@@ -78,7 +77,7 @@ class Library(Plugin):
                 it = self.taglist.item(i)
                 if it.checkState() == QtCore.Qt.Checked:
                     tags.append(it.text())
-            self.settings.setValue('grouping', QtCore.QVariant(tags))
+            self.settings.setValue('grouping', tags)
 
             self.settings.endGroup()
             self.plugin.fill_library()
@@ -202,8 +201,8 @@ class LibraryWidget(QtGui.QWidget):
 
     def fill_library(self):
         self.logger.info('Refreshing library.')
-        self.grouping.setText('/'.join(self.settings.value('grouping').toStringList()))
-        self.plugin.mpclient.database(lambda songs: self.library_model.fill(songs, self.settings.value('grouping').toStringList()))
+        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)
     def filter_library(self, text):
diff --git a/nephilim/plugins/Lyrics.py b/nephilim/plugins/Lyrics.py
index 61d34f1..4413b8e 100644
--- a/nephilim/plugins/Lyrics.py
+++ b/nephilim/plugins/Lyrics.py
@@ -16,7 +16,6 @@
 #
 
 from PyQt4        import QtGui, QtCore, QtNetwork
-from PyQt4.QtCore import QVariant
 
 import os
 import re
@@ -110,7 +109,7 @@ class Lyrics(Plugin):
 
     # private
     DEFAULTS          = {'fetchers' : ['Lyricwiki', 'Animelyrics'], 'lyricdir' : '${musicdir}/${songdir}',
-                         'lyricname' : '.lyrics_%s_${artist}_${album}_${title}'%common.APPNAME, 'store' : True}
+                         'lyricname' : '.lyrics_%s_${artist}_${album}_${title}'%common.APPNAME, 'store' : 1}
     "implemented fetchers"
     available_fetchers = None   #XXX SettingsWidget currently uses it
     "enabled fetchers, those with higher priority first"
@@ -136,7 +135,7 @@ class Lyrics(Plugin):
 
         i = self.__fetchers.index(self.sender())
         if lyrics and i < self.__index:
-            if self.settings.value(self.name + '/store').toBool() and self.__lyrics_path:
+            if int(self.settings.value(self.name + '/store')) and self.__lyrics_path:
                 self.save_lyrics_file(lyrics)
             self.__index = i
             return self.o.set_lyrics(song, lyrics)
@@ -159,17 +158,17 @@ class Lyrics(Plugin):
             self.store = QtGui.QGroupBox('Store lyrics.')
             self.store.setToolTip('Should %s store its own copy of lyrics?'%common.APPNAME)
             self.store.setCheckable(True)
-            self.store.setChecked(self.settings.value('store').toBool())
+            self.store.setChecked(int(self.settings.value('store')))
             self.store.setLayout(QtGui.QGridLayout())
 
             # paths to lyrics
-            self.lyricdir  = QtGui.QLineEdit(self.settings.value('lyricdir').toString())
+            self.lyricdir  = QtGui.QLineEdit(self.settings.value('lyricdir'))
             self.lyricdir.setToolTip('Where should %s store lyrics.\n'
                                      '${musicdir} will be expanded to path to MPD music library (as set by user)\n'
                                      '${songdir} will be expanded to path to the song (relative to ${musicdir}\n'
                                      'other tags same as in lyricname'
                                       %common.APPNAME)
-            self.lyricname = QtGui.QLineEdit(self.settings.value('lyricname').toString())
+            self.lyricname = QtGui.QLineEdit(self.settings.value('lyricname'))
             self.lyricname.setToolTip('Filename for %s lyricsfiles.\n'
                                       'All tags supported by MPD will be expanded to their\n'
                                       'values for current song, e.g. ${title}, ${track}, ${artist},\n'
@@ -180,7 +179,7 @@ class Lyrics(Plugin):
             self.store.layout().addWidget(self.lyricname, 1, 1)
 
             # fetchers list
-            fetchers          = self.settings.value('fetchers').toStringList()
+            fetchers          = self.settings.value('fetchers')
             self.fetcherlist = QtGui.QListWidget(self)
             self.fetcherlist.setDragDropMode(QtGui.QAbstractItemView.InternalMove)
             for fetcher in fetchers:
@@ -202,16 +201,16 @@ class Lyrics(Plugin):
 
         def save_settings(self):
             self.settings.beginGroup(self.plugin.name)
-            self.settings.setValue('lyricdir', QVariant(self.lyricdir.text()))
-            self.settings.setValue('lyricname', QVariant(self.lyricname.text()))
-            self.settings.setValue('store', QVariant(self.store.isChecked()))
+            self.settings.setValue('lyricdir',  self.lyricdir.text())
+            self.settings.setValue('lyricname', self.lyricname.text())
+            self.settings.setValue('store',     int(self.store.isChecked()))
 
             fetchers = []
             for i in range(self.fetcherlist.count()):
                 it = self.fetcherlist.item(i)
                 if it.checkState() == QtCore.Qt.Checked:
                     fetchers.append(it.text())
-            self.settings.setValue('fetchers', QVariant(fetchers))
+            self.settings.setValue('fetchers', fetchers)
 
             self.settings.endGroup()
             self.plugin.refresh_fetchers()
@@ -244,8 +243,8 @@ class Lyrics(Plugin):
             return self.o.set_lyrics(None, None)
 
         (self.__lyrics_dir, self.__lyrics_path) = common.generate_metadata_path(song,
-                                                                          self.settings.value(self.name + '/lyricdir').toString(),
-                                                                          self.settings.value(self.name + '/lyricname').toString())
+                                                                          self.settings.value(self.name + '/lyricdir'),
+                                                                          self.settings.value(self.name + '/lyricname'))
         try:
             self.logger.info('Trying to read lyrics from file %s.'%self.__lyrics_path)
             file   = open(self.__lyrics_path, 'r')
@@ -280,8 +279,8 @@ class Lyrics(Plugin):
         if not song:
             path = self.__lyrics_path
         else:
-            path = common.generate_metadata_path(song, self.settings.value(self.name + '/lyricdir').toString(),
-                                               self.settings.value(self.name + '/lyricname').toString())
+            path = common.generate_metadata_path(song, self.settings.value(self.name + '/lyricdir'),
+                                               self.settings.value(self.name + '/lyricname'))
 
         try:
             os.remove(path)
@@ -295,7 +294,7 @@ class Lyrics(Plugin):
         """Refresh the list of available fetchers."""
         self.__fetchers = []
         # append fetchers in order they are stored in settings
-        for name in self.settings.value('%s/fetchers'%self.name).toStringList():
+        for name in self.settings.value('%s/fetchers'%self.name):
             for fetcher in self.available_fetchers:
                 if fetcher.name == name:
                     self.__fetchers.append(fetcher(self))
diff --git a/nephilim/plugins/Notify.py b/nephilim/plugins/Notify.py
index af97e06..bb01aab 100644
--- a/nephilim/plugins/Notify.py
+++ b/nephilim/plugins/Notify.py
@@ -17,7 +17,6 @@
 #
 
 from PyQt4 import QtGui, QtCore
-from PyQt4.QtCore import QVariant
 
 from ..common import sec2min, APPNAME, expand_tags
 from ..plugin import Plugin
@@ -123,18 +122,17 @@ class Notify(Plugin):
         if not song:
             return
         self.settings.beginGroup(self.name)
-        self.o.show(expand_tags(self.settings.value('songformat').toString(), (song,)), self.settings.value('timer').toInt()[0],
-                    NOTIFY_PRIORITY_SONG)
+        self.o.show(expand_tags(self.settings.value('songformat'), (song,)), int(self.settings.value('timer')), NOTIFY_PRIORITY_SONG)
         self.settings.endGroup()
 
     def on_connect_changed(self, val):
-        self.o.show('%s.'%('Connected' if val else 'Disconnected'), self.settings.value(self.name + '/timer').toInt()[0])
+        self.o.show('%s.'%('Connected' if val else 'Disconnected'), int(self.settings.value(self.name + '/timer')))
 
     def onStateChange(self, new_state):
-        self.o.show(new_state, self.settings.value(self.name + '/timer').toInt()[0])
+        self.o.show(new_state, int(self.settings.value(self.name + '/timer')))
 
     def onVolumeChange(self, new_vol):
-        self.o.show('Volume: %i%%'%(new_vol), self.settings.value(self.name + '/timer').toInt()[0], priority = NOTIFY_PRIORITY_VOLUME)
+        self.o.show('Volume: %i%%'%(new_vol), int(self.settings.value(self.name + '/timer')), priority = NOTIFY_PRIORITY_VOLUME)
 
     class SettingsWidgetNotify(Plugin.SettingsWidget):
         format = None
@@ -144,9 +142,9 @@ class Notify(Plugin):
             Plugin.SettingsWidget.__init__(self, plugin)
             self.settings.beginGroup(self.plugin.name)
 
-            self.format = QtGui.QLineEdit(self.settings.value('songformat').toString())
+            self.format = QtGui.QLineEdit(self.settings.value('songformat'))
 
-            self.timer = QtGui.QLineEdit(self.settings.value('timer').toString())
+            self.timer = QtGui.QLineEdit(self.settings.value('timer'))
             self.timer.setValidator(QtGui.QIntValidator(self.timer))
 
             self.setLayout(QtGui.QVBoxLayout())
@@ -158,8 +156,8 @@ class Notify(Plugin):
 
         def save_settings(self):
             self.settings.beginGroup(self.plugin.name)
-            self.settings.setValue('songformat', QVariant(self.format.text()))
-            self.settings.setValue('timer', QVariant(int(self.timer.text())))
+            self.settings.setValue('songformat', self.format.text())
+            self.settings.setValue('timer',      int(self.timer.text()))
             self.settings.endGroup()
             self.plugin.onSongChange()
 
diff --git a/nephilim/plugins/PlayControl.py b/nephilim/plugins/PlayControl.py
index c3d01d6..5fad0e8 100644
--- a/nephilim/plugins/PlayControl.py
+++ b/nephilim/plugins/PlayControl.py
@@ -16,7 +16,6 @@
 #
 
 from PyQt4 import QtGui, QtCore
-from PyQt4.QtCore import QVariant
 
 from ..common import Button
 from ..plugin import Plugin
diff --git a/nephilim/plugins/Playlist.py b/nephilim/plugins/Playlist.py
index e6a1852..af64bf3 100644
--- a/nephilim/plugins/Playlist.py
+++ b/nephilim/plugins/Playlist.py
@@ -16,7 +16,6 @@
 #
 
 from PyQt4 import QtGui, QtCore
-from PyQt4.QtCore import QVariant
 
 from ..plugin import Plugin
 from ..common import MIMETYPES, SongsMimeData
@@ -82,10 +81,10 @@ class PlaylistTree(QtGui.QTreeWidget):
         self.setDropIndicatorShown(True)
         self.setDragDropMode(QtGui.QAbstractItemView.DragDrop)
 
-        columns = self.plugin.settings.value(self.plugin.name + '/columns').toStringList()
+        columns = self.plugin.settings.value(self.plugin.name + '/columns')
         self.setColumnCount(len(columns))
         self.setHeaderLabels(columns)
-        self.header().restoreState(self.plugin.settings.value(self.plugin.name + '/header_state').toByteArray())
+        self.header().restoreState(self.plugin.settings.value(self.plugin.name + '/header_state'))
 
         # menu
         self._menu      = QtGui.QMenu()
@@ -99,13 +98,13 @@ class PlaylistTree(QtGui.QTreeWidget):
         self.plugin.mpclient.connect_changed.connect(self._update_menu)
 
     def _save_state(self):
-        self.plugin.settings.setValue(self.plugin.name + '/header_state', QVariant(self.header().saveState()))
+        self.plugin.settings.setValue(self.plugin.name + '/header_state', self.header().saveState())
 
     def _song_activated(self, item):
         self.plugin.mpclient.play(item.song['id'])
 
     def fill(self, songs):
-        columns = self.plugin.settings.value(self.plugin.name + '/columns').toStringList()
+        columns = self.plugin.settings.value(self.plugin.name + '/columns')
         self.clear()
         for song in songs:
             item = PlaylistSongItem(PlaylistEntryRef(self.plugin.mpclient, song['id']))
diff --git a/nephilim/plugins/Songinfo.py b/nephilim/plugins/Songinfo.py
index 7184544..2d73575 100644
--- a/nephilim/plugins/Songinfo.py
+++ b/nephilim/plugins/Songinfo.py
@@ -58,7 +58,7 @@ class Songinfo(Plugin):
         return SettingsWidgetSonginfo(self)
 
     def update_tagtypes(self):
-        self.__tags = [tag for tag in self.settings.value(self.name + '/tagtypes').toStringList() if tag in self.mpclient.tagtypes]
+        self.__tags = [tag for tag in self.settings.value(self.name + '/tagtypes') if tag in self.mpclient.tagtypes]
         self.o.set_tagtypes(self.__tags)
     def refresh(self):
         self.logger.info('Refreshing.')
@@ -140,7 +140,7 @@ class SettingsWidgetSonginfo(Plugin.SettingsWidget):
             return
 
         self.taglist.clear()
-        tags_enabled = self.settings.value('tagtypes').toStringList()
+        tags_enabled = self.settings.value('tagtypes')
         tags         = self.plugin.mpclient.tagtypes
         for tag in [tag for tag in tags_enabled if tag in tags]:
             it = QtGui.QListWidgetItem(tag)
@@ -162,7 +162,7 @@ class SettingsWidgetSonginfo(Plugin.SettingsWidget):
             it = self.taglist.item(i)
             if it.checkState() == QtCore.Qt.Checked:
                 tags.append(it.text())
-        self.settings.setValue('tagtypes', QtCore.QVariant(tags))
+        self.settings.setValue('tagtypes', tags)
 
         self.plugin.update_tagtypes()
         self.plugin.refresh()
diff --git a/nephilim/plugins/Systray.py b/nephilim/plugins/Systray.py
index 6a8f1ab..2411309 100644
--- a/nephilim/plugins/Systray.py
+++ b/nephilim/plugins/Systray.py
@@ -17,7 +17,6 @@
 #
 
 from PyQt4 import QtGui, QtCore
-from PyQt4.QtCore import QVariant
 
 from ..plugin import Plugin
 from ..common import sec2min, APPNAME, appIcon, expand_tags
@@ -36,7 +35,7 @@ class Systray(Plugin):
     DEFAULTS  = {'format': '${track} - ${title} by ${artist} on ${album} (${length})'}
 
     def _load(self):
-        self.format = self.settings.value(self.name + '/format').toString()
+        self.format = self.settings.value(self.name + '/format')
         class SystrayWheelEventObject(QtCore.QObject):
             """This class listens for systray-wheel events"""
             def eventFilter(self, object, event):
@@ -100,14 +99,14 @@ class Systray(Plugin):
         def __init__(self, plugin):
             Plugin.SettingsWidget.__init__(self, plugin)
 
-            self.format = QtGui.QLineEdit(self.settings.value(self.plugin.name + '/format').toString())
+            self.format = QtGui.QLineEdit(self.settings.value(self.plugin.name + '/format'))
 
             self.setLayout(QtGui.QVBoxLayout())
             self._add_widget(self.format, 'Tooltip format')
 
         def save_settings(self):
             self.settings.beginGroup(self.plugin.name)
-            self.settings.setValue('format', QVariant(self.format.text()))
+            self.settings.setValue('format', self.format.text())
             self.settings.endGroup()
 
     def get_settings_widget(self):
diff --git a/nephilim/settings_wg.py b/nephilim/settings_wg.py
index 2d32ea8..85a046e 100644
--- a/nephilim/settings_wg.py
+++ b/nephilim/settings_wg.py
@@ -17,7 +17,6 @@
 #
 
 from PyQt4 import QtGui, QtCore
-from PyQt4.QtCore import QVariant
 import os
 
 from common import Button
@@ -48,12 +47,12 @@ class SettingsWidget(QtGui.QWidget):
             self.mpclient = mpclient
 
             self.settings.beginGroup('MPD')
-            self.host_txt = QtGui.QLineEdit(self.settings.value('host', QVariant('localhost')).toString())
-            self.port_txt = QtGui.QLineEdit(self.settings.value('port', QVariant('6600')).toString())
+            self.host_txt = QtGui.QLineEdit(self.settings.value('host', 'localhost'))
+            self.port_txt = QtGui.QLineEdit(self.settings.value('port', '6600'))
             self.port_txt.setValidator(QtGui.QIntValidator(0, 65535, self))
-            self.pass_txt = QtGui.QLineEdit(self.settings.value('password').toString())
+            self.pass_txt = QtGui.QLineEdit(self.settings.value('password'))
             self.pass_txt.setEchoMode(QtGui.QLineEdit.Password)
-            self.lib_txt  = QtGui.QLineEdit(self.settings.value('music_dir', QVariant(os.path.expanduser('~/music/'))).toString())
+            self.lib_txt  = QtGui.QLineEdit(self.settings.value('music_dir', os.path.expanduser('~/music/')))
             self.settings.endGroup()
 
             self.update = QtGui.QPushButton('Update MPD database')
@@ -89,17 +88,17 @@ class SettingsWidget(QtGui.QWidget):
             reconnect = False
 
             self.settings.beginGroup('MPD')
-            if self.host_txt.text() != self.settings.value('host').toString():
-                self.settings.setValue('host', QVariant(self.host_txt.text()))
+            if self.host_txt.text() != self.settings.value('host'):
+                self.settings.setValue('host', self.host_txt.text())
                 reconnect = True
-            if self.port_txt.text() != self.settings.value('port').toString():
-                self.settings.setValue('port', QVariant(self.port_txt.text()))
+            if self.port_txt.text() != self.settings.value('port'):
+                self.settings.setValue('port', self.port_txt.text())
                 reconnect = True
-            if self.pass_txt.text() != self.settings.value('password').toString():
-                self.settings.setValue('password', QVariant(self.pass_txt.text()))
+            if self.pass_txt.text() != self.settings.value('password'):
+                self.settings.setValue('password', self.pass_txt.text())
                 if self.pass_txt.text():
                     self.mpclient.password(self.pass_txt.text())
-            self.settings.setValue('music_dir', QVariant(self.lib_txt.text()))
+            self.settings.setValue('music_dir', self.lib_txt.text())
             self.settings.endGroup()
 
             if reconnect:
@@ -169,7 +168,7 @@ class SettingsWidget(QtGui.QWidget):
         self.close()
 
     def plugin_checked(self, item):
-        toload = (item.checkState() == QtCore.Qt.Checked)
+        toload = int(item.checkState() == QtCore.Qt.Checked)
         name   = str(item.text()[0:str(item.text()).find('\t')])
         if toload:
             # refresh the plugin file
@@ -177,7 +176,7 @@ class SettingsWidget(QtGui.QWidget):
             self.fill_pluginlist()
         else:
             self.plugins.unload(name)
-        self.settings.setValue(name + '/load', QtCore.QVariant(toload))
+        self.settings.setValue(name + '/load', toload)
 
     def closeEvent(self, event):
         self.hide()
diff --git a/nephilim/winMain.py b/nephilim/winMain.py
index 865f98f..b7fea71 100644
--- a/nephilim/winMain.py
+++ b/nephilim/winMain.py
@@ -17,7 +17,7 @@
 #
 
 from PyQt4 import QtGui, QtCore
-from PyQt4.QtCore import QVariant, pyqtSlot as Slot
+from PyQt4.QtCore import pyqtSlot as Slot
 import logging
 
 from common import APPNAME, sec2min, appIcon
@@ -93,7 +93,7 @@ class winMain(QtGui.QMainWindow):
                 |QtGui.QMainWindow.AllowTabbedDocks \
                 |QtGui.QMainWindow.VerticalTabs)
         self.setDockNestingEnabled(True)
-        self.restoreGeometry(self.settings.value('geometry').toByteArray())
+        self.restoreGeometry(self.settings.value('geometry'))
 
         " add event handlers"
         self.mpclient.connect_changed.connect(self.__on_connect_changed)
@@ -104,7 +104,7 @@ class winMain(QtGui.QMainWindow):
         self.show()
 
     def on_quit(self):
-        self.settings.setValue('geometry', QVariant(self.saveGeometry()))
+        self.settings.setValue('geometry', self.saveGeometry())
 
     def __update_layout_menu(self):
         self.__layout_menu.clear()
@@ -114,7 +114,7 @@ class winMain(QtGui.QMainWindow):
         # create checkable menu
         a = QtGui.QAction('Show titlebars', self)
         a.setCheckable(True)
-        a.setChecked(self.settings.value('show_titlebars', QVariant(True)).toBool())
+        a.setChecked(int(self.settings.value('show_titlebars', 1)))
         self.__toggle_titlebars(a.isChecked())
         a.toggled.connect(self.__toggle_titlebars)
         self.__layout_menu.addAction(a)
@@ -127,9 +127,9 @@ class winMain(QtGui.QMainWindow):
 
     def __toggle_titlebars(self, val):
         if val:
-            self.settings.setValue('show_titlebars', QVariant(True))
+            self.settings.setValue('show_titlebars', 1)
         else:
-            self.settings.setValue('show_titlebars', QVariant(False))
+            self.settings.setValue('show_titlebars', 0)
         for dock in self.__docks:
             if val:
                 dock.setTitleBarWidget(None)
@@ -148,9 +148,9 @@ class winMain(QtGui.QMainWindow):
             self.__update_layout_menu()
 
     def save_layout(self):
-        self.settings.setValue('layout', QVariant(self.saveState()))
+        self.settings.setValue('layout', self.saveState())
     def restore_layout(self):
-        layout = self.settings.value('layout').toByteArray()
+        layout = self.settings.value('layout')
         if not layout:
             layout = QtCore.QFile(':default_layout').readAll()
         self.restoreState(layout)