<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[55498] trunk/WebKitTools</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/55498">55498</a></dd>
<dt>Author</dt> <dd>eric@webkit.org</dd>
<dt>Date</dt> <dd>2010-03-03 19:13:57 -0800 (Wed, 03 Mar 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>2010-03-03  Jesus Sanchez-Palencia  &lt;jesus.palencia@openbossa.org&gt;

        Reviewed by Simon Hausmann.

        Add a missing 'm_' to class variables names.

        [Qt] QtLauncher is not respecting class variable names
        https://bugs.webkit.org/show_bug.cgi?id=35542

        * QtLauncher/main.cpp:
        (LauncherWindow::LauncherWindow):
        (LauncherWindow::init):
        (LauncherWindow::sendTouchEvent):
        (LauncherWindow::eventFilter):
        (LauncherWindow::zoomIn):
        (LauncherWindow::zoomOut):
        (LauncherWindow::resetZoom):
        (LauncherWindow::setEditable):
        (LauncherWindow::setTouchMocking):
        (LauncherWindow::initializeView):
        (LauncherWindow::createChrome):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebKitToolsChangeLog">trunk/WebKitTools/ChangeLog</a></li>
<li><a href="#trunkWebKitToolsQtLaunchermaincpp">trunk/WebKitTools/QtLauncher/main.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebKitToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/ChangeLog (55497 => 55498)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/ChangeLog        2010-03-04 03:00:44 UTC (rev 55497)
+++ trunk/WebKitTools/ChangeLog        2010-03-04 03:13:57 UTC (rev 55498)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2010-03-03  Jesus Sanchez-Palencia  &lt;jesus.palencia@openbossa.org&gt;
+
+        Reviewed by Simon Hausmann.
+
+        Add a missing 'm_' to class variables names.
+
+        [Qt] QtLauncher is not respecting class variable names
+        https://bugs.webkit.org/show_bug.cgi?id=35542
+
+        * QtLauncher/main.cpp:
+        (LauncherWindow::LauncherWindow):
+        (LauncherWindow::init):
+        (LauncherWindow::sendTouchEvent):
+        (LauncherWindow::eventFilter):
+        (LauncherWindow::zoomIn):
+        (LauncherWindow::zoomOut):
+        (LauncherWindow::resetZoom):
+        (LauncherWindow::setEditable):
+        (LauncherWindow::setTouchMocking):
+        (LauncherWindow::initializeView):
+        (LauncherWindow::createChrome):
+
</ins><span class="cx"> 2010-03-03  Alexey Proskuryakov  &lt;ap@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Rubber-stamped by Mark Rowe.
</span></span></pre></div>
<a id="trunkWebKitToolsQtLaunchermaincpp"></a>
<div class="modfile"><h4>Modified: trunk/WebKitTools/QtLauncher/main.cpp (55497 => 55498)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitTools/QtLauncher/main.cpp        2010-03-04 03:00:44 UTC (rev 55497)
+++ trunk/WebKitTools/QtLauncher/main.cpp        2010-03-04 03:13:57 UTC (rev 55498)
</span><span class="lines">@@ -127,19 +127,19 @@
</span><span class="cx">     void createChrome();
</span><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    QVector&lt;int&gt; zoomLevels;
-    int currentZoom;
</del><ins>+    QVector&lt;int&gt; m_zoomLevels;
+    int m_currentZoom;
</ins><span class="cx"> 
</span><span class="cx">     QWidget* m_view;
</span><del>-    WebInspector* inspector;
</del><ins>+    WebInspector* m_inspector;
</ins><span class="cx"> 
</span><del>-    QAction* formatMenuAction;
-    QAction* flipAnimated;
-    QAction* flipYAnimated;
</del><ins>+    QAction* m_formatMenuAction;
+    QAction* m_flipAnimated;
+    QAction* m_flipYAnimated;
</ins><span class="cx"> 
</span><span class="cx"> #if QT_VERSION &gt;= QT_VERSION_CHECK(4, 6, 0)
</span><del>-    QList&lt;QTouchEvent::TouchPoint&gt; touchPoints;
-    bool touchMocking;
</del><ins>+    QList&lt;QTouchEvent::TouchPoint&gt; m_touchPoints;
+    bool m_touchMocking;
</ins><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     void init(bool useGraphicsView = false);
</span><span class="lines">@@ -149,12 +149,12 @@
</span><span class="cx"> 
</span><span class="cx"> LauncherWindow::LauncherWindow(LauncherWindow* other, bool shareScene)
</span><span class="cx">     : MainWindow()
</span><del>-    , currentZoom(100)
</del><ins>+    , m_currentZoom(100)
</ins><span class="cx">     , m_view(0)
</span><del>-    , inspector(0)
-    , formatMenuAction(0)
-    , flipAnimated(0)
-    , flipYAnimated(0)
</del><ins>+    , m_inspector(0)
+    , m_formatMenuAction(0)
+    , m_flipAnimated(0)
+    , m_flipYAnimated(0)
</ins><span class="cx"> {
</span><span class="cx">     if (other) {
</span><span class="cx">         init(other-&gt;isGraphicsBased());
</span><span class="lines">@@ -197,15 +197,15 @@
</span><span class="cx">     if (!gInspectorUrl.isEmpty())
</span><span class="cx">       page()-&gt;settings()-&gt;setInspectorUrl(gInspectorUrl);
</span><span class="cx"> 
</span><del>-    inspector = new WebInspector(splitter);
-    inspector-&gt;setPage(page());
-    inspector-&gt;hide();
-    connect(this, SIGNAL(destroyed()), inspector, SLOT(deleteLater()));
</del><ins>+    m_inspector = new WebInspector(splitter);
+    m_inspector-&gt;setPage(page());
+    m_inspector-&gt;hide();
+    connect(this, SIGNAL(destroyed()), m_inspector, SLOT(deleteLater()));
</ins><span class="cx"> 
</span><span class="cx">     // the zoom values are chosen to be like in Mozilla Firefox 3
</span><del>-    zoomLevels &lt;&lt; 30 &lt;&lt; 50 &lt;&lt; 67 &lt;&lt; 80 &lt;&lt; 90;
-    zoomLevels &lt;&lt; 100;
-    zoomLevels &lt;&lt; 110 &lt;&lt; 120 &lt;&lt; 133 &lt;&lt; 150 &lt;&lt; 170 &lt;&lt; 200 &lt;&lt; 240 &lt;&lt; 300;
</del><ins>+    m_zoomLevels &lt;&lt; 30 &lt;&lt; 50 &lt;&lt; 67 &lt;&lt; 80 &lt;&lt; 90;
+    m_zoomLevels &lt;&lt; 100;
+    m_zoomLevels &lt;&lt; 110 &lt;&lt; 120 &lt;&lt; 133 &lt;&lt; 150 &lt;&lt; 170 &lt;&lt; 200 &lt;&lt; 240 &lt;&lt; 300;
</ins><span class="cx"> 
</span><span class="cx">     grabZoomKeys(true);
</span><span class="cx"> }
</span><span class="lines">@@ -282,31 +282,31 @@
</span><span class="cx"> #if QT_VERSION &gt;= QT_VERSION_CHECK(4, 6, 0)
</span><span class="cx"> void LauncherWindow::sendTouchEvent()
</span><span class="cx"> {
</span><del>-    if (touchPoints.isEmpty())
</del><ins>+    if (m_touchPoints.isEmpty())
</ins><span class="cx">         return;
</span><span class="cx"> 
</span><span class="cx">     QEvent::Type type = QEvent::TouchUpdate;
</span><del>-    if (touchPoints.size() == 1) {
-        if (touchPoints[0].state() == Qt::TouchPointReleased)
</del><ins>+    if (m_touchPoints.size() == 1) {
+        if (m_touchPoints[0].state() == Qt::TouchPointReleased)
</ins><span class="cx">             type = QEvent::TouchEnd;
</span><del>-        else if (touchPoints[0].state() == Qt::TouchPointPressed)
</del><ins>+        else if (m_touchPoints[0].state() == Qt::TouchPointPressed)
</ins><span class="cx">             type = QEvent::TouchBegin;
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     QTouchEvent touchEv(type);
</span><del>-    touchEv.setTouchPoints(touchPoints);
</del><ins>+    touchEv.setTouchPoints(m_touchPoints);
</ins><span class="cx">     QCoreApplication::sendEvent(page(), &amp;touchEv);
</span><span class="cx"> 
</span><span class="cx">     // After sending the event, remove all touchpoints that were released
</span><del>-    if (touchPoints[0].state() == Qt::TouchPointReleased)
-        touchPoints.removeAt(0);
-    if (touchPoints.size() &gt; 1 &amp;&amp; touchPoints[1].state() == Qt::TouchPointReleased)
-        touchPoints.removeAt(1);
</del><ins>+    if (m_touchPoints[0].state() == Qt::TouchPointReleased)
+        m_touchPoints.removeAt(0);
+    if (m_touchPoints.size() &gt; 1 &amp;&amp; m_touchPoints[1].state() == Qt::TouchPointReleased)
+        m_touchPoints.removeAt(1);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> bool LauncherWindow::eventFilter(QObject* obj, QEvent* event)
</span><span class="cx"> {
</span><del>-    if (!touchMocking || obj != m_view)
</del><ins>+    if (!m_touchMocking || obj != m_view)
</ins><span class="cx">         return QObject::eventFilter(obj, event);
</span><span class="cx"> 
</span><span class="cx">     if (event-&gt;type() == QEvent::MouseButtonPress
</span><span class="lines">@@ -333,12 +333,12 @@
</span><span class="cx">         touchPoint.setPressure(1);
</span><span class="cx"> 
</span><span class="cx">         // If the point already exists, update it. Otherwise create it.
</span><del>-        if (touchPoints.size() &gt; 0 &amp;&amp; !touchPoints[0].id())
-            touchPoints[0] = touchPoint;
-        else if (touchPoints.size() &gt; 1 &amp;&amp; !touchPoints[1].id())
-            touchPoints[1] = touchPoint;
</del><ins>+        if (m_touchPoints.size() &gt; 0 &amp;&amp; !m_touchPoints[0].id())
+            m_touchPoints[0] = touchPoint;
+        else if (m_touchPoints.size() &gt; 1 &amp;&amp; !m_touchPoints[1].id())
+            m_touchPoints[1] = touchPoint;
</ins><span class="cx">         else
</span><del>-            touchPoints.append(touchPoint);
</del><ins>+            m_touchPoints.append(touchPoint);
</ins><span class="cx"> 
</span><span class="cx">         sendTouchEvent();
</span><span class="cx">     } else if (event-&gt;type() == QEvent::KeyPress
</span><span class="lines">@@ -346,12 +346,12 @@
</span><span class="cx">         &amp;&amp; static_cast&lt;QKeyEvent*&gt;(event)-&gt;modifiers() == Qt::ControlModifier) {
</span><span class="cx"> 
</span><span class="cx">         // If the keyboard point is already pressed, release it.
</span><del>-        // Otherwise create it and append to touchPoints.
-        if (touchPoints.size() &gt; 0 &amp;&amp; touchPoints[0].id() == 1) {
-            touchPoints[0].setState(Qt::TouchPointReleased);
</del><ins>+        // Otherwise create it and append to m_touchPoints.
+        if (m_touchPoints.size() &gt; 0 &amp;&amp; m_touchPoints[0].id() == 1) {
+            m_touchPoints[0].setState(Qt::TouchPointReleased);
</ins><span class="cx">             sendTouchEvent();
</span><del>-        } else if (touchPoints.size() &gt; 1 &amp;&amp; touchPoints[1].id() == 1) {
-            touchPoints[1].setState(Qt::TouchPointReleased);
</del><ins>+        } else if (m_touchPoints.size() &gt; 1 &amp;&amp; m_touchPoints[1].id() == 1) {
+            m_touchPoints[1].setState(Qt::TouchPointReleased);
</ins><span class="cx">             sendTouchEvent();
</span><span class="cx">         } else {
</span><span class="cx">             QTouchEvent::TouchPoint touchPoint;
</span><span class="lines">@@ -360,11 +360,11 @@
</span><span class="cx">             touchPoint.setScreenPos(QCursor::pos());
</span><span class="cx">             touchPoint.setPos(m_view-&gt;mapFromGlobal(QCursor::pos()));
</span><span class="cx">             touchPoint.setPressure(1);
</span><del>-            touchPoints.append(touchPoint);
</del><ins>+            m_touchPoints.append(touchPoint);
</ins><span class="cx">             sendTouchEvent();
</span><span class="cx"> 
</span><span class="cx">             // After sending the event, change the touchpoint state to stationary
</span><del>-            touchPoints.last().setState(Qt::TouchPointStationary);
</del><ins>+            m_touchPoints.last().setState(Qt::TouchPointStationary);
</ins><span class="cx">         }
</span><span class="cx">     }
</span><span class="cx">     return false;
</span><span class="lines">@@ -396,27 +396,27 @@
</span><span class="cx"> 
</span><span class="cx"> void LauncherWindow::zoomIn()
</span><span class="cx"> {
</span><del>-    int i = zoomLevels.indexOf(currentZoom);
</del><ins>+    int i = m_zoomLevels.indexOf(m_currentZoom);
</ins><span class="cx">     Q_ASSERT(i &gt;= 0);
</span><del>-    if (i &lt; zoomLevels.count() - 1)
-        currentZoom = zoomLevels[i + 1];
</del><ins>+    if (i &lt; m_zoomLevels.count() - 1)
+        m_currentZoom = m_zoomLevels[i + 1];
</ins><span class="cx"> 
</span><del>-    page()-&gt;mainFrame()-&gt;setZoomFactor(qreal(currentZoom) / 100.0);
</del><ins>+    page()-&gt;mainFrame()-&gt;setZoomFactor(qreal(m_currentZoom) / 100.0);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void LauncherWindow::zoomOut()
</span><span class="cx"> {
</span><del>-    int i = zoomLevels.indexOf(currentZoom);
</del><ins>+    int i = m_zoomLevels.indexOf(m_currentZoom);
</ins><span class="cx">     Q_ASSERT(i &gt;= 0);
</span><span class="cx">     if (i &gt; 0)
</span><del>-        currentZoom = zoomLevels[i - 1];
</del><ins>+        m_currentZoom = m_zoomLevels[i - 1];
</ins><span class="cx"> 
</span><del>-    page()-&gt;mainFrame()-&gt;setZoomFactor(qreal(currentZoom) / 100.0);
</del><ins>+    page()-&gt;mainFrame()-&gt;setZoomFactor(qreal(m_currentZoom) / 100.0);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void LauncherWindow::resetZoom()
</span><span class="cx"> {
</span><del>-    currentZoom = 100;
</del><ins>+    m_currentZoom = 100;
</ins><span class="cx">     page()-&gt;mainFrame()-&gt;setZoomFactor(1.0);
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -454,7 +454,7 @@
</span><span class="cx"> void LauncherWindow::setEditable(bool on)
</span><span class="cx"> {
</span><span class="cx">     page()-&gt;setContentEditable(on);
</span><del>-    formatMenuAction-&gt;setVisible(on);
</del><ins>+    m_formatMenuAction-&gt;setVisible(on);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> /*
</span><span class="lines">@@ -493,7 +493,7 @@
</span><span class="cx"> void LauncherWindow::setTouchMocking(bool on)
</span><span class="cx"> {
</span><span class="cx"> #if QT_VERSION &gt;= QT_VERSION_CHECK(4, 6, 0)
</span><del>-    touchMocking = on;
</del><ins>+    m_touchMocking = on;
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -521,18 +521,18 @@
</span><span class="cx">         WebViewGraphicsBased* view = new WebViewGraphicsBased(splitter);
</span><span class="cx">         view-&gt;setPage(page());
</span><span class="cx"> 
</span><del>-        if (flipAnimated)
-            connect(flipAnimated, SIGNAL(triggered()), view, SLOT(animatedFlip()));
</del><ins>+        if (m_flipAnimated)
+            connect(m_flipAnimated, SIGNAL(triggered()), view, SLOT(animatedFlip()));
</ins><span class="cx"> 
</span><del>-        if (flipYAnimated)
-            connect(flipYAnimated, SIGNAL(triggered()), view, SLOT(animatedYFlip()));
</del><ins>+        if (m_flipYAnimated)
+            connect(m_flipYAnimated, SIGNAL(triggered()), view, SLOT(animatedYFlip()));
</ins><span class="cx"> 
</span><span class="cx">         m_view = view;
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx"> #if QT_VERSION &gt;= QT_VERSION_CHECK(4, 6, 0)
</span><span class="cx">     m_view-&gt;installEventFilter(this);
</span><del>-    touchMocking = false;
</del><ins>+    m_touchMocking = false;
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -586,8 +586,8 @@
</span><span class="cx">     // viewMenu-&gt;addAction(&quot;Dump plugins&quot;, this, SLOT(dumpPlugins()));
</span><span class="cx"> 
</span><span class="cx">     QMenu* formatMenu = new QMenu(&quot;F&amp;ormat&quot;, this);
</span><del>-    formatMenuAction = menuBar()-&gt;addMenu(formatMenu);
-    formatMenuAction-&gt;setVisible(false);
</del><ins>+    m_formatMenuAction = menuBar()-&gt;addMenu(formatMenu);
+    m_formatMenuAction-&gt;setVisible(false);
</ins><span class="cx">     formatMenu-&gt;addAction(page()-&gt;action(QWebPage::ToggleBold));
</span><span class="cx">     formatMenu-&gt;addAction(page()-&gt;action(QWebPage::ToggleItalic));
</span><span class="cx">     formatMenu-&gt;addAction(page()-&gt;action(QWebPage::ToggleUnderline));
</span><span class="lines">@@ -602,9 +602,9 @@
</span><span class="cx"> 
</span><span class="cx">     QMenu* toolsMenu = menuBar()-&gt;addMenu(&quot;&amp;Develop&quot;);
</span><span class="cx">     toolsMenu-&gt;addAction(&quot;Select Elements...&quot;, this, SLOT(selectElements()));
</span><del>-    QAction* showInspectorAction = toolsMenu-&gt;addAction(&quot;Show Web Inspector&quot;, inspector, SLOT(setVisible(bool)), QKeySequence(Qt::CTRL | Qt::ALT | Qt::Key_I));
</del><ins>+    QAction* showInspectorAction = toolsMenu-&gt;addAction(&quot;Show Web Inspector&quot;, m_inspector, SLOT(setVisible(bool)), QKeySequence(Qt::CTRL | Qt::ALT | Qt::Key_I));
</ins><span class="cx">     showInspectorAction-&gt;setCheckable(true);
</span><del>-    showInspectorAction-&gt;connect(inspector, SIGNAL(visibleChanged(bool)), SLOT(setChecked(bool)));
</del><ins>+    showInspectorAction-&gt;connect(m_inspector, SIGNAL(visibleChanged(bool)), SLOT(setChecked(bool)));
</ins><span class="cx"> 
</span><span class="cx"> #if QT_VERSION &gt;= QT_VERSION_CHECK(4, 6, 0)
</span><span class="cx">     QAction* touchMockAction = toolsMenu-&gt;addAction(&quot;Toggle multitouch mocking&quot;, this, SLOT(setTouchMocking(bool)));
</span><span class="lines">@@ -631,18 +631,18 @@
</span><span class="cx"> 
</span><span class="cx">     graphicsViewMenu-&gt;addSeparator();
</span><span class="cx"> 
</span><del>-    flipAnimated = graphicsViewMenu-&gt;addAction(&quot;Animated Flip&quot;);
-    flipAnimated-&gt;connect(toggleGraphicsView, SIGNAL(toggled(bool)), SLOT(setEnabled(bool)));
-    flipAnimated-&gt;setEnabled(isGraphicsBased());
</del><ins>+    m_flipAnimated = graphicsViewMenu-&gt;addAction(&quot;Animated Flip&quot;);
+    m_flipAnimated-&gt;connect(toggleGraphicsView, SIGNAL(toggled(bool)), SLOT(setEnabled(bool)));
+    m_flipAnimated-&gt;setEnabled(isGraphicsBased());
</ins><span class="cx"> 
</span><del>-    flipYAnimated = graphicsViewMenu-&gt;addAction(&quot;Animated Y-Flip&quot;);
-    flipYAnimated-&gt;connect(toggleGraphicsView, SIGNAL(toggled(bool)), SLOT(setEnabled(bool)));
-    flipYAnimated-&gt;setEnabled(isGraphicsBased());
</del><ins>+    m_flipYAnimated = graphicsViewMenu-&gt;addAction(&quot;Animated Y-Flip&quot;);
+    m_flipYAnimated-&gt;connect(toggleGraphicsView, SIGNAL(toggled(bool)), SLOT(setEnabled(bool)));
+    m_flipYAnimated-&gt;setEnabled(isGraphicsBased());
</ins><span class="cx"> 
</span><span class="cx">     if (isGraphicsBased()) {
</span><span class="cx">         WebViewGraphicsBased* view = static_cast&lt;WebViewGraphicsBased*&gt;(m_view);
</span><del>-        connect(flipAnimated, SIGNAL(triggered()), view, SLOT(animatedFlip()));
-        connect(flipYAnimated, SIGNAL(triggered()), view, SLOT(animatedYFlip()));
</del><ins>+        connect(m_flipAnimated, SIGNAL(triggered()), view, SLOT(animatedFlip()));
+        connect(m_flipYAnimated, SIGNAL(triggered()), view, SLOT(animatedYFlip()));
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     graphicsViewMenu-&gt;addSeparator();
</span></span></pre>
</div>
</div>

</body>
</html>