File 0003-Bookmarks-Runner-Remove-unused-database-pa... of Package plasma5-workspace

Overview Repositories Revisions Requests Users Attributes Meta

File 0003-Bookmarks-Runner-Remove-unused-database-parameter-fr.patch of Package plasma5-workspace (Revision e708fd90268cb6dd9084d6b481f1b801)

Currently displaying revision e708fd90268cb6dd9084d6b481f1b801 , Show latest

From c7e6b584de6d5f4b01e85153c0bee46beddaee5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
Date: Sun, 9 Sep 2018 20:13:14 +0200
Subject: [PATCH 3/4] [Bookmarks Runner] Remove unused database parameter from
 query

Summary:
The query is no longer initialized for each query, just once, thus there
no longer is a need for the database parameter.

Test Plan: make

Reviewers: #frameworks, davidedmundson

Reviewed By: davidedmundson

Subscribers: plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D15490
---
 runners/bookmarks/faviconfromblob.cpp | 3 +--
 runners/bookmarks/fetchsqlite.cpp     | 2 +-
 runners/bookmarks/fetchsqlite.h       | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/runners/bookmarks/faviconfromblob.cpp b/runners/bookmarks/faviconfromblob.cpp
index a9daffa5..cb71ff4b 100644
--- a/runners/bookmarks/faviconfromblob.cpp
+++ b/runners/bookmarks/faviconfromblob.cpp
@@ -39,8 +39,7 @@
 class StaticQuery : public BuildQuery {
 public:
     StaticQuery(const QString &query) : m_query(query) {}
-    QString query(QSqlDatabase *database) const override {
-      Q_UNUSED(database);
+    QString query() const override {
       return m_query;
     }
 private:
diff --git a/runners/bookmarks/fetchsqlite.cpp b/runners/bookmarks/fetchsqlite.cpp
index ce6cb74f..deb633dd 100644
--- a/runners/bookmarks/fetchsqlite.cpp
+++ b/runners/bookmarks/fetchsqlite.cpp
@@ -67,7 +67,7 @@ void FetchSqlite::teardown()
 
 QList<QVariantMap> FetchSqlite::query(BuildQuery *buildQuery, QMap<QString, QVariant> bindObjects)
 {
-    return query(buildQuery->query(&m_db), bindObjects);
+    return query(buildQuery->query(), bindObjects);
 }
 
 QList<QVariantMap> FetchSqlite::query(const QString &sql, QMap<QString, QVariant> bindObjects)
diff --git a/runners/bookmarks/fetchsqlite.h b/runners/bookmarks/fetchsqlite.h
index 7f3fc710..1b967635 100644
--- a/runners/bookmarks/fetchsqlite.h
+++ b/runners/bookmarks/fetchsqlite.h
@@ -33,7 +33,7 @@
 
 class BuildQuery {
 public:
-    virtual QString query(QSqlDatabase *database) const = 0;
+    virtual QString query() const = 0;
     virtual ~BuildQuery() {}
 };
 
-- 
2.19.0

Places

File 0003-Bookmarks-Runner-Remove-unused-database-parameter-fr.patch of Package plasma5-workspace (Revision e708fd90268cb6dd9084d6b481f1b801)

Places