summaryrefslogtreecommitdiffstats
path: root/src/libs/installer/productkeycheck.cpp
diff options
context:
space:
mode:
authorkh1 <karsten.heimrich@digia.com>2013-11-25 16:53:04 +0100
committerKarsten Heimrich <karsten.heimrich@digia.com>2013-11-25 16:53:33 +0100
commit31a0f80573edce1a08b0532327a15287298d8a2c (patch)
tree12ead8dafb8b22105251fed2e6dea78a384bccc4 /src/libs/installer/productkeycheck.cpp
parent42255f8756c5c92bc3312dce2d672bb2c4d6f2b7 (diff)
Adjust ProductKeyCheck API. (in preparation for multiple pages)
Change-Id: I69d0fc9842df7fb564db57067da5f40e002b61de Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Diffstat (limited to 'src/libs/installer/productkeycheck.cpp')
-rw-r--r--src/libs/installer/productkeycheck.cpp30
1 files changed, 6 insertions, 24 deletions
diff --git a/src/libs/installer/productkeycheck.cpp b/src/libs/installer/productkeycheck.cpp
index 9a9010d60..6b5699361 100644
--- a/src/libs/installer/productkeycheck.cpp
+++ b/src/libs/installer/productkeycheck.cpp
@@ -1,6 +1,6 @@
/**************************************************************************
**
-** Copyright (c) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (c) 2013 Digia Plc and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of Installer Framework
@@ -27,42 +27,24 @@
**
**************************************************************************/
-#include <productkeycheck.h>
-#include <packagemanagercore.h>
-
-class ProductKeyCheckPrivate
-{
- public:
- static QPointer<QInstaller::PackageManagerCore> core;
-};
-
-QPointer<QInstaller::PackageManagerCore> ProductKeyCheckPrivate::core = 0;
-
+#include "productkeycheck.h"
+#include "packagemanagercore.h"
ProductKeyCheck::ProductKeyCheck()
- : d(new ProductKeyCheckPrivate())
{
}
-ProductKeyCheck::~ProductKeyCheck()
-{
- delete d;
-}
-
-ProductKeyCheck *ProductKeyCheck::instance(QInstaller::PackageManagerCore *core)
+ProductKeyCheck *ProductKeyCheck::instance()
{
static ProductKeyCheck instance;
- if (core)
- instance.setPackageManagerCore(core);
return &instance;
}
-void ProductKeyCheck::setPackageManagerCore(QInstaller::PackageManagerCore *core)
+void ProductKeyCheck::init(QInstaller::PackageManagerCore *core)
{
- ProductKeyCheckPrivate::core = core;
+ Q_UNUSED(core)
}
-
bool ProductKeyCheck::hasValidKey()
{
return true;