diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-11-27 00:09:00 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-11-27 00:09:00 (GMT) |
| commit | 1efae63bf7cba55526c91dcff3139d0a10885efc (patch) | |
| tree | d07e1a5db7b2726bbc5d941da3ed97097820b8ca /demos/browser/webview.cpp | |
| parent | 249bb31dc9fa12acff44ebf0effbdaedc43b5305 (diff) | |
| parent | 41f1276392444b9e46b30f3537a8a63af6fffc9d (diff) | |
| download | Qt-1efae63bf7cba55526c91dcff3139d0a10885efc.zip Qt-1efae63bf7cba55526c91dcff3139d0a10885efc.tar.gz Qt-1efae63bf7cba55526c91dcff3139d0a10885efc.tar.bz2 | |
Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declarativeui
Diffstat (limited to 'demos/browser/webview.cpp')
| -rw-r--r-- | demos/browser/webview.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/demos/browser/webview.cpp b/demos/browser/webview.cpp index 754fedc..1fcced4 100644 --- a/demos/browser/webview.cpp +++ b/demos/browser/webview.cpp @@ -68,8 +68,8 @@ WebPage::WebPage(QObject *parent) , m_openInNewTab(false) { setNetworkAccessManager(BrowserApplication::networkAccessManager()); - connect(this, SIGNAL(unsupportedContent(QNetworkReply *)), - this, SLOT(handleUnsupportedContent(QNetworkReply *))); + connect(this, SIGNAL(unsupportedContent(QNetworkReply*)), + this, SLOT(handleUnsupportedContent(QNetworkReply*))); } BrowserMainWindow *WebPage::mainWindow() @@ -192,16 +192,16 @@ WebView::WebView(QWidget* parent) , m_page(new WebPage(this)) { setPage(m_page); - connect(page(), SIGNAL(statusBarMessage(const QString&)), - SLOT(setStatusBarText(const QString&))); + connect(page(), SIGNAL(statusBarMessage(QString)), + SLOT(setStatusBarText(QString))); connect(this, SIGNAL(loadProgress(int)), this, SLOT(setProgress(int))); connect(this, SIGNAL(loadFinished(bool)), this, SLOT(loadFinished())); - connect(page(), SIGNAL(loadingUrl(const QUrl&)), - this, SIGNAL(urlChanged(const QUrl &))); - connect(page(), SIGNAL(downloadRequested(const QNetworkRequest &)), - this, SLOT(downloadRequested(const QNetworkRequest &))); + connect(page(), SIGNAL(loadingUrl(QUrl)), + this, SIGNAL(urlChanged(QUrl))); + connect(page(), SIGNAL(downloadRequested(QNetworkRequest)), + this, SLOT(downloadRequested(QNetworkRequest))); page()->setForwardUnsupportedContent(true); } |