Apply the prefix operator to iterators.

Prefix operators are supposed to be more efficient with iterators,
so lets use them instead of postfix operators.

Change-Id: I3090e4954c5cb67db47c88e2874b1a8ac52aa2cd
Reviewed-on: https://code.wireshark.org/review/15546
Reviewed-by: Anders Broman <a.broman58@gmail.com>

11 files changed, 58 insertions, 59 deletions

diff --git a/ui/qt/bluetooth_att_server_attributes_dialog.cpp b/ui/qt/bluetooth_att_server_attributes_dialog.cpp
index c427895e52..431c40f63a 100644
--- a/ui/qt/bluetooth_att_server_attributes_dialog.cpp
+++ b/ui/qt/bluetooth_att_server_attributes_dialog.cpp
@@ -236,7 +236,7 @@ gboolean BluetoothAttServerAttributesDialog::tapPacket(void *tapinfo_ptr, packet
                     item->text(column_number_uuid) == uuid &&
                     item->text(column_number_uuid_name) == uuid_name)
                 return TRUE;
-            i_item += 1;
+            ++i_item;
         }
     }
 
@@ -300,7 +300,7 @@ void BluetoothAttServerAttributesDialog::on_actionCopy_All_triggered()
                 .arg(item->text(column_number_handle), -6)
                 .arg(item->text(column_number_uuid), -32)
                 .arg(item->text(column_number_uuid_name));
-        i_item += 1;
+        ++i_item;
     }
 
     clipboard->setText(copy);
diff --git a/ui/qt/bluetooth_devices_dialog.cpp b/ui/qt/bluetooth_devices_dialog.cpp
index 9523105de0..ee5da1f6b6 100644
--- a/ui/qt/bluetooth_devices_dialog.cpp
+++ b/ui/qt/bluetooth_devices_dialog.cpp
@@ -262,7 +262,7 @@ gboolean BluetoothDevicesDialog::tapPacket(void *tapinfo_ptr, packet_info *pinfo
                 item = current_item;
                 break;
             }
-            i_item += 1;
+            ++i_item;
         }
     }
 
@@ -365,7 +365,7 @@ void BluetoothDevicesDialog::on_actionCopy_All_triggered()
                 .arg(item->text(column_number_hci_version), -20)
                 .arg(item->text(column_number_hci_revision), -20)
                 .arg(item->text(column_number_is_local_adapter), -20);
-        i_item += 1;
+        ++i_item;
     }
 
     clipboard->setText(copy);
diff --git a/ui/qt/bluetooth_hci_summary_dialog.cpp b/ui/qt/bluetooth_hci_summary_dialog.cpp
index 89570c909c..1a88413c82 100644
--- a/ui/qt/bluetooth_hci_summary_dialog.cpp
+++ b/ui/qt/bluetooth_hci_summary_dialog.cpp
@@ -678,7 +678,6 @@ void BluetoothHciSummaryDialog::on_actionCopy_All_triggered()
 {
     QClipboard             *clipboard = QApplication::clipboard();
     QString                 copy;
-    QTreeWidgetItemIterator i_item(ui->tableTreeWidget);
     QTreeWidgetItem        *item;
 
     item = ui->tableTreeWidget->headerItem();
@@ -694,7 +693,7 @@ void BluetoothHciSummaryDialog::on_actionCopy_All_triggered()
             .arg(item->text(column_number_hardware_error), -15)
             .arg(item->text(column_number_occurrence), -10);
 
-    for (int i_item = 0; i_item < ui->tableTreeWidget->topLevelItemCount(); i_item += 1) {
+    for (int i_item = 0; i_item < ui->tableTreeWidget->topLevelItemCount(); ++i_item) {
         item = ui->tableTreeWidget->topLevelItem(i_item);
 
         copy += QString("%1  %2  %3  %4  %5  %6  %7  %8  %9\n")
diff --git a/ui/qt/byte_view_text.cpp b/ui/qt/byte_view_text.cpp
index b0d2a10511..d010d86cdb 100644
--- a/ui/qt/byte_view_text.cpp
+++ b/ui/qt/byte_view_text.cpp
@@ -235,7 +235,7 @@ void ByteViewText::mousePressEvent (QMouseEvent *event) {
                 tree_widget_->scrollToItem((*iter));
             }
 
-            iter++;
+            ++iter;
         }
     }
 }
diff --git a/ui/qt/coloring_rules_dialog.cpp b/ui/qt/coloring_rules_dialog.cpp
index a31ec77191..009d453caa 100644
--- a/ui/qt/coloring_rules_dialog.cpp
+++ b/ui/qt/coloring_rules_dialog.cpp
@@ -193,7 +193,7 @@ void ColoringRulesDialog::updateWidgets()
             error_text.prepend(QString("%1: ").arg(item->text(name_col_)));
             break;
         }
-        iter++;
+        ++iter;
     }
 
     if (error_text.isEmpty()) {
diff --git a/ui/qt/interface_tree.cpp b/ui/qt/interface_tree.cpp
index 142089a003..e95a48bda2 100644
--- a/ui/qt/interface_tree.cpp
+++ b/ui/qt/interface_tree.cpp
@@ -303,7 +303,7 @@ void InterfaceTree::getPoints(int row, PointList *pts)
             //qDebug("done");
             return;
         }
-        iter++;
+        ++iter;
     }
 }
 
@@ -347,7 +347,7 @@ void InterfaceTree::updateStatistics(void) {
             global_capture_opts.all_ifaces = g_array_remove_index(global_capture_opts.all_ifaces, if_idx);
             g_array_insert_val(global_capture_opts.all_ifaces, if_idx, device);
         }
-        iter++;
+        ++iter;
     }
 #endif // HAVE_LIBPCAP
 }
@@ -413,7 +413,7 @@ void InterfaceTree::updateSelectedInterfaces()
                 break;
             }
         }
-        iter++;
+        ++iter;
     }
     blockSignals(blocking);
 #endif // HAVE_LIBPCAP
diff --git a/ui/qt/lbm_lbtrm_transport_dialog.cpp b/ui/qt/lbm_lbtrm_transport_dialog.cpp
index a2ff0118a5..b232f927ed 100644
--- a/ui/qt/lbm_lbtrm_transport_dialog.cpp
+++ b/ui/qt/lbm_lbtrm_transport_dialog.cpp
@@ -434,25 +434,25 @@ LBMLBTRMSourceTransportEntry::LBMLBTRMSourceTransportEntry(const QString & trans
 
 LBMLBTRMSourceTransportEntry::~LBMLBTRMSourceTransportEntry(void)
 {
-    for (LBMLBTRMSQNMapIterator it = m_data_sqns.begin(); it != m_data_sqns.end(); it++)
+    for (LBMLBTRMSQNMapIterator it = m_data_sqns.begin(); it != m_data_sqns.end(); ++it)
     {
         delete *it;
     }
     m_data_sqns.clear();
 
-    for (LBMLBTRMSQNMapIterator it = m_rx_data_sqns.begin(); it != m_rx_data_sqns.end(); it++)
+    for (LBMLBTRMSQNMapIterator it = m_rx_data_sqns.begin(); it != m_rx_data_sqns.end(); ++it)
     {
         delete *it;
     }
     m_rx_data_sqns.clear();
 
-    for (LBMLBTRMNCFSQNMapIterator it = m_ncf_sqns.begin(); it != m_ncf_sqns.end(); it++)
+    for (LBMLBTRMNCFSQNMapIterator it = m_ncf_sqns.begin(); it != m_ncf_sqns.end(); ++it)
     {
         delete *it;
     }
     m_ncf_sqns.clear();
 
-    for (LBMLBTRMSQNMapIterator it = m_sm_sqns.begin(); it != m_sm_sqns.end(); it++)
+    for (LBMLBTRMSQNMapIterator it = m_sm_sqns.begin(); it != m_sm_sqns.end(); ++it)
     {
         delete *it;
     }
@@ -666,7 +666,7 @@ LBMLBTRMSourceEntry::LBMLBTRMSourceEntry(const QString & source_address) :
 
 LBMLBTRMSourceEntry::~LBMLBTRMSourceEntry(void)
 {
-    for (LBMLBTRMSourceTransportMapIterator it = m_transports.begin(); it != m_transports.end(); it++)
+    for (LBMLBTRMSourceTransportMapIterator it = m_transports.begin(); it != m_transports.end(); ++it)
     {
         delete *it;
     }
@@ -828,7 +828,7 @@ LBMLBTRMReceiverTransportEntry::LBMLBTRMReceiverTransportEntry(const QString & t
 
 LBMLBTRMReceiverTransportEntry::~LBMLBTRMReceiverTransportEntry(void)
 {
-    for (LBMLBTRMSQNMapIterator it = m_nak_sqns.begin(); it != m_nak_sqns.end(); it++)
+    for (LBMLBTRMSQNMapIterator it = m_nak_sqns.begin(); it != m_nak_sqns.end(); ++it)
     {
         delete *it;
     }
@@ -942,7 +942,7 @@ LBMLBTRMReceiverEntry::LBMLBTRMReceiverEntry(const QString & receiver_address) :
 
 LBMLBTRMReceiverEntry::~LBMLBTRMReceiverEntry(void)
 {
-    for (LBMLBTRMReceiverTransportMapIterator it = m_transports.begin(); it != m_transports.end(); it++)
+    for (LBMLBTRMReceiverTransportMapIterator it = m_transports.begin(); it != m_transports.end(); ++it)
     {
         delete *it;
     }
@@ -1116,13 +1116,13 @@ void LBMLBTRMTransportDialogInfo::processPacket(const packet_info * pinfo, const
 
 void LBMLBTRMTransportDialogInfo::clearMaps(void)
 {
-    for (LBMLBTRMSourceMapIterator it = m_sources.begin(); it != m_sources.end(); it++)
+    for (LBMLBTRMSourceMapIterator it = m_sources.begin(); it != m_sources.end(); ++it)
     {
         delete *it;
     }
     m_sources.clear();
 
-    for (LBMLBTRMReceiverMapIterator it = m_receivers.begin(); it != m_receivers.end(); it++)
+    for (LBMLBTRMReceiverMapIterator it = m_receivers.begin(); it != m_receivers.end(); ++it)
     {
         delete *it;
     }
@@ -1420,7 +1420,7 @@ void LBMLBTRMTransportDialog::sourcesItemClicked(QTreeWidgetItem * item, int)
 
 void LBMLBTRMTransportDialog::loadSourceDataDetails(LBMLBTRMSourceTransportEntry * transport)
 {
-    for (LBMLBTRMSQNMapIterator it = transport->m_data_sqns.begin(); it != transport->m_data_sqns.end(); it++)
+    for (LBMLBTRMSQNMapIterator it = transport->m_data_sqns.begin(); it != transport->m_data_sqns.end(); ++it)
     {
         LBMLBTRMSQNEntry * sqn = it.value();
         m_ui->sources_detail_sqn_TreeWidget->addTopLevelItem(sqn);
@@ -1429,7 +1429,7 @@ void LBMLBTRMTransportDialog::loadSourceDataDetails(LBMLBTRMSourceTransportEntry
 
 void LBMLBTRMTransportDialog::loadSourceRXDataDetails(LBMLBTRMSourceTransportEntry * transport)
 {
-    for (LBMLBTRMSQNMapIterator it = transport->m_rx_data_sqns.begin(); it != transport->m_rx_data_sqns.end(); it++)
+    for (LBMLBTRMSQNMapIterator it = transport->m_rx_data_sqns.begin(); it != transport->m_rx_data_sqns.end(); ++it)
     {
         LBMLBTRMSQNEntry * sqn = it.value();
         m_ui->sources_detail_sqn_TreeWidget->addTopLevelItem(sqn);
@@ -1438,7 +1438,7 @@ void LBMLBTRMTransportDialog::loadSourceRXDataDetails(LBMLBTRMSourceTransportEnt
 
 void LBMLBTRMTransportDialog::loadSourceNCFDetails(LBMLBTRMSourceTransportEntry * transport)
 {
-    for (LBMLBTRMNCFSQNMapIterator it = transport->m_ncf_sqns.begin(); it != transport->m_ncf_sqns.end(); it++)
+    for (LBMLBTRMNCFSQNMapIterator it = transport->m_ncf_sqns.begin(); it != transport->m_ncf_sqns.end(); ++it)
     {
         LBMLBTRMNCFSQNEntry * sqn = it.value();
         m_ui->sources_detail_ncf_sqn_TreeWidget->addTopLevelItem(sqn);
@@ -1447,7 +1447,7 @@ void LBMLBTRMTransportDialog::loadSourceNCFDetails(LBMLBTRMSourceTransportEntry
 
 void LBMLBTRMTransportDialog::loadSourceSMDetails(LBMLBTRMSourceTransportEntry * transport)
 {
-    for (LBMLBTRMSQNMapIterator it = transport->m_sm_sqns.begin(); it != transport->m_sm_sqns.end(); it++)
+    for (LBMLBTRMSQNMapIterator it = transport->m_sm_sqns.begin(); it != transport->m_sm_sqns.end(); ++it)
     {
         LBMLBTRMSQNEntry * sqn = it.value();
         m_ui->sources_detail_sqn_TreeWidget->addTopLevelItem(sqn);
@@ -1471,7 +1471,7 @@ void LBMLBTRMTransportDialog::receiversItemClicked(QTreeWidgetItem * item, int)
 
 void LBMLBTRMTransportDialog::loadReceiverNAKDetails(LBMLBTRMReceiverTransportEntry * transport)
 {
-    for (LBMLBTRMSQNMapIterator it = transport->m_nak_sqns.begin(); it != transport->m_nak_sqns.end(); it++)
+    for (LBMLBTRMSQNMapIterator it = transport->m_nak_sqns.begin(); it != transport->m_nak_sqns.end(); ++it)
     {
         LBMLBTRMSQNEntry * sqn = it.value();
         m_ui->receivers_detail_TreeWidget->addTopLevelItem(sqn);
diff --git a/ui/qt/lbm_lbtru_transport_dialog.cpp b/ui/qt/lbm_lbtru_transport_dialog.cpp
index 304c38c6bc..a787b12808 100644
--- a/ui/qt/lbm_lbtru_transport_dialog.cpp
+++ b/ui/qt/lbm_lbtru_transport_dialog.cpp
@@ -162,7 +162,7 @@ static QString format_rate(const nstime_t & elapsed, guint64 bytes)
 // 3) destruction involves removing all items from all QTreeWidgets (rather than letting QTreeWidget delete them)
 // 4) the destructor for each item has the form
 //    <for each QMap container>
-//      for (XXXMapIterator it = m_xxx.begin(); it != m_xxx.end(); it++)
+//      for (XXXMapIterator it = m_xxx.begin(); it != m_xxx.end(); ++it)
 //      {
 //          delete *it;
 //      }
@@ -224,7 +224,7 @@ LBMLBTRUSQNEntry::LBMLBTRUSQNEntry(guint32 sqn) :
 
 LBMLBTRUSQNEntry::~LBMLBTRUSQNEntry(void)
 {
-    for (LBMLBTRUFrameMapIterator it = m_frames.begin(); it != m_frames.end(); it++)
+    for (LBMLBTRUFrameMapIterator it = m_frames.begin(); it != m_frames.end(); ++it)
     {
         delete *it;
     }
@@ -294,7 +294,7 @@ LBMLBTRUNCFReasonEntry::LBMLBTRUNCFReasonEntry(guint8 reason) :
 
 LBMLBTRUNCFReasonEntry::~LBMLBTRUNCFReasonEntry(void)
 {
-    for (LBMLBTRUFrameMapIterator it = m_frames.begin(); it != m_frames.end(); it++)
+    for (LBMLBTRUFrameMapIterator it = m_frames.begin(); it != m_frames.end(); ++it)
     {
         delete *it;
     }
@@ -351,7 +351,7 @@ LBMLBTRUNCFSQNEntry::LBMLBTRUNCFSQNEntry(guint32 sqn) :
 
 LBMLBTRUNCFSQNEntry::~LBMLBTRUNCFSQNEntry(void)
 {
-    for (LBMLBTRUNCFReasonMapIterator it = m_reasons.begin(); it != m_reasons.end(); it++)
+    for (LBMLBTRUNCFReasonMapIterator it = m_reasons.begin(); it != m_reasons.end(); ++it)
     {
         delete *it;
     }
@@ -422,7 +422,7 @@ LBMLBTRURSTReasonEntry::LBMLBTRURSTReasonEntry(guint32 reason) :
 
 LBMLBTRURSTReasonEntry::~LBMLBTRURSTReasonEntry(void)
 {
-    for (LBMLBTRUFrameMapIterator it = m_frames.begin(); it != m_frames.end(); it++)
+    for (LBMLBTRUFrameMapIterator it = m_frames.begin(); it != m_frames.end(); ++it)
     {
         delete *it;
     }
@@ -487,7 +487,7 @@ LBMLBTRUCREQRequestEntry::LBMLBTRUCREQRequestEntry(guint32 request) :
 
 LBMLBTRUCREQRequestEntry::~LBMLBTRUCREQRequestEntry(void)
 {
-    for (LBMLBTRUFrameMapIterator it = m_frames.begin(); it != m_frames.end(); it++)
+    for (LBMLBTRUFrameMapIterator it = m_frames.begin(); it != m_frames.end(); ++it)
     {
         delete *it;
     }
@@ -589,31 +589,31 @@ LBMLBTRUSourceTransportEntry::LBMLBTRUSourceTransportEntry(const QString & trans
 
 LBMLBTRUSourceTransportEntry::~LBMLBTRUSourceTransportEntry(void)
 {
-    for (LBMLBTRUSQNMapIterator it = m_data_sqns.begin(); it != m_data_sqns.end(); it++)
+    for (LBMLBTRUSQNMapIterator it = m_data_sqns.begin(); it != m_data_sqns.end(); ++it)
     {
         delete *it;
     }
     m_data_sqns.clear();
 
-    for (LBMLBTRUSQNMapIterator it = m_rx_data_sqns.begin(); it != m_rx_data_sqns.end(); it++)
+    for (LBMLBTRUSQNMapIterator it = m_rx_data_sqns.begin(); it != m_rx_data_sqns.end(); ++it)
     {
         delete *it;
     }
     m_rx_data_sqns.clear();
 
-    for (LBMLBTRUNCFSQNMapIterator it = m_ncf_sqns.begin(); it != m_ncf_sqns.end(); it++)
+    for (LBMLBTRUNCFSQNMapIterator it = m_ncf_sqns.begin(); it != m_ncf_sqns.end(); ++it)
     {
         delete *it;
     }
     m_ncf_sqns.clear();
 
-    for (LBMLBTRUSQNMapIterator it = m_sm_sqns.begin(); it != m_sm_sqns.end(); it++)
+    for (LBMLBTRUSQNMapIterator it = m_sm_sqns.begin(); it != m_sm_sqns.end(); ++it)
     {
         delete *it;
     }
     m_sm_sqns.clear();
 
-    for (LBMLBTRURSTReasonMapIterator it = m_rst_reasons.begin(); it != m_rst_reasons.end(); it++)
+    for (LBMLBTRURSTReasonMapIterator it = m_rst_reasons.begin(); it != m_rst_reasons.end(); ++it)
     {
         delete *it;
     }
@@ -859,7 +859,7 @@ LBMLBTRUSourceEntry::LBMLBTRUSourceEntry(const QString & source_address) :
 
 LBMLBTRUSourceEntry::~LBMLBTRUSourceEntry(void)
 {
-    for (LBMLBTRUSourceTransportMapIterator it = m_transports.begin(); it != m_transports.end(); it++)
+    for (LBMLBTRUSourceTransportMapIterator it = m_transports.begin(); it != m_transports.end(); ++it)
     {
         delete *it;
     }
@@ -1045,19 +1045,19 @@ LBMLBTRUReceiverTransportEntry::LBMLBTRUReceiverTransportEntry(const QString & t
 
 LBMLBTRUReceiverTransportEntry::~LBMLBTRUReceiverTransportEntry(void)
 {
-    for (LBMLBTRUSQNMapIterator it = m_nak_sqns.begin(); it != m_nak_sqns.end(); it++)
+    for (LBMLBTRUSQNMapIterator it = m_nak_sqns.begin(); it != m_nak_sqns.end(); ++it)
     {
         delete *it;
     }
     m_nak_sqns.clear();
 
-    for (LBMLBTRUSQNMapIterator it = m_ack_sqns.begin(); it != m_ack_sqns.end(); it++)
+    for (LBMLBTRUSQNMapIterator it = m_ack_sqns.begin(); it != m_ack_sqns.end(); ++it)
     {
         delete *it;
     }
     m_ack_sqns.clear();
 
-    for (LBMLBTRUCREQRequestMapIterator it = m_creq_requests.begin(); it != m_creq_requests.end(); it++)
+    for (LBMLBTRUCREQRequestMapIterator it = m_creq_requests.begin(); it != m_creq_requests.end(); ++it)
     {
         delete *it;
     }
@@ -1246,7 +1246,7 @@ LBMLBTRUReceiverEntry::LBMLBTRUReceiverEntry(const QString & receiver_address) :
 
 LBMLBTRUReceiverEntry::~LBMLBTRUReceiverEntry(void)
 {
-    for (LBMLBTRUReceiverTransportMapIterator it = m_transports.begin(); it != m_transports.end(); it++)
+    for (LBMLBTRUReceiverTransportMapIterator it = m_transports.begin(); it != m_transports.end(); ++it)
     {
         delete *it;
     }
@@ -1457,13 +1457,13 @@ void LBMLBTRUTransportDialogInfo::processPacket(const packet_info * pinfo, const
 
 void LBMLBTRUTransportDialogInfo::clearMaps(void)
 {
-    for (LBMLBTRUSourceMapIterator it = m_sources.begin(); it != m_sources.end(); it++)
+    for (LBMLBTRUSourceMapIterator it = m_sources.begin(); it != m_sources.end(); ++it)
     {
         delete *it;
     }
     m_sources.clear();
 
-    for (LBMLBTRUReceiverMapIterator it = m_receivers.begin(); it != m_receivers.end(); it++)
+    for (LBMLBTRUReceiverMapIterator it = m_receivers.begin(); it != m_receivers.end(); ++it)
     {
         delete *it;
     }
@@ -1847,7 +1847,7 @@ void LBMLBTRUTransportDialog::sourcesItemClicked(QTreeWidgetItem * item, int)
 
 void LBMLBTRUTransportDialog::loadSourceDataDetails(LBMLBTRUSourceTransportEntry * transport)
 {
-    for (LBMLBTRUSQNMapIterator it = transport->m_data_sqns.begin(); it != transport->m_data_sqns.end(); it++)
+    for (LBMLBTRUSQNMapIterator it = transport->m_data_sqns.begin(); it != transport->m_data_sqns.end(); ++it)
     {
         LBMLBTRUSQNEntry * sqn = it.value();
         m_ui->sources_detail_sqn_TreeWidget->addTopLevelItem(sqn);
@@ -1856,7 +1856,7 @@ void LBMLBTRUTransportDialog::loadSourceDataDetails(LBMLBTRUSourceTransportEntry
 
 void LBMLBTRUTransportDialog::loadSourceRXDataDetails(LBMLBTRUSourceTransportEntry * transport)
 {
-    for (LBMLBTRUSQNMapIterator it = transport->m_rx_data_sqns.begin(); it != transport->m_rx_data_sqns.end(); it++)
+    for (LBMLBTRUSQNMapIterator it = transport->m_rx_data_sqns.begin(); it != transport->m_rx_data_sqns.end(); ++it)
     {
         LBMLBTRUSQNEntry * sqn = it.value();
         m_ui->sources_detail_sqn_TreeWidget->addTopLevelItem(sqn);
@@ -1865,7 +1865,7 @@ void LBMLBTRUTransportDialog::loadSourceRXDataDetails(LBMLBTRUSourceTransportEnt
 
 void LBMLBTRUTransportDialog::loadSourceNCFDetails(LBMLBTRUSourceTransportEntry * transport)
 {
-    for (LBMLBTRUNCFSQNMapIterator it = transport->m_ncf_sqns.begin(); it != transport->m_ncf_sqns.end(); it++)
+    for (LBMLBTRUNCFSQNMapIterator it = transport->m_ncf_sqns.begin(); it != transport->m_ncf_sqns.end(); ++it)
     {
         LBMLBTRUNCFSQNEntry * sqn = it.value();
         m_ui->sources_detail_ncf_sqn_TreeWidget->addTopLevelItem(sqn);
@@ -1874,7 +1874,7 @@ void LBMLBTRUTransportDialog::loadSourceNCFDetails(LBMLBTRUSourceTransportEntry
 
 void LBMLBTRUTransportDialog::loadSourceSMDetails(LBMLBTRUSourceTransportEntry * transport)
 {
-    for (LBMLBTRUSQNMapIterator it = transport->m_sm_sqns.begin(); it != transport->m_sm_sqns.end(); it++)
+    for (LBMLBTRUSQNMapIterator it = transport->m_sm_sqns.begin(); it != transport->m_sm_sqns.end(); ++it)
     {
         LBMLBTRUSQNEntry * sqn = it.value();
         m_ui->sources_detail_sqn_TreeWidget->addTopLevelItem(sqn);
@@ -1883,7 +1883,7 @@ void LBMLBTRUTransportDialog::loadSourceSMDetails(LBMLBTRUSourceTransportEntry *
 
 void LBMLBTRUTransportDialog::loadSourceRSTDetails(LBMLBTRUSourceTransportEntry * transport)
 {
-    for (LBMLBTRURSTReasonMapIterator it = transport->m_rst_reasons.begin(); it != transport->m_rst_reasons.end(); it++)
+    for (LBMLBTRURSTReasonMapIterator it = transport->m_rst_reasons.begin(); it != transport->m_rst_reasons.end(); ++it)
     {
         LBMLBTRURSTReasonEntry * reason = it.value();
         m_ui->sources_detail_rst_TreeWidget->addTopLevelItem(reason);
@@ -1952,7 +1952,7 @@ void LBMLBTRUTransportDialog::receiversItemClicked(QTreeWidgetItem * item, int)
 
 void LBMLBTRUTransportDialog::loadReceiverNAKDetails(LBMLBTRUReceiverTransportEntry * transport)
 {
-    for (LBMLBTRUSQNMapIterator it = transport->m_nak_sqns.begin(); it != transport->m_nak_sqns.end(); it++)
+    for (LBMLBTRUSQNMapIterator it = transport->m_nak_sqns.begin(); it != transport->m_nak_sqns.end(); ++it)
     {
         LBMLBTRUSQNEntry * sqn = it.value();
         m_ui->receivers_detail_sqn_TreeWidget->addTopLevelItem(sqn);
@@ -1961,7 +1961,7 @@ void LBMLBTRUTransportDialog::loadReceiverNAKDetails(LBMLBTRUReceiverTransportEn
 
 void LBMLBTRUTransportDialog::loadReceiverACKDetails(LBMLBTRUReceiverTransportEntry * transport)
 {
-    for (LBMLBTRUSQNMapIterator it = transport->m_ack_sqns.begin(); it != transport->m_ack_sqns.end(); it++)
+    for (LBMLBTRUSQNMapIterator it = transport->m_ack_sqns.begin(); it != transport->m_ack_sqns.end(); ++it)
     {
         LBMLBTRUSQNEntry * sqn = it.value();
         m_ui->receivers_detail_sqn_TreeWidget->addTopLevelItem(sqn);
@@ -1970,7 +1970,7 @@ void LBMLBTRUTransportDialog::loadReceiverACKDetails(LBMLBTRUReceiverTransportEn
 
 void LBMLBTRUTransportDialog::loadReceiverCREQDetails(LBMLBTRUReceiverTransportEntry * transport)
 {
-    for (LBMLBTRUCREQRequestMapIterator it = transport->m_creq_requests.begin(); it != transport->m_creq_requests.end(); it++)
+    for (LBMLBTRUCREQRequestMapIterator it = transport->m_creq_requests.begin(); it != transport->m_creq_requests.end(); ++it)
     {
         LBMLBTRUCREQRequestEntry * req = it.value();
         m_ui->receivers_detail_reason_TreeWidget->addTopLevelItem(req);
diff --git a/ui/qt/lbm_stream_dialog.cpp b/ui/qt/lbm_stream_dialog.cpp
index f9970bedbe..000527a679 100644
--- a/ui/qt/lbm_stream_dialog.cpp
+++ b/ui/qt/lbm_stream_dialog.cpp
@@ -182,7 +182,7 @@ LBMStreamEntry::~LBMStreamEntry(void)
 {
     LBMSubstreamMapIterator it;
 
-    for (it = m_substreams.begin(); it != m_substreams.end(); it++)
+    for (it = m_substreams.begin(); it != m_substreams.end(); ++it)
     {
         delete *it;
     }
@@ -333,7 +333,7 @@ void LBMStreamDialogInfo::resetStreams(void)
     while (it != m_streams.end())
     {
         delete *it;
-        it++;
+        ++it;
     }
     m_streams.clear();
 }
diff --git a/ui/qt/proto_tree.cpp b/ui/qt/proto_tree.cpp
index f8aa48bbab..a3c7a75cf8 100644
--- a/ui/qt/proto_tree.cpp
+++ b/ui/qt/proto_tree.cpp
@@ -403,7 +403,7 @@ void ProtoTree::goToField(int hf_id)
                 break;
             }
         }
-        iter++;
+        ++iter;
     }
 }
 
@@ -537,7 +537,7 @@ void ProtoTree::expandSubtrees()
             break;
         }
         (*iter)->setExpanded(true);
-        iter++;
+        ++iter;
     }
     updateContentWidth();
 }
@@ -600,7 +600,7 @@ void ProtoTree::selectField(field_info *fi)
             scrollToItem(*iter);
             break;
         }
-        iter++;
+        ++iter;
     }
 }
 
@@ -638,7 +638,7 @@ void ProtoTree::restoreSelectedField()
             scrollToItem(*iter);
             break;
         }
-        iter++;
+        ++iter;
     }
 }
 
diff --git a/ui/qt/protocol_hierarchy_dialog.cpp b/ui/qt/protocol_hierarchy_dialog.cpp
index bdda94b901..79bab76339 100644
--- a/ui/qt/protocol_hierarchy_dialog.cpp
+++ b/ui/qt/protocol_hierarchy_dialog.cpp
@@ -345,7 +345,7 @@ void ProtocolHierarchyDialog::on_actionCopyAsCsv_triggered()
         }
         stream << separated_value.join(",") << endl;
 
-        if (!first) iter++;
+        if (!first) ++iter;
         first = false;
     }
     wsApp->clipboard()->setText(stream.readAll());
@@ -366,7 +366,7 @@ void ProtocolHierarchyDialog::on_actionCopyAsYaml_triggered()
         foreach (QVariant v, protoHierRowData(item)) {
             stream << " - " << v.toString() << endl;
         }
-        if (!first) iter++;
+        if (!first) ++iter;
         first = false;
     }
     wsApp->clipboard()->setText(stream.readAll());