diff options
| author | Gerald Combs <gerald@zing.org> | 2014-09-04 20:42:42 -0700 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2014-09-05 04:03:56 +0000 |
| commit | f4e28192b214d199dca07a0d717790ad6bf34c42 (patch) | |
| tree | 66c34ef50fb786ceaf4a5f986acf718348b39288 /ui | |
| parent | 97b073810bd871729ba4f14de79072c6df20f4d6 (diff) | |
Fix compiler warnings from g30f3d52.
Change-Id: I76fa088f72f0e31da9be105919d56fd8db1ea7b5
Reviewed-on: https://code.wireshark.org/review/3999
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/qt/conversation_dialog.cpp | 14 | ||||
| -rw-r--r-- | ui/qt/endpoint_dialog.cpp | 10 | ||||
| -rw-r--r-- | ui/traffic_table_ui.h | 2 |
3 files changed, 13 insertions, 13 deletions
diff --git a/ui/qt/conversation_dialog.cpp b/ui/qt/conversation_dialog.cpp index 898a02c657..0821e84097 100644 --- a/ui/qt/conversation_dialog.cpp +++ b/ui/qt/conversation_dialog.cpp @@ -508,31 +508,31 @@ ConversationTreeWidget::ConversationTreeWidget(QWidget *parent, register_ct_t* t switch (i) { case CONV_COLUMN_SRC_ADDR: case CONV_COLUMN_DST_ADDR: - setColumnWidth(i, one_en * strlen("000.000.000.000")); + setColumnWidth(i, one_en * (int) strlen("000.000.000.000")); break; case CONV_COLUMN_SRC_PORT: case CONV_COLUMN_DST_PORT: - setColumnWidth(i, one_en * strlen("000000")); + setColumnWidth(i, one_en * (int) strlen("000000")); break; case CONV_COLUMN_PACKETS: case CONV_COLUMN_PKT_AB: case CONV_COLUMN_PKT_BA: - setColumnWidth(i, one_en * strlen("00,000")); + setColumnWidth(i, one_en * (int) strlen("00,000")); break; case CONV_COLUMN_BYTES: case CONV_COLUMN_BYTES_AB: case CONV_COLUMN_BYTES_BA: - setColumnWidth(i, one_en * strlen("000,000")); + setColumnWidth(i, one_en * (int) strlen("000,000")); break; case CONV_COLUMN_START: - setColumnWidth(i, one_en * strlen("00.000")); + setColumnWidth(i, one_en * (int) strlen("00.000")); break; case CONV_COLUMN_DURATION: - setColumnWidth(i, one_en * strlen("00.000000")); + setColumnWidth(i, one_en * (int) strlen("00.000000")); break; case CONV_COLUMN_BPS_AB: case CONV_COLUMN_BPS_BA: - setColumnWidth(i, one_en * strlen("000 k")); + setColumnWidth(i, one_en * (int) strlen("000 k")); break; default: setColumnWidth(i, one_en * 5); diff --git a/ui/qt/endpoint_dialog.cpp b/ui/qt/endpoint_dialog.cpp index 1523819d6d..40b0eabc30 100644 --- a/ui/qt/endpoint_dialog.cpp +++ b/ui/qt/endpoint_dialog.cpp @@ -381,23 +381,23 @@ EndpointTreeWidget::EndpointTreeWidget(QWidget *parent, register_ct_t *table) : for (int i = 0; i < columnCount(); i++) { switch (i) { case ENDP_COLUMN_ADDR: - setColumnWidth(i, one_en * strlen("000.000.000.000")); + setColumnWidth(i, one_en * (int) strlen("000.000.000.000")); break; case ENDP_COLUMN_PORT: - setColumnWidth(i, one_en * strlen("000000")); + setColumnWidth(i, one_en * (int) strlen("000000")); break; case ENDP_COLUMN_PACKETS: case ENDP_COLUMN_PKT_AB: case ENDP_COLUMN_PKT_BA: - setColumnWidth(i, one_en * strlen("00,000")); + setColumnWidth(i, one_en * (int) strlen("00,000")); break; case ENDP_COLUMN_BYTES: case ENDP_COLUMN_BYTES_AB: case ENDP_COLUMN_BYTES_BA: - setColumnWidth(i, one_en * strlen("000,000")); + setColumnWidth(i, one_en * (int) strlen("000,000")); break; default: - setColumnWidth(i, one_en * strlen("-00.000000")); // GeoIP + setColumnWidth(i, one_en * (int) strlen("-00.000000")); // GeoIP } } diff --git a/ui/traffic_table_ui.h b/ui/traffic_table_ui.h index 0b7de72752..9f3bd061ba 100644 --- a/ui/traffic_table_ui.h +++ b/ui/traffic_table_ui.h @@ -65,7 +65,7 @@ typedef enum ENDP_COLUMN_BYTES_AB, ENDP_COLUMN_PKT_BA, ENDP_COLUMN_BYTES_BA, - ENDP_NUM_COLUMNS, + ENDP_NUM_COLUMNS } endpoint_column_type_e; extern const char *endp_column_titles[ENDP_NUM_COLUMNS]; |