From 3538e6d6e0cbed314dff62b4dc68af350da26977 Mon Sep 17 00:00:00 2001 From: Nicolay Izoderov Date: Sat, 25 Jul 2015 16:15:58 +0300 Subject: [PATCH] [sqlitehistory][histview] Polishing --- src/plugins/generic/histview/src/histview.cpp | 2 -- src/plugins/generic/sqlitehistory/sqlitehistory.cpp | 6 +----- src/plugins/generic/sqlitehistory/sqlitehistory.h | 1 - 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/plugins/generic/histview/src/histview.cpp b/src/plugins/generic/histview/src/histview.cpp index d59a17aa2..ab18df1da 100644 --- a/src/plugins/generic/histview/src/histview.cpp +++ b/src/plugins/generic/histview/src/histview.cpp @@ -55,8 +55,6 @@ HistView::HistView() HistView::~HistView() { - //MenuController::removeAction(m_historyAction.data()); - delete m_historyAction; } diff --git a/src/plugins/generic/sqlitehistory/sqlitehistory.cpp b/src/plugins/generic/sqlitehistory/sqlitehistory.cpp index 9a7ad709f..b2893a23a 100644 --- a/src/plugins/generic/sqlitehistory/sqlitehistory.cpp +++ b/src/plugins/generic/sqlitehistory/sqlitehistory.cpp @@ -45,7 +45,6 @@ SqliteHistory::SqliteHistory() : m_thread(new QThread), m_worker(new SqliteWorker) { - m_worker->moveToThread(m_thread); connect(m_worker, SIGNAL(error(QString)), this, SLOT(errorHandler(QString))); @@ -223,9 +222,6 @@ AsyncResult> SqliteHistory::contacts(const Account query.bindValue(QStringLiteral(":protocol"), account.protocol); query.exec(); - qDebug() << query.executedQuery(); - qDebug() << "account" << account.account; - qDebug() << "protocol" << account.protocol; auto error = query.lastError(); if (error.isValid()) { qDebug() << "Error type: " << error.type(); @@ -392,7 +388,7 @@ void SqliteWorker::prepareDb() QSqlQuery query; query.prepare(QStringLiteral("INSERT INTO qutim_history_version (key, value) " - "VALUES (:key, :value)")); + "VALUES (:key, :value)")); query.bindValue(QStringLiteral(":key"), QStringLiteral("sqlitehistory")); query.bindValue(QStringLiteral(":value"), currentVersion()); query.exec(); diff --git a/src/plugins/generic/sqlitehistory/sqlitehistory.h b/src/plugins/generic/sqlitehistory/sqlitehistory.h index fbd1df29f..06983c5cb 100644 --- a/src/plugins/generic/sqlitehistory/sqlitehistory.h +++ b/src/plugins/generic/sqlitehistory/sqlitehistory.h @@ -81,7 +81,6 @@ class SqliteWorker : public QObject void shutdown(); public slots: void process(); - //void deleteLater(); signals: void finished(); void error(const QString &error);