diff --git a/apps/opencs/model/settings/settingsitem.hpp b/apps/opencs/model/settings/settingsitem.hpp
index 4139b8545..c2587e892 100644
--- a/apps/opencs/model/settings/settingsitem.hpp
+++ b/apps/opencs/model/settings/settingsitem.hpp
@@ -56,7 +56,6 @@ namespace CSMSettings
         /// Verifies that the supplied value is one of the following:
         ///  1.  Within the limits of the value pair (min / max)
         ///  2.  One of the values indicated in the value list
-        ///  TODO:  value list logic iterates QList.  Should use find() instead.
         bool validate (const QString &value);
     };
 }
diff --git a/apps/opencs/model/settings/usersettings.hpp b/apps/opencs/model/settings/usersettings.hpp
index 213c5a35c..da8408b3e 100644
--- a/apps/opencs/model/settings/usersettings.hpp
+++ b/apps/opencs/model/settings/usersettings.hpp
@@ -53,8 +53,8 @@ namespace CSMSettings {
 
         /// Retrieves the settings file at all three levels (global, local and user).
 
-        /// TODO:  Multi-valued settings are not fully implemented.  Setting values
-        /// loaded in later files will always overwrite previously loaded values.
+        /// \todo Multi-valued settings are not fully implemented.  Setting values
+        /// \todo loaded in later files will always overwrite previously loaded values.
         void loadSettings (const QString &fileName);
 
         /// Returns the entire map of settings across all sections
diff --git a/apps/opencs/view/settings/settingwidget.hpp b/apps/opencs/view/settings/settingwidget.hpp
index 738b268b0..9f4513671 100644
--- a/apps/opencs/view/settings/settingwidget.hpp
+++ b/apps/opencs/view/settings/settingwidget.hpp
@@ -180,7 +180,7 @@ namespace CSVSettings
     };
 
     /// list widget template
-    /// TODO: Not fully implemented.  Only widget supporting multi-valued settings
+    /// \todo Not fully implemented.  Only widget supporting multi-valued settings
     template <>
     class SettingWidget <QListWidget>: public CSVSettings::AbstractWidget
     {