From 817d1326040f246d683d9c0bba0125a2306653ab Mon Sep 17 00:00:00 2001
From: NissimHadar <nissim.hadar@gmail.com>
Date: Thu, 24 Jan 2019 12:13:35 -0800
Subject: [PATCH] renamed ...Button... to ...pushButton... for consistency.

---
 tools/nitpick/src/Nitpick.cpp | 50 +++++++++---------
 tools/nitpick/src/Nitpick.h   | 42 +++++++--------
 tools/nitpick/ui/Nitpick.ui   | 96 +++++++++++++++++------------------
 3 files changed, 94 insertions(+), 94 deletions(-)

diff --git a/tools/nitpick/src/Nitpick.cpp b/tools/nitpick/src/Nitpick.cpp
index 35d60576ec..12c038a50f 100644
--- a/tools/nitpick/src/Nitpick.cpp
+++ b/tools/nitpick/src/Nitpick.cpp
@@ -26,7 +26,7 @@ Nitpick::Nitpick(QWidget* parent) : QMainWindow(parent) {
 
     _signalMapper = new QSignalMapper();
 
-    connect(_ui.actionClose, &QAction::triggered, this, &Nitpick::on_closeButton_clicked);
+    connect(_ui.actionClose, &QAction::triggered, this, &Nitpick::on_closePushbutton_clicked);
     connect(_ui.actionAbout, &QAction::triggered, this, &Nitpick::about);
     connect(_ui.actionContent, &QAction::triggered, this, &Nitpick::content);
 
@@ -88,12 +88,12 @@ void Nitpick::setup() {
     if (_testRunnerDesktop) {
         delete _testRunnerDesktop;
     }
-    _testRunnerDesktop = new TestRunnerDesktop(dayCheckboxes, timeEditCheckboxes, timeEdits, _ui.workingFolderRunOnDesktopLabel, _ui.checkBoxServerless, _ui.runLatestOnDesktopCheckBox, _ui.urlOnDesktopLineEdit, _ui.runNowButton);
+    _testRunnerDesktop = new TestRunnerDesktop(dayCheckboxes, timeEditCheckboxes, timeEdits, _ui.workingFolderRunOnDesktopLabel, _ui.checkBoxServerless, _ui.runLatestOnDesktopCheckBox, _ui.urlOnDesktopLineEdit, _ui.runNowPushbutton);
 
     if (_testRunnerMobile) {
         delete _testRunnerMobile;
     }
-    _testRunnerMobile = new TestRunnerMobile(_ui.workingFolderRunOnMobileLabel, _ui.connectDeviceButton, _ui.pullFolderButton, _ui.detectedDeviceLabel, _ui.folderLineEdit);
+    _testRunnerMobile = new TestRunnerMobile(_ui.workingFolderRunOnMobileLabel, _ui.connectDevicePushbutton, _ui.pullFolderPushbutton, _ui.detectedDeviceLabel, _ui.folderLineEdit);
 }
 
 void Nitpick::startTestsEvaluation(const bool isRunningFromCommandLine,
@@ -120,43 +120,43 @@ void Nitpick::on_tabWidget_currentChanged(int index) {
     }
 }
 
-void Nitpick::on_evaluateTestsButton_clicked() {
+void Nitpick::on_evaluateTestsPushbutton_clicked() {
     _test->startTestsEvaluation(false, false);
 }
 
-void Nitpick::on_createRecursiveScriptButton_clicked() {
+void Nitpick::on_createRecursiveScriptPushbutton_clicked() {
     _test->createRecursiveScript();
 }
 
-void Nitpick::on_createAllRecursiveScriptsButton_clicked() {
+void Nitpick::on_createAllRecursiveScriptsPushbutton_clicked() {
     _test->createAllRecursiveScripts();
 }
 
-void Nitpick::on_createTestsButton_clicked() {
+void Nitpick::on_createTestsPushbutton_clicked() {
     _test->createTests();
 }
 
-void Nitpick::on_createMDFileButton_clicked() {
+void Nitpick::on_createMDFilePushbutton_clicked() {
     _test->createMDFile();
 }
 
-void Nitpick::on_createAllMDFilesButton_clicked() {
+void Nitpick::on_createAllMDFilesPushbutton_clicked() {
     _test->createAllMDFiles();
 }
 
-void Nitpick::on_createTestAutoScriptButton_clicked() {
+void Nitpick::on_createTestAutoScriptPushbutton_clicked() {
     _test->createTestAutoScript();
 }
 
-void Nitpick::on_createAllTestAutoScriptsButton_clicked() {
+void Nitpick::on_createAllTestAutoScriptsPushbutton_clicked() {
     _test->createAllTestAutoScripts();
 }
 
-void Nitpick::on_createTestsOutlineButton_clicked() {
+void Nitpick::on_createTestsOutlinePushbutton_clicked() {
     _test->createTestsOutline();
 }
 
-void Nitpick::on_createTestRailTestCasesButton_clicked() {
+void Nitpick::on_createTestRailTestCasesPushbutton_clicked() {
     _test->createTestRailTestCases();
 }
 
@@ -164,17 +164,17 @@ void Nitpick::on_createTestRailRunButton_clicked() {
     _test->createTestRailRun();
 }
 
-void Nitpick::on_setWorkingFolderRunOnDesktopButton_clicked() {
+void Nitpick::on_setWorkingFolderRunOnDesktopPushbutton_clicked() {
     _testRunnerDesktop->setWorkingFolderAndEnableControls();
 }
 
 void Nitpick::enableRunTabControls() {
-    _ui.runNowButton->setEnabled(true);
+    _ui.runNowPushbutton->setEnabled(true);
     _ui.daysGroupBox->setEnabled(true);
     _ui.timesGroupBox->setEnabled(true);
 }
 
-void Nitpick::on_runNowButton_clicked() {
+void Nitpick::on_runNowPushbutton_clicked() {
     _testRunnerDesktop->run();
 }
 
@@ -186,7 +186,7 @@ void Nitpick::automaticTestRunEvaluationComplete(QString zippedFolderName, int n
     _testRunnerDesktop->automaticTestRunEvaluationComplete(zippedFolderName, numberOfFailures);
 }
 
-void Nitpick::on_updateTestRailRunResultsButton_clicked() {
+void Nitpick::on_updateTestRailRunResultsPushbutton_clicked() {
     _test->updateTestRailRunResult();
 }
 
@@ -194,7 +194,7 @@ void Nitpick::on_updateTestRailRunResultsButton_clicked() {
 //   if (uState & ABS_AUTOHIDE) on_showTaskbarButton_clicked();
 //   else on_hideTaskbarButton_clicked();
 //
-void Nitpick::on_hideTaskbarButton_clicked() {
+void Nitpick::on_hideTaskbarPushbutton_clicked() {
 #ifdef Q_OS_WIN
     APPBARDATA abd = { sizeof abd };
     UINT uState = (UINT)SHAppBarMessage(ABM_GETSTATE, &abd);
@@ -204,7 +204,7 @@ void Nitpick::on_hideTaskbarButton_clicked() {
 #endif
 }
 
-void Nitpick::on_showTaskbarButton_clicked() {
+void Nitpick::on_showTaskbarPushbutton_clicked() {
 #ifdef Q_OS_WIN
     APPBARDATA abd = { sizeof abd };
     UINT uState = (UINT)SHAppBarMessage(ABM_GETSTATE, &abd);
@@ -214,7 +214,7 @@ void Nitpick::on_showTaskbarButton_clicked() {
 #endif
 }
 
-void Nitpick::on_closeButton_clicked() {
+void Nitpick::on_closePushbutton_clicked() {
     exit(0);
 }
 
@@ -226,7 +226,7 @@ void Nitpick::on_createXMLScriptRadioButton_clicked() {
     _test->setTestRailCreateMode(XML);
 }
 
-void Nitpick::on_createWebPagePushButton_clicked() {
+void Nitpick::on_createWebPagePushbutton_clicked() {
     _test->createWebPage(_ui.updateAWSCheckBox, _ui.awsURLLineEdit);
 }
 
@@ -324,11 +324,11 @@ void Nitpick::appendLogWindow(const QString& message) {
 }
 
 // Test on Mobile
-void Nitpick::on_setWorkingFolderRunOnMobileButton_clicked() {
+void Nitpick::on_setWorkingFolderRunOnMobilePushbutton_clicked() {
     _testRunnerMobile->setWorkingFolderAndEnableControls();
 }
 
-void Nitpick::on_connectDeviceButton_clicked() {
+void Nitpick::on_connectDevicePushbutton_clicked() {
     _testRunnerMobile->connectDevice();
 }
 
@@ -336,10 +336,10 @@ void Nitpick::on_runLatestOnMobileCheckBox_clicked() {
     _ui.urlOnMobileLineEdit->setEnabled(!_ui.runLatestOnMobileCheckBox->isChecked());
 }
 
-void Nitpick::on_downloadAPKButton_clicked() {
+void Nitpick::on_downloadAPKPushbutton_clicked() {
     _testRunnerMobile->downloadAPK();
 }
 
-void Nitpick::on_pullFolderButton_clicked() {
+void Nitpick::on_pullFolderPushbutton_clicked() {
     _testRunnerMobile->pullFolder();
 }
diff --git a/tools/nitpick/src/Nitpick.h b/tools/nitpick/src/Nitpick.h
index fe8ce608f3..18916a1f03 100644
--- a/tools/nitpick/src/Nitpick.h
+++ b/tools/nitpick/src/Nitpick.h
@@ -55,40 +55,40 @@ public:
     void appendLogWindow(const QString& message);
 
 private slots:
-    void on_closeButton_clicked();
+    void on_closePushbutton_clicked();
 
     void on_tabWidget_currentChanged(int index);
 
-    void on_evaluateTestsButton_clicked();
-    void on_createRecursiveScriptButton_clicked();
-    void on_createAllRecursiveScriptsButton_clicked();
-    void on_createTestsButton_clicked();
+    void on_evaluateTestsPushbutton_clicked();
+    void on_createRecursiveScriptPushbutton_clicked();
+    void on_createAllRecursiveScriptsPushbutton_clicked();
+    void on_createTestsPushbutton_clicked();
 
-    void on_createMDFileButton_clicked();
-    void on_createAllMDFilesButton_clicked();
+    void on_createMDFilePushbutton_clicked();
+    void on_createAllMDFilesPushbutton_clicked();
 
-    void on_createTestAutoScriptButton_clicked();
-    void on_createAllTestAutoScriptsButton_clicked();
+    void on_createTestAutoScriptPushbutton_clicked();
+    void on_createAllTestAutoScriptsPushbutton_clicked();
 
-    void on_createTestsOutlineButton_clicked();
+    void on_createTestsOutlinePushbutton_clicked();
 
-    void on_createTestRailTestCasesButton_clicked();
+    void on_createTestRailTestCasesPushbutton_clicked();
     void on_createTestRailRunButton_clicked();
 
-    void on_setWorkingFolderRunOnDesktopButton_clicked();
-    void on_runNowButton_clicked();
+    void on_setWorkingFolderRunOnDesktopPushbutton_clicked();
+    void on_runNowPushbutton_clicked();
 
     void on_runLatestOnDesktopCheckBox_clicked();
 
-    void on_updateTestRailRunResultsButton_clicked();
+    void on_updateTestRailRunResultsPushbutton_clicked();
 
-    void on_hideTaskbarButton_clicked();
-    void on_showTaskbarButton_clicked();
+    void on_hideTaskbarPushbutton_clicked();
+    void on_showTaskbarPushbutton_clicked();
 
     void on_createPythonScriptRadioButton_clicked();
     void on_createXMLScriptRadioButton_clicked();
 
-    void on_createWebPagePushButton_clicked();
+    void on_createWebPagePushbutton_clicked();
 
     void saveFile(int index);
 
@@ -96,11 +96,11 @@ private slots:
     void content();
 
     // Run on Mobile controls
-    void on_setWorkingFolderRunOnMobileButton_clicked();
-    void on_connectDeviceButton_clicked();
+    void on_setWorkingFolderRunOnMobilePushbutton_clicked();
+    void on_connectDevicePushbutton_clicked();
     void on_runLatestOnMobileCheckBox_clicked();
-    void on_downloadAPKButton_clicked();
-    void on_pullFolderButton_clicked();
+    void on_downloadAPKPushbutton_clicked();
+    void on_pullFolderPushbutton_clicked();
 
 private:
     Ui::NitpickClass _ui;
diff --git a/tools/nitpick/ui/Nitpick.ui b/tools/nitpick/ui/Nitpick.ui
index 85df106334..2d6f781b8e 100644
--- a/tools/nitpick/ui/Nitpick.ui
+++ b/tools/nitpick/ui/Nitpick.ui
@@ -20,7 +20,7 @@
    <string>Nitpick</string>
   </property>
   <widget class="QWidget" name="centralWidget">
-   <widget class="QPushButton" name="closeButton">
+   <widget class="QPushButton" name="closePushbutton">
     <property name="geometry">
      <rect>
       <x>470</x>
@@ -43,16 +43,16 @@
      </rect>
     </property>
     <property name="currentIndex">
-     <number>3</number>
+     <number>5</number>
     </property>
     <widget class="QWidget" name="tab_1">
      <attribute name="title">
       <string>Create</string>
      </attribute>
-     <widget class="QPushButton" name="createTestsButton">
+     <widget class="QPushButton" name="createTestsPushbutton">
       <property name="geometry">
        <rect>
-        <x>195</x>
+        <x>210</x>
         <y>60</y>
         <width>220</width>
         <height>40</height>
@@ -62,7 +62,7 @@
        <string>Create Tests</string>
       </property>
      </widget>
-     <widget class="QPushButton" name="createMDFileButton">
+     <widget class="QPushButton" name="createMDFilePushbutton">
       <property name="geometry">
        <rect>
         <x>70</x>
@@ -75,7 +75,7 @@
        <string>Create MD file</string>
       </property>
      </widget>
-     <widget class="QPushButton" name="createAllMDFilesButton">
+     <widget class="QPushButton" name="createAllMDFilesPushbutton">
       <property name="geometry">
        <rect>
         <x>320</x>
@@ -88,10 +88,10 @@
        <string>Create all  MD files</string>
       </property>
      </widget>
-     <widget class="QPushButton" name="createTestsOutlineButton">
+     <widget class="QPushButton" name="createTestsOutlinePushbutton">
       <property name="geometry">
        <rect>
-        <x>195</x>
+        <x>210</x>
         <y>120</y>
         <width>220</width>
         <height>40</height>
@@ -101,7 +101,7 @@
        <string>Create Tests Outline</string>
       </property>
      </widget>
-     <widget class="QPushButton" name="createRecursiveScriptButton">
+     <widget class="QPushButton" name="createRecursiveScriptPushbutton">
       <property name="geometry">
        <rect>
         <x>70</x>
@@ -114,7 +114,7 @@
        <string>Create Recursive Script</string>
       </property>
      </widget>
-     <widget class="QPushButton" name="createAllRecursiveScriptsButton">
+     <widget class="QPushButton" name="createAllRecursiveScriptsPushbutton">
       <property name="geometry">
        <rect>
         <x>320</x>
@@ -127,7 +127,7 @@
        <string>Create all  Recursive Scripts</string>
       </property>
      </widget>
-     <widget class="QPushButton" name="createTestAutoScriptButton">
+     <widget class="QPushButton" name="createTestAutoScriptPushbutton">
       <property name="geometry">
        <rect>
         <x>70</x>
@@ -140,7 +140,7 @@
        <string>Create testAuto script</string>
       </property>
      </widget>
-     <widget class="QPushButton" name="createAllTestAutoScriptsButton">
+     <widget class="QPushButton" name="createAllTestAutoScriptsPushbutton">
       <property name="geometry">
        <rect>
         <x>320</x>
@@ -158,7 +158,7 @@
      <attribute name="title">
       <string>Windows</string>
      </attribute>
-     <widget class="QPushButton" name="hideTaskbarButton">
+     <widget class="QPushButton" name="hideTaskbarPushbutton">
       <property name="geometry">
        <rect>
         <x>200</x>
@@ -171,7 +171,7 @@
        <string>Hide Windows Taskbar</string>
       </property>
      </widget>
-     <widget class="QPushButton" name="showTaskbarButton">
+     <widget class="QPushButton" name="showTaskbarPushbutton">
       <property name="geometry">
        <rect>
         <x>200</x>
@@ -189,7 +189,7 @@
      <attribute name="title">
       <string>Test on Desktop</string>
      </attribute>
-     <widget class="QPushButton" name="runNowButton">
+     <widget class="QPushButton" name="runNowPushbutton">
       <property name="enabled">
        <bool>false</bool>
       </property>
@@ -420,7 +420,7 @@
        </property>
       </widget>
      </widget>
-     <widget class="QPushButton" name="setWorkingFolderRunOnDesktopButton">
+     <widget class="QPushButton" name="setWorkingFolderRunOnDesktopPushbutton">
       <property name="geometry">
        <rect>
         <x>10</x>
@@ -551,7 +551,7 @@
      <attribute name="title">
       <string>Test on Mobile</string>
      </attribute>
-     <widget class="QPushButton" name="connectDeviceButton">
+     <widget class="QPushButton" name="connectDevicePushbutton">
       <property name="enabled">
        <bool>false</bool>
       </property>
@@ -580,7 +580,7 @@
        <string>(not detected)</string>
       </property>
      </widget>
-     <widget class="QPushButton" name="setWorkingFolderRunOnMobileButton">
+     <widget class="QPushButton" name="setWorkingFolderRunOnMobilePushbutton">
       <property name="geometry">
        <rect>
         <x>10</x>
@@ -606,13 +606,13 @@
        <string>(not set...)</string>
       </property>
      </widget>
-     <widget class="QPushButton" name="pullFolderButton">
+     <widget class="QPushButton" name="pullFolderPushbutton">
       <property name="enabled">
        <bool>false</bool>
       </property>
       <property name="geometry">
        <rect>
-        <x>200</x>
+        <x>460</x>
         <y>350</y>
         <width>160</width>
         <height>30</height>
@@ -630,7 +630,7 @@
        <rect>
         <x>10</x>
         <y>350</y>
-        <width>161</width>
+        <width>441</width>
         <height>31</height>
        </rect>
       </property>
@@ -667,7 +667,7 @@
        <bool>true</bool>
       </property>
      </widget>
-     <widget class="QPushButton" name="downloadAPKButton">
+     <widget class="QPushButton" name="downloadAPKPushbutton">
       <property name="enabled">
        <bool>false</bool>
       </property>
@@ -704,7 +704,7 @@
        <string>Interactive Mode</string>
       </property>
      </widget>
-     <widget class="QPushButton" name="evaluateTestsButton">
+     <widget class="QPushButton" name="evaluateTestsPushbutton">
       <property name="geometry">
        <rect>
         <x>330</x>
@@ -722,7 +722,7 @@
      <attribute name="title">
       <string>Web Interface</string>
      </attribute>
-     <widget class="QPushButton" name="updateTestRailRunResultsButton">
+     <widget class="QPushButton" name="updateTestRailRunResultsPushbutton">
       <property name="geometry">
        <rect>
         <x>240</x>
@@ -751,7 +751,7 @@
        <bool>true</bool>
       </property>
      </widget>
-     <widget class="QPushButton" name="createTestRailRunButton">
+     <widget class="QPushButton" name="createTestRailRunPushbutton">
       <property name="geometry">
        <rect>
         <x>240</x>
@@ -764,7 +764,7 @@
        <string>Create Run</string>
       </property>
      </widget>
-     <widget class="QPushButton" name="createTestRailTestCasesButton">
+     <widget class="QPushButton" name="createTestRailTestCasesPushbutton">
       <property name="geometry">
        <rect>
         <x>240</x>
@@ -815,7 +815,7 @@
       <property name="title">
        <string>Amazon Web Services</string>
       </property>
-      <widget class="QPushButton" name="createWebPagePushButton">
+      <widget class="QPushButton" name="createWebPagePushPushbutton">
        <property name="enabled">
         <bool>true</bool>
        </property>
@@ -856,10 +856,10 @@
       </widget>
      </widget>
      <zorder>groupBox</zorder>
-     <zorder>updateTestRailRunResultsButton</zorder>
+     <zorder>updateTestRailRunResultsPushbutton</zorder>
      <zorder>createPythonScriptRadioButton</zorder>
-     <zorder>createTestRailRunButton</zorder>
-     <zorder>createTestRailTestCasesButton</zorder>
+     <zorder>createTestRailRunPushbutton</zorder>
+     <zorder>createTestRailTestCasesPushbutton</zorder>
      <zorder>createXMLScriptRadioButton</zorder>
      <zorder>groupBox_2</zorder>
     </widget>
@@ -988,17 +988,17 @@
  <tabstops>
   <tabstop>userLineEdit</tabstop>
   <tabstop>branchLineEdit</tabstop>
-  <tabstop>createTestsButton</tabstop>
-  <tabstop>createMDFileButton</tabstop>
-  <tabstop>createAllMDFilesButton</tabstop>
-  <tabstop>createTestsOutlineButton</tabstop>
-  <tabstop>createRecursiveScriptButton</tabstop>
-  <tabstop>createAllRecursiveScriptsButton</tabstop>
-  <tabstop>createTestAutoScriptButton</tabstop>
-  <tabstop>createAllTestAutoScriptsButton</tabstop>
-  <tabstop>hideTaskbarButton</tabstop>
-  <tabstop>showTaskbarButton</tabstop>
-  <tabstop>runNowButton</tabstop>
+  <tabstop>createTestsPushbutton</tabstop>
+  <tabstop>createMDFilePushbutton</tabstop>
+  <tabstop>createAllMDFilesPushbutton</tabstop>
+  <tabstop>createTestsOutlinePushbutton</tabstop>
+  <tabstop>createRecursiveScriptPushbutton</tabstop>
+  <tabstop>createAllRecursiveScriptsPushbutton</tabstop>
+  <tabstop>createTestAutoScriptPushbutton</tabstop>
+  <tabstop>createAllTestAutoScriptsPushbutton</tabstop>
+  <tabstop>hideTaskbarPushbutton</tabstop>
+  <tabstop>showTaskbarPushbutton</tabstop>
+  <tabstop>runNowPushbutton</tabstop>
   <tabstop>sundayCheckBox</tabstop>
   <tabstop>wednesdayCheckBox</tabstop>
   <tabstop>tuesdayCheckBox</tabstop>
@@ -1014,22 +1014,22 @@
   <tabstop>timeEdit2checkBox</tabstop>
   <tabstop>timeEdit3checkBox</tabstop>
   <tabstop>timeEdit4checkBox</tabstop>
-  <tabstop>setWorkingFolderRunOnDesktopButton</tabstop>
+  <tabstop>setWorkingFolderRunOnDesktopPushbutton</tabstop>
   <tabstop>plainTextEdit</tabstop>
   <tabstop>checkBoxServerless</tabstop>
   <tabstop>runLatestOnDesktopCheckBox</tabstop>
   <tabstop>urlOnDesktopLineEdit</tabstop>
   <tabstop>checkBoxInteractiveMode</tabstop>
-  <tabstop>evaluateTestsButton</tabstop>
-  <tabstop>updateTestRailRunResultsButton</tabstop>
+  <tabstop>evaluateTestsPushbutton</tabstop>
+  <tabstop>updateTestRailRunResultsPushbutton</tabstop>
   <tabstop>createPythonScriptRadioButton</tabstop>
-  <tabstop>createTestRailRunButton</tabstop>
-  <tabstop>createTestRailTestCasesButton</tabstop>
+  <tabstop>createTestRailRunPushbutton</tabstop>
+  <tabstop>createTestRailTestCasesPushbutton</tabstop>
   <tabstop>createXMLScriptRadioButton</tabstop>
-  <tabstop>createWebPagePushButton</tabstop>
+  <tabstop>createWebPagePushPushbutton</tabstop>
   <tabstop>updateAWSCheckBox</tabstop>
   <tabstop>awsURLLineEdit</tabstop>
-  <tabstop>closeButton</tabstop>
+  <tabstop>closePushbutton</tabstop>
   <tabstop>tabWidget</tabstop>
  </tabstops>
  <resources/>