+ fix comment, convert native separators to UNIX separators

FreeCAD · Oct 25, 2015 · a3cd03a · a3cd03a
1 parent d58ccf7
commit a3cd03a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/App/PropertyStandard.h b/src/App/PropertyStandard.h
@@ -467,10 +467,10 @@ class AppExport PropertyFloat: public Property
 };
 
 /** Constraint float properties
- * This property fullfill the need of constraint float. It holds basicly a 
+ * This property fullfill the need of constraint float. It holds basicly a
  * state (float) and a struct of boundaries. If the boundaries
- * is not set it act basicly like a FloatProperty and do no checking.
- * The constraints struct can be created on the heap or build in.
+ * is not set it acts basicly like a PropertyFloat and does no checking
+ * The constraints struct can be created on the heap or built-in.
  */
 class AppExport PropertyFloatConstraint: public PropertyFloat
 {

diff --git a/src/Gui/FileDialog.cpp b/src/Gui/FileDialog.cpp
@@ -28,6 +28,7 @@
 # include <QCompleter>
 # include <QComboBox>
 # include <QDesktopServices>
+# include <QDir>
 # include <QGridLayout>
 # include <QGroupBox>
 # include <QLineEdit>
@@ -565,8 +566,7 @@ QString FileChooser::fileName() const
 
 void FileChooser::editingFinished()
 {
-    QString le_converted = lineEdit->text();
-    le_converted.replace(QString::fromStdString("\\"), QString::fromStdString("/"));
+    QString le_converted = QDir::fromNativeSeparators(lineEdit->text());
     lineEdit->setText(le_converted);
     FileDialog::setWorkingDirectory(le_converted);
     fileNameSelected(le_converted);
@@ -598,6 +598,7 @@ void FileChooser::chooseFile()
         fn = QFileDialog::getExistingDirectory( this, tr( "Select a directory" ), prechosenDirectory );
 
     if (!fn.isEmpty()) {
+        fn = QDir::fromNativeSeparators(fn);
         lineEdit->setText(fn);
         FileDialog::setWorkingDirectory(fn);
         fileNameSelected(fn);