diff options
author | Gerald Combs <gerald@wireshark.org> | 2012-10-13 00:18:46 +0000 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2012-10-13 00:18:46 +0000 |
commit | 419f851e34263e0100ba9f013c267ce9858694ed (patch) | |
tree | 098671835b211efe7ce3abc207f359c7978e8126 /ui | |
parent | cfa22deaae3169b3bca9fd4cd9c564d391531bb0 (diff) | |
download | wireshark-419f851e34263e0100ba9f013c267ce9858694ed.tar.gz |
Fix Windows compilation problems from r45513. #ifdef out some non-Windows
code. Get rid of a few uses of the global cfile.
svn path=/trunk/; revision=45514
Diffstat (limited to 'ui')
-rw-r--r-- | ui/gtk/print_dlg.c | 2 | ||||
-rw-r--r-- | ui/qt/capture_file_dialog.cpp | 217 | ||||
-rw-r--r-- | ui/qt/capture_file_dialog.h | 7 | ||||
-rw-r--r-- | ui/qt/export_dissection_dialog.cpp | 31 | ||||
-rw-r--r-- | ui/qt/export_dissection_dialog.h | 10 | ||||
-rw-r--r-- | ui/qt/main_window.cpp | 3 | ||||
-rw-r--r-- | ui/win32/file_dlg_win32.c | 14 | ||||
-rw-r--r-- | ui/win32/file_dlg_win32.h | 2 |
8 files changed, 143 insertions, 143 deletions
diff --git a/ui/gtk/print_dlg.c b/ui/gtk/print_dlg.c index a43f21311d..3507868933 100644 --- a/ui/gtk/print_dlg.c +++ b/ui/gtk/print_dlg.c @@ -184,7 +184,7 @@ static gboolean export_text_prefs_init = FALSE; void export_text_cmd_cb(GtkWidget *widget _U_, gpointer data _U_) { - win32_export_file(GDK_WINDOW_HWND(gtk_widget_get_window(top_level)), export_type_text); + win32_export_file(GDK_WINDOW_HWND(gtk_widget_get_window(top_level)), &cfile export_type_text); return; } #else diff --git a/ui/qt/capture_file_dialog.cpp b/ui/qt/capture_file_dialog.cpp index b42006e7a6..d67b66d053 100644 --- a/ui/qt/capture_file_dialog.cpp +++ b/ui/qt/capture_file_dialog.cpp @@ -30,7 +30,7 @@ #include <windows.h> #include "packet-range.h" #include "ui/win32/file_dlg_win32.h" -#endif +#else // Q_WS_WIN #include <errno.h> #include "file.h" @@ -47,6 +47,7 @@ #include <QFileInfo> #include <QMessageBox> #include <QSpacerItem> +#endif // Q_WS_WIN #include <QDebug> @@ -244,68 +245,92 @@ check_savability_t CaptureFileDialog::checkSaveAsWithComments(QWidget * #endif // Q_WS_WIN } -void CaptureFileDialog::addPreview(QVBoxLayout &v_box) { - QGridLayout *preview_grid = new QGridLayout(); - QLabel *lbl; - preview_labels_.clear(); - v_box.addLayout(preview_grid); +// You have to use open, merge, saveAs, or exportPackets. We should +// probably just make each type a subclass. +int CaptureFileDialog::exec() { + return QDialog::Rejected; +} - preview_grid->setColumnStretch(0, 0); - preview_grid->setColumnStretch(1, 10); - lbl = new QLabel(tr("Format:")); - preview_grid->addWidget(lbl, 0, 0); - preview_grid->addWidget(&preview_format_, 0, 1); - preview_labels_ << lbl << &preview_format_; - lbl = new QLabel(tr("Size:")); - preview_grid->addWidget(lbl, 1, 0); - preview_grid->addWidget(&preview_size_, 1, 1); - preview_labels_ << lbl << &preview_size_; +// Windows +#ifdef Q_WS_WIN +int CaptureFileDialog::selectedFileType() { + return file_type_; +} - lbl = new QLabel(tr("Packets:")); - preview_grid->addWidget(lbl, 2, 0); - preview_grid->addWidget(&preview_packets_, 2, 1); - preview_labels_ << lbl << &preview_packets_; +bool CaptureFileDialog::isCompressed() { + return compressed_; +} - lbl = new QLabel(tr("First Packet:")); - preview_grid->addWidget(lbl, 3, 0); - preview_grid->addWidget(&preview_first_, 3, 1); - preview_labels_ << lbl << &preview_first_; +int CaptureFileDialog::open(QString &file_name) { + GString *fname = g_string_new(file_name.toUtf8().constData()); + GString *dfilter = g_string_new(display_filter_.toUtf8().constData()); + gboolean wof_status; - lbl = new QLabel(tr("Elapsed Time:")); - preview_grid->addWidget(lbl, 4, 0); - preview_grid->addWidget(&preview_elapsed_, 4, 1); - preview_labels_ << lbl << &preview_elapsed_; + wof_status = win32_open_file(parentWidget()->effectiveWinId(), fname, dfilter); + file_name = fname->str; + display_filter_ = dfilter->str; - connect(this, SIGNAL(currentChanged(const QString &)), this, SLOT(preview(const QString &))); + g_string_free(fname, TRUE); + g_string_free(dfilter, TRUE); - preview(""); + return (int) wof_status; } -void CaptureFileDialog::addMergeControls(QVBoxLayout &v_box) { +check_savability_t CaptureFileDialog::saveAs(QString &file_name, bool must_support_comments) { + GString *fname = g_string_new(file_name.toUtf8().constData()); + gboolean wsf_status; - merge_prepend_.setText("Prepend packets"); - merge_prepend_.setToolTip("Insert packets from the selected file before the current file. Packet timestamps will be ignored."); - v_box.addWidget(&merge_prepend_, 0, Qt::AlignTop); + wsf_status = win32_save_as_file(parentWidget()->effectiveWinId(), cap_file_, fname, &file_type_, &compressed_, must_support_comments); + file_name = fname->str; - merge_chrono_.setText("Merge chronologically"); - merge_chrono_.setToolTip("Insert packets in chronological order."); - merge_chrono_.setChecked(true); - v_box.addWidget(&merge_chrono_, 0, Qt::AlignTop); + g_string_free(fname, TRUE); - merge_append_.setText("Append packets"); - merge_append_.setToolTip("Insert packets from the selected file after the current file. Packet timestamps will be ignored."); - v_box.addWidget(&merge_append_, 0, Qt::AlignTop); + if (wsf_status) { + return win32_check_save_as_with_comments(parentWidget()->effectiveWinId(), cap_file_, file_type_); + } + + return CANCELLED; } -// You have to use open, merge, saveAs, or exportPackets. We should -// probably just make each type a subclass. -int CaptureFileDialog::exec() { - return QDialog::Rejected; +check_savability_t CaptureFileDialog::exportSelectedPackets(QString &file_name, packet_range_t *range) { + GString *fname = g_string_new(file_name.toUtf8().constData()); + gboolean wespf_status; + + wespf_status = win32_export_specified_packets_file(parentWidget()->effectiveWinId(), fname, &file_type_, &compressed_, range); + file_name = fname->str; + + g_string_free(fname, TRUE); + + if (wespf_status) { + return win32_check_save_as_with_comments(parentWidget()->effectiveWinId(), cap_file_, file_type_); + } + + return CANCELLED; } +int CaptureFileDialog::merge(QString &file_name) { + GString *fname = g_string_new(file_name.toUtf8().constData()); + GString *dfilter = g_string_new(display_filter_.toUtf8().constData()); + gboolean wmf_status; + + wmf_status = win32_merge_file(parentWidget()->effectiveWinId(), fname, dfilter, &merge_type_); + file_name = fname->str; + display_filter_ = dfilter->str; + + g_string_free(fname, TRUE); + g_string_free(dfilter, TRUE); + + return (int) wmf_status; +} + +int CaptureFileDialog::mergeType() { + return merge_type_; +} + +#else // not Q_WS_WINDOWS QString CaptureFileDialog::fileType(int ft, bool extension_globs) { QString filter; @@ -363,84 +388,62 @@ QStringList CaptureFileDialog::buildFileOpenTypeList() { return filters; } +void CaptureFileDialog::addPreview(QVBoxLayout &v_box) { + QGridLayout *preview_grid = new QGridLayout(); + QLabel *lbl; -// Windows -#ifdef Q_WS_WIN -int CaptureFileDialog::selectedFileType() { - return file_type_; -} - -bool CaptureFileDialog::isCompressed() { - return compressed_; -} - -int CaptureFileDialog::open(QString &file_name) { - GString *fname = g_string_new(file_name.toUtf8().constData()); - GString *dfilter = g_string_new(display_filter_.toUtf8().constData()); - gboolean wof_status; - - wof_status = win32_open_file(parentWidget()->effectiveWinId(), fname, dfilter); - file_name = fname->str; - display_filter_ = dfilter->str; - - g_string_free(fname, TRUE); - g_string_free(dfilter, TRUE); - - return (int) wof_status; -} - -check_savability_t CaptureFileDialog::saveAs(QString &file_name, bool must_support_comments) { - GString *fname = g_string_new(file_name.toUtf8().constData()); - gboolean wsf_status; - - wsf_status = win32_save_as_file(parentWidget()->effectiveWinId(), cap_file_, fname, &file_type_, &compressed_, must_support_comments); - file_name = fname->str; + preview_labels_.clear(); + v_box.addLayout(preview_grid); - g_string_free(fname, TRUE); + preview_grid->setColumnStretch(0, 0); + preview_grid->setColumnStretch(1, 10); - if (wsf_status) { - return win32_check_save_as_with_comments(parentWidget()->effectiveWinId(), cap_file_, file_type_); - } + lbl = new QLabel(tr("Format:")); + preview_grid->addWidget(lbl, 0, 0); + preview_grid->addWidget(&preview_format_, 0, 1); + preview_labels_ << lbl << &preview_format_; - return CANCELLED; -} + lbl = new QLabel(tr("Size:")); + preview_grid->addWidget(lbl, 1, 0); + preview_grid->addWidget(&preview_size_, 1, 1); + preview_labels_ << lbl << &preview_size_; -check_savability_t CaptureFileDialog::exportSelectedPackets(QString &file_name, packet_range_t *range) { - GString *fname = g_string_new(file_name.toUtf8().constData()); - gboolean wespf_status; + lbl = new QLabel(tr("Packets:")); + preview_grid->addWidget(lbl, 2, 0); + preview_grid->addWidget(&preview_packets_, 2, 1); + preview_labels_ << lbl << &preview_packets_; - wespf_status = win32_export_specified_packets_file(parentWidget()->effectiveWinId(), fname, &file_type_, &compressed_, range); - file_name = fname->str; + lbl = new QLabel(tr("First Packet:")); + preview_grid->addWidget(lbl, 3, 0); + preview_grid->addWidget(&preview_first_, 3, 1); + preview_labels_ << lbl << &preview_first_; - g_string_free(fname, TRUE); + lbl = new QLabel(tr("Elapsed Time:")); + preview_grid->addWidget(lbl, 4, 0); + preview_grid->addWidget(&preview_elapsed_, 4, 1); + preview_labels_ << lbl << &preview_elapsed_; - if (wespf_status) { - return win32_check_save_as_with_comments(parentWidget()->effectiveWinId(), cap_file_, file_type_); - } + connect(this, SIGNAL(currentChanged(const QString &)), this, SLOT(preview(const QString &))); - return CANCELLED; + preview(""); } -int CaptureFileDialog::merge(QString &file_name) { - GString *fname = g_string_new(file_name.toUtf8().constData()); - GString *dfilter = g_string_new(display_filter_.toUtf8().constData()); - gboolean wmf_status; - - wmf_status = win32_merge_file(parentWidget()->effectiveWinId(), fname, dfilter, &merge_type_); - file_name = fname->str; - display_filter_ = dfilter->str; +void CaptureFileDialog::addMergeControls(QVBoxLayout &v_box) { - g_string_free(fname, TRUE); - g_string_free(dfilter, TRUE); + merge_prepend_.setText("Prepend packets"); + merge_prepend_.setToolTip("Insert packets from the selected file before the current file. Packet timestamps will be ignored."); + v_box.addWidget(&merge_prepend_, 0, Qt::AlignTop); - return (int) wmf_status; -} + merge_chrono_.setText("Merge chronologically"); + merge_chrono_.setToolTip("Insert packets in chronological order."); + merge_chrono_.setChecked(true); + v_box.addWidget(&merge_chrono_, 0, Qt::AlignTop); -int CaptureFileDialog::mergeType() { - return merge_type_; + merge_append_.setText("Append packets"); + merge_append_.setToolTip("Insert packets from the selected file after the current file. Packet timestamps will be ignored."); + v_box.addWidget(&merge_append_, 0, Qt::AlignTop); } -#else // not Q_WS_WINDOWS int CaptureFileDialog::selectedFileType() { return type_hash_.value(selectedNameFilter(), -1); } diff --git a/ui/qt/capture_file_dialog.h b/ui/qt/capture_file_dialog.h index 779b60c60b..9e49f9e2ba 100644 --- a/ui/qt/capture_file_dialog.h +++ b/ui/qt/capture_file_dialog.h @@ -74,6 +74,10 @@ public: bool isCompressed(); private: + capture_file *cap_file_; + QString &display_filter_; + +#if !defined(Q_WS_WIN) void addMergeControls(QVBoxLayout &v_box); void addDisplayFilterEdit(); void addPreview(QVBoxLayout &v_box); @@ -83,8 +87,6 @@ private: QVBoxLayout left_v_box_; QVBoxLayout right_v_box_; - QString &display_filter_; - capture_file *cap_file_; DisplayFilterEdit* display_filter_edit_; int last_row_; @@ -101,7 +103,6 @@ private: QHash<QString, int>type_hash_; -#if !defined(Q_WS_WIN) void addResolutionControls(QVBoxLayout &v_box); void addGzipControls(QVBoxLayout &v_box); void addRangeControls(QVBoxLayout &v_box, packet_range_t *range); diff --git a/ui/qt/export_dissection_dialog.cpp b/ui/qt/export_dissection_dialog.cpp index 47ba3d72cc..dcd3082332 100644 --- a/ui/qt/export_dissection_dialog.cpp +++ b/ui/qt/export_dissection_dialog.cpp @@ -23,7 +23,11 @@ #include "export_dissection_dialog.h" -#if !defined(Q_WS_WIN) +#ifdef Q_WS_WIN +#include <windows.h> +#include "packet-range.h" +#include "ui/win32/file_dlg_win32.h" +#else // Q_WS_WIN #include "print.h" #include "ui/alert_box.h" @@ -43,11 +47,13 @@ #include <QDebug> #endif // Q_WS_WIN -ExportDissectionDialog::ExportDissectionDialog(QWidget *parent, export_type_e export_type, capture_file *cap_file): +ExportDissectionDialog::ExportDissectionDialog(QWidget *parent, capture_file *cap_file, export_type_e export_type): QFileDialog(parent), - export_type_(export_type), cap_file_(cap_file), - save_bt_(NULL) + export_type_(export_type) + #if !defined(Q_WS_WIN) + , save_bt_(NULL) + #endif Q_WS_WIN { #if !defined(Q_WS_WIN) QDialogButtonBox *button_box = findChild<QDialogButtonBox *>(); @@ -198,11 +204,12 @@ int ExportDissectionDialog::exec() return retval; #else // Q_WS_WIN - win32_export_file(parent->effectiveWinId(), export_type_); + win32_export_file(parentWidget()->effectiveWinId(), cap_file_, export_type_); return QDialog::Accepted; #endif // Q_WS_WIN } +#ifndef Q_WS_WIN void ExportDissectionDialog::exportTypeChanged(QString name_filter) { export_type_ = export_type_map_.value(name_filter); @@ -234,16 +241,4 @@ void ExportDissectionDialog::checkValidity() save_bt_->setEnabled(enable); } - -//#if !defined(Q_WS_WIN) -//void ExportDissectionDialog::on_buttonBox_helpRequested() -//{ -// gchar *url = topic_action_url(HELP_EXPORT_FILE_DIALOG); - -// if(url != NULL) { -// QDesktopServices::openUrl(QUrl(url)); -// g_free(url); -// } -//} - -//#endif // Q_WS_WIN +#endif // Q_WS_WIN diff --git a/ui/qt/export_dissection_dialog.h b/ui/qt/export_dissection_dialog.h index c6b462e82d..4de468904a 100644 --- a/ui/qt/export_dissection_dialog.h +++ b/ui/qt/export_dissection_dialog.h @@ -34,8 +34,8 @@ #include "ui/file_dialog.h" #ifndef Q_WS_WIN -#import "packet_range_group_box.h" -#import "packet_format_group_box.h" +#include "packet_range_group_box.h" +#include "packet_format_group_box.h" #endif // Q_WS_WIN #include <QFileDialog> @@ -45,20 +45,22 @@ class ExportDissectionDialog : public QFileDialog Q_OBJECT public: - explicit ExportDissectionDialog(QWidget *parent, export_type_e export_type, capture_file *cap_file); + explicit ExportDissectionDialog(QWidget *parent, capture_file *cap_file, export_type_e export_type); ~ExportDissectionDialog(); public slots: int exec(); private slots: +#ifndef Q_WS_WIN void exportTypeChanged(QString name_filter); void checkValidity(); +#endif // Q_WS_WIN private: export_type_e export_type_; -#if !defined(Q_WS_WIN) capture_file *cap_file_; +#ifndef Q_WS_WIN print_args_t print_args_; QMap<QString, export_type_e> export_type_map_; diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp index 9f6492be9f..9431422246 100644 --- a/ui/qt/main_window.cpp +++ b/ui/qt/main_window.cpp @@ -838,8 +838,7 @@ void MainWindow::exportSelectedPackets() { } void MainWindow::exportDissections(export_type_e export_type) { - QString file_name = ""; - ExportDissectionDialog ed_dlg(this, export_type, cap_file_); + ExportDissectionDialog ed_dlg(this, cap_file_, export_type); packet_range_t range; if (!cap_file_) diff --git a/ui/win32/file_dlg_win32.c b/ui/win32/file_dlg_win32.c index 2761bedc4f..3ec0a3f9f8 100644 --- a/ui/win32/file_dlg_win32.c +++ b/ui/win32/file_dlg_win32.c @@ -605,7 +605,7 @@ win32_merge_file (HWND h_wnd, GString *file_name, GString *display_filter, int * } void -win32_export_file(HWND h_wnd, export_type_e export_type) { +win32_export_file(HWND h_wnd, capture_file *cf, export_type_e export_type) { OPENFILENAME *ofn; TCHAR file_name[MAX_PATH] = _T(""); char *dirname; @@ -670,7 +670,7 @@ win32_export_file(HWND h_wnd, export_type_e export_type) { g_free( (void *) ofn); return; } - status = cf_print_packets(&cfile, &print_args); + status = cf_print_packets(cf, &print_args); break; case export_type_ps: /* PostScript (r) */ print_args.stream = print_stream_ps_new(TRUE, print_args.file); @@ -679,19 +679,19 @@ win32_export_file(HWND h_wnd, export_type_e export_type) { g_free( (void *) ofn); return; } - status = cf_print_packets(&cfile, &print_args); + status = cf_print_packets(cf, &print_args); break; case export_type_csv: /* CSV */ - status = cf_write_csv_packets(&cfile, &print_args); + status = cf_write_csv_packets(cf, &print_args); break; case export_type_carrays: /* C Arrays */ - status = cf_write_carrays_packets(&cfile, &print_args); + status = cf_write_carrays_packets(cf, &print_args); break; case export_type_psml: /* PSML */ - status = cf_write_psml_packets(&cfile, &print_args); + status = cf_write_psml_packets(cf, &print_args); break; case export_type_pdml: /* PDML */ - status = cf_write_pdml_packets(&cfile, &print_args); + status = cf_write_pdml_packets(cf, &print_args); break; default: g_free( (void *) ofn); diff --git a/ui/win32/file_dlg_win32.h b/ui/win32/file_dlg_win32.h index d4a49d1921..36932ca3ea 100644 --- a/ui/win32/file_dlg_win32.h +++ b/ui/win32/file_dlg_win32.h @@ -93,7 +93,7 @@ gboolean win32_merge_file (HWND h_wnd, GString *file_name, GString *display_filt * @param h_wnd HWND of the parent window. * @param export_type The export type. */ -void win32_export_file (HWND h_wnd, export_type_e export_type); +void win32_export_file (HWND h_wnd, capture_file *cf, export_type_e export_type); /** Open the "Export raw bytes" dialog box. * |