Changeset 76627 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jan 3, 2019 9:28:51 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

127931

Message:

FE/Qt: Some variable renaming

Location:

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl

Files:

• UIFileManager.cpp (modified) (3 diffs)
• UIFileManager.h (modified) (1 diff)
• UIFileManagerOptionsPanel.cpp (modified) (9 diffs)
• UIFileManagerTable.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManager.cpp

@@ -105 +105 @@
 
 UIFileManagerOptions::UIFileManagerOptions()
-    : bListDirectoriesOnTop(true)
-    , bAskDeleteConfirmation(false)
-    , bShowHumanReadableSizes(true)
-    , bShowHiddenObjects(true)
+    : fListDirectoriesOnTop(true)
+    , fAskDeleteConfirmation(false)
+    , fShowHumanReadableSizes(true)
+    , fShowHiddenObjects(true)
 {
 }
@@ -700 +700 @@
     if (pOptions)
     {
-        gEDataManager->setFileManagerOptions(pOptions->bListDirectoriesOnTop,
-                                             pOptions->bAskDeleteConfirmation,
-                                             pOptions->bShowHumanReadableSizes,
-                                             pOptions->bShowHiddenObjects);
+        gEDataManager->setFileManagerOptions(pOptions->fListDirectoriesOnTop,
+                                             pOptions->fAskDeleteConfirmation,
+                                             pOptions->fShowHumanReadableSizes,
+                                             pOptions->fShowHiddenObjects);
     }
 }
@@ -739 +739 @@
     if (pOptions)
     {
-        pOptions->bListDirectoriesOnTop = gEDataManager->fileManagerListDirectoriesFirst();
-        pOptions->bAskDeleteConfirmation = gEDataManager->fileManagerShowDeleteConfirmation();
-        pOptions->bShowHumanReadableSizes = gEDataManager->fileManagerShowHumanReadableSizes();
-        pOptions->bShowHiddenObjects = gEDataManager->fileManagerShowHiddenObjects();
+        pOptions->fListDirectoriesOnTop = gEDataManager->fileManagerListDirectoriesFirst();
+        pOptions->fAskDeleteConfirmation = gEDataManager->fileManagerShowDeleteConfirmation();
+        pOptions->fShowHumanReadableSizes = gEDataManager->fileManagerShowHumanReadableSizes();
+        pOptions->fShowHiddenObjects = gEDataManager->fileManagerShowHiddenObjects();
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManager.h

@@ -70 +70 @@
     static void destroy();
 
-    bool bListDirectoriesOnTop;
-    bool bAskDeleteConfirmation;
-    bool bShowHumanReadableSizes;
-    bool bShowHiddenObjects;
+    bool fListDirectoriesOnTop;
+    bool fAskDeleteConfirmation;
+    bool fShowHumanReadableSizes;
+    bool fShowHiddenObjects;
 
 private:

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerOptionsPanel.cpp

@@ -57 +57 @@
     {
         m_pListDirectoriesOnTopCheckBox->blockSignals(true);
-        m_pListDirectoriesOnTopCheckBox->setChecked(m_pFileManagerOptions->bListDirectoriesOnTop);
+        m_pListDirectoriesOnTopCheckBox->setChecked(m_pFileManagerOptions->fListDirectoriesOnTop);
         m_pListDirectoriesOnTopCheckBox->blockSignals(false);
     }
@@ -64 +64 @@
     {
         m_pDeleteConfirmationCheckBox->blockSignals(true);
-        m_pDeleteConfirmationCheckBox->setChecked(m_pFileManagerOptions->bAskDeleteConfirmation);
+        m_pDeleteConfirmationCheckBox->setChecked(m_pFileManagerOptions->fAskDeleteConfirmation);
         m_pDeleteConfirmationCheckBox->blockSignals(false);
     }
@@ -71 +71 @@
     {
         m_pHumanReabableSizesCheckBox->blockSignals(true);
-        m_pHumanReabableSizesCheckBox->setChecked(m_pFileManagerOptions->bShowHumanReadableSizes);
+        m_pHumanReabableSizesCheckBox->setChecked(m_pFileManagerOptions->fShowHumanReadableSizes);
         m_pHumanReabableSizesCheckBox->blockSignals(false);
     }
@@ -78 +78 @@
     {
         m_pShowHiddenObjectsCheckBox->blockSignals(true);
-        m_pShowHiddenObjectsCheckBox->setChecked(m_pFileManagerOptions->bShowHiddenObjects);
+        m_pShowHiddenObjectsCheckBox->setChecked(m_pFileManagerOptions->fShowHiddenObjects);
         m_pShowHiddenObjectsCheckBox->blockSignals(false);
     }
@@ -116 +116 @@
     {
         if (m_pListDirectoriesOnTopCheckBox)
-            m_pListDirectoriesOnTopCheckBox->setChecked(m_pFileManagerOptions->bListDirectoriesOnTop);
+            m_pListDirectoriesOnTopCheckBox->setChecked(m_pFileManagerOptions->fListDirectoriesOnTop);
         if (m_pDeleteConfirmationCheckBox)
-            m_pDeleteConfirmationCheckBox->setChecked(m_pFileManagerOptions->bAskDeleteConfirmation);
+            m_pDeleteConfirmationCheckBox->setChecked(m_pFileManagerOptions->fAskDeleteConfirmation);
         if (m_pHumanReabableSizesCheckBox)
-            m_pHumanReabableSizesCheckBox->setChecked(m_pFileManagerOptions->bShowHumanReadableSizes);
+            m_pHumanReabableSizesCheckBox->setChecked(m_pFileManagerOptions->fShowHumanReadableSizes);
         if (m_pShowHiddenObjectsCheckBox)
-            m_pShowHiddenObjectsCheckBox->setChecked(m_pFileManagerOptions->bShowHiddenObjects);
+            m_pShowHiddenObjectsCheckBox->setChecked(m_pFileManagerOptions->fShowHiddenObjects);
 
     }
@@ -133 +133 @@
     if (!m_pFileManagerOptions)
         return;
-    m_pFileManagerOptions->bListDirectoriesOnTop = bChecked;
+    m_pFileManagerOptions->fListDirectoriesOnTop = bChecked;
     emit sigOptionsChanged();
 }
@@ -141 +141 @@
     if (!m_pFileManagerOptions)
         return;
-    m_pFileManagerOptions->bAskDeleteConfirmation = bChecked;
+    m_pFileManagerOptions->fAskDeleteConfirmation = bChecked;
     emit sigOptionsChanged();
 }
@@ -149 +149 @@
     if (!m_pFileManagerOptions)
         return;
-    m_pFileManagerOptions->bShowHumanReadableSizes = bChecked;
+    m_pFileManagerOptions->fShowHumanReadableSizes = bChecked;
     emit sigOptionsChanged();
 }
@@ -157 +157 @@
     if (!m_pFileManagerOptions)
         return;
-    m_pFileManagerOptions->bShowHiddenObjects = bChecked;
+    m_pFileManagerOptions->fShowHiddenObjects = bChecked;
     emit sigOptionsChanged();
 }

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerTable.cpp

@@ -348 +348 @@
         UIFileManagerOptions *pFileManagerOptions = UIFileManagerOptions::instance();
         if (pFileManagerOptions)
-            m_pAskNextTimeCheckBox->setChecked(pFileManagerOptions->bAskDeleteConfirmation);
+            m_pAskNextTimeCheckBox->setChecked(pFileManagerOptions->fAskDeleteConfirmation);
 
         pLayout->addWidget(m_pAskNextTimeCheckBox);
@@ -1161 +1161 @@
         if (m_pProxyModel)
         {
-            m_pProxyModel->setListDirectoriesOnTop(pOptions->bListDirectoriesOnTop);
-            m_pProxyModel->setShowHiddenObjects(pOptions->bShowHiddenObjects);
+            m_pProxyModel->setListDirectoriesOnTop(pOptions->fListDirectoriesOnTop);
+            m_pProxyModel->setShowHiddenObjects(pOptions->fShowHiddenObjects);
         }
         if (m_pModel)
-            m_pModel->setShowHumanReadableSizes(pOptions->bShowHumanReadableSizes);
+            m_pModel->setShowHumanReadableSizes(pOptions->fShowHumanReadableSizes);
     }
     relist();
@@ -1230 +1230 @@
     if (!pFileManagerOptions)
         return true;
-    if (!pFileManagerOptions->bAskDeleteConfirmation)
+    if (!pFileManagerOptions->fAskDeleteConfirmation)
         return true;
     UIFileDeleteConfirmationDialog *pDialog =
@@ -1239 +1239 @@
 
     /* Update the file manager options only if it is necessary: */
-    if (pFileManagerOptions->bAskDeleteConfirmation != bAskNextTime)
-    {
-        pFileManagerOptions->bAskDeleteConfirmation = bAskNextTime;
+    if (pFileManagerOptions->fAskDeleteConfirmation != bAskNextTime)
+    {
+        pFileManagerOptions->fAskDeleteConfirmation = bAskNextTime;
         /* Notify file manager options panel so that the check box there is updated: */
         emit sigDeleteConfirmationOptionChanged();