Changeset 64297 in webkit

Timestamp:

Jul 29, 2010 11:44:37 AM (14 years ago)

Author:

tonikitoo@webkit.org

Message:

2010-07-29 Antonio Gomes <​tonikitoo@webkit.org>

Reviewed by Kenneth Christiansen.

[Qt] QtTestBrowser: Move WebPage class methods definitions from main.cpp to webpage.cpp
​https://bugs.webkit.org/show_bug.cgi?id=43199

There is no sense in keeping WebPage method definitions in main.cpp once
webpage.cpp already exists.

No behavior change.

• QtTestBrowser/main.cpp:
• QtTestBrowser/webpage.cpp: (WebPage::createWindow): (WebPage::createPlugin):

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• QtTestBrowser/main.cpp (modified) (1 diff)
• QtTestBrowser/webpage.cpp (modified) (2 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-07-29  Antonio Gomes  <tonikitoo@webkit.org>
+
+        Reviewed by Kenneth Christiansen.
+
+        [Qt] QtTestBrowser: Move WebPage class methods definitions from main.cpp to webpage.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=43199
+
+        There is no sense in keeping WebPage method definitions in main.cpp once
+        webpage.cpp already exists.
+
+        No behavior change.
+
+        * QtTestBrowser/main.cpp:
+        * QtTestBrowser/webpage.cpp:
+        (WebPage::createWindow):
+        (WebPage::createPlugin):
+
 2010-07-29  Antonio Gomes  <tonikitoo@webkit.org>
 

trunk/WebKitTools/QtTestBrowser/main.cpp

@@ -34 +34 @@
 #include "urlloader.h"
 
-QWebPage* WebPage::createWindow(QWebPage::WebWindowType type)
-{
-    LauncherWindow* mw = new LauncherWindow;
-    if (type == WebModalDialog)
-        mw->setWindowModality(Qt::ApplicationModal);
-    mw->show();
-    return mw->page();
-}
-
-QObject* WebPage::createPlugin(const QString &classId, const QUrl&, const QStringList&, const QStringList&)
-{
-    if (classId == "alien_QLabel") {
-        QLabel* l = new QLabel;
-        l->winId();
-        return l;
-    }
-
-#ifndef QT_NO_UITOOLS
-    QUiLoader loader;
-    return loader.createWidget(classId, view());
-#else
-    Q_UNUSED(classId);
-    return 0;
-#endif
-}
-
 int launcherMain(const QApplication& app)
 {

trunk/WebKitTools/QtTestBrowser/webpage.cpp

@@ -33 +33 @@
 #include "webpage.h"
 
+#include "launcherwindow.h"
+
 #include <QAuthenticator>
 #include <QDesktopServices>
@@ -186 +188 @@
 {
 }
+
+QWebPage* WebPage::createWindow(QWebPage::WebWindowType type)
+{
+    LauncherWindow* mw = new LauncherWindow;
+    if (type == WebModalDialog)
+        mw->setWindowModality(Qt::ApplicationModal);
+    mw->show();
+    return mw->page();
+}
+
+QObject* WebPage::createPlugin(const QString &classId, const QUrl&, const QStringList&, const QStringList&)
+{
+    if (classId == "alien_QLabel") {
+        QLabel* l = new QLabel;
+        l->winId();
+        return l;
+    }
+
+#ifndef QT_NO_UITOOLS
+    QUiLoader loader;
+    return loader.createWidget(classId, view());
+#else
+    Q_UNUSED(classId);
+    return 0;
+#endif
+}
+