diff --git a/krfb/eventsmanager.cpp b/krfb/eventsmanager.cpp
index 5da88c5e..a6c63978 100644
--- a/krfb/eventsmanager.cpp
+++ b/krfb/eventsmanager.cpp
@@ -63,18 +63,12 @@ EventsManager *EventsManager::instance()
 
 QSharedPointer<EventHandler> EventsManager::eventHandler()
 {
-    QMap<QString, EventsPlugin *>::const_iterator iter = m_plugins.constBegin();
-
-    while (iter != m_plugins.constEnd()) {
-
-        QSharedPointer<EventHandler> eventHandler(iter.value()->eventHandler());
-
+    for (auto it = m_plugins.cbegin(); it != m_plugins.constEnd(); it++) {
+        QSharedPointer<EventHandler> eventHandler(it.value()->eventHandler());
         if (eventHandler) {
             eventHandler->setFrameBufferPlugin(RfbServerManager::instance()->framebuffer());
             return eventHandler;
         }
-
-        ++iter;
     }
 
     // No valid events plugin found.
diff --git a/krfb/framebuffermanager.cpp b/krfb/framebuffermanager.cpp
index bbf43b6b..20242ce1 100644
--- a/krfb/framebuffermanager.cpp
+++ b/krfb/framebuffermanager.cpp
@@ -78,23 +78,17 @@ QSharedPointer<FrameBuffer> FrameBufferManager::frameBuffer(WId id, const QVaria
     }
 
     // We don't already have that frame buffer.
-    QMap<QString, FrameBufferPlugin *>::const_iterator iter = m_plugins.constBegin();
-
-    while (iter != m_plugins.constEnd()) {
-
-        if (iter.key() == KrfbConfig::preferredFrameBufferPlugin()) {
+    for (auto it = m_plugins.cbegin(); it != m_plugins.constEnd(); it++) {
+        if (it.key() == KrfbConfig::preferredFrameBufferPlugin()) {
             qCDebug(KRFB) << "Using FrameBuffer:" << KrfbConfig::preferredFrameBufferPlugin();
 
-            QSharedPointer<FrameBuffer> frameBuffer(iter.value()->frameBuffer(id, args));
-
+            QSharedPointer<FrameBuffer> frameBuffer(it.value()->frameBuffer(id, args));
             if (frameBuffer) {
                 m_frameBuffers.insert(id, frameBuffer.toWeakRef());
 
                 return frameBuffer;
             }
         }
-
-        ++iter;
     }
 
     // No valid framebuffer plugin found.