From e3deb6cfd5ae97b0631d38f3375676f9e98fe83c Mon Sep 17 00:00:00 2001 From: David Rosca Date: Sun, 8 Feb 2015 11:51:19 +0100 Subject: [PATCH] More cleanups + remove now unusued WebHistoryInterface --- src/lib/app/mainapplication.cpp | 7 ----- src/lib/bookmarks/bookmarksicon.cpp | 2 -- src/lib/history/webhistoryinterface.cpp | 39 ----------------------- src/lib/history/webhistoryinterface.h | 42 ------------------------- src/lib/navigation/websearchbar.cpp | 3 -- src/lib/other/clearprivatedata.cpp | 6 ---- 6 files changed, 99 deletions(-) delete mode 100644 src/lib/history/webhistoryinterface.cpp delete mode 100644 src/lib/history/webhistoryinterface.h diff --git a/src/lib/app/mainapplication.cpp b/src/lib/app/mainapplication.cpp index 73fc7b1fc..39e29e6a9 100644 --- a/src/lib/app/mainapplication.cpp +++ b/src/lib/app/mainapplication.cpp @@ -520,11 +520,7 @@ QNetworkDiskCache* MainApplication::networkCache() Settings settings; const QString defaultBasePath = QString("%1/networkcache/").arg(DataPaths::currentProfilePath()); const QString basePath = settings.value("Web-Browser-Settings/CachePath", defaultBasePath).toString(); -#if QTWEBENGINE_DISABLED - const QString cachePath = QString("%1/%2-Qt%3/").arg(basePath, qWebKitVersion(), qVersion()); -#else const QString cachePath = QString("%1/QtWebEngine/").arg(basePath); -#endif m_networkCache = new QNetworkDiskCache(this); m_networkCache->setCacheDirectory(cachePath); @@ -702,9 +698,6 @@ void MainApplication::postLaunch() } QSettings::setPath(QSettings::IniFormat, QSettings::UserScope, DataPaths::currentProfilePath()); -#if QTWEBENGINE_DISABLED - QWebEngineHistoryInterface::setDefaultInterface(new WebHistoryInterface(this)); -#endif connect(this, SIGNAL(messageReceived(QString)), this, SLOT(messageReceived(QString))); connect(this, SIGNAL(aboutToQuit()), this, SLOT(saveSettings())); diff --git a/src/lib/bookmarks/bookmarksicon.cpp b/src/lib/bookmarks/bookmarksicon.cpp index ee92c43ba..6471587c9 100644 --- a/src/lib/bookmarks/bookmarksicon.cpp +++ b/src/lib/bookmarks/bookmarksicon.cpp @@ -61,8 +61,6 @@ void BookmarksIcon::checkBookmark(const QUrl &url, bool forceCheck) QList items = mApp->bookmarks()->searchBookmarks(url); m_bookmark = items.isEmpty() ? 0 : items.first(); -#if QTWEBENGINE_DISABLED -#endif if (m_bookmark /*|| !mApp->plugins()->speedDial()->pageForUrl(url).url.isEmpty()*/) { setBookmarkSaved(); } diff --git a/src/lib/history/webhistoryinterface.cpp b/src/lib/history/webhistoryinterface.cpp deleted file mode 100644 index c1540cf4a..000000000 --- a/src/lib/history/webhistoryinterface.cpp +++ /dev/null @@ -1,39 +0,0 @@ -/* ============================================================ -* QupZilla - WebKit based browser -* Copyright (C) 2010-2014 David Rosca -* -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 3 of the License, or -* (at your option) any later version. -* -* 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 General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program. If not, see . -* ============================================================ */ -#include "webhistoryinterface.h" -#include "mainapplication.h" -#include "history.h" - -#if QTWEBENGINE_DISABLED - -WebHistoryInterface::WebHistoryInterface(QObject* parent) - : QWebEngineHistoryInterface(parent) -{ -} - -void WebHistoryInterface::addHistoryEntry(const QString &url) -{ - m_clickedLinks.insert(url); -} - -bool WebHistoryInterface::historyContains(const QString &url) const -{ - return m_clickedLinks.find(url) != m_clickedLinks.end(); -} - -#endif diff --git a/src/lib/history/webhistoryinterface.h b/src/lib/history/webhistoryinterface.h deleted file mode 100644 index 0e305c9aa..000000000 --- a/src/lib/history/webhistoryinterface.h +++ /dev/null @@ -1,42 +0,0 @@ -/* ============================================================ -* QupZilla - WebKit based browser -* Copyright (C) 2010-2014 David Rosca -* -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 3 of the License, or -* (at your option) any later version. -* -* 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 General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program. If not, see . -* ============================================================ */ -#ifndef WEBHISTORYINTERFACE_H -#define WEBHISTORYINTERFACE_H - -#include - -#include "qzcommon.h" - -#if QTWEBENGINE_DISABLED - -class QUPZILLA_EXPORT WebHistoryInterface : public QWebEngineHistoryInterface -{ -public: - explicit WebHistoryInterface(QObject* parent = 0); - - void addHistoryEntry(const QString &url); - bool historyContains(const QString &url) const; - -private: - std::set m_clickedLinks; - -}; - -#endif - -#endif // WEBHISTORYINTERFACE_H diff --git a/src/lib/navigation/websearchbar.cpp b/src/lib/navigation/websearchbar.cpp index 45c2e6a7f..72961326e 100644 --- a/src/lib/navigation/websearchbar.cpp +++ b/src/lib/navigation/websearchbar.cpp @@ -36,9 +36,6 @@ #include #include #include -#if QTWEBENGINE_DISABLED -#include -#endif #include #include diff --git a/src/lib/other/clearprivatedata.cpp b/src/lib/other/clearprivatedata.cpp index 85709242d..48efe60ca 100644 --- a/src/lib/other/clearprivatedata.cpp +++ b/src/lib/other/clearprivatedata.cpp @@ -33,9 +33,6 @@ #include #include -#if QTWEBENGINE_DISABLED -#include -#endif #include #include #include @@ -80,9 +77,6 @@ void ClearPrivateData::clearWebDatabases() { const QString profile = DataPaths::currentProfilePath(); -#if QTWEBENGINE_DISABLED - QWebDatabase::removeAllDatabases(); -#endif QzTools::removeDir(profile + "/Databases"); }