summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@nokia.com>2012-03-30 12:45:43 +0200
committerQt by Nokia <qt-info@nokia.com>2012-04-03 13:37:15 +0200
commit6e81da009eee35927f02b43c100248699bc771b4 (patch)
treeb1adef886c7ab24eb50558bc59f838c0b34608a7
parentb3a37659057bb4250532a0150b557b8bdc35bd34 (diff)
Replace the connection with defaultConnection in JsonDatabase
Change-Id: I087c969635260c50ed54fc77b2f3605f24680e6c Reviewed-by: Tapani Mikola <tapani.mikola@nokia.com> Reviewed-by: Jing Bai <jing.t.bai@nokia.com>
-rw-r--r--src/imports/jsondb/jsondatabase.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/imports/jsondb/jsondatabase.cpp b/src/imports/jsondb/jsondatabase.cpp
index 951c5ef5..ca990638 100644
--- a/src/imports/jsondb/jsondatabase.cpp
+++ b/src/imports/jsondb/jsondatabase.cpp
@@ -44,6 +44,7 @@
#include <QJSEngine>
#include <QQmlEngine>
#include <qjsondbobject.h>
+#include <qjsondbconnection.h>
#include <qdebug.h>
QT_BEGIN_NAMESPACE_JSONDB
@@ -66,9 +67,6 @@ JsonDatabase::JsonDatabase(QObject *parent)
JsonDatabase::~JsonDatabase()
{
- if (connection) {
- delete connection;
- }
}
/*!
@@ -201,7 +199,7 @@ void JsonDatabase::onQueryError(QtJsonDb::QJsonDbRequest::ErrorCode code, const
QJsonDbConnection& JsonDatabase::sharedConnection()
{
if (!connection) {
- connection = new QJsonDbConnection();
+ connection = QJsonDbConnection::defaultConnection();
connection->connectToServer();
}
return *connection;