1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
|
Date: Wed, 6 Jun 2018 20:46:38 +0200
This reverts commit eceda92a16f1f4e5c5b584acd745398571df2bd6.
---
src/application/mainapplication.cpp | 3 ---
src/application/mainwindow.cpp | 11 -----------
src/application/mainwindow.h | 2 --
src/newstabwidget.cpp | 6 +-----
src/newstabwidget.h | 2 +-
src/optionsdialog.cpp | 2 --
src/webview/webpage.cpp | 13 +------------
src/webview/webpage.h | 3 ---
8 files changed, 3 insertions(+), 39 deletions(-)
diff --git a/src/application/mainapplication.cpp b/src/application/mainapplication.cpp
index e93ec9c1..a5913bdf 100644
--- a/src/application/mainapplication.cpp
+++ b/src/application/mainapplication.cpp
@@ -566,9 +566,6 @@ void MainApplication::c2fLoadSettings()
settings.beginGroup("ClickToFlash");
c2fWhitelist_ = settings.value("whitelist", QStringList()).toStringList();
c2fEnabled_ = settings.value("enabled", true).toBool();
-#if QT_VERSION >= 0x050900
- c2fEnabled_ = false;
-#endif
settings.endGroup();
}
diff --git a/src/application/mainwindow.cpp b/src/application/mainwindow.cpp
index 337a7c4e..42255d2c 100644
--- a/src/application/mainwindow.cpp
+++ b/src/application/mainwindow.cpp
@@ -8140,14 +8140,3 @@ void MainWindow::createBackup()
QFile::copy(settings.fileName(), backupFileName);
}
}
-
-void MainWindow::webViewFullScreen(bool on)
-{
- setFullScreen();
- feedsWidget_->setVisible(!on);
- pushButtonNull_->setVisible(!on);
- tabBarWidget_->setVisible(!on);
- currentNewsTab->newsWidget_->setVisible(!on);
- pushButtonNull_->setVisible(!on);
- statusBar()->setVisible(!on);
-}
diff --git a/src/application/mainwindow.h b/src/application/mainwindow.h
index 995f96dc..93b75c11 100644
--- a/src/application/mainwindow.h
+++ b/src/application/mainwindow.h
@@ -271,8 +271,6 @@ public:
AdBlockIcon *adBlockIcon() { return adblockIcon_; }
- void webViewFullScreen(bool on);
-
public slots:
void restoreFeedsOnStartUp();
void addFeed();
diff --git a/src/newstabwidget.cpp b/src/newstabwidget.cpp
index 77d74d3b..c6c130f7 100644
--- a/src/newstabwidget.cpp
+++ b/src/newstabwidget.cpp
@@ -1842,12 +1842,8 @@ void NewsTabWidget::loadNewspaper(int refresh)
*----------------------------------------------------------------------------*/
void NewsTabWidget::slotSetHtmlWebView(const QString &html, const QUrl &baseUrl)
{
- QUrl url = baseUrl;
-#if QT_VERSION >= 0x050900
- url.setScheme("");
-#endif
webView_->history()->setMaximumItemCount(0);
- webView_->setHtml(html, url);
+ webView_->setHtml(html, baseUrl);
webView_->history()->setMaximumItemCount(100);
}
diff --git a/src/newstabwidget.h b/src/newstabwidget.h
index 7f5c3957..8d1266ac 100644
--- a/src/newstabwidget.h
+++ b/src/newstabwidget.h
@@ -127,7 +127,6 @@ public:
QToolBar *newsToolBar_;
QSplitter *newsTabWidgetSplitter_;
- QWidget *newsWidget_;
WebView *webView_;
QToolBar *webToolBar_;
LocationBar *locationBar_;
@@ -199,6 +198,7 @@ private:
MainWindow *mainWindow_;
QSqlDatabase db_;
+ QWidget *newsWidget_;
FeedsModel *feedsModel_;
FeedsProxyModel *feedsProxyModel_;
diff --git a/src/optionsdialog.cpp b/src/optionsdialog.cpp
index 73136dec..c082bc30 100644
--- a/src/optionsdialog.cpp
+++ b/src/optionsdialog.cpp
@@ -741,9 +741,7 @@ void OptionsDialog::createBrowserWidget()
browserWidget_ = new QTabWidget();
browserWidget_->addTab(generalBrowserWidget, tr("General"));
browserWidget_->addTab(historyBrowserWidget_, tr("History"));
-#if QT_VERSION < 0x050900
browserWidget_->addTab(click2FlashWidget_, tr("Click to Flash"));
-#endif
browserWidget_->addTab(downloadsWidget, tr("Downloads"));
}
diff --git a/src/webview/webpage.cpp b/src/webview/webpage.cpp
index 6401ec87..0254a167 100644
--- a/src/webview/webpage.cpp
+++ b/src/webview/webpage.cpp
@@ -51,10 +51,7 @@ WebPage::WebPage(QObject *parent)
this, SLOT(downloadRequested(QNetworkRequest)));
connect(this, SIGNAL(printRequested(QWebFrame*)),
mainApp->mainWindow(), SLOT(slotPrint(QWebFrame*)));
-#if QT_VERSION >= 0x050900
- connect(this, SIGNAL(fullScreenRequested(QWebFullScreenRequest)),
- this, SLOT(slotFullScreenRequested(QWebFullScreenRequest)));
-#endif
+
livingPages_.append(this);
}
@@ -286,11 +283,3 @@ void WebPage::cleanBlockedObjects()
mainFrame()->scrollToAnchor(mainFrame()->url().fragment());
}
}
-
-#if QT_VERSION >= 0x050900
-void WebPage::slotFullScreenRequested(QWebFullScreenRequest fullScreenRequest)
-{
- fullScreenRequest.accept();
- mainApp->mainWindow()->webViewFullScreen(fullScreenRequest.toggleOn());
-}
-#endif
diff --git a/src/webview/webpage.h b/src/webview/webpage.h
index 5c376c50..91e72758 100644
--- a/src/webview/webpage.h
+++ b/src/webview/webpage.h
@@ -68,9 +68,6 @@ private slots:
void downloadRequested(const QNetworkRequest &request);
void cleanBlockedObjects();
void urlChanged(const QUrl &url);
-#if QT_VERSION >= 0x050900
- void slotFullScreenRequested(QWebFullScreenRequest fullScreenRequest);
-#endif
private:
NetworkManagerProxy *networkManagerProxy_;
--
2.16.2
|