[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[kenneth at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit ce4e6c0e181f4cd60dda4990c4ffafb4db0454cc
Author: kenneth at webkit.org <kenneth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 27 17:43:15 2010 +0000

    Rubberstamped by Simon Hausmann.
    
    [Qt] QtLauncher, coding style fixes.
    
    * QtLauncher/main.cpp:
    (MainWindow::MainWindow):
    (MainWindow::sendTouchEvent):
    (MainWindow::eventFilter):
    (MainWindow::loadURL):
    (MainWindow::setupUI):
    (WebPage::createPlugin):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53938 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 2656298..58d53d8 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,20 @@
 
         Rubberstamped by Simon Hausmann.
 
+        [Qt] QtLauncher, coding style fixes.
+
+        * QtLauncher/main.cpp:
+        (MainWindow::MainWindow):
+        (MainWindow::sendTouchEvent):
+        (MainWindow::eventFilter):
+        (MainWindow::loadURL):
+        (MainWindow::setupUI):
+        (WebPage::createPlugin):
+
+2010-01-27  Kenneth Rohde Christiansen  <kenneth at webkit.org>
+
+        Rubberstamped by Simon Hausmann.
+
         [Qt] QtLauncher refactoring, separating the webview and
         adding a QGraphicsWebView based version.
 
diff --git a/WebKitTools/QtLauncher/main.cpp b/WebKitTools/QtLauncher/main.cpp
index ad059ed..4720132 100644
--- a/WebKitTools/QtLauncher/main.cpp
+++ b/WebKitTools/QtLauncher/main.cpp
@@ -82,10 +82,8 @@ public:
         touchMocking = false;
 #endif
 
-        connect(view, SIGNAL(loadFinished(bool)),
-                this, SLOT(loadFinished()));
-        connect(view, SIGNAL(titleChanged(const QString&)),
-                this, SLOT(setWindowTitle(const QString&)));
+        connect(view, SIGNAL(loadFinished(bool)), this, SLOT(loadFinished()));
+        connect(view, SIGNAL(titleChanged(const QString&)), this, SLOT(setWindowTitle(const QString&)));
         connect(view->page(), SIGNAL(linkHovered(const QString&, const QString&, const QString &)),
                 this, SLOT(showLinkHover(const QString&, const QString&)));
         connect(view->page(), SIGNAL(windowCloseRequested()), this, SLOT(close()));
@@ -97,10 +95,6 @@ public:
 
         setupUI();
 
-        QFileInfo fi(url);
-        if (fi.exists() && fi.isRelative())
-            url = fi.absoluteFilePath();
-
         QUrl qurl = urlFromUserInput(url);
         if (qurl.scheme().isEmpty())
             qurl = QUrl("http://" + url + "/");
@@ -137,7 +131,7 @@ public:
         if (touchPoints[0].state() == Qt::TouchPointReleased)
             touchPoints.removeAt(0);
         if (touchPoints.size() > 1 && touchPoints[1].state() == Qt::TouchPointReleased)
-            touchPoints.removeAt(1);        
+            touchPoints.removeAt(1);
     }
 
     bool eventFilter(QObject* obj, QEvent* event)
@@ -169,9 +163,9 @@ public:
             touchPoint.setPressure(1);
 
             // If the point already exists, update it. Otherwise create it.
-            if (touchPoints.size() > 0 && !touchPoints[0].id()) 
+            if (touchPoints.size() > 0 && !touchPoints[0].id())
                 touchPoints[0] = touchPoint;
-            else if (touchPoints.size() > 1 && !touchPoints[1].id()) 
+            else if (touchPoints.size() > 1 && !touchPoints[1].id())
                 touchPoints[1] = touchPoint;
             else 
                 touchPoints.append(touchPoint);
@@ -195,7 +189,7 @@ public:
                 touchPoint.setId(1);
                 touchPoint.setScreenPos(QCursor::pos());
                 touchPoint.setPos(view->mapFromGlobal(QCursor::pos()));
-                touchPoint.setPressure(1);            
+                touchPoint.setPressure(1);
                 touchPoints.append(touchPoint);
                 sendTouchEvent();
 
@@ -389,7 +383,7 @@ private:
     {
         if (!url.isValid())
             return;
-    
+
         urlEdit->setText(url.toString());
         view->load(url);
         view->setFocus(Qt::OtherFocusReason);
@@ -457,7 +451,7 @@ private:
         zoomTextOnly->setChecked(false);
         viewMenu->addSeparator();
         viewMenu->addAction("Dump HTML", this, SLOT(dumpHtml()));
-        //viewMenu->addAction("Dump plugins", this, SLOT(dumpPlugins()));
+        // viewMenu->addAction("Dump plugins", this, SLOT(dumpPlugins()));
 
         QMenu* formatMenu = new QMenu("F&ormat", this);
         formatMenuAction = menuBar()->addMenu(formatMenu);
@@ -523,12 +517,8 @@ QWebPage* WebPage::createWindow(QWebPage::WebWindowType)
     return mw->webPage();
 }
 
-QObject* WebPage::createPlugin(const QString &classId, const QUrl &url, const QStringList &paramNames, const QStringList &paramValues)
+QObject* WebPage::createPlugin(const QString &classId, const QUrl&, const QStringList&, const QStringList&)
 {
-    Q_UNUSED(url);
-    Q_UNUSED(paramNames);
-    Q_UNUSED(paramValues);
-
     if (classId == "alien_QLabel") {
         QLabel* l = new QLabel;
         l->winId();

-- 
WebKit Debian packaging