diff --git a/lib/Filter.cpp b/lib/Filter.cpp
index 2e8d2fb..611fb6c 100644
--- a/lib/Filter.cpp
+++ b/lib/Filter.cpp
@@ -418,7 +418,7 @@ UrlFilter::HotSpot::HotSpot(int startLine,int startColumn,int endLine,int endCol
 
 UrlFilter::HotSpot::UrlType UrlFilter::HotSpot::urlType() const
 {
-    QString url = capturedTexts().first();
+    QString url = capturedTexts().constFirst();
 
     if ( FullUrlRegExp.exactMatch(url) )
         return StandardUrl;
@@ -430,7 +430,7 @@ UrlFilter::HotSpot::UrlType UrlFilter::HotSpot::urlType() const
 
 void UrlFilter::HotSpot::activate(const QString& actionName)
 {
-    QString url = capturedTexts().first();
+    QString url = capturedTexts().constFirst();
 
     const UrlType kind = urlType();
 
diff --git a/lib/KeyboardTranslator.cpp b/lib/KeyboardTranslator.cpp
index 856fadb..70b5b44 100644
--- a/lib/KeyboardTranslator.cpp
+++ b/lib/KeyboardTranslator.cpp
@@ -543,27 +543,27 @@ QList<KeyboardTranslatorReader::Token> KeyboardTranslatorReader::tokenize(const
     if ( title.exactMatch(text) )
     {
         Token titleToken = { Token::TitleKeyword , QString() };
-        Token textToken = { Token::TitleText , title.capturedTexts()[1] };
+        Token textToken = { Token::TitleText , title.capturedTexts().at(1) };
 
         list << titleToken << textToken;
     }
     else if  ( key.exactMatch(text) )
     {
         Token keyToken = { Token::KeyKeyword , QString() };
-        Token sequenceToken = { Token::KeySequence , key.capturedTexts()[1].remove(' ') };
+        Token sequenceToken = { Token::KeySequence , key.capturedTexts().value(1).remove(' ') };
 
         list << keyToken << sequenceToken;
 
-        if ( key.capturedTexts()[3].isEmpty() )
+        if ( key.capturedTexts().at(3).isEmpty() )
         {
             // capturedTexts()[2] is a command
-            Token commandToken = { Token::Command , key.capturedTexts()[2] };
+            Token commandToken = { Token::Command , key.capturedTexts().at(2) };
             list << commandToken;
         }
         else
         {
             // capturedTexts()[3] is the output string
-           Token outputToken = { Token::OutputText , key.capturedTexts()[3] };
+           Token outputToken = { Token::OutputText , key.capturedTexts().at(3) };
            list << outputToken;
         }
     }
@@ -852,10 +852,11 @@ void KeyboardTranslator::removeEntry(const Entry& entry)
 }
 KeyboardTranslator::Entry KeyboardTranslator::findEntry(int keyCode, Qt::KeyboardModifiers modifiers, States state) const
 {
-    foreach(const Entry& entry, _entries.values(keyCode))
+    for (auto it = _entries.cbegin(), end = _entries.cend(); it != end; ++it)
     {
-        if ( entry.matches(keyCode,modifiers,state) )
-            return entry;
+        if (it.key() == keyCode)
+            if ( it.value().matches(keyCode,modifiers,state) )
+                return *it;
     }
     return Entry(); // entry not found
 }
diff --git a/lib/ShellCommand.cpp b/lib/ShellCommand.cpp
index 7440305..210285c 100644
--- a/lib/ShellCommand.cpp
+++ b/lib/ShellCommand.cpp
@@ -96,8 +96,9 @@ QStringList ShellCommand::expand(const QStringList & items)
 {
     QStringList result;
 
-    foreach( QString item , items )
-    result << expand(item);
+    foreach(const QString &item, items ) {
+        result << expand(item);
+    }
 
     return result;
 }
diff --git a/lib/Vt102Emulation.cpp b/lib/Vt102Emulation.cpp
index f3bf1f9..7a0587f 100644
--- a/lib/Vt102Emulation.cpp
+++ b/lib/Vt102Emulation.cpp
@@ -1268,7 +1268,7 @@ char Vt102Emulation::eraseChar() const
                                             0,
                                             0);
   if ( entry.text().count() > 0 )
-      return entry.text()[0];
+      return entry.text().at(0);
   else
       return '\b';
 }
diff --git a/lib/tools.cpp b/lib/tools.cpp
index d7054ea..1269e40 100644
--- a/lib/tools.cpp
+++ b/lib/tools.cpp
@@ -92,7 +92,7 @@ const QStringList get_color_schemes_dirs()
         rval << (QCoreApplication::applicationDirPath() + "/../Resources/color-schemes/");
     }
 #endif
-    for (const QString& custom_dir : custom_color_schemes_dirs)
+    for (const QString& custom_dir : const_cast<const QStringList&>(custom_color_schemes_dirs))
     {
         d.setPath(custom_dir);
         if (d.exists())