diff options
| author | Guy Harris <guy@alum.mit.edu> | 2016-02-23 21:09:04 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2016-02-24 05:09:42 +0000 |
| commit | ec691a9e20effe7998c02b21d592059b8da00488 (patch) | |
| tree | 94f7ffb63859af5a9f9b61e7d5a3dc85a4c0aa30 | |
| parent | 8d256d26d3fda27d521e4edffd6713c0dfcc1c66 (diff) | |
| download | wireshark-ec691a9e20effe7998c02b21d592059b8da00488.tar.gz | |
De-canonicalize paths for file and directory path preferences.
Undo Qt's "helpful" canonicalization of paths returned by the file
dialogs to use / as the pathname component separator rather than using
the native pathname component separator.
Bug: 12117
Change-Id: I6077191a2204574ca50f53b5424f7f421db33db3
Reviewed-on: https://code.wireshark.org/review/14109
Reviewed-by: Guy Harris <guy@alum.mit.edu>
| -rw-r--r-- | ui/qt/module_preferences_scroll_area.cpp | 4 | ||||
| -rw-r--r-- | ui/qt/preferences_dialog.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ui/qt/module_preferences_scroll_area.cpp b/ui/qt/module_preferences_scroll_area.cpp index c9ac847f07..4aaa3b21f2 100644 --- a/ui/qt/module_preferences_scroll_area.cpp +++ b/ui/qt/module_preferences_scroll_area.cpp @@ -502,7 +502,7 @@ void ModulePreferencesScrollArea::filenamePushButtonPressed() if (!filename.isEmpty()) { g_free((void *)pref->stashed_val.string); - pref->stashed_val.string = qstring_strdup(filename); + pref->stashed_val.string = qstring_strdup(QDir::toNativeSeparators(filename)); updateWidgets(); } } @@ -520,7 +520,7 @@ void ModulePreferencesScrollArea::dirnamePushButtonPressed() if (!dirname.isEmpty()) { g_free((void *)pref->stashed_val.string); - pref->stashed_val.string = qstring_strdup(dirname); + pref->stashed_val.string = qstring_strdup(QDir::toNativeSeparators(dirname)); updateWidgets(); } } diff --git a/ui/qt/preferences_dialog.cpp b/ui/qt/preferences_dialog.cpp index f8c16f83dc..0908901783 100644 --- a/ui/qt/preferences_dialog.cpp +++ b/ui/qt/preferences_dialog.cpp @@ -627,7 +627,7 @@ void PreferencesDialog::on_advancedTree_itemActivated(QTreeWidgetItem *item, int } if (!filename.isEmpty()) { g_free((void *)pref->stashed_val.string); - pref->stashed_val.string = qstring_strdup(filename); + pref->stashed_val.string = qstring_strdup(QDir::toNativeSeparators(filename)); updateItem(*item); } break; |