[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[benjamin.poulain at nokia.com]

The following commit has been merged in the debian/experimental branch:
commit 6a306631e783197eefad458ee2c47c296f9e3369
Author: benjamin.poulain at nokia.com <benjamin.poulain at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Jan 9 02:13:24 2011 +0000

    2011-01-08  Benjamin Poulain  <benjamin.poulain at nokia.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] PasteboardQt.cpp has coding-style errors
            https://bugs.webkit.org/show_bug.cgi?id=39771
    
            Update the code to follow the coding style.
    
            * platform/qt/PasteboardQt.cpp:
            (WebCore::Pasteboard::writeSelection):
            (WebCore::Pasteboard::plainText):
            (WebCore::Pasteboard::writePlainText):
            (WebCore::Pasteboard::writeURL):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75339 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 5d69faa..bcbd57c 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2011-01-08  Benjamin Poulain  <benjamin.poulain at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] PasteboardQt.cpp has coding-style errors
+        https://bugs.webkit.org/show_bug.cgi?id=39771
+
+        Update the code to follow the coding style.
+
+        * platform/qt/PasteboardQt.cpp:
+        (WebCore::Pasteboard::writeSelection):
+        (WebCore::Pasteboard::plainText):
+        (WebCore::Pasteboard::writePlainText):
+        (WebCore::Pasteboard::writeURL):
+
 2011-01-08  Tony Gentilcore  <tonyg at chromium.org>
 
         Reviewed by Eric Seidel.
diff --git a/Source/WebCore/platform/qt/PasteboardQt.cpp b/Source/WebCore/platform/qt/PasteboardQt.cpp
index 1c60da0..6865fd7 100644
--- a/Source/WebCore/platform/qt/PasteboardQt.cpp
+++ b/Source/WebCore/platform/qt/PasteboardQt.cpp
@@ -32,13 +32,12 @@
 #include "Editor.h"
 #include "Frame.h"
 #include "Image.h"
-#include "markup.h"
 #include "RenderImage.h"
-
-#include <qdebug.h>
+#include "markup.h"
+#include <qapplication.h>
 #include <qclipboard.h>
+#include <qdebug.h>
 #include <qmimedata.h>
-#include <qapplication.h>
 #include <qurl.h>
 
 #define methodDebug() qDebug() << "PasteboardQt: " << __FUNCTION__;
@@ -75,8 +74,7 @@ void Pasteboard::writeSelection(Range* selectedRange, bool canSmartCopyOrDelete,
 #endif
 
 #ifndef QT_NO_CLIPBOARD
-    QApplication::clipboard()->setMimeData(md, m_selectionMode ?
-            QClipboard::Selection : QClipboard::Clipboard);
+    QApplication::clipboard()->setMimeData(md, m_selectionMode ? QClipboard::Selection : QClipboard::Clipboard);
 #endif
     if (canSmartCopyOrDelete)
         md->setData("application/vnd.qtwebkit.smartpaste", QByteArray());
@@ -94,8 +92,7 @@ bool Pasteboard::canSmartReplace()
 String Pasteboard::plainText(Frame*)
 {
 #ifndef QT_NO_CLIPBOARD
-    return QApplication::clipboard()->text(m_selectionMode ?
-            QClipboard::Selection : QClipboard::Clipboard);
+    return QApplication::clipboard()->text(m_selectionMode ? QClipboard::Selection : QClipboard::Clipboard);
 #else
     return String();
 #endif
@@ -136,22 +133,20 @@ void Pasteboard::writePlainText(const String& text)
     QString qtext = text;
     qtext.replace(QChar(0xa0), QLatin1Char(' '));
     md->setText(qtext);
-    QApplication::clipboard()->setMimeData(md, m_selectionMode ?
-            QClipboard::Selection : QClipboard::Clipboard);
+    QApplication::clipboard()->setMimeData(md, m_selectionMode ? QClipboard::Selection : QClipboard::Clipboard);
 #endif
 }
 
-void Pasteboard::writeURL(const KURL& _url, const String&, Frame*)
+void Pasteboard::writeURL(const KURL& url, const String&, Frame*)
 {
-    ASSERT(!_url.isEmpty());
+    ASSERT(!url.isEmpty());
 
 #ifndef QT_NO_CLIPBOARD
     QMimeData* md = new QMimeData;
-    QString url = _url.string();
-    md->setText(url);
-    md->setUrls(QList<QUrl>() << QUrl(url));
-    QApplication::clipboard()->setMimeData(md, m_selectionMode ?
-            QClipboard::Selection : QClipboard::Clipboard);
+    QString urlString = url.string();
+    md->setText(urlString);
+    md->setUrls(QList<QUrl>() << url);
+    QApplication::clipboard()->setMimeData(md, m_selectionMode ? QClipboard::Selection : QClipboard::Clipboard);
 #endif
 }
 

-- 
WebKit Debian packaging