[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[tonikitoo at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit a219783ddbbafa551d6cfa6453d7ac8e293c6740
Author: tonikitoo at webkit.org <tonikitoo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 5 00:13:34 2010 +0000

    2010-08-04  Antonio Gomes  <tonikitoo at 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:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64694 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 0b89a82..b9f75ef 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -26,6 +26,28 @@
 
 2010-08-04  Antonio Gomes  <tonikitoo at 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 at webkit.org>
+
         Reviewed by Simon Hausmann and Kenneth Christiansen.
 
         [Qt] [QtTestBrowser] Clean up static and global menu state controls
diff --git a/WebKitTools/QtTestBrowser/launcherwindow.cpp b/WebKitTools/QtTestBrowser/launcherwindow.cpp
index 4acf2f0..1d6c799 100644
--- a/WebKitTools/QtTestBrowser/launcherwindow.cpp
+++ b/WebKitTools/QtTestBrowser/launcherwindow.cpp
@@ -40,8 +40,6 @@ LauncherWindow::LauncherWindow(WindowOptions* data, QGraphicsScene* sharedScene)
     , m_view(0)
     , m_inspector(0)
     , m_formatMenuAction(0)
-    , m_flipAnimated(0)
-    , m_flipYAnimated(0)
 #if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
     , m_zoomAnimation(0)
 #endif
@@ -116,12 +114,6 @@ void LauncherWindow::initializeView()
         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)));
 
         view->installEventFilter(this);
@@ -322,18 +314,18 @@ void LauncherWindow::createChrome()
 
     graphicsViewMenu->addSeparator();
 
-    m_flipAnimated = graphicsViewMenu->addAction("Animated Flip");
-    m_flipAnimated->connect(toggleGraphicsView, SIGNAL(toggled(bool)), SLOT(setEnabled(bool)));
-    m_flipAnimated->setEnabled(isGraphicsBased());
+    QAction* flipAnimated = graphicsViewMenu->addAction("Animated Flip");
+    flipAnimated->connect(toggleGraphicsView, SIGNAL(toggled(bool)), SLOT(setEnabled(bool)));
+    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* 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()));
     }
 
     QAction* cloneWindow = graphicsViewMenu->addAction("Clone Window", this, SLOT(cloneWindow()));
diff --git a/WebKitTools/QtTestBrowser/launcherwindow.h b/WebKitTools/QtTestBrowser/launcherwindow.h
index 9595901..9efee1e 100644
--- a/WebKitTools/QtTestBrowser/launcherwindow.h
+++ b/WebKitTools/QtTestBrowser/launcherwindow.h
@@ -195,8 +195,6 @@ private:
     WindowOptions m_windowOptions;
 
     QAction* m_formatMenuAction;
-    QAction* m_flipAnimated;
-    QAction* m_flipYAnimated;
 
 #if QT_VERSION >= QT_VERSION_CHECK(4, 6, 0)
     QPropertyAnimation* m_zoomAnimation;

-- 
WebKit Debian packaging