# HG changeset patch
# User Chris Cannam
# Date 1154621040 0
# Node ID d4487202d0e8e3d7cb0b0c0d8a53b391a02c4ec9
# Parent  0a687ed1b50f8d7ea49eb266d493a17a89f9872d
* Replace all uses of ConfigFile with QSettings

diff -r 0a687ed1b50f -r d4487202d0e8 main/PreferencesDialog.cpp
--- a/main/PreferencesDialog.cpp	Thu Aug 03 15:40:11 2006 +0000
+++ b/main/PreferencesDialog.cpp	Thu Aug 03 16:04:00 2006 +0000
@@ -31,7 +31,6 @@
 #include <fftw3.h>
 
 #include "base/Preferences.h"
-#include "base/ConfigFile.h"
 
 PreferencesDialog::PreferencesDialog(QWidget *parent, Qt::WFlags flags) :
     QDialog(parent, flags)
@@ -352,7 +351,6 @@
 PreferencesDialog::okClicked()
 {
     applyClicked();
-    Preferences::getInstance()->getConfigFile()->commit();
     accept();
 }
 
diff -r 0a687ed1b50f -r d4487202d0e8 main/main.cpp
--- a/main/main.cpp	Thu Aug 03 15:40:11 2006 +0000
+++ b/main/main.cpp	Thu Aug 03 16:04:00 2006 +0000
@@ -20,7 +20,6 @@
 #include "base/TempDirectory.h"
 #include "base/PropertyContainer.h"
 #include "base/Preferences.h"
-#include "base/ConfigFile.h"
 
 #include <QMetaType>
 #include <QApplication>
@@ -64,9 +63,9 @@
 
     svSystemSpecificInitialisation();
 
-    QApplication::setOrganizationName("Sonic Visualiser");
+    QApplication::setOrganizationName("sonic-visualiser");
     QApplication::setOrganizationDomain("sonicvisualiser.org");
-    QApplication::setApplicationName("Sonic Visualiser");
+    QApplication::setApplicationName("sonic-visualiser");
 
     QString language = QLocale::system().name();
 
@@ -127,7 +126,6 @@
 
     cleanupMutex.lock();
     TempDirectory::getInstance()->cleanup();
-    Preferences::getInstance()->getConfigFile()->commit();
 
     return rv;
 }