aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarja Hassinen <marja.hassinen@nokia.com>2010-09-21 09:58:23 +0300
committerMarja Hassinen <marja.hassinen@nokia.com>2010-09-21 09:58:23 +0300
commitacb1d8e6357eb04c896fd8285901aa14da71d53a (patch)
tree6ab379d0771ced41c6945a1ef6e02f50ba2fb3fc
parentdaaf9dd2237ac6c97fad25215df4b35e8fb743de (diff)
QObject has a virtual dtor, InfoBackend doesn't need one.
Revert "Adding a virtual dtor to InfoBackend." This reverts commit daaf9dd2237ac6c97fad25215df4b35e8fb743de.
-rw-r--r--libcontextsubscriber/src/infobackend.cpp6
-rw-r--r--libcontextsubscriber/src/infobackend.h3
2 files changed, 1 insertions, 8 deletions
diff --git a/libcontextsubscriber/src/infobackend.cpp b/libcontextsubscriber/src/infobackend.cpp
index 22f039e3..614c90e6 100644
--- a/libcontextsubscriber/src/infobackend.cpp
+++ b/libcontextsubscriber/src/infobackend.cpp
@@ -40,7 +40,7 @@
used by ContextRegistryInfo and ContextPropertyInfo classes.
*/
-InfoBackend* InfoBackend::backendInstance = 0;
+InfoBackend* InfoBackend::backendInstance = NULL;
/// Constructs the object. The \a connectCount is 0 on start.
InfoBackend::InfoBackend(QObject *parent) : QObject(parent)
@@ -48,10 +48,6 @@ InfoBackend::InfoBackend(QObject *parent) : QObject(parent)
connectCount = 0;
}
-InfoBackend::~InfoBackend()
-{
-}
-
/// Returns the actual singleton instance, creates it on first access. Mutex-protected.
/// ContextRegistryInfo and ContextPropertyInfo use this method to access the backend.
/// The optional \a backendName specifies the backend to force, ie: 'xml' or 'cdb'.
diff --git a/libcontextsubscriber/src/infobackend.h b/libcontextsubscriber/src/infobackend.h
index 3688cea8..ff37e1e6 100644
--- a/libcontextsubscriber/src/infobackend.h
+++ b/libcontextsubscriber/src/infobackend.h
@@ -60,9 +60,6 @@ public:
/// Returns a list of providers for the given key.
virtual const QList<ContextProviderInfo> providersForKey(QString key) const = 0;
- /// To make sure the subclasses are freed properly
- virtual ~InfoBackend();
-
Q_SIGNALS:
/// Emitted when key list changes. ContextRegistryInfo listens on that.
void keysChanged(const QStringList& currentKeys);