FCL/sf/mw/browser: comparison bookmarks/BookmarksManager.cpp

equal deleted inserted replaced

-:1d6c4b7a8fbd
+:5ea3798f1248
 /*
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU Lesser General Public License as published by
 * the Free Software Foundation, version 2.1 of the License.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU Lesser General Public License for more details.
 *
 * You should have received a copy of the GNU Lesser General Public License
 * along with this program.  If not,
 * see "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html/".
 *
 * Description: This implements the bookmarks API's.
 *
 */
 #include<QString>
 #include<QFile>
 #include<QFileInfo>
 #include<QDebug>
-#include<QSqlDatabase>
 #include<QSqlQuery>
 #include<QSqlError>
 #include<QWidget>
 #include<QtGui>
+#include "../../../app/browserui/bedrockProvisioning/bedrockprovisioning.h"
 #include "bookmarksapi.h"
 #include "BookmarksManager.h"
 #include "BookmarkFav.h"
 #include "BookmarkResults.h"
 #include "TagResults.h"
 #include "xbelreader.h"
 #include "xbelwriter.h"
 #include "defaultBookmarks.xml.h"
+namespace
+{
+const QString BOOKMARK_IMPORT_FILENAME = "bookmarks.xml";
+const QString DEFAULT_BOOKMARKS_IMPORT_FILENAME = "defaultBookmarks.xml";
+const QString TAGS_TABLE_NAME = "tags";
+const QString BOOKMARKS_TABLE_NAME = "bookmarks";
+}
+BookmarksManager* BookmarksManager::instance()
+{
+static BookmarksManager* s_instance;
+if(!s_instance) {
+s_instance = new BookmarksManager();
+if(s_instance->needsImport())
+s_instance->importDefaultBookmarks();
+}
+Q_ASSERT(s_instance);
+return s_instance;
+}
 BookmarksManager::BookmarksManager(QWidget *parent) :
 QObject(parent)
 {
 setObjectName("bookmarksManager");
+m_needsImport = false;
 m_db = QSqlDatabase::database(BOOKMARKS_DB_NAME);
 if (!m_db.isValid()) {
 m_db = QSqlDatabase::addDatabase("QSQLITE", BOOKMARKS_DB_NAME);
 m_db.setDatabaseName(BOOKMARKS_DB_FILE);
 }
 if (m_db.open()) {
 // TODO: Do we need a flag so that this gets called only once OR when
 // creating a database tables "IF NOT EXISTS" is good enough
-createBookmarksSchema();
+if(!doesTableExist(BOOKMARKS_TABLE_NAME) || !doesTableExist(TAGS_TABLE_NAME)) {
-}
+createBookmarksSchema();
-}
+m_needsImport = true;
+}
-BookmarksManager::~BookmarksManager() {
+}
+}
+BookmarksManager::~BookmarksManager()
+{
 m_db.close();
 QSqlDatabase::removeDatabase(BOOKMARKS_DB_NAME);
+}
+bool BookmarksManager::createFile(QString filename, QString fileContents)
+{
+QFile file(filename);
+if(file.exists())
+file.remove();
+if (!file.open(QIODevice::WriteOnly | QIODevice::Text))
+return false;
+QTextStream out(&file);
+out << fileContents;
+file.flush();
+file.close();
+return file.exists();
+}
+void BookmarksManager::deleteFile(QString filename) {
+QFile::remove(filename);
+}
+bool BookmarksManager::doesTableExist(QString tableName)
+{
+bool retVal = false;
+if (!m_db.isValid() || !m_db.isOpen())
+return false;
+QSqlQuery query(m_db);
+query.prepare("SELECT name FROM sqlite_master WHERE type = 'table' AND name=:tableName");
+query.bindValue(":tableName", QVariant(tableName));
+if (query.exec()) {
+if (query.next())
+retVal = true;
+query.finish();
+}
+return retVal;
 }
 /*
 * +-------------+       +----------+
 * |Bookmarks(ID)|* <-> *|Tags(BMID)|
 * +-------------+       +----------+
 */
-void BookmarksManager::createBookmarksSchema() {
+void BookmarksManager::createBookmarksSchema()
+{
 // Bookmarks
 if (!doQuery("CREATE TABLE IF NOT EXISTS bookmarks("
 "id INTEGER PRIMARY KEY,"
 "title text, "
 "url text,"
 "sortIndex int DEFAULT 0)")) {
 // TODO: do some error handling here!
 return;
 }
 // Make sorting faster
-if (!doQuery("CREATE INDEX IF NOT EXISTS bm_sort_idx ON bookmarks(sortIndex ASC)")) {
+if (!doQuery(
+"CREATE INDEX IF NOT EXISTS bm_sort_idx ON bookmarks(sortIndex ASC)")) {
 // TODO: do some error handling here!
 return;
 }
 // We do a lot of lookups by id
 if (!doQuery("CREATE INDEX IF NOT EXISTS bm_id_idx ON bookmarks(id ASC)")) {
 // Tags
 // Note: foreign key constraints are not enforced in the current version of sqlite
 // that we are using.
 if (!doQuery("CREATE TABLE IF NOT EXISTS tags("
 "bmid INTEGER,"
 "tag text,"
 "FOREIGN KEY(bmid) REFERENCES bookmarks(id))")) {
 // TODO: do some error handling here!
 return;
 }
 // We do a lot of lookups, both by bookmark id and by tag
 if (!doQuery("CREATE INDEX IF NOT EXISTS tags_bmid_idx ON tags(bmid ASC)")) {
 // TODO: do some error handling here!
 return;
 }
 }
+int BookmarksManager::importDefaultBookmarks()
+{
+int success = FAILURE;
+// TODO: When Jira Task BR-4939 (https://qtrequirements.europe.nokia.com/browse/BR-4939) is
+// finished, refactor this to get the path of the bookmarks.xml from that service.
+//QString bookmarksFilename = BEDROCK_PROVISIONING::BedrockProvisioning::createBedrockProvisioning()->valueAsString("DataBaseDirectory");
+if(QFile::exists(QString("z:/private/10008d39/").append(BOOKMARK_IMPORT_FILENAME))) {
+success = importBookmarks(QString("z:/private/10008d39/").append(BOOKMARK_IMPORT_FILENAME));
+qDebug() << "Import of bookmarks.xml " << (success == SUCCESS ? "successful." : "failed.");
+} else if (QFile::exists(QString("c:/private/10008d39/").append(BOOKMARK_IMPORT_FILENAME))) {
+success = importBookmarks(QString("c:/private/10008d39/").append(BOOKMARK_IMPORT_FILENAME));
+qDebug() << "Import of bookmarks.xml " << (success == SUCCESS ? "successful." : "failed.");
+} else if(createFile(DEFAULT_BOOKMARKS_IMPORT_FILENAME, defaultBookmarksList)) {
+success = importBookmarks(DEFAULT_BOOKMARKS_IMPORT_FILENAME);
+qDebug() << "bookmarks.xml not found. Import of defaultBookmarks.xml " <<
+(success == SUCCESS ? "successful." : "failed.");
+} else {
+qDebug() << "Could not import factory or default bookmarks.";
+}
+return success;
+}
 // TODO refactor this - nothing except the schema creation can use it as is
-bool BookmarksManager::doQuery(QString query) {
+bool BookmarksManager::doQuery(QString query)
+{
 #ifdef ENABLE_PERF_TRACE
 PERF_DEBUG() << __PRETTY_FUNCTION__ << query << "\n";
 unsigned int st = WrtPerfTracer::tracer()->startTimer();
 #endif
 QSqlQuery db_query(m_db);
 bool ok = db_query.exec(query);
 if (!ok) {
-qDebug() << "BookmarksManager::doQuery" << QString("ERR: %1 %2").arg(db_query.lastError().type()).arg(db_query.lastError().text()) << " Query: " << db_query.lastQuery();
+qDebug() << "BookmarksManager::doQuery" << QString("ERR: %1 %2").arg(
+db_query.lastError().type()).arg(db_query.lastError().text())
+<< " Query: " << db_query.lastQuery();
 }
 #ifdef ENABLE_PERF_TRACE
 PERF_DEBUG() << __PRETTY_FUNCTION__ << WrtPerfTracer::tracer()->elapsedTime(st) << "\n";
 #endif
 return ok;
 }
 /**==============================================================
 * Description: Normalize a given url, if needed.
 * It adds http:// in front, if the url is relative.
 ================================================================*/
 ================================================================*/
 int BookmarksManager::addBookmark(QString title, QString URL)
 {
 int bookmarkId = 0;
-if(URL.isEmpty()) {
+if (URL.isEmpty()) {
 bookmarkId = FAILURE;
 }
-if(bookmarkId != FAILURE) {
+if (bookmarkId != FAILURE) {
 // do some checking on parameters
 QString updatedTitle = title;
 QString updatedUrl = normalizeUrl(URL);
 int soIndex = 1;
 if (title.isEmpty()) {
 }
 if (m_db.isOpen()) {
 QSqlQuery query(m_db);
 m_db.transaction();
 if (!query.exec("SELECT count(*) from bookmarks")) {
 lastErrMsg(query);
 m_db.rollback();
 return DATABASEERROR;
 }
 if(query.next()) {
 query.prepare("UPDATE bookmarks SET sortIndex=sortIndex+1 WHERE sortIndex >= :sIndex");
 query.bindValue(":sIndex", soIndex);
 if (!query.exec()) {
 lastErrMsg(query);
 m_db.rollback();
 return DATABASEERROR;
 }
 }
 query.prepare("INSERT INTO bookmarks (title, url, sortIndex) "
 "VALUES (:title, :url, :sIndex)");
 query.bindValue(":title", QVariant(updatedTitle));
 query.bindValue(":url",    QVariant(updatedUrl));
 query.bindValue(":sIndex",  QVariant(soIndex));
 if (!query.exec()) {
 lastErrMsg(query);
 m_db.rollback();
 return DATABASEERROR;
 }
 // Note: lastInsertId() is not thread-safe
 bookmarkId = query.lastInsertId().toInt();
 if (!m_db.commit()) {
 qDebug() << m_db.lastError().text();
 m_db.rollback();
 return DATABASEERROR;
 }
 } else {
 bookmarkId = FAILURE;
 }
 }
 return bookmarkId;
 }
 int BookmarksManager::importBookmarks(QString xbelFilePath)
 {
 XbelReader *reader = new XbelReader(this);
 bool retVal = false;
-if(xbelFilePath.isEmpty() || !QFile::exists(xbelFilePath)) {
+if (xbelFilePath.isEmpty() || !QFile::exists(xbelFilePath)) {
-xbelFilePath = "c:\\data\\temp.xml";
+xbelFilePath = DEFAULT_BOOKMARKS_IMPORT_FILENAME;
 QFile file(xbelFilePath);
-if(file.exists())
+if (file.exists())
 file.remove();
 if (!file.open(QIODevice::WriteOnly | QIODevice::Text))
 return false;
 QTextStream out(&file);
 out << defaultBookmarksList;
 out.flush();
 file.close();
 }
 QFile file(xbelFilePath);
-if(file.exists()) {
+if (file.exists()) {
 file.open(QIODevice::ReadOnly | QIODevice::Text);
 retVal = reader->read(&file);
 file.close();
 }
-if(reader)
+if(QFile::exists(DEFAULT_BOOKMARKS_IMPORT_FILENAME)) {
+QFile::remove(DEFAULT_BOOKMARKS_IMPORT_FILENAME);
+}
+if (reader)
 delete reader;
 return retVal ? SUCCESS : FAILURE;
 }
 /**==============================================================
 ==============================================================*/
 int BookmarksManager::exportBookmarks(QString xbelFilePath)
 {
 XbelWriter *writer = new XbelWriter(this);
 bool retVal = false;
-if(xbelFilePath.isEmpty()) {
+if (xbelFilePath.isEmpty()) {
 xbelFilePath = "c:\\data\\myBookmarks.xml";
 }
 QFile file(xbelFilePath);
-if(file.exists()) {
+if (file.exists()) {
 file.remove(xbelFilePath);
 }
 file.open(QIODevice::WriteOnly | QIODevice::Text);
 retVal = writer->writeFile(&file);
 file.flush();
 file.close();
-if(writer)
+if (writer)
 delete writer;
 return retVal ? SUCCESS : FAILURE;
 }
 /**==============================================================
 * Description: Modify the existing bookmark. Given id of the bookmark
 * and new title or url, it modifies the existing bookmark.
 * Returns : Success(0) or Failure(-1 or -2).
 ================================================================*/
-int BookmarksManager::modifyBookmark(int origBookmarkId, QString newTitle, QString newURL)
+int BookmarksManager::modifyBookmark(int origBookmarkId, QString newTitle,
+QString newURL)
 {
 int retVal = SUCCESS;
 // Client has to at least pass title or url
-if(newTitle.isEmpty() && newURL.isEmpty())
+if (newTitle.isEmpty() && newURL.isEmpty())
 retVal = FAILURE;
-if(retVal == SUCCESS) {
+if (retVal == SUCCESS) {
 if (m_db.isOpen()) {
 QSqlQuery query(m_db);
-if(newTitle.isEmpty()) {
+if (newTitle.isEmpty()) {
-query.prepare("UPDATE bookmarks SET url=:newurl WHERE id=:bmId");
+query.prepare(
+"UPDATE bookmarks SET url=:newurl WHERE id=:bmId");
 query.bindValue(":newurl", normalizeUrl(newURL));
 query.bindValue(":bmId", origBookmarkId);
-} else if(newURL.isEmpty()) {
+} else if (newURL.isEmpty()) {
-query.prepare("UPDATE bookmarks SET title=:newTitle WHERE id=:bmId");
+query.prepare(
+"UPDATE bookmarks SET title=:newTitle WHERE id=:bmId");
 query.bindValue(":newTitle", newTitle);
 query.bindValue(":bmId", origBookmarkId);
 } else {
-query.prepare("UPDATE bookmarks SET url=:newurl, title=:newTitle WHERE id=:bmId");
+query.prepare(
+"UPDATE bookmarks SET url=:newurl, title=:newTitle WHERE id=:bmId");
 query.bindValue(":newurl", normalizeUrl(newURL));
 query.bindValue(":newTitle", newTitle);
 query.bindValue(":bmId", origBookmarkId);
 }
 if (!query.exec()) {
 lastErrMsg(query);
 return DATABASEERROR;
 }
 if (query.numRowsAffected() == 0) {
 // No update happened - must be an invalid id
 // TODO: shall we return some other status
 retVal = FAILURE;
 }
 } else
 retVal = FAILURE;
 }
 return retVal;
 }
 * Returns: SUCCESS(0) or Failure(-1 or -2)
 ======================================================================================*/
 int BookmarksManager::deleteBookmark(int bookmarkId)
 {
 int retVal = SUCCESS;
 if (m_db.isOpen()) {
 QSqlQuery query(m_db);
 // TODO: Need to think about whether we need to get sortIndex and update all the
 // rows after the deletion or not
 // TODO: check if transaction() has been supported
 // by calling hasfeature() function first
 if (!query.exec()) {
 lastErrMsg(query);
 m_db.rollback();
 return DATABASEERROR;
 }
 query.prepare("DELETE FROM tags WHERE bmid=:bmId");
 query.bindValue(":bmId", bookmarkId);
 if (!query.exec()) {
 lastErrMsg(query);
 m_db.rollback();
 return DATABASEERROR;
 }
 if (!m_db.commit()) {
 qDebug() << m_db.lastError().text();
 m_db.rollback();
 return DATABASEERROR;
 }
 } else
 retVal = FAILURE;
 return retVal;
 }
 /**===================================================================================
 * Description: Delete all records from the bookmarks table as well as all the tags.
 * Returns: SUCCESS(0) or FAILURE(-1 or -2)
 ======================================================================================*/
 int BookmarksManager::clearAll()
 {
 int retVal = SUCCESS;
 if (m_db.isOpen()) {
 QSqlQuery query(m_db);
 // TODO: check if transaction() has been supported
 // by calling hasfeature() function first
 m_db.transaction();
-if(!query.exec("DELETE FROM bookmarks")) {
+if (!query.exec("DELETE FROM bookmarks")) {
 lastErrMsg(query);
 m_db.rollback();
 retVal = DATABASEERROR;
 }
 if (retVal == SUCCESS && !query.exec("DELETE FROM tags")) {
 lastErrMsg(query);
 m_db.rollback();
 retVal = DATABASEERROR;
 }
 if (retVal == SUCCESS && !m_db.commit()) {
 qDebug() << m_db.lastError().text();
 m_db.rollback();
 retVal = DATABASEERROR;
 }
 } else
 retVal = FAILURE;
 return retVal;
 }
 /**==============================================================
 * Description: Deletes a single tag associated with the bookmark
 * Returns: SUCCESS(0) or FAILURE (-1 or -2)
 ===============================================================*/
 int BookmarksManager::deleteTag(int bookmarkId, QString tagToDelete)
 {
 int retVal = SUCCESS;
-if(tagToDelete.isEmpty()|| bookmarkId < 0)
+if (tagToDelete.isEmpty() || bookmarkId < 0)
 retVal = FAILURE;
 if (retVal == SUCCESS) {
 if (m_db.isOpen()) {
 QSqlQuery query(m_db);
 query.prepare("DELETE FROM tags WHERE bmid=:bmId AND tag=:tag");
 query.bindValue(":bmId", bookmarkId);
 query.bindValue(":tag", tagToDelete);
 if (!query.exec()) {
 lastErrMsg(query);
 retVal = DATABASEERROR;
 }
 } else
 retVal = FAILURE;
 }
 return retVal;
 }
 /**================================================================
 * Description: Adds a single tag associated given the bookmark id
 * Returns: SUCCESS(0) or FAILURE (-1 or -2)
 ==================================================================*/
 int BookmarksManager::addTag(int bookmarkId, QString tagToAdd)
 {
 int retVal = SUCCESS;
-if(tagToAdd.isEmpty()|| bookmarkId < 0)
+if (tagToAdd.isEmpty() || bookmarkId < 0)
 retVal = FAILURE;
-if(retVal == SUCCESS) {
+if (retVal == SUCCESS) {
 if (m_db.isOpen()) {
 QSqlQuery query(m_db);
 query.prepare("INSERT INTO tags (bmid, tag) "
 "VALUES (:id, :tag)");
-query.bindValue(":id",   QVariant(bookmarkId));
+query.bindValue(":id", QVariant(bookmarkId));
-query.bindValue(":tag",  QVariant(tagToAdd));
+query.bindValue(":tag", QVariant(tagToAdd));
 if (!query.exec()) {
 lastErrMsg(query);
 retVal = DATABASEERROR;
 }
 } else
 retVal = FAILURE;
 }
 return retVal;
 }
 * or not.
 * Returns: A pointer to BookmarkResults object or NULL.
 ===============================================================*/
 BookmarkResults *BookmarksManager::findAllBookmarks()
 {
 BookmarkResults * results = NULL;
 QString queryStr = QString("SELECT "
 " id, title, url, sortIndex "
 " FROM bookmarks ORDER BY sortIndex");
 if (m_db.isOpen()) {
 QSqlQuery *query = new QSqlQuery(m_db);
 if (query->exec(queryStr)) {
 results = new BookmarkResults(query);
 } else {
-qDebug() << query->lastError().text() << " Query: " << query->lastQuery();
+qDebug() << query->lastError().text() << " Query: "
+<< query->lastQuery();
 results = NULL;
 }
 }
 return results;
 }
 * Description: Finds all the distinct tags.
 * Returns: A pointer to TagResults object or NULL.
 ===============================================================*/
 TagResults *BookmarksManager::findAllTags()
 {
 TagResults * results = NULL;
 if (m_db.isOpen()) {
 QSqlQuery *query = new QSqlQuery(m_db);
 if (query->exec("SELECT DISTINCT tag FROM tags")) {
 // TODO: do we need javascript hack here like in findAllBookmarks API.
 results = new TagResults(query);
 } else {
-qDebug() << query->lastError().text() << " Query: " << query->lastQuery();
+qDebug() << query->lastError().text() << " Query: "
+<< query->lastQuery();
 results = NULL;
 }
 }
 return results;
 }
 /**==============================================================
 * Description: Finds all the bookmarks associated with a given
 * tag.
 * Returns: A pointer to BookmarkResults object or NULL.
 ===============================================================*/
 BookmarkResults *BookmarksManager::findBookmarksByTag(QString tag)
 {
 BookmarkResults * results = NULL;
 QString queryStr = QString("SELECT "
 " id, title, url, sortIndex "
 " FROM bookmarks b JOIN"
 " tags t ON b.id=t.bmid WHERE"
 " t.tag=:tag");
 if (m_db.isOpen()) {
 QSqlQuery *query = new QSqlQuery(m_db);
 query->prepare(queryStr);
 query->bindValue(":tag", tag);
 if (query->exec()) {
 // TODO: do we need javascript hack here like in findAllBookmarks API.
 results = new BookmarkResults(query);
 } else {
-qDebug() << query->lastError().text() << " Query: " << query->lastQuery();
+qDebug() << query->lastError().text() << " Query: "
+<< query->lastQuery();
 results = NULL;
 }
 }
 return results;
 }
 /**==============================================================
 * Description: Finds all the Tags associated with a given
 * bookmarkID.
 * Returns: A pointer to TagResults object or NULL.
 ===============================================================*/
 TagResults *BookmarksManager::findTagsByBookmark(int bookmarkID)
 {
 TagResults * results = NULL;
 QString queryStr = QString("SELECT DISTINCT tag "
 " FROM tags t JOIN"
 " bookmarks b ON t.bmid=b.id WHERE"
 " t.bmid=:id");
 if (m_db.isOpen()) {
 QSqlQuery *query = new QSqlQuery(m_db);
 query->prepare(queryStr);
 query->bindValue(":id", bookmarkID);
 if (query->exec()) {
 // TODO: do we need javascript hack here like in findAllBookmarks API.
-results =  new TagResults(query);
+results = new TagResults(query);
 } else {
-qDebug() << query->lastError().text() << " Query: " << query->lastQuery();
+qDebug() << query->lastError().text() << " Query: "
+<< query->lastQuery();
 results = NULL;
 }
 }
 return results;
 }
 /**==============================================================
 * Description: Finds all the Bookmarks that doesn't have any
 * tags associated with it. It is needed by export API.
 * Returns: A pointer to BookmarkResults object or NULL.
 ===============================================================*/
 BookmarkResults *BookmarksManager::findUntaggedBookmarks()
 {
 BookmarkResults * results = NULL;
 QString queryStr = QString("SELECT "
 " id, title, url, sortIndex "
 " FROM bookmarks b LEFT OUTER JOIN"
 " tags t ON b.id=t.bmid WHERE"
 " t.bmid IS NULL ORDER BY sortIndex");
 if (m_db.isOpen()) {
 QSqlQuery *query = new QSqlQuery(m_db);
 if (query->exec(queryStr)) {
 // TODO: do we need javascript hack here like in findAllBookmarks API.
 results = new BookmarkResults(query);
 } else {
-qDebug() << query->lastError().text() << " Query: " << query->lastQuery();
+qDebug() << query->lastError().text() << " Query: "
-results = NULL;
+<< query->lastQuery();
-}
+results = NULL;
+}
 }
 return results;
 }
 /**==============================================================
 * Description: Reorder bookmarks. Moves a given bookmark to a
 * passed new index.
 * Returns: SUCCESS(0) or FAILURE (-1 or -2)
 ===============================================================*/
 int BookmarksManager::reorderBookmark(int bookmarkID, int newIndex)
 {
 if (newIndex <= 0)
 return FAILURE;
 if (!m_db.isOpen())
 	return DATABASEERROR;
 ===============================================================*/
 BookmarkFav* BookmarksManager::findBookmark(int bookmarkId)
 {
 BookmarkFav * results = NULL;
+if (m_db.isOpen()) {
-if (m_db.isOpen()) {
+QSqlQuery query(m_db);
-QSqlQuery query(m_db);
+query.prepare(
-query.prepare("SELECT title, url, sortIndex FROM bookmarks WHERE id=:id");
+"SELECT title, url, sortIndex FROM bookmarks WHERE id=:id");
 query.bindValue(":id", bookmarkId);
 if (query.exec()) {
 if (query.next())
-results = new BookmarkFav(bookmarkId, query.value(0).toString(),
+results = new BookmarkFav(bookmarkId,
-query.value(1).toString(), query.value(2).toInt());
+query.value(0).toString(), query.value(1).toString(),
+query.value(2).toInt());
 } else {
 lastErrMsg(query);
 }
 }
 return results;
 /**==============================================================
 * Description: Prints a last error message from the query.
 * Returns: Nothing.
 ===============================================================*/
 void BookmarksManager::lastErrMsg(QSqlQuery& query)
 {
-qDebug() << "BookmarksManager::lastErrMsg" << QString("ERR: %1 %2").arg(query.lastError().type()).arg(query.lastError().text()) << " Query: " << query.lastQuery();
+qDebug() << "BookmarksManager::lastErrMsg" << QString("ERR: %1 %2").arg(
-}
+query.lastError().type()).arg(query.lastError().text())
+<< " Query: " << query.lastQuery();
+}

changeset 15	5ea3798f1248
parent 12	d26902edeef5