Changeset 53449 in vbox for trunk/src/VBox/Frontends

Timestamp:

Dec 5, 2014 9:48:21 AM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: cache the home folder and don't call IVirtualBox::GetHomeFolder() from an alien thread

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataManager.cpp (modified) (2 diffs)
• globals/UIMessageCenter.cpp (modified) (1 diff)
• globals/VBoxGlobal.cpp (modified) (2 diffs)
• globals/VBoxGlobal.h (modified) (2 diffs)
• net/UIDownloaderAdditions.cpp (modified) (1 diff)
• net/UIDownloaderExtensionPack.cpp (modified) (1 diff)
• net/UIDownloaderUserManual.cpp (modified) (1 diff)
• net/UINetworkReply.cpp (modified) (1 diff)
• settings/global/UIGlobalSettingsGeneral.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

@@ -953 +953 @@
 
     /* Compose initial file-name: */
-    const CVirtualBox vbox = vboxGlobal().virtualBox();
-    const QString strInitialFileName = QDir(vbox.GetHomeFolder()).absoluteFilePath(QString("%1_ExtraData.xml").arg(currentChooserName()));
+    const QString strInitialFileName = QDir(vboxGlobal().HomeFolder()).absoluteFilePath(QString("%1_ExtraData.xml").arg(currentChooserName()));
     /* Open file-save dialog to choose file to save extra-data into: */
     const QString strFileName = QIFileDialog::getSaveFileName(strInitialFileName, "XML files (*.xml)", this,
@@ -1041 +1040 @@
 
     /* Compose initial file-name: */
-    const CVirtualBox vbox = vboxGlobal().virtualBox();
-    const QString strInitialFileName = QDir(vbox.GetHomeFolder()).absoluteFilePath(QString("%1_ExtraData.xml").arg(currentChooserName()));
+    const QString strInitialFileName = QDir(vboxGlobal().HomeFolder()).absoluteFilePath(QString("%1_ExtraData.xml").arg(currentChooserName()));
     /* Open file-open dialog to choose file to open extra-data into: */
     const QString strFileName = QIFileDialog::getOpenFileName(strInitialFileName, "XML files (*.xml)", this,

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp

@@ -2523 +2523 @@
     QString strUserManualFileName1 = vboxGlobal().helpFile();
     QString strShortFileName = QFileInfo(strUserManualFileName1).fileName();
-    QString strUserManualFileName2 = QDir(vboxGlobal().virtualBox().GetHomeFolder()).absoluteFilePath(strShortFileName);
+    QString strUserManualFileName2 = QDir(vboxGlobal().HomeFolder()).absoluteFilePath(strShortFileName);
     /* Show if user manual already present: */
     if (QFile::exists(strUserManualFileName1))

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -1602 +1602 @@
     }
     QString strHomeFolder = fUseLastFolder && !strLastFolder.isEmpty() ? strLastFolder :
-                            strDefaultFolder.isEmpty() ? vboxGlobal().virtualBox().GetHomeFolder() : strDefaultFolder;
+                            strDefaultFolder.isEmpty() ? vboxGlobal().homeFolder() : strDefaultFolder;
 
     /* Prepare filters and backends: */
@@ -3877 +3877 @@
     }
     mHost = virtualBox().GetHost();
+    mHomeFolder = virtualBox().GetHomeFolder();
 
     /* create default non-null global settings */

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h

@@ -104 +104 @@
     CVirtualBox virtualBox() const { return mVBox; }
     CHost host() const { return mHost; }
+    QString homeFolder() const { return mHomeFolder; }
 
     VBoxGlobalSettings &settings() { return gset; }
@@ -431 +432 @@
     CVirtualBox mVBox;
     CHost mHost;
+    QString mHomeFolder;
 
     VBoxGlobalSettings gset;

trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderAdditions.cpp

@@ -64 +64 @@
     const QString &strName = QString("VBoxGuestAdditions_%1.iso").arg(vboxGlobal().vboxVersionStringNormalized());
     const QString &strSource = QString("http://download.virtualbox.org/virtualbox/%1/").arg(vboxGlobal().vboxVersionStringNormalized()) + strName;
-    const QString &strTarget = QDir(vboxGlobal().virtualBox().GetHomeFolder()).absoluteFilePath(strName);
+    const QString &strTarget = QDir(vboxGlobal().homeFolder()).absoluteFilePath(strName);
 
     /* Set source/target: */

trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderExtensionPack.cpp

@@ -70 +70 @@
     QString strSourceName(strTemplateSourceName.arg(vboxGlobal().vboxVersionStringNormalized()));
     QString strSource(strSourcePath + strSourceName);
-    QString strTargetPath(vboxGlobal().virtualBox().GetHomeFolder());
+    QString strTargetPath(vboxGlobal().homeFolder());
     QString strTargetName(strSourceName);
     QString strTarget(QDir(strTargetPath).absoluteFilePath(strTargetName));

trunk/src/VBox/Frontends/VirtualBox/src/net/UIDownloaderUserManual.cpp

@@ -70 +70 @@
 
     /* Set target: */
-    QString strUserManualDestination = QDir(vboxGlobal().virtualBox().GetHomeFolder()).absoluteFilePath(strUserManualShortFileName);
+    QString strUserManualDestination = QDir(vboxGlobal().homeFolder()).absoluteFilePath(strUserManualShortFileName);
     setTarget(strUserManualDestination);
 }

trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkReply.cpp

@@ -207 +207 @@
 QString UINetworkReplyPrivateThread::fullCertificateFileName()
 {
-    const QDir homeDir(QDir::toNativeSeparators(vboxGlobal().virtualBox().GetHomeFolder()));
+    const QDir homeDir(QDir::toNativeSeparators(vboxGlobal().homeFolder()));
     return QDir::toNativeSeparators(homeDir.absoluteFilePath(m_strCertificateFileName));
 }

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsGeneral.cpp

@@ -44 +44 @@
 
     /* Setup widgets: */
-    m_pSelectorMachineFolder->setHomeDir(vboxGlobal().virtualBox().GetHomeFolder());
-    m_pSelectorVRDPLibName->setHomeDir(vboxGlobal().virtualBox().GetHomeFolder());
+    m_pSelectorMachineFolder->setHomeDir(vboxGlobal().homeFolder());
+    m_pSelectorVRDPLibName->setHomeDir(vboxGlobal().homeFolder());
     m_pSelectorVRDPLibName->setMode(VBoxFilePathSelectorWidget::Mode_File_Open);