diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2013-04-24 11:07:25 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2013-04-24 11:07:25 +0000 |
| commit | 9db6d700cde9bcc88c00c86e5439079e06911c2a (patch) | |
| tree | 4a88c9323f23a1e22234307e739af20c3b7a427a /ui/qt/capture_file_dialog.h | |
| parent | 2616e091409ba18c6f241a274e2af9d5e13853b0 (diff) | |
The porting guide for Qt5 requires that Q_OS_ be used instead
of Q_WS_ in Qt4 projects
See:
http://qt-project.org/doc/qt-5.0/qtdoc/portingguide.html
svn path=/trunk/; revision=49013
Diffstat (limited to 'ui/qt/capture_file_dialog.h')
| -rw-r--r-- | ui/qt/capture_file_dialog.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ui/qt/capture_file_dialog.h b/ui/qt/capture_file_dialog.h index 4dae59cc81..fdfa51c7d0 100644 --- a/ui/qt/capture_file_dialog.h +++ b/ui/qt/capture_file_dialog.h @@ -28,7 +28,7 @@ #include "display_filter_edit.h" #include "packet_range_group_box.h" #include "ui/help_url.h" -#endif // Q_WS_WIN +#endif // Q_OS_WIN #include "packet_list_record.h" #include "cfile.h" @@ -72,9 +72,9 @@ class CaptureFileDialog : public QFileDialog public: explicit CaptureFileDialog(QWidget *parent = NULL, capture_file *cf = NULL, QString &display_filter = *new QString()); static check_savability_t checkSaveAsWithComments(QWidget * -#if defined(Q_WS_WIN) +#if defined(Q_OS_WIN) parent -#endif // Q_WS_WIN +#endif // Q_OS_WIN , capture_file *cf, int file_type); int mergeType(); @@ -85,7 +85,7 @@ private: capture_file *cap_file_; QString &display_filter_; -#if !defined(Q_WS_WIN) +#if !defined(Q_OS_WIN) void addMergeControls(QVBoxLayout &v_box); void addDisplayFilterEdit(); void addPreview(QVBoxLayout &v_box); @@ -131,11 +131,11 @@ private: QPushButton *save_bt_; topic_action_e help_topic_; -#else // Q_WS_WIN +#else // Q_OS_WIN int file_type_; int merge_type_; gboolean compressed_; -#endif // Q_WS_WIN +#endif // Q_OS_WIN signals: @@ -148,10 +148,10 @@ public slots: int merge(QString &file_name); private slots: -#if !defined(Q_WS_WIN) +#if !defined(Q_OS_WIN) void preview(const QString & path); void on_buttonBox_helpRequested(); -#endif // Q_WS_WIN +#endif // Q_OS_WIN }; #endif // CAPTURE_FILE_DIALOG_H |