diff options
| author | Gerald Combs <gerald@wireshark.org> | 2012-09-26 21:16:59 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2012-09-26 21:16:59 +0000 |
| commit | b3ced494126802091ac25090a941bae99d8a8d5b (patch) | |
| tree | 7e3bd3f728bb160b8f35fe31beb4a8b5139658ec /ui/qt/capture_file_dialog.h | |
| parent | 9636d1655d0859b530162604c620ac3fcb73d62c (diff) | |
Fix compilation on Windows.
svn path=/trunk/; revision=45160
Diffstat (limited to 'ui/qt/capture_file_dialog.h')
| -rw-r--r-- | ui/qt/capture_file_dialog.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ui/qt/capture_file_dialog.h b/ui/qt/capture_file_dialog.h index 94d1dbadbe..12f19d9479 100644 --- a/ui/qt/capture_file_dialog.h +++ b/ui/qt/capture_file_dialog.h @@ -62,9 +62,8 @@ class CaptureFileDialog : public QFileDialog Q_OBJECT public: explicit CaptureFileDialog(QWidget *parent = NULL, QString &display_filter = *new QString()); -#if !defined(Q_WS_WIN) - static check_savability_t checkSaveAsWithComments(capture_file *cf, int file_type); -#endif // Q_WS_WIN + static check_savability_t checkSaveAsWithComments(QWidget *parent, capture_file *cf, int file_type); + int mergeType(); int selectedFileType(); bool isCompressed(); @@ -113,7 +112,7 @@ private: #else // Q_WS_WIN int file_type_; int merge_type_; - bool compressed_; + gboolean compressed_; #endif // Q_WS_WIN signals: |