web/surfer
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rename webpage and webview to swisswebpage and swissswebview to be more specific; refs #115

Browse Source
This commit is contained in:
Marc Wäckerlin
2012-02-09 09:22:33 +00:00
parent 66f3cad774
commit 7bb38a75f4
7 changed files with 100 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/browser.hxx
View File

@@ -13,7 +13,7 @@
#include <errorlog.hxx>
#include <downloadmanager.hxx>
#include <authentication.hxx>
#include <qbrowserlib/webview.hxx>
#include <qbrowserlib/swisswebview.hxx>
#include <settings.hxx>
#include <editbookmarks.hxx>
#include <temporaryfile.hxx>
@@ -222,8 +222,8 @@ class Browser: public QMainWindow, protected Ui::Browser {
return true;
}
WebView* newTab() {
WebView* browser(new WebView);
SwissWebView* newTab() {
SwissWebView* browser(new SwissWebView);
newTab(browser);
return browser;
}
@@ -277,14 +277,14 @@ class Browser: public QMainWindow, protected Ui::Browser {
view->load(page);
}
void newTab(WebView* browser) {
void newTab(SwissWebView* browser) {
browser->page()->setNetworkAccessManager(&_networkManager);
assert(connect(&_networkManager, SIGNAL(finished(QNetworkReply*)),
SLOT(finished(QNetworkReply*))));
_url->setFocus();
// WebView
assert(connect(browser, SIGNAL(newView(WebView*)),
SLOT(newTab(WebView*))));
// SwissWebView
assert(connect(browser, SIGNAL(newView(SwissWebView*)),
SLOT(newTab(SwissWebView*))));
// QWebView
assert(connect(browser, SIGNAL(urlChanged(const QUrl&)),
SLOT(urlChanged(const QUrl&))));