diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2018-11-17 19:08:06 +0100 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2018-11-17 19:25:14 +0000 |
| commit | 77578b081bdc57b2856577f1f3afb2bdc01f9ab2 (patch) | |
| tree | 9cb0fecf54f4f839aeca75a6c98d5c116ff00050 /ui/qt/main_window.cpp | |
| parent | 9891cb2c22485f88127022a5bf953bba0d693fd3 (diff) | |
Qt: fix build failure due to adding two incompatible pointers
Change-Id: I08d45c87c9232edcabfc69d25a773552fe9e0871
Fixes: v2.9.0rc0-2567-g43872a3a0e (""." in version numbers and file names isn't translated into other languages.")
Reviewed-on: https://code.wireshark.org/review/30680
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'ui/qt/main_window.cpp')
| -rw-r--r-- | ui/qt/main_window.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp index d671566398..8b2f7ee5c2 100644 --- a/ui/qt/main_window.cpp +++ b/ui/qt/main_window.cpp @@ -1652,7 +1652,7 @@ void MainWindow::fileAddExtension(QString &file_name, int file_type, wtap_compre /* OK, see if the file has one of those extensions. */ for (extension = extensions_list; extension != NULL; extension = g_slist_next(extension)) { - QString file_suffix = "." + (char *)extension->data; + QString file_suffix = QString(".") + (char *)extension->data; if (file_name_lower.endsWith(file_suffix)) { /* * The file name has one of the extensions for @@ -1677,7 +1677,7 @@ void MainWindow::fileAddExtension(QString &file_name, int file_type, wtap_compre } if (add_extension) { if (wtap_default_file_extension(file_type) != NULL) { - file_name += "." + wtap_default_file_extension(file_type); + file_name += QString(".") + wtap_default_file_extension(file_type); if (compression_type == WTAP_GZIP_COMPRESSED) { file_name += ".gz"; } |