diff --git a/src/libs/utils/fancymainwindow.cpp b/src/libs/utils/fancymainwindow.cpp
index 1302567c8847962965871af188a2e157be2e23df..965c8e1c34265754ebdf9502c74b4a07d58af487 100644
--- a/src/libs/utils/fancymainwindow.cpp
+++ b/src/libs/utils/fancymainwindow.cpp
@@ -64,7 +64,7 @@ struct FancyMainWindowPrivate
     FancyMainWindowPrivate();
 
     bool m_locked;
-    bool m_handleDockVisibilityChanges; //todo
+    bool m_handleDockVisibilityChanges;
 
     QAction m_menuSeparator1;
     QAction m_toggleLockedAction;
diff --git a/src/plugins/bineditor/bineditorplugin.cpp b/src/plugins/bineditor/bineditorplugin.cpp
index cc7ccdeba7aae52254f0743023fa006a29310276..02bad814e78932689cf655d1cb1bc300033b31e1 100644
--- a/src/plugins/bineditor/bineditorplugin.cpp
+++ b/src/plugins/bineditor/bineditorplugin.cpp
@@ -375,8 +375,8 @@ public:
     bool duplicateSupported() const { return false; }
     IEditor *duplicate(QWidget * /* parent */) { return 0; }
 
-    QByteArray saveState() const { return QByteArray(); } // TODO
-    bool restoreState(const QByteArray & /* state */) { return false; } // TODO
+    QByteArray saveState() const { return QByteArray(); } // not supported
+    bool restoreState(const QByteArray & /* state */) { return false; }  // not supported
 
     QWidget *toolBar() { return m_toolBar; }
 
diff --git a/src/plugins/coreplugin/editormanager/editormanager.cpp b/src/plugins/coreplugin/editormanager/editormanager.cpp
index dc9c82b46510b7eed42d5274cfb61bc3acb3fb93..d9ab7b9ef23041104a09dacb019d0a3cabcec32a 100644
--- a/src/plugins/coreplugin/editormanager/editormanager.cpp
+++ b/src/plugins/coreplugin/editormanager/editormanager.cpp
@@ -1588,7 +1588,7 @@ bool EditorManager::saveDocumentAs(IDocument *documentParam)
     const bool success = DocumentManager::saveDocument(document, absoluteFilePath);
     document->checkPermissions();
 
-    // @todo: There is an issue to be treated here. The new file might be of a different mime
+    // TODO: There is an issue to be treated here. The new file might be of a different mime
     // type than the original and thus require a different editor. An alternative strategy
     // would be to close the current editor and open a new appropriate one, but this is not
     // a good way out either (also the undo stack would be lost). Perhaps the best is to
diff --git a/src/plugins/coreplugin/editormanager/editorview.cpp b/src/plugins/coreplugin/editormanager/editorview.cpp
index c58ad38e1f18b4c7cd8053af28c55fd56d719866..a45beca58a46bfcf354f7c6aaf27a5ebc921944b 100644
--- a/src/plugins/coreplugin/editormanager/editorview.cpp
+++ b/src/plugins/coreplugin/editormanager/editorview.cpp
@@ -264,7 +264,7 @@ void EditorView::setCurrentEditor(IEditor *editor)
         || m_container->indexOf(editor->widget()) == -1) {
         m_toolBar->updateEditorStatus(0);
         m_infoBarDisplay->setInfoBar(0);
-        // ### TODO the combo box m_editorList should show an empty item
+        QTC_CHECK(m_container->count() == 0);
         return;
     }
 
diff --git a/src/plugins/coreplugin/progressmanager/progressbar.h b/src/plugins/coreplugin/progressmanager/progressbar.h
index 5e14bc7faf9189f27b853d5e4c6a8e4f16b7c6e2..f290618b1115ce19ad8bf7d747c7e308fe539297 100644
--- a/src/plugins/coreplugin/progressmanager/progressbar.h
+++ b/src/plugins/coreplugin/progressmanager/progressbar.h
@@ -51,7 +51,6 @@ public:
 
     QString title() const;
     void setTitle(const QString &title);
-    // TODO rename setError
     void setError(bool on);
     bool hasError() const;
     QSize sizeHint() const;
diff --git a/src/plugins/coreplugin/rightpane.cpp b/src/plugins/coreplugin/rightpane.cpp
index 4c29c7c43fed66ca3ce4ed6b513a740b8c842b74..af340be3322c92daab333f801539528e50cbb8da 100644
--- a/src/plugins/coreplugin/rightpane.cpp
+++ b/src/plugins/coreplugin/rightpane.cpp
@@ -182,7 +182,7 @@ void RightPaneWidget::readSettings(QSettings *settings)
     if (settings->contains(QLatin1String("RightPane/Visible"))) {
         setShown(settings->value(QLatin1String("RightPane/Visible")).toBool());
     } else {
-        setShown(false); //TODO set to false
+        setShown(false);
     }
 
     if (settings->contains(QLatin1String("RightPane/Width"))) {
diff --git a/src/plugins/find/searchresulttreemodel.cpp b/src/plugins/find/searchresulttreemodel.cpp
index f4f4caf7f5008fb0e0321e5bc7798f76babfd6fd..2e697ae5fadd36009717491df689717047b0ea6c 100644
--- a/src/plugins/find/searchresulttreemodel.cpp
+++ b/src/plugins/find/searchresulttreemodel.cpp
@@ -273,13 +273,6 @@ QVariant SearchResultTreeModel::data(const SearchResultTreeItem *row, int role)
     case ItemDataRoles::IsGeneratedRole:
         result = row->isGenerated();
         break;
-// TODO this looks stupid in case of symbol tree, is it necessary?
-//    case Qt::BackgroundRole:
-//        if (row->parent() && row->parent()->parent())
-//            result = QVariant();
-//        else
-//            result = QApplication::palette().base().color().darker(105);
-//        break;
     default:
         result = QVariant();
         break;