Implemented NetworkCookieJar::clearCookiesSetting()

[situare] / src / ui / mainwindow.cpp

diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index d53c5c1..4ec70c4 100644 (file)
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -138,7 +138,7 @@ void MainWindow::automaticUpdateDialogFinished(int result)
     if (result == QMessageBox::Yes) {
         readAutomaticLocationUpdateSettings();
     } else {
-        QSettings settings(DIRECTORY_NAME, FILE_NAME);
+        QSettings settings(SETTINGS_ORGANIZATION_NAME, SETTINGS_APPLICATION_NAME);
         settings.setValue(SETTINGS_AUTOMATIC_UPDATE_ENABLED, false);
         readAutomaticLocationUpdateSettings();
     }
@@ -739,7 +739,7 @@ void MainWindow::readAutomaticLocationUpdateSettings()
 {
     qDebug() << __PRETTY_FUNCTION__;
 
-    QSettings settings(DIRECTORY_NAME, FILE_NAME);
+    QSettings settings(SETTINGS_ORGANIZATION_NAME, SETTINGS_APPLICATION_NAME);
     bool automaticUpdateEnabled = settings.value(SETTINGS_AUTOMATIC_UPDATE_ENABLED, false).toBool();
     QTime automaticUpdateInterval = settings.value(SETTINGS_AUTOMATIC_UPDATE_INTERVAL, QTime())
                                       .toTime();
@@ -752,28 +752,6 @@ void MainWindow::readAutomaticLocationUpdateSettings()
     }
 }
 
-///< @todo remove old, duplicate saveCookies()
-void MainWindow::saveCookies()
-{
-    qDebug() << __PRETTY_FUNCTION__;
-
-//    if(!m_cookieJar)
-//        m_cookieJar = new NetworkCookieJar(new QNetworkCookieJar(this));
-
-//    QList<QNetworkCookie> cookieList = m_cookieJar->allCookies();
-//    QStringList list;
-
-//    for(int i=0;i<cookieList.count();i++) {
-//        QNetworkCookie cookie = cookieList.at(i);
-//        QByteArray byteArray = cookie.toRawForm(QNetworkCookie::Full);
-//        list.append(QString(byteArray));
-//    }
-//    list.removeDuplicates();
-
-//    QSettings settings(DIRECTORY_NAME, FILE_NAME);
-//    settings.setValue(COOKIES, list);
-}
-
 void MainWindow::setCrosshairVisibility(bool visibility)
 {
     qDebug() << __PRETTY_FUNCTION__;