diff options
author | Evan Huus <eapache@gmail.com> | 2012-10-13 01:15:35 +0000 |
---|---|---|
committer | Evan Huus <eapache@gmail.com> | 2012-10-13 01:15:35 +0000 |
commit | 1ed9eb2ece25c58bdcf2fd8bec1bb0619a05eb86 (patch) | |
tree | bb03b9c5ff36a01b9e8e26f670e0d60c481a76d0 /ui/qt/export_dissection_dialog.cpp | |
parent | 818cf887f9f4dac418651c9a74e6292df5d75ea8 (diff) |
Fix compilation with GCC:
- initialization order
- unused and uninitialized local print_args_t
- missing comment on #endif
svn path=/trunk/; revision=45517
Diffstat (limited to 'ui/qt/export_dissection_dialog.cpp')
-rw-r--r-- | ui/qt/export_dissection_dialog.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/ui/qt/export_dissection_dialog.cpp b/ui/qt/export_dissection_dialog.cpp index dcd3082332..0fe701335a 100644 --- a/ui/qt/export_dissection_dialog.cpp +++ b/ui/qt/export_dissection_dialog.cpp @@ -49,11 +49,11 @@ ExportDissectionDialog::ExportDissectionDialog(QWidget *parent, capture_file *cap_file, export_type_e export_type): QFileDialog(parent), - cap_file_(cap_file), - export_type_(export_type) + export_type_(export_type), + cap_file_(cap_file) #if !defined(Q_WS_WIN) , save_bt_(NULL) - #endif Q_WS_WIN + #endif /* Q_WS_WIN */ { #if !defined(Q_WS_WIN) QDialogButtonBox *button_box = findChild<QDialogButtonBox *>(); @@ -131,7 +131,6 @@ int ExportDissectionDialog::exec() retval = QFileDialog::exec(); if (retval == QDialog::Accepted && selectedFiles().length() > 0) { - print_args_t print_args; cf_print_status_t status; QString file_name = selectedFiles()[0]; @@ -187,10 +186,10 @@ int ExportDissectionDialog::exec() case CF_PRINT_OK: break; case CF_PRINT_OPEN_ERROR: - open_failure_alert_box(print_args.file, errno, TRUE); + open_failure_alert_box(print_args_.file, errno, TRUE); break; case CF_PRINT_WRITE_ERROR: - write_failure_alert_box(print_args.file, errno); + write_failure_alert_box(print_args_.file, errno); break; } |