[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[tonikitoo at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 9b12c4b8556f76f349fbad7915f89d1979e666d3
Author: tonikitoo at webkit.org <tonikitoo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 22 16:42:39 2009 +0000

    Code standarlization for QGVLauncher.
    
    Patch by Antonio Gomes <tonikitoo at webkit.org> on 2009-10-22
    RubberStamped by Tor Arne Vestbø.
    
    1) Made member initilization lists in constructors
       to be per line.
    2) Made applyProxy method inline as all other methods in
       WebPage class.
    
    * QGVLauncher/main.cpp:
    (WebPage::WebPage):
    (WebPage::applyProxy):
    (MainView::MainView):
    (MainWindow::MainWindow):
    (MainWindow::init):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49943 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index c238d76..6cbdad4 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,5 +1,23 @@
 2009-10-22  Antonio Gomes  <tonikitoo at webkit.org>
 
+        Rubberstamped by Tor Arne Vestbø.
+
+        Code standarlization for QGVLauncher.
+
+        1) Made member initilization lists in constructors
+           to be per line.
+        2) Made applyProxy method inline as all other methods in
+           WebPage class.
+
+        * QGVLauncher/main.cpp:
+        (WebPage::WebPage):
+        (WebPage::applyProxy):
+        (MainView::MainView):
+        (MainWindow::MainWindow):
+        (MainWindow::init):
+
+2009-10-22  Antonio Gomes  <tonikitoo at webkit.org>
+
         Reviewed by Tor Arne Vestbø.
 
         Add a Y-Axis rotation to QGVLauncher.
diff --git a/WebKit/qt/QGVLauncher/main.cpp b/WebKit/qt/QGVLauncher/main.cpp
index f1300c0..fe33a73 100644
--- a/WebKit/qt/QGVLauncher/main.cpp
+++ b/WebKit/qt/QGVLauncher/main.cpp
@@ -83,24 +83,38 @@ class WebPage : public QWebPage {
     Q_OBJECT
 
 public:
-    WebPage(QObject* parent = 0) : QWebPage(parent)
+    WebPage(QObject* parent = 0)
+        : QWebPage(parent)
     {
         applyProxy();
     }
     virtual QWebPage* createWindow(QWebPage::WebWindowType);
 
 private:
-    void applyProxy();
+    void applyProxy()
+    {
+        QUrl proxyUrl = QWebView::guessUrlFromString(qgetenv("http_proxy"));
+
+        if (proxyUrl.isValid() && !proxyUrl.host().isEmpty()) {
+            int proxyPort = (proxyUrl.port() > 0) ? proxyUrl.port() : 8080;
+            networkAccessManager()->setProxy(QNetworkProxy(QNetworkProxy::HttpProxy, proxyUrl.host(), proxyPort));
+        }
+    }
 };
 
 class MainView : public QGraphicsView {
     Q_OBJECT
 
 public:
-    MainView(QWidget* parent) : QGraphicsView(parent), m_mainWidget(0)
+    MainView(QWidget* parent)
+        : QGraphicsView(parent)
+        , m_mainWidget(0)
     {
         setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
         setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+
+        setFrameShape(QFrame::NoFrame);
+        setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
     }
 
     void setMainWidget(QGraphicsWidget* widget)
@@ -201,13 +215,17 @@ class MainWindow : public QMainWindow {
 
 public:
     MainWindow(QExplicitlySharedDataPointer<SharedScene> other)
-        : QMainWindow(), view(new MainView(this)), scene(other)
+        : QMainWindow()
+        , view(new MainView(this))
+        , scene(other)
     {
         init();
     }
 
     MainWindow()
-        : QMainWindow(), view(new MainView(this)), scene(new SharedScene())
+        : QMainWindow()
+        , view(new MainView(this))
+        , scene(new SharedScene())
     {
         init();
     }
@@ -217,8 +235,7 @@ public:
         setAttribute(Qt::WA_DeleteOnClose);
 
         view->setScene(scene->scene());
-        view->setFrameShape(QFrame::NoFrame);
-        view->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+
         setCentralWidget(view);
 
         view->setMainWidget(scene->webView());
@@ -390,16 +407,6 @@ QWebPage* WebPage::createWindow(QWebPage::WebWindowType)
     return mw->page();
 }
 
-void WebPage::applyProxy()
-{
-    QUrl proxyUrl = QWebView::guessUrlFromString(qgetenv("http_proxy"));
-
-    if (proxyUrl.isValid() && !proxyUrl.host().isEmpty()) {
-        int proxyPort = (proxyUrl.port() > 0) ? proxyUrl.port() : 8080;
-        networkAccessManager()->setProxy(QNetworkProxy(QNetworkProxy::HttpProxy, proxyUrl.host(), proxyPort));
-    }
-}
-
 int main(int argc, char** argv)
 {
     QApplication app(argc, argv);

-- 
WebKit Debian packaging