Changeset 75339 in webkit

Timestamp:

Jan 8, 2011 6:13:24 PM (13 years ago)

Author:

benjamin.poulain@nokia.com

Message:

2011-01-08 Benjamin Poulain <​benjamin.poulain@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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/qt/PasteboardQt.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-01-08  Benjamin Poulain  <benjamin.poulain@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@chromium.org>
 

trunk/Source/WebCore/platform/qt/PasteboardQt.cpp

@@ -33 +33 @@
 #include "Frame.h"
 #include "Image.h"
+#include "RenderImage.h"
 #include "markup.h"
-#include "RenderImage.h"
-
+#include <qapplication.h>
+#include <qclipboard.h>
 #include <qdebug.h>
-#include <qclipboard.h>
 #include <qmimedata.h>
-#include <qapplication.h>
 #include <qurl.h>
 
@@ -76 +75 @@
 
 #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)
@@ -95 +93 @@
 {
 #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();
@@ -137 +134 @@
     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
 }