Changeset 52816 in vbox for trunk

Timestamp:

Sep 22, 2014 1:46:28 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: Few small bug-fixes, thanks PVS

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extensions/QIFileDialog.cpp (modified) (2 diffs)
• widgets/UIApplianceEditorWidget.h (modified) (1 diff)
• wizards/exportappliance/UIWizardExportApp.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIFileDialog.cpp

@@ -481 +481 @@
             ofn.lStructSize = sizeof (OPENFILENAME);
             ofn.hwndOwner = topParent ? topParent->winId() : 0;
-            ofn.lpstrFilter = (TCHAR *) winFilters.isNull() ? 0 : winFilters.utf16();
+            ofn.lpstrFilter = (TCHAR *)(winFilters.isNull() ? 0 : winFilters.utf16());
             ofn.lpstrFile = buf;
             ofn.nMaxFile = sizeof (buf) - 1;
-            ofn.lpstrInitialDir = (TCHAR *) workDir.isNull() ? 0 : workDir.utf16();
-            ofn.lpstrTitle = (TCHAR *) title.isNull() ? 0 : title.utf16();
+            ofn.lpstrInitialDir = (TCHAR *)(workDir.isNull() ? 0 : workDir.utf16());
+            ofn.lpstrTitle = (TCHAR *)(title.isNull() ? 0 : title.utf16());
             ofn.Flags = (OFN_NOCHANGEDIR | OFN_HIDEREADONLY |
                          OFN_EXPLORER | OFN_ENABLEHOOK |
@@ -738 +738 @@
             ofn.lStructSize = sizeof (OPENFILENAME);
             ofn.hwndOwner = topParent ? topParent->winId() : 0;
-            ofn.lpstrFilter = (TCHAR *) winFilters.isNull() ? 0 : winFilters.utf16();
+            ofn.lpstrFilter = (TCHAR *)(winFilters.isNull() ? 0 : winFilters.utf16());
             ofn.lpstrFile = buf;
             ofn.nMaxFile = sizeof (buf) - 1;
-            ofn.lpstrInitialDir = (TCHAR *) workDir.isNull() ? 0 : workDir.utf16();
-            ofn.lpstrTitle = (TCHAR *) title.isNull() ? 0 : title.utf16();
+            ofn.lpstrInitialDir = (TCHAR *)(workDir.isNull() ? 0 : workDir.utf16());
+            ofn.lpstrTitle = (TCHAR *)(title.isNull() ? 0 : title.utf16());
             ofn.Flags = (OFN_NOCHANGEDIR | OFN_HIDEREADONLY |
                           OFN_EXPLORER | OFN_ENABLEHOOK |

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.h

@@ -52 +52 @@
     ModelItem(int number, ModelItem_type type, ModelItem *pParent = NULL);
 
-    ~ModelItem();
+    virtual ~ModelItem();
 
     ModelItem *parent() const { return m_pParentItem; }

trunk/src/VBox/Frontends/VirtualBox/src/wizards/exportappliance/UIWizardExportApp.cpp

@@ -181 +181 @@
             if (!field("password").toString().isEmpty())
                 uri = QString("%1:%2").arg(uri).arg(field("password").toString());
-            if (!field("username").toString().isEmpty() || !field("username").toString().isEmpty())
+            if (!field("username").toString().isEmpty() || !field("password").toString().isEmpty())
                 uri = QString("%1@").arg(uri);
             uri = QString("%1%2/%3/%4").arg(uri).arg("object.storage.network.com").arg(field("bucket").toString()).arg(path);