From 9db6d700cde9bcc88c00c86e5439079e06911c2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Mayer?= <jmayer@loplof.de>
Date: Wed, 24 Apr 2013 11:07:25 +0000
Subject: 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
---
 ui/qt/export_dissection_dialog.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'ui/qt/export_dissection_dialog.cpp')

diff --git a/ui/qt/export_dissection_dialog.cpp b/ui/qt/export_dissection_dialog.cpp
index 7e38909571..62a2c4d559 100644
--- a/ui/qt/export_dissection_dialog.cpp
+++ b/ui/qt/export_dissection_dialog.cpp
@@ -23,11 +23,11 @@
 
 #include "export_dissection_dialog.h"
 
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN
 #include <windows.h>
 #include "packet-range.h"
 #include "ui/win32/file_dlg_win32.h"
-#else // Q_WS_WIN
+#else // Q_OS_WIN
 #include "print.h"
 
 #include "ui/alert_box.h"
@@ -43,17 +43,17 @@
 #include <QGridLayout>
 #include <QPushButton>
 
-#endif // Q_WS_WIN
+#endif // Q_OS_WIN
 
 ExportDissectionDialog::ExportDissectionDialog(QWidget *parent, capture_file *cap_file, export_type_e export_type):
     QFileDialog(parent),
     export_type_(export_type),
     cap_file_(cap_file)
-  #if !defined(Q_WS_WIN)
+  #if !defined(Q_OS_WIN)
     , save_bt_(NULL)
- #endif /* Q_WS_WIN */
+ #endif /* Q_OS_WIN */
 {
-#if !defined(Q_WS_WIN)
+#if !defined(Q_OS_WIN)
     QDialogButtonBox *button_box = findChild<QDialogButtonBox *>();
     QGridLayout *fd_grid = qobject_cast<QGridLayout*>(layout());
     QHBoxLayout *h_box = new QHBoxLayout();
@@ -112,8 +112,8 @@ ExportDissectionDialog::ExportDissectionDialog(QWidget *parent, capture_file *ca
     // Grow the dialog to account for the extra widgets.
     resize(width(), height() + (packet_range_group_box_.height() * 2 / 3));
 
-#else // Q_WS_WIN
-#endif // Q_WS_WIN
+#else // Q_OS_WIN
+#endif // Q_OS_WIN
 }
 
 ExportDissectionDialog::~ExportDissectionDialog()
@@ -122,7 +122,7 @@ ExportDissectionDialog::~ExportDissectionDialog()
 
 int ExportDissectionDialog::exec()
 {
-#if !defined(Q_WS_WIN)
+#if !defined(Q_OS_WIN)
     int retval;
 
     if (!cap_file_) return QDialog::Rejected;
@@ -200,13 +200,13 @@ int ExportDissectionDialog::exec()
     }
 
     return retval;
-#else // Q_WS_WIN
+#else // Q_OS_WIN
     win32_export_file(parentWidget()->effectiveWinId(), cap_file_, export_type_);
     return QDialog::Accepted;
-#endif // Q_WS_WIN
+#endif // Q_OS_WIN
 }
 
-#ifndef Q_WS_WIN
+#ifndef Q_OS_WIN
 void ExportDissectionDialog::exportTypeChanged(QString name_filter)
 {
     export_type_ = export_type_map_.value(name_filter);
@@ -243,7 +243,7 @@ void ExportDissectionDialog::on_buttonBox_helpRequested()
 {
     wsApp->helpTopicAction(HELP_EXPORT_FILE_DIALOG);
 }
-#endif // Q_WS_WIN
+#endif // Q_OS_WIN
 
 /*
  * Editor modelines
-- 
cgit v1.2.3