From 35eb251d7ca4bd010b927402d2c7dbdcd35a9263 Mon Sep 17 00:00:00 2001 From: Alexander Lohnau Date: Thu, 18 Mar 2021 11:44:41 +0000 Subject: [PATCH] bookmarksrunner: Apply improvements based on review --- runners/bookmarks/autotests/CMakeLists.txt | 3 +-- runners/bookmarks/autotests/bookmarksmatchtest.cpp | 10 ++-------- .../autotests/firefox/testfirefoxbookmarks.cpp | 9 +++------ runners/bookmarks/browserfactory.cpp | 2 +- runners/bookmarks/browsers/firefox.cpp | 6 +++--- runners/bookmarks/browsers/firefox.h | 6 +++--- 6 files changed, 13 insertions(+), 23 deletions(-) diff --git a/runners/bookmarks/autotests/CMakeLists.txt b/runners/bookmarks/autotests/CMakeLists.txt index 32368fe92..0f6b67ae0 100644 --- a/runners/bookmarks/autotests/CMakeLists.txt +++ b/runners/bookmarks/autotests/CMakeLists.txt @@ -4,9 +4,8 @@ include(ECMAddTests) ecm_add_test(chrome/testchromebookmarks.cpp TEST_NAME testChromeBookmarks - LINK_LIBRARIES Qt::Test krunner_bookmarks_common + LINK_LIBRARIES Qt::Test krunner_bookmarks_common ) -file(COPY chrome/chrome-config-home DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/chrome/) ecm_add_test(firefox/testfirefoxbookmarks.cpp TEST_NAME testFirefoxBookmarks LINK_LIBRARIES Qt::Test krunner_bookmarks_common diff --git a/runners/bookmarks/autotests/bookmarksmatchtest.cpp b/runners/bookmarks/autotests/bookmarksmatchtest.cpp index 2c7ecfeec..e9a51ff26 100644 --- a/runners/bookmarks/autotests/bookmarksmatchtest.cpp +++ b/runners/bookmarks/autotests/bookmarksmatchtest.cpp @@ -14,13 +14,7 @@ class TestBookmarksMatch : public QObject { Q_OBJECT public: - explicit TestBookmarksMatch(QObject *parent = nullptr) - : QObject(parent) - { - } - -private: - Firefox *m_firefox; + using QObject::QObject; private Q_SLOTS: void testQueryMatchConversion(); @@ -84,4 +78,4 @@ void TestBookmarksMatch::testAddToList() QTEST_MAIN(TestBookmarksMatch) -#include "bookmarksmatchtest.moc" \ No newline at end of file +#include "bookmarksmatchtest.moc" diff --git a/runners/bookmarks/autotests/firefox/testfirefoxbookmarks.cpp b/runners/bookmarks/autotests/firefox/testfirefoxbookmarks.cpp index 5db4944d8..49c9ec66f 100644 --- a/runners/bookmarks/autotests/firefox/testfirefoxbookmarks.cpp +++ b/runners/bookmarks/autotests/firefox/testfirefoxbookmarks.cpp @@ -13,13 +13,10 @@ class TestBookmarksMatch : public QObject { Q_OBJECT public: - explicit TestBookmarksMatch(QObject *parent = nullptr) - : QObject(parent) - { - } + using QObject::QObject; private: - Firefox *m_firefox; + Firefox *m_firefox = nullptr; private Q_SLOTS: void initTestCase(); @@ -31,7 +28,7 @@ private Q_SLOTS: void TestBookmarksMatch::initTestCase() { QStandardPaths::setTestModeEnabled(true); - m_firefox = new Firefox(this, QFINDTESTDATA("firefox-config-home")); + m_firefox = new Firefox(QFINDTESTDATA("firefox-config-home"), this); } void TestBookmarksMatch::testAllBookmarks() diff --git a/runners/bookmarks/browserfactory.cpp b/runners/bookmarks/browserfactory.cpp index fb6b3c45c..fce734490 100644 --- a/runners/bookmarks/browserfactory.cpp +++ b/runners/bookmarks/browserfactory.cpp @@ -35,7 +35,7 @@ Browser *BrowserFactory::find(const QString &browserName, QObject *parent) delete m_previousBrowser; m_previousBrowserName = browserName; if (browserName.contains(QLatin1String("firefox"), Qt::CaseInsensitive) || browserName.contains(QLatin1String("iceweasel"), Qt::CaseInsensitive)) { - m_previousBrowser = new Firefox(parent); + m_previousBrowser = new Firefox(QDir::homePath() + QStringLiteral("/.mozilla/firefox"), parent); } else if (browserName.contains(QLatin1String("opera"), Qt::CaseInsensitive)) { m_previousBrowser = new Opera(parent); } else if (browserName.contains(QLatin1String("chrome"), Qt::CaseInsensitive)) { diff --git a/runners/bookmarks/browsers/firefox.cpp b/runners/bookmarks/browsers/firefox.cpp index 9282dcc7a..c91148fa3 100644 --- a/runners/bookmarks/browsers/firefox.cpp +++ b/runners/bookmarks/browsers/firefox.cpp @@ -30,14 +30,14 @@ #include #include -Firefox::Firefox(QObject *parent, const QString &firefoxConfigDir) +Firefox::Firefox(const QString &firefoxConfigDir, QObject *parent) : QObject(parent) + , m_dbCacheFile(QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + QStringLiteral("/bookmarkrunnerfirefoxdbfile.sqlite")) + , m_dbCacheFile_fav(QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + QStringLiteral("/bookmarkrunnerfirefoxfavdbfile.sqlite")) , m_favicon(new FallbackFavicon(this)) , m_fetchsqlite(nullptr) , m_fetchsqlite_fav(nullptr) { - m_dbCacheFile = QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + QStringLiteral("/bookmarkrunnerfirefoxdbfile.sqlite"); - m_dbCacheFile_fav = QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + QStringLiteral("/bookmarkrunnerfirefoxfavdbfile.sqlite"); init(firefoxConfigDir); } diff --git a/runners/bookmarks/browsers/firefox.h b/runners/bookmarks/browsers/firefox.h index 7c02270a9..2ed34b05a 100644 --- a/runners/bookmarks/browsers/firefox.h +++ b/runners/bookmarks/browsers/firefox.h @@ -31,7 +31,7 @@ class Firefox : public QObject, public Browser { Q_OBJECT public: - explicit Firefox(QObject *parent = nullptr, const QString &firefoxConfigDir = QDir::homePath() + QStringLiteral("/.mozilla/firefox")); + explicit Firefox(const QString &firefoxConfigDir, QObject *parent = nullptr); ~Firefox() override; QList match(const QString &term, bool addEverything) override; public Q_SLOTS: @@ -42,8 +42,8 @@ private: void init(const QString &firefoxConfigDir); QString m_dbFile; QString m_dbFile_fav; - QString m_dbCacheFile; - QString m_dbCacheFile_fav; + const QString m_dbCacheFile; + const QString m_dbCacheFile_fav; Favicon *m_favicon; FetchSqlite *m_fetchsqlite; FetchSqlite *m_fetchsqlite_fav;