summaryrefslogtreecommitdiffstats
path: root/desktop-widgets
diff options
context:
space:
mode:
Diffstat (limited to 'desktop-widgets')
-rw-r--r--desktop-widgets/updatemanager.cpp17
-rw-r--r--desktop-widgets/updatemanager.h1
-rw-r--r--desktop-widgets/usersurvey.cpp2
3 files changed, 2 insertions, 18 deletions
diff --git a/desktop-widgets/updatemanager.cpp b/desktop-widgets/updatemanager.cpp
index 0760d6407..2ab92b3a5 100644
--- a/desktop-widgets/updatemanager.cpp
+++ b/desktop-widgets/updatemanager.cpp
@@ -1,5 +1,6 @@
#include "updatemanager.h"
#include "helpers.h"
+#include "qthelper.h"
#include <QtNetwork>
#include <QMessageBox>
#include <QUuid>
@@ -60,22 +61,6 @@ void UpdateManager::checkForUpdates(bool automatic)
connect(SubsurfaceWebServices::manager()->get(request), SIGNAL(finished()), this, SLOT(requestReceived()), Qt::UniqueConnection);
}
-QString UpdateManager::getUUID()
-{
- QString uuidString;
- QSettings settings;
- settings.beginGroup("UpdateManager");
- if (settings.contains("UUID")) {
- uuidString = settings.value("UUID").toString();
- } else {
- QUuid uuid = QUuid::createUuid();
- uuidString = uuid.toString();
- settings.setValue("UUID", uuidString);
- }
- uuidString.replace("{", "").replace("}", "");
- return uuidString;
-}
-
void UpdateManager::requestReceived()
{
bool haveNewVersion = false;
diff --git a/desktop-widgets/updatemanager.h b/desktop-widgets/updatemanager.h
index f91c82dc8..4e95d740f 100644
--- a/desktop-widgets/updatemanager.h
+++ b/desktop-widgets/updatemanager.h
@@ -11,7 +11,6 @@ class UpdateManager : public QObject {
public:
explicit UpdateManager(QObject *parent = 0);
void checkForUpdates(bool automatic = false);
- static QString getUUID();
public
slots:
diff --git a/desktop-widgets/usersurvey.cpp b/desktop-widgets/usersurvey.cpp
index 05da582a1..2d5d5b07e 100644
--- a/desktop-widgets/usersurvey.cpp
+++ b/desktop-widgets/usersurvey.cpp
@@ -31,7 +31,7 @@ UserSurvey::UserSurvey(QWidget *parent) : QDialog(parent),
os.append(QString("&osCpuArch=%1").arg(osArch));
}
os.append(QString("&uiLang=%1").arg(uiLanguage(NULL)));
- os.append(QString("&uuid=%1").arg(UpdateManager::getUUID()));
+ os.append(QString("&uuid=%1").arg(getUUID()));
ui->system->setPlainText(getVersion());
}