Changeset 85466 in vbox for trunk/src/VBox

Timestamp:

Jul 27, 2020 9:42:02 AM (5 years ago)

Author:

vboxsync

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

139518

Message:

FE/Qt: bugref:9663. r139498 was not so well done.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageExpert.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvd/UIWizardNewVDPageExpert.cpp

@@ -44 +44 @@
 #include "CSystemProperties.h"
 
-/* Other VBox includes: */
-#include <iprt/path.h>
 
 UIWizardNewVDPageExpert::UIWizardNewVDPageExpert(const QString &strDefaultName, const QString &strDefaultPath, qulonglong uDefaultSize)
@@ -213 +211 @@
     {
         QFileInfo fileInfo(m_pLocationEditor->text());
-        QString strSuffix = fileInfo.suffix();
-        if (strSuffix != m_strDefaultExtension)
-        {
-            /* QFileInfo::baseName() removes completeSuffix() from the fileName(), which is everthing coming after the 'first'
-               dot. I want to allow disk names with dots in it. So I remove the string from fileName()
-               that comes after the 'last' dot: */
-            QByteArray strFileName = fileInfo.fileName().toUtf8();
-            RTPathStripSuffix(strFileName.data());
-            QString strNewFilePath = QString("%1/%2.%3")
-                .arg(fileInfo.absoluteDir().absolutePath())
-                .arg(QString(strFileName))
-                .arg(m_strDefaultExtension);
-            m_pLocationEditor->setText(strNewFilePath);
+        if (fileInfo.suffix() != m_strDefaultExtension)
+        {
+            QFileInfo newFileInfo(fileInfo.absolutePath(), QString("%1.%2").arg(fileInfo.completeBaseName()).arg(m_strDefaultExtension));
+            m_pLocationEditor->setText(newFileInfo.absoluteFilePath());
         }
     }