diff --git a/mythplugins/mythmusic/mythmusic/metaio.cpp b/mythplugins/mythmusic/mythmusic/metaio.cpp
index 1840ba88c4e..5d5c5f8b70e 100644
--- a/mythplugins/mythmusic/mythmusic/metaio.cpp
+++ b/mythplugins/mythmusic/mythmusic/metaio.cpp
@@ -47,11 +47,11 @@ void MetaIO::readFromFilename(const QString &filename,
     QStringList::iterator fmt_it = fmt_list.begin();
 
     // go through loop once to get minimum part number
-    for (; fmt_it != fmt_list.end(); fmt_it++, part_num--) {}
+    for (; fmt_it != fmt_list.end(); ++fmt_it, --part_num) {}
 
     // reset to go through loop for real
     fmt_it = fmt_list.begin();
-    for(; fmt_it != fmt_list.end(); fmt_it++, part_num++)
+    for(; fmt_it != fmt_list.end(); ++fmt_it, ++part_num)
     {
         QString part_str = lfilename.section( "/", part_num, part_num);
 
diff --git a/mythplugins/mythzoneminder/mythzmserver/zmserver.cpp b/mythplugins/mythzoneminder/mythzmserver/zmserver.cpp
index aef3c1226b9..48b17d9add5 100644
--- a/mythplugins/mythzoneminder/mythzmserver/zmserver.cpp
+++ b/mythplugins/mythzoneminder/mythzmserver/zmserver.cpp
@@ -1196,7 +1196,8 @@ void ZMServer::handleDeleteEventList(vector<string> tokens)
     string outStr("");
 
     vector<string>::iterator it = tokens.begin();
-    it++;
+    if (it != tokens.end())
+        ++it;
     while (it != tokens.end())
     {
         if (eventList == "")
@@ -1204,7 +1205,7 @@ void ZMServer::handleDeleteEventList(vector<string> tokens)
         else
             eventList += "," + (*it);
 
-       it++;
+        ++it;
     }
 
     if (m_debug)
diff --git a/mythplugins/mythzoneminder/mythzoneminder/zmclient.cpp b/mythplugins/mythzoneminder/mythzoneminder/zmclient.cpp
index 45840f9ac81..ac2e3c80a9f 100644
--- a/mythplugins/mythzoneminder/mythzoneminder/zmclient.cpp
+++ b/mythplugins/mythzoneminder/mythzoneminder/zmclient.cpp
@@ -429,7 +429,7 @@ void ZMClient::deleteEventList(vector<Event*> *eventList)
     QStringList strList("DELETE_EVENT_LIST");
     int count = 0;
     vector<Event*>::iterator it;
-    for (it = eventList->begin(); it != eventList->end(); it++)
+    for (it = eventList->begin(); it != eventList->end(); ++it)
     {
         strList << QString::number((*it)->eventID);
 
diff --git a/mythplugins/mythzoneminder/mythzoneminder/zmliveplayer.cpp b/mythplugins/mythzoneminder/mythzoneminder/zmliveplayer.cpp
index 3a5ef9df6c9..8c4e0e9131e 100644
--- a/mythplugins/mythzoneminder/mythzoneminder/zmliveplayer.cpp
+++ b/mythplugins/mythzoneminder/mythzoneminder/zmliveplayer.cpp
@@ -142,7 +142,7 @@ ZMLivePlayer::~ZMLivePlayer()
         QString s = "";
         Player *p;
         vector<Player*>::iterator i = m_players->begin();
-        for (; i != m_players->end(); i++)
+        for (; i != m_players->end(); ++i)
         {
             p = *i;
             if (s != "")
@@ -223,7 +223,7 @@ void ZMLivePlayer::changePlayerMonitor(int playerNo)
 
     // find the old monitor ID in the list of available monitors
     vector<Monitor*>::iterator i = m_monitors->begin();
-    for (; i != m_monitors->end(); i++)
+    for (; i != m_monitors->end(); ++i)
     {
         mon = *i;
         if (oldMonID == mon->id)
@@ -234,7 +234,7 @@ void ZMLivePlayer::changePlayerMonitor(int playerNo)
 
     // get the next monitor in the list
     if (i != m_monitors->end())
-        i++;
+        ++i;
 
     // wrap around to the start if we've reached the end
     if (i == m_monitors->end())
@@ -261,7 +261,7 @@ void ZMLivePlayer::updateFrame()
     QList<int> monList;
     Player *p;
     vector<Player*>::iterator i = m_players->begin();
-    for (; i != m_players->end(); i++)
+    for (; i != m_players->end(); ++i)
     {
         p = *i;
         if (!monList.contains(p->getMonitor()->id))
@@ -278,7 +278,7 @@ void ZMLivePlayer::updateFrame()
             // update each player that is displaying this monitor
             Player *p;
             vector<Player*>::iterator i = m_players->begin();
-            for (; i != m_players->end(); i++)
+            for (; i != m_players->end(); ++i)
             {
                 p = *i;
                 if (p->getMonitor()->id == monList[x])
@@ -342,7 +342,7 @@ void ZMLivePlayer::setMonitorLayout(int layout, bool restore)
 
                 // try to find a monitor that matches the monID
                 vector<Monitor*>::iterator i = m_monitors->begin();
-                for (; i != m_monitors->end(); i++)
+                for (; i != m_monitors->end(); ++i)
                 {
                     if ((*i)->id == monID)
                     {
diff --git a/mythtv/libs/libmyth/mediamonitor-unix.cpp b/mythtv/libs/libmyth/mediamonitor-unix.cpp
index b1114ad49d3..ffb4480b49e 100644
--- a/mythtv/libs/libmyth/mediamonitor-unix.cpp
+++ b/mythtv/libs/libmyth/mediamonitor-unix.cpp
@@ -768,7 +768,7 @@ bool MediaMonitorUnix::FindPartitions(const QString &dev, bool checkPartitions)
         bool found_partitions = false;
         QStringList parts = sysfs.entryList();
         for (QStringList::iterator pit = parts.begin();
-             pit != parts.end(); pit++)
+             pit != parts.end(); ++pit)
         {
             if (*pit == "." || *pit == "..")
                 continue;
@@ -843,7 +843,7 @@ void MediaMonitorUnix::CheckDeviceNotifications(void)
     const QStringList list = qBuffer.split('\n', QString::SkipEmptyParts);
 
     QStringList::const_iterator it = list.begin();
-    for (; it != list.end(); it++)
+    for (; it != list.end(); ++it)
     {
         if ((*it).startsWith("add"))
         {
diff --git a/mythtv/libs/libmythprotoserver/mythsocketmanager.cpp b/mythtv/libs/libmythprotoserver/mythsocketmanager.cpp
index fe22b474436..93c4eae8882 100644
--- a/mythtv/libs/libmythprotoserver/mythsocketmanager.cpp
+++ b/mythtv/libs/libmythprotoserver/mythsocketmanager.cpp
@@ -232,12 +232,12 @@ void MythSocketManager::ProcessRequestWork(MythSocket *sock)
                     QString("Attempting to handle annouce with: %1")
                         .arg((*i)->GetHandlerName()));
                 handled = (*i)->HandleAnnounce(sock, tokens, listline);
-                i++;
+                ++i;
             }
 
             if (handled)
             {
-                i--;
+                --i;
                 LOG(VB_SOCKET, LOG_DEBUG, LOC +
                     QString("Socket announce handled by: %1")
                         .arg((*i)->GetHandlerName()));
@@ -297,7 +297,7 @@ void MythSocketManager::ProcessRequestWork(MythSocket *sock)
         while (!handled && (i != m_handlerMap.constEnd()))
         {
             handled = (*i)->HandleQuery(handler, tokens, listline);
-            i++;
+            ++i;
         }
 
         if (handled)
diff --git a/mythtv/libs/libmythtv/cc608reader.cpp b/mythtv/libs/libmythtv/cc608reader.cpp
index 7d509bf19c5..a0d332e1d4e 100644
--- a/mythtv/libs/libmythtv/cc608reader.cpp
+++ b/mythtv/libs/libmythtv/cc608reader.cpp
@@ -269,7 +269,7 @@ int CC608Reader::Update(unsigned char *inpos)
             if (m_state[streamIdx].m_outputRow > 15)
             {
                 ccp = ccbuf->begin();
-                for (; ccp != ccbuf->end(); ccp++)
+                for (; ccp != ccbuf->end(); ++ccp)
                 {
                     tmpcc = *ccp;
                     tmpcc->y -= (m_state[streamIdx].m_outputRow - 15);
@@ -391,7 +391,7 @@ void CC608Reader::Update608Text(
                 {
                     // scroll up
                     cc->y -= (scroll + ymove);
-                    i++;
+                    ++i;
                 }
                 else
                 {
@@ -401,7 +401,9 @@ void CC608Reader::Update608Text(
                 }
             }
             else
-                i++;
+            {
+                ++i;
+            }
         }
     }
 
@@ -410,15 +412,13 @@ void CC608Reader::Update608Text(
     if (ccbuf)
     {
         // add new text
-        i = ccbuf->begin();
-        while (i < ccbuf->end())
+        for (i = ccbuf->begin(); i != ccbuf->end(); ++i)
         {
             if (*i)
             {
                 visible++;
                 m_state[streamIdx].m_output.buffers.push_back(*i);
             }
-            i++;
         }
     }
     m_state[streamIdx].m_changed = visible;
diff --git a/mythtv/libs/libmythtv/cc608reader.h b/mythtv/libs/libmythtv/cc608reader.h
index effebfce278..bb5963124c7 100644
--- a/mythtv/libs/libmythtv/cc608reader.h
+++ b/mythtv/libs/libmythtv/cc608reader.h
@@ -39,7 +39,7 @@ class CC608Buffer
     {
         lock.lock();
         vector<CC608Text*>::iterator i = buffers.begin();
-        for (; i != buffers.end(); i++)
+        for (; i != buffers.end(); ++i)
         {
             CC608Text *cc = (*i);
             if (cc)
diff --git a/mythtv/libs/libmythtv/channelbase.cpp b/mythtv/libs/libmythtv/channelbase.cpp
index 5107c091a47..42e769421db 100644
--- a/mythtv/libs/libmythtv/channelbase.cpp
+++ b/mythtv/libs/libmythtv/channelbase.cpp
@@ -95,7 +95,7 @@ bool ChannelBase::Init(QString &inputname, QString &startchannel, bool setchan)
         DBChanList channels = GetChannels(*it);
 
         DBChanList::const_iterator cit = channels.begin();
-        for (; cit != channels.end(); cit++)
+        for (; cit != channels.end(); ++cit)
         {
             if ((*cit).channum == startchannel &&
                 IsTunable(*it, startchannel))
@@ -108,7 +108,7 @@ bool ChannelBase::Init(QString &inputname, QString &startchannel, bool setchan)
             }
         }
 
-        it++;
+        ++it;
         it = (it == inputs.end()) ? inputs.begin() : it;
         if (it == start)
             break;
@@ -155,7 +155,7 @@ bool ChannelBase::Init(QString &inputname, QString &startchannel, bool setchan)
             }
         }
 
-        it++;
+        ++it;
         it = (it == inputs.end()) ? inputs.begin() : it;
         if (it == start)
             break;
diff --git a/mythtv/libs/libmythtv/tv_play.cpp b/mythtv/libs/libmythtv/tv_play.cpp
index 9b18b74fe0f..e9a74b176b8 100644
--- a/mythtv/libs/libmythtv/tv_play.cpp
+++ b/mythtv/libs/libmythtv/tv_play.cpp
@@ -1491,7 +1491,7 @@ void TV::ShowOSDAskAllow(PlayerContext *ctx)
     QMap<QString,AskProgramInfo>::iterator next = it;
     while (it != askAllowPrograms.end())
     {
-        next = it; next++;
+        next = it; ++next;
         if ((*it).expiry <= timeNow)
         {
 #if 0