summaryrefslogtreecommitdiff
path: root/ui/qt/supported_protocols_dialog.cpp
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2015-10-16 19:02:29 -0700
committerGerald Combs <gerald@wireshark.org>2015-10-17 03:18:01 +0000
commitfbef9e630ba87850c44dafd2280689d350912d1a (patch)
tree4226592d325458686bec338b31a9513de045f2af /ui/qt/supported_protocols_dialog.cpp
parent4695ea20cc8f241c5b2ae0e6fc380cc583ee5050 (diff)
downloadwireshark-fbef9e630ba87850c44dafd2280689d350912d1a.tar.gz
Fix a Qt 5.3 + MSVC 2013 + 64-bit warning.
Change-Id: I60837ce9e9a65f6bf318cab5bbacf9e3f4be5553 Reviewed-on: https://code.wireshark.org/review/11108 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/qt/supported_protocols_dialog.cpp')
-rw-r--r--ui/qt/supported_protocols_dialog.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/ui/qt/supported_protocols_dialog.cpp b/ui/qt/supported_protocols_dialog.cpp
index 9e10855cde..08ff8b116e 100644
--- a/ui/qt/supported_protocols_dialog.cpp
+++ b/ui/qt/supported_protocols_dialog.cpp
@@ -19,6 +19,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
+// warning C4267: 'argument' : conversion from 'size_t' to 'int', possible loss of data
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4267)
+#endif
+
#include "supported_protocols_dialog.h"
#include "ui_supported_protocols_dialog.h"
@@ -34,6 +40,10 @@
#include "wireshark_application.h"
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
enum { name_col_, filter_col_, type_col_, descr_col_ };
SupportedProtocolsDialog::SupportedProtocolsDialog(QWidget *parent) :