From 545e470e52f0ac6a3a072bf559c796b42c6066b6 Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Tue, 15 Jun 2010 19:36:43 +0100
Subject: Merge webkit.org at r61121: Initial merge by git.

Change-Id: Icd6db395c62285be384d137164d95d7466c98760
---
 WebKit/qt/WebCoreSupport/EditCommandQt.h | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'WebKit/qt/WebCoreSupport/EditCommandQt.h')

diff --git a/WebKit/qt/WebCoreSupport/EditCommandQt.h b/WebKit/qt/WebCoreSupport/EditCommandQt.h
index ae6ea51..e03b9b2 100644
--- a/WebKit/qt/WebCoreSupport/EditCommandQt.h
+++ b/WebKit/qt/WebCoreSupport/EditCommandQt.h
@@ -17,16 +17,12 @@
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef EDITCOMMANDQT_H
-#define EDITCOMMANDQT_H
+#ifndef EditCommandQt_h
+#define EditCommandQt_h
 
-#include <qglobal.h>
-QT_BEGIN_NAMESPACE
-class QUndoCommand;
-QT_END_NAMESPACE
-
-#include <QUndoCommand>
 #include <EditCommand.h>
+#include <QUndoCommand>
+#include <qglobal.h>
 
 class EditCommandQt
 #ifndef QT_NO_UNDOCOMMAND
@@ -41,8 +37,8 @@ class EditCommandQt
         void undo();
 
     private:
-        WTF::RefPtr<WebCore::EditCommand> _cmd;
-        bool _first;
+        WTF::RefPtr<WebCore::EditCommand> m_cmd;
+        bool m_first;
 };
 
 #endif
-- 
cgit v1.1