Call QSettings constructors with no parametrs.

11 files changed, 15 insertions, 17 deletions

diff --git a/nephilim.py b/nephilim.py
index db78bb5..6cefbe0 100755
--- a/nephilim.py
+++ b/nephilim.py
@@ -28,13 +28,14 @@ except ImportError:
     sys.exit('PyQt4 not found. Ensure that it is installed.')
 
 from nephilim.winMain import winMain
-from nephilim.misc    import APPNAME
+from nephilim.misc    import APPNAME, ORGNAME
 
 
 def main():
     try:
         app = QtGui.QApplication(sys.argv)
         app.setApplicationName(APPNAME)
+        app.setOrganizationName(ORGNAME)
 
         wMain = winMain()
         wMain.show()
diff --git a/nephilim/connect_wg.py b/nephilim/connect_wg.py
index 3a3f0dd..a7c3896 100644
--- a/nephilim/connect_wg.py
+++ b/nephilim/connect_wg.py
@@ -2,7 +2,7 @@ from PyQt4 import QtGui, QtCore
 from PyQt4.QtCore import QVariant
 import time
 
-from misc import ORGNAME, APPNAME, appIcon
+from misc import appIcon
 
 class ConnectWidget(QtGui.QWidget):
     host_txt    = None
@@ -15,7 +15,7 @@ class ConnectWidget(QtGui.QWidget):
     def __init__(self, parent):
         QtGui.QWidget.__init__(self)
         self.mpclient = parent.mpclient
-        self.settings = QtCore.QSettings(ORGNAME, APPNAME)
+        self.settings = QtCore.QSettings()
 
         self.host_txt = QtGui.QLineEdit(self.settings.value('MPD/host', QVariant('localhost')).toString())
         self.port_txt = QtGui.QLineEdit(self.settings.value('MPD/port', QVariant('6600')).toString())
diff --git a/nephilim/plugin.py b/nephilim/plugin.py
index 86a379c..1a9bb0c 100644
--- a/nephilim/plugin.py
+++ b/nephilim/plugin.py
@@ -3,7 +3,6 @@ from PyQt4.QtCore import QVariant
 import logging
 
 import plugins
-from misc import *
 
 class Plugin(QtCore.QObject):
     _name        = None
@@ -22,7 +21,7 @@ class Plugin(QtCore.QObject):
         self._mpclient  = mpclient
         self._loaded    = False
         self._listeners = []
-        self._settings  = QtCore.QSettings(ORGNAME, APPNAME)
+        self._settings  = QtCore.QSettings()
 
         #init settings
         self._settings.beginGroup(name)
@@ -89,7 +88,7 @@ class Plugin(QtCore.QObject):
         def __init__(self, plugin):
             QtGui.QWidget.__init__(self)
             self.plugin    = plugin
-            self._settings = QtCore.QSettings(ORGNAME, APPNAME)
+            self._settings = QtCore.QSettings()
 
         def settings(self):
             return self._settings
diff --git a/nephilim/plugins/AlbumCover.py b/nephilim/plugins/AlbumCover.py
index 321495a..ad7b2f2 100644
--- a/nephilim/plugins/AlbumCover.py
+++ b/nephilim/plugins/AlbumCover.py
@@ -5,7 +5,7 @@ import logging
 import os
 
 from ..plugin import Plugin
-from ..misc     import ORGNAME, APPNAME, expand_tags
+from ..misc     import APPNAME, expand_tags
 
 # FETCH MODES
 AC_NO_FETCH        = 0
diff --git a/nephilim/plugins/Filebrowser.py b/nephilim/plugins/Filebrowser.py
index 65256a8..27efcf0 100644
--- a/nephilim/plugins/Filebrowser.py
+++ b/nephilim/plugins/Filebrowser.py
@@ -3,7 +3,6 @@ from PyQt4.QtCore import QVariant
 import os
 
 from ..plugin import Plugin
-from ..misc     import ORGNAME, APPNAME
 
 class Filebrowser(Plugin):
     o = None
diff --git a/nephilim/plugins/Library.py b/nephilim/plugins/Library.py
index d900891..a10b0b6 100644
--- a/nephilim/plugins/Library.py
+++ b/nephilim/plugins/Library.py
@@ -2,7 +2,6 @@ from PyQt4 import QtGui, QtCore
 from PyQt4.QtCore import QVariant
 
 from ..plugin import Plugin
-from ..misc     import ORGNAME, APPNAME
 
 class Library(Plugin):
     o=None
@@ -95,7 +94,7 @@ class LibraryWidget(QtGui.QWidget):
     def __init__(self, plugin):
         QtGui.QWidget.__init__(self)
         self.plugin = plugin
-        self.settings = QtCore.QSettings(ORGNAME, APPNAME)
+        self.settings = QtCore.QSettings()
         self.settings.beginGroup(self.plugin.name())
 
         self.modes = QtGui.QComboBox()
diff --git a/nephilim/plugins/Notify.py b/nephilim/plugins/Notify.py
index f87e47a..4a1d536 100644
--- a/nephilim/plugins/Notify.py
+++ b/nephilim/plugins/Notify.py
@@ -2,7 +2,7 @@ from PyQt4 import QtGui, QtCore
 from PyQt4.QtCore import QVariant
 from traceback import print_exc
 
-from ..misc     import sec2min, ORGNAME, APPNAME, expand_tags
+from ..misc     import sec2min, APPNAME, expand_tags
 from ..plugin import Plugin
 from ..         import plugins
 
diff --git a/nephilim/plugins/PlayControl.py b/nephilim/plugins/PlayControl.py
index 9eb1855..ca02fe2 100644
--- a/nephilim/plugins/PlayControl.py
+++ b/nephilim/plugins/PlayControl.py
@@ -2,7 +2,7 @@ from PyQt4 import QtGui, QtCore
 from PyQt4.QtCore import QVariant
 import logging
 
-from ..misc import ORGNAME, APPNAME, Button
+from ..misc import Button
 from ..plugin import Plugin
 
 class wgPlayControl(QtGui.QToolBar):
diff --git a/nephilim/plugins/Systray.py b/nephilim/plugins/Systray.py
index 0997f37..ed13832 100644
--- a/nephilim/plugins/Systray.py
+++ b/nephilim/plugins/Systray.py
@@ -2,7 +2,7 @@ from PyQt4 import QtGui, QtCore
 from PyQt4.QtCore import QVariant
 
 from ..plugin import Plugin
-from ..misc import sec2min, ORGNAME, APPNAME, appIcon, expand_tags
+from ..misc import sec2min, APPNAME, appIcon, expand_tags
 
 class Systray(Plugin):
     o         = None
diff --git a/nephilim/settings_win.py b/nephilim/settings_win.py
index 8986a1c..d5e021d 100644
--- a/nephilim/settings_win.py
+++ b/nephilim/settings_win.py
@@ -2,7 +2,7 @@ from PyQt4 import QtGui, QtCore
 from PyQt4.QtCore import QVariant
 import os
 
-from misc import ORGNAME, APPNAME, Button, appIcon
+from misc import Button, appIcon
 import plugin
 
 
@@ -76,7 +76,7 @@ class SettingsWindow(QtGui.QWidget):
 
     def __init__(self, main_win):
         QtGui.QWidget.__init__(self, main_win, QtCore.Qt.Window)
-        self.settings = QtCore.QSettings(ORGNAME, APPNAME)
+        self.settings = QtCore.QSettings()
         self.main_win = main_win
 
         self.save_btn  = Button('save all', self.save_clicked)
diff --git a/nephilim/winMain.py b/nephilim/winMain.py
index bd0893d..0a5b3c5 100644
--- a/nephilim/winMain.py
+++ b/nephilim/winMain.py
@@ -2,7 +2,7 @@ from PyQt4 import QtGui, QtCore
 from PyQt4.QtCore import QVariant
 import logging
 
-from misc import ORGNAME, APPNAME, sec2min, appIcon
+from misc import APPNAME, sec2min, appIcon
 from mpclient import MPClient
 from connect_wg import ConnectWidget
 from settings_win import SettingsWindow
@@ -33,7 +33,7 @@ class winMain(QtGui.QMainWindow):
 
     def __init__(self, parent=None):
         QtGui.QWidget.__init__(self, parent)
-        self.settings = QtCore.QSettings(ORGNAME, APPNAME)
+        self.settings = QtCore.QSettings()
         self.mpclient = MPClient()
 
         self.wConnect = ConnectWidget(self)