Changeset 64694 in webkit

Timestamp:

Aug 4, 2010 5:13:34 PM (14 years ago)

Author:

tonikitoo@webkit.org

Message:

2010-08-04 Antonio Gomes <​tonikitoo@webkit.org>

Reviewed by Kenneth Christiansen.

[Qt] [QtTestBrowser] Remove unneeded QAction class members
​https://bugs.webkit.org/show_bug.cgi?id=43518

LauncherWindow class has two totally unneeded class members: m_flopAnimated and
m_flipYAnimated. Also, in initializeView method there are some dead code block
trying to connect them at the wrong time, when they have not been instanciated.

This patch:

• removes the two cited class members in favor of local variables in createChrome method;
• removes the dead code block.

• QtTestBrowser/launcherwindow.cpp: (LauncherWindow::LauncherWindow): (LauncherWindow::initializeView): (LauncherWindow::createChrome):
• QtTestBrowser/launcherwindow.h:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• QtTestBrowser/launcherwindow.cpp (modified) (3 diffs)
• QtTestBrowser/launcherwindow.h (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ -24 +24 @@
         * TestResultServer/model/testfile.py:
         * TestResultServer/templates/uploadform.html:
+
+2010-08-04  Antonio Gomes  <tonikitoo@webkit.org>
+
+        Reviewed by Kenneth Christiansen.
+
+        [Qt] [QtTestBrowser] Remove unneeded QAction class members
+        https://bugs.webkit.org/show_bug.cgi?id=43518
+
+        LauncherWindow class has two totally unneeded class members: m_flopAnimated and
+        m_flipYAnimated. Also, in initializeView method there are some dead code block
+        trying to connect them at the wrong time, when they have not been instanciated.
+
+        This patch:
+
+        - removes the two cited class members in favor of local variables in createChrome method;
+        - removes the dead code block.
+
+        * QtTestBrowser/launcherwindow.cpp:
+        (LauncherWindow::LauncherWindow):
+        (LauncherWindow::initializeView):
+        (LauncherWindow::createChrome):
+        * QtTestBrowser/launcherwindow.h:
 
 2010-08-04  Antonio Gomes  <tonikitoo@webkit.org>

trunk/WebKitTools/QtTestBrowser/launcherwindow.cpp

@@ -41 +41 @@
     , m_inspector(0)
     , m_formatMenuAction(0)
-    , m_flipAnimated(0)
-    , m_flipYAnimated(0)
 #if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
     , m_zoomAnimation(0)
@@ -116 +114 @@
         WebViewGraphicsBased* view = new WebViewGraphicsBased(splitter);
         view->setPage(page());
-
-        if (m_flipAnimated)
-            connect(m_flipAnimated, SIGNAL(triggered()), view, SLOT(animatedFlip()));
-
-        if (m_flipYAnimated)
-            connect(m_flipYAnimated, SIGNAL(triggered()), view, SLOT(animatedYFlip()));
 
         connect(view, SIGNAL(currentFPSUpdated(int)), this, SLOT(updateFPS(int)));
@@ -323 +315 @@
     graphicsViewMenu->addSeparator();
 
-    m_flipAnimated = graphicsViewMenu->addAction("Animated Flip");
-    m_flipAnimated->connect(toggleGraphicsView, SIGNAL(toggled(bool)), SLOT(setEnabled(bool)));
-    m_flipAnimated->setEnabled(isGraphicsBased());
-
-    m_flipYAnimated = graphicsViewMenu->addAction("Animated Y-Flip");
-    m_flipYAnimated->connect(toggleGraphicsView, SIGNAL(toggled(bool)), SLOT(setEnabled(bool)));
-    m_flipYAnimated->setEnabled(isGraphicsBased());
+    QAction* flipAnimated = graphicsViewMenu->addAction("Animated Flip");
+    flipAnimated->connect(toggleGraphicsView, SIGNAL(toggled(bool)), SLOT(setEnabled(bool)));
+    flipAnimated->setEnabled(isGraphicsBased());
+
+    QAction* flipYAnimated = graphicsViewMenu->addAction("Animated Y-Flip");
+    flipYAnimated->connect(toggleGraphicsView, SIGNAL(toggled(bool)), SLOT(setEnabled(bool)));
+    flipYAnimated->setEnabled(isGraphicsBased());
 
     if (isGraphicsBased()) {
         WebViewGraphicsBased* view = static_cast<WebViewGraphicsBased*>(m_view);
-        connect(m_flipAnimated, SIGNAL(triggered()), view, SLOT(animatedFlip()));
-        connect(m_flipYAnimated, SIGNAL(triggered()), view, SLOT(animatedYFlip()));
+        connect(flipAnimated, SIGNAL(triggered()), view, SLOT(animatedFlip()));
+        connect(flipYAnimated, SIGNAL(triggered()), view, SLOT(animatedYFlip()));
     }
 

trunk/WebKitTools/QtTestBrowser/launcherwindow.h

@@ -196 +196 @@
 
     QAction* m_formatMenuAction;
-    QAction* m_flipAnimated;
-    QAction* m_flipYAnimated;
 
 #if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)