kiwix/kiwix-desktop
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-desktop.git synced 2025-09-22 11:37:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused reader parameter in TabWidget::openUrl.

Browse Source
This commit is contained in:
Matthieu Gautier 2018-07-19 11:03:11 +02:00
parent 3e46893e2d
commit ee2a55bcbf
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/kiwixapp.cpp
View File

@ -72,9 +72,7 @@ void KiwixApp::openZimFile(const QString &zimfile)
} }
void KiwixApp::openUrl(const QUrl &url, bool newTab) { void KiwixApp::openUrl(const QUrl &url, bool newTab) {
auto reader = library.getReader(url.host()); tabWidget->openUrl(url, newTab);
Q_ASSERT(reader);
tabWidget->openUrl(reader, url, newTab);
} }
void KiwixApp::showMessage(const QString &message) void KiwixApp::showMessage(const QString &message)

2
src/tabwidget.cpp
View File

@ -21,7 +21,7 @@ WebView* TabWidget::createNewTab(bool setCurrent)
return webView; return webView;
} }
void TabWidget::openUrl(std::shared_ptr<kiwix::Reader> reader, const QUrl& url, bool newTab) void TabWidget::openUrl(const QUrl& url, bool newTab)
{ {
WebView* webView = nullptr; WebView* webView = nullptr;
if (newTab || !currentWidget()) { if (newTab || !currentWidget()) {

3
src/tabwidget.h
View File

@ -3,7 +3,6 @@
#include <QTableWidget> #include <QTableWidget>
#include <memory> #include <memory>
#include <kiwix/reader.h>
#include "webview.h" #include "webview.h"
class TabWidget : public QTabWidget class TabWidget : public QTabWidget
@ -12,7 +11,7 @@ public:
TabWidget(QWidget* parent=nullptr); TabWidget(QWidget* parent=nullptr);
WebView* createNewTab(bool setCurrent); WebView* createNewTab(bool setCurrent);
void openUrl(std::shared_ptr<kiwix::Reader> reader, const QUrl &url, bool newTab); void openUrl(const QUrl &url, bool newTab);
void setTitleOf(WebView* webView, const QString& title); void setTitleOf(WebView* webView, const QString& title);
void setIconOf(WebView* webView, const QIcon& icon); void setIconOf(WebView* webView, const QIcon& icon);
}; };