Turned onLoadProgressChanged into a real private slot.
authorhausmann <hausmann@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 7 Nov 2007 14:28:56 +0000 (14:28 +0000)
committerhausmann <hausmann@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 7 Nov 2007 14:28:56 +0000 (14:28 +0000)
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@27530 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKit/qt/Api/qwebpage.cpp
WebKit/qt/Api/qwebpage.h
WebKit/qt/Api/qwebpage_p.h
WebKit/qt/ChangeLog

index 60f5ed7a9485c144f7a9302a9ac41ea0002a7db4..b303a16159abc012f2b238a9aa02f1ad4bbc0400 100644 (file)
@@ -152,7 +152,7 @@ QWebPage::QWebPage(QWidget *parent)
 
     setPalette(pal);
     setAcceptDrops(true);
-    connect(this, SIGNAL(loadProgressChanged(int)), this, SLOT(onLoadProgressChanged(int)));
+    connect(this, SIGNAL(loadProgressChanged(int)), this, SLOT(_q_onLoadProgressChanged(int)));
 }
 
 QWebPage::~QWebPage()
@@ -837,9 +837,9 @@ QString QWebPage::userAgentStringForUrl(const QUrl& forUrl) const {
 }
 
 
-void QWebPage::onLoadProgressChanged(int) {
-    d->m_totalBytes = d->page->progress()->totalPageAndResourceBytesToLoad();
-    d->m_bytesReceived = d->page->progress()->totalBytesReceived();
+void QWebPagePrivate::_q_onLoadProgressChanged(int) {
+    m_totalBytes = page->progress()->totalPageAndResourceBytesToLoad();
+    m_bytesReceived = page->progress()->totalBytesReceived();
 }
 
 
@@ -851,3 +851,5 @@ quint64 QWebPage::totalBytes() const {
 quint64 QWebPage::bytesReceived() const {
     return d->m_totalBytes;
 }
+
+#include "moc_qwebpage.cpp"
index 6969f9ba2c36e9b83be50c284096968cbb51b3cd..47a9acb060da8cbc0523ae4e8cc03d9b4be36fa7 100644 (file)
@@ -178,10 +178,6 @@ signals:
 
     void frameCreated(QWebFrame *frame);
 
-private slots:
-    // ### should go!
-    void onLoadProgressChanged(int);
-
 protected:
     virtual QWebPage *createWindow();
     virtual QWebPage *createModalDialog();
@@ -218,6 +214,7 @@ protected:
     virtual void dropEvent(QDropEvent *);
 
 private:
+    Q_PRIVATE_SLOT(d, void _q_onLoadProgressChanged(int))
     friend class QWebFrame;
     friend class QWebPagePrivate;
     friend class WebCore::ChromeClientQt;
index f7e3bdc4a063ee3d6a51e91438174939c9fb5823..20f6aef9a9369927c32b9f9281fb540cafee2cca 100644 (file)
@@ -47,6 +47,8 @@ public:
 
     QWebFrame *frameAt(const QPoint &pos) const;
 
+    void _q_onLoadProgressChanged(int);
+
     WebCore::ChromeClientQt *chromeClient;
     WebCore::ContextMenuClientQt *contextMenuClient;
     WebCore::EditorClientQt *editorClient;
index da2fef528e78978754119d7728dde09f8f0c56c9..9aeb0afcccd22d2edd0e0cd8b5288a92ef31b0a8 100644 (file)
@@ -1,3 +1,14 @@
+2007-11-07  Simon Hausmann  <hausmann@kde.org>
+
+        Reviewed by Lars.
+
+        Turned onLoadProgressChanged into a real private slot.
+
+        * Api/qwebpage.cpp:
+        (QWebPage::QWebPage):
+        * Api/qwebpage.h:
+        * Api/qwebpage_p.h:
+
 2007-11-07  Simon Hausmann  <hausmann@kde.org>
 
         Reviewed by Lars.