debugger: Remove few redundant variables

debugger/QT/SkDebuggerGUI.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkDebuggerGUI.h"
 #include "SkForceLinking.h"
 #include <QListWidgetItem>
@@ skipping 44 matching lines @@
     , fActionZoomOut(this)
     , fMapper(this)
     , fListWidget(&fCentralSplitter)
     , fDirectoryWidget(&fCentralSplitter)
     , fCanvasWidget(this, &fDebugger)
     , fDrawCommandGeometryWidget(&fDebugger)
     , fMenuBar(this)
     , fMenuFile(this)
     , fMenuNavigate(this)
     , fMenuView(this)
-    , fBreakpointsActivated(false)
-    , fIndexStyleToggle(false)
-    , fDeletesActivated(false)
-    , fPause(false)
     , fLoading(false)
 {
     setupUi(this);
     fListWidget.setSelectionMode(QAbstractItemView::ExtendedSelection);
     connect(&fListWidget, SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)), this, SLOT(registerListClick(QListWidgetItem *)));
     connect(&fActionOpen, SIGNAL(triggered()), this, SLOT(openFile()));
     connect(&fActionDirectory, SIGNAL(triggered()), this, SLOT(toggleDirectory()));
     connect(&fDirectoryWidget, SIGNAL(currentItemChanged(QListWidgetItem*, QListWidgetItem*)), this, SLOT(loadFile(QListWidgetItem *)));
     connect(&fActionDelete, SIGNAL(triggered()), this, SLOT(actionDelete()));
     connect(&fListWidget, SIGNAL(itemDoubleClicked(QListWidgetItem*)), this, SLOT(toggleBreakpoint()));
@@ skipping 37 matching lines @@
     connect(&fMapper, SIGNAL(mapped(int)), &fCanvasWidget, SLOT(zoom(int)));
 
     fViewStateFrame.setDisabled(true);
     fInspectorWidget.setDisabled(true);
     fMenuEdit.setDisabled(true);
     fMenuNavigate.setDisabled(true);
     fMenuView.setDisabled(true);
 }
 
 void SkDebuggerGUI::actionBreakpoints() {
-    fBreakpointsActivated = !fBreakpointsActivated;
+    bool breakpointsActivated = fActionBreakpoint.isChecked();
     for (int row = 0; row < fListWidget.count(); row++) {
         QListWidgetItem *item = fListWidget.item(row);
-        item->setHidden(item->checkState() == Qt::Unchecked && fBreakpointsActivated);
+        item->setHidden(item->checkState() == Qt::Unchecked && breakpointsActivated);
     }
 }
 
 void SkDebuggerGUI::actionToggleIndexStyle() {
-    fIndexStyleToggle = !fIndexStyleToggle;
+    bool indexStyleToggle = fActionToggleIndexStyle.isChecked();
     SkListWidget* list = (SkListWidget*) fListWidget.itemDelegate();
-    list->setIndexStyle(fIndexStyleToggle ? SkListWidget::kIndex_IndexStyle :
-                                            SkListWidget::kOffset_IndexStyle);
+    list->setIndexStyle(indexStyleToggle ? SkListWidget::kOffset_IndexStyle
+                                         : SkListWidget::kIndex_IndexStyle);
     fListWidget.update();
 }
 
 void SkDebuggerGUI::showDeletes() {
-    fDeletesActivated = !fDeletesActivated;
+    bool deletesActivated = fActionShowDeletes.isChecked();
     for (int row = 0; row < fListWidget.count(); row++) {
         QListWidgetItem *item = fListWidget.item(row);
-        item->setHidden(fDebugger.isCommandVisible(row) && fDeletesActivated);
+        item->setHidden(fDebugger.isCommandVisible(row) && deletesActivated);
     }
 }
 // This is a simplification of PictureBenchmark's run with the addition of
 // clearing of the times after the first pass (in resetTimes)
 void SkDebuggerGUI::run(const SkPicture* pict,
                         sk_tools::PictureRenderer* renderer,
                         int repeats) {
     SkASSERT(pict);
     if (NULL == pict) {
         return;
@@ skipping 59 matching lines @@
     }
 }
 
 void SkDebuggerGUI::actionClearDeletes() {
     for (int row = 0; row < fListWidget.count(); row++) {
         QListWidgetItem* item = fListWidget.item(row);
         item->setData(Qt::UserRole + 2, QPixmap(":/blank.png"));
         fDebugger.setCommandVisible(row, true);
         fSkipCommands[row] = false;
     }
-    if (fPause) {
+    if (this->isPaused()) {
         fCanvasWidget.drawTo(fPausedRow);
     } else {
         fCanvasWidget.drawTo(fListWidget.currentRow());
     }
 }
 
 void SkDebuggerGUI::actionClose() {
     this->close();
 }
 
@@ skipping 12 matching lines @@
             fSkipCommands[row] = true;
         } else {
             item->setData(Qt::UserRole + 2, QPixmap(":/blank.png"));
             fDebugger.setCommandVisible(row, true);
             fSkipCommands[row] = false;
         }
     }
 
     int currentRow = fListWidget.currentRow();
 
-    if (fPause) {
+    if (this->isPaused()) {
         fCanvasWidget.drawTo(fPausedRow);
     } else {
         fCanvasWidget.drawTo(currentRow);
     }
 }
 
 #if SK_SUPPORT_GPU
 void SkDebuggerGUI::actionGLSettingsChanged() {
     bool isToggled = fSettingsWidget.isGLActive();
     if (isToggled) {
@@ skipping 126 matching lines @@
     fDirectoryWidgetActive = false;
     if (!filename.isEmpty()) {
         QFileInfo pathInfo(filename);
         loadPicture(SkString(filename.toAscii().data()));
         setupDirectoryWidget(pathInfo.path());
     }
     fDirectoryWidgetActive = true;
 }
 
 void SkDebuggerGUI::pauseDrawing(bool isPaused) {
-    fPause = isPaused;
     fPausedRow = fListWidget.currentRow();
-    fCanvasWidget.drawTo(fPausedRow);
+    if (!fLoading) {
+        fCanvasWidget.drawTo(fPausedRow);
+    }
 }
 
 void SkDebuggerGUI::registerListClick(QListWidgetItem *item) {
     if(!fLoading) {
         int currentRow = fListWidget.currentRow();
 
         if (currentRow != -1) {
-            if (!fPause) {
+            if (!this->isPaused()) {
                 fCanvasWidget.drawTo(currentRow);
             }
             const SkTDArray<SkString*> *currInfo = fDebugger.getCommandInfo(currentRow);
 
             /* TODO(chudy): Add command type before parameters. Rename v
              * to something more informative. */
             if (currInfo) {
                 QString info;
                 info.append("<b>Parameters: </b><br/>");
                 for (int i = 0; i < currInfo->count(); i++) {
 
                     info.append(QString((*currInfo)[i]->c_str()));
                     info.append("<br/>");
                 }
                 fInspectorWidget.setText(info, SkInspectorWidget::kDetail_TabType);
                 fInspectorWidget.setDisabled(false);
                 fViewStateFrame.setDisabled(false);
             }
             setupClipStackText();
         }
 
     }
 }
 
 void SkDebuggerGUI::selectCommand(int command) {
-    if (fPause) {
+    if (this->isPaused()) {
         fListWidget.setCurrentRow(command);
     }
 }
 
 void SkDebuggerGUI::toggleBreakpoint() {
     QListWidgetItem* item = fListWidget.currentItem();
     if (item->checkState() == Qt::Unchecked) {
         item->setCheckState(Qt::Checked);
         item->setData(Qt::DecorationRole,
                 QPixmap(":/breakpoint_16x16.png"));
@@ skipping 26 matching lines @@
 
     fActionOpen.setShortcuts(QKeySequence::Open);
     fActionOpen.setText("Open");
 
     QIcon breakpoint;
     breakpoint.addFile(QString::fromUtf8(":/breakpoint.png"),
             QSize(), QIcon::Normal, QIcon::Off);
     fActionBreakpoint.setShortcut(QKeySequence(tr("Ctrl+B")));
     fActionBreakpoint.setIcon(breakpoint);
     fActionBreakpoint.setText("Breakpoints");
+    fActionBreakpoint.setCheckable(true);
 
     fActionToggleIndexStyle.setShortcut(QKeySequence(tr("Ctrl+T")));
     fActionToggleIndexStyle.setText("Toggle Index Style");
+    fActionToggleIndexStyle.setCheckable(true);
 
     QIcon cancel;
     cancel.addFile(QString::fromUtf8(":/reload.png"), QSize(),
             QIcon::Normal, QIcon::Off);
     fActionCancel.setIcon(cancel);
     fActionCancel.setText("Clear Filter");
 
     fActionClearBreakpoints.setShortcut(QKeySequence(tr("Alt+B")));
     fActionClearBreakpoints.setText("Clear Breakpoints");
 
@@ skipping 57 matching lines @@
 
     fActionSave.setShortcut(QKeySequence::Save);
     fActionSave.setText("Save");
     fActionSave.setDisabled(true);
     fActionSaveAs.setShortcut(QKeySequence::SaveAs);
     fActionSaveAs.setText("Save As");
     fActionSaveAs.setDisabled(true);
 
     fActionShowDeletes.setShortcut(QKeySequence(tr("Ctrl+X")));
     fActionShowDeletes.setText("Deleted Commands");
+    fActionShowDeletes.setCheckable(true);
 
     QIcon stepBack;
     stepBack.addFile(QString::fromUtf8(":/previous.png"), QSize(),
             QIcon::Normal, QIcon::Off);
     fActionStepBack.setShortcut(QKeySequence(tr("[")));
     fActionStepBack.setIcon(stepBack);
     fActionStepBack.setText("Step Back");
 
     QIcon stepForward;
     stepForward.addFile(QString::fromUtf8(":/next.png"),
@@ skipping 137 matching lines @@
     fMenuWindows.addAction(&fActionDirectory);
 
     fActionGoToLine.setText("Go to Line...");
     fActionGoToLine.setDisabled(true);
     fMenuBar.addAction(fMenuFile.menuAction());
     fMenuBar.addAction(fMenuEdit.menuAction());
     fMenuBar.addAction(fMenuView.menuAction());
     fMenuBar.addAction(fMenuNavigate.menuAction());
     fMenuBar.addAction(fMenuWindows.menuAction());
 
-    fPause = false;
-
     SkDebuggerGUI->setMenuBar(&fMenuBar);
     QMetaObject::connectSlotsByName(SkDebuggerGUI);
 }
 
 void SkDebuggerGUI::setupDirectoryWidget(const QString& path) {
     fPath = path;
     QDir dir(path);
     QRegExp r(".skp");
     fDirectoryWidget.clear();
     const QStringList files = dir.entryList();
@@ skipping 40 matching lines @@
     this->setupComboBox();
     this->setupOverviewText(NULL, 0.0, 1);
     fInspectorWidget.setDisabled(false);
     fViewStateFrame.setDisabled(false);
     fSettingsWidget.setDisabled(false);
     fMenuEdit.setDisabled(false);
     fMenuNavigate.setDisabled(false);
     fMenuView.setDisabled(false);
     fActionSave.setDisabled(false);
     fActionSaveAs.setDisabled(false);
+    fActionPause.setChecked(false);
     fLoading = false;
     actionPlay();
 }
 
 void SkDebuggerGUI::setupListWidget() {
     fListWidget.clear();
     int counter = 0;
     int indent = 0;
     for (int i = 0; i < fDebugger.getSize(); i++) {
         QListWidgetItem *item = new QListWidgetItem();
@@ skipping 60 matching lines @@
 }
 
 void SkDebuggerGUI::updateCommand(int newCommand) {
     fCurrentCommandBox.setText(QString::number(newCommand));
 }
 
 void SkDebuggerGUI::updateHit(int newHit) {
     fCommandHitBox.setText(QString::number(newHit));
 }