diff --git a/src/Parsers/CppParser/cppdocumentparser.cpp b/src/Parsers/CppParser/cppdocumentparser.cpp
index 60bdb47..cffa94f 100644
--- a/src/Parsers/CppParser/cppdocumentparser.cpp
+++ b/src/Parsers/CppParser/cppdocumentparser.cpp
@@ -393,13 +393,11 @@ CppDocumentParser::CppDocumentParser( QObject* parent )
 
   CppEditor::CppModelManager* modelManager = CppEditor::CppModelManager::instance();
   connect( modelManager, &CppEditor::CppModelManager::documentUpdated, this, &CppDocumentParser::parseCppDocumentOnUpdate, Qt::DirectConnection );
-  connect(         qApp, &QApplication::aboutToQuit,                  this, [=]() {
-          /* Disconnect any signals that might still get emitted. */
-          modelManager->disconnect( this );
-          SpellCheckerCore::instance()->disconnect( this );
-          this->disconnect( SpellCheckerCore::instance() );
-        }, Qt::DirectConnection );
-
+  connect( qApp, &QApplication::aboutToQuit, this, [=, this]() {
+      /* Disconnect any signals that might still get emitted. */
+      modelManager->disconnect( this );
+      SpellCheckerCore::instance()->disconnect( this );
+      this->disconnect( SpellCheckerCore::instance() ); }, Qt::DirectConnection );
   Core::Context context( CppEditor::Constants::CPPEDITOR_ID );
   Core::ActionContainer* cppEditorContextMenu = Core::ActionManager::createMenu( CppEditor::Constants::M_CONTEXT );
   Core::ActionContainer* contextMenu          = Core::ActionManager::createMenu( Constants::CONTEXT_MENU_ID );
diff --git a/src/Parsers/CppParser/cppdocumentprocessor.cpp b/src/Parsers/CppParser/cppdocumentprocessor.cpp
index 67b7979..bb86baf 100644
--- a/src/Parsers/CppParser/cppdocumentprocessor.cpp
+++ b/src/Parsers/CppParser/cppdocumentprocessor.cpp
@@ -155,6 +155,23 @@ void CppDocumentProcessor::process( CppDocumentProcessor::Promise& promise )
     return;
   }
 
+  if (d->settings.whatToCheck.testFlag(CppParserSettings::CheckIdentifiers)) {
+    /* Parse identifiers (consider merging all the 3 loops, because we now touch each token) */
+    unsigned int tokenCount = d->trUnit->tokenCount();
+    for ( unsigned int tokenIndex = 0; tokenIndex < tokenCount; ++tokenIndex ) {
+      const CPlusPlus::Token &token{ d->trUnit->tokenAt( tokenIndex ) };
+      const CPlusPlus::Identifier *identifier{ token.identifier };
+      if ( identifier ) {
+        wordTokens.push_back( parseToken( token, WordTokens::Type::Identifier ) );
+      }
+    }
+  }
+
+  if (promise.isCanceled() == true) {
+    promise.future().cancel();
+    return;
+  }
+
   /* At this point the DocPtr can be released since it will no longer be
    * Used */
   d->docPtr->releaseSourceAndAST();
diff --git a/src/Parsers/CppParser/cppdocumentprocessor.h b/src/Parsers/CppParser/cppdocumentprocessor.h
index dabab4a..cf1cd47 100644
--- a/src/Parsers/CppParser/cppdocumentprocessor.h
+++ b/src/Parsers/CppParser/cppdocumentprocessor.h
@@ -56,7 +56,8 @@ struct WordTokens
   enum class Type {
     Comment = 0,
     Doxygen,
-    Literal
+    Literal,
+    Identifier,
   };
 
   HashWords::key_type hash;
diff --git a/src/Parsers/CppParser/cppparseroptionswidget.cpp b/src/Parsers/CppParser/cppparseroptionswidget.cpp
index 12a7650..ae432a8 100644
--- a/src/Parsers/CppParser/cppparseroptionswidget.cpp
+++ b/src/Parsers/CppParser/cppparseroptionswidget.cpp
@@ -37,12 +37,12 @@ CppParserOptionsWidget::CppParserOptionsWidget( const CppParserSettings* const s
   ui->labelDescriptionEmail->setText( ui->labelDescriptionEmail->text().arg( QLatin1String( SpellChecker::Parsers::CppParser::Constants::EMAIL_ADDRESS_REGEXP_PATTERN ) ) );
   ui->labelDescriptionWebsites->setText( ui->labelDescriptionWebsites->text().arg( QLatin1String( SpellChecker::Parsers::CppParser::Constants::WEBSITE_ADDRESS_REGEXP_PATTERN ) ) );
   /* Set up the options for What to Check */
-  ui->radioButtonWhatComments->setProperty( ENUM_VAL_PROPERTY, CppParserSettings::CheckComments );
-  ui->radioButtonWhatLiterals->setProperty( ENUM_VAL_PROPERTY, CppParserSettings::CheckStringLiterals );
-  ui->radioButtonWhatBoth->setProperty( ENUM_VAL_PROPERTY, CppParserSettings::CheckBoth );
-  connect( ui->radioButtonWhatComments, &QRadioButton::toggled, this, &CppParserOptionsWidget::radioButtonWhatToggled );
-  connect( ui->radioButtonWhatLiterals, &QRadioButton::toggled, this, &CppParserOptionsWidget::radioButtonWhatToggled );
-  connect( ui->radioButtonWhatBoth,     &QRadioButton::toggled, this, &CppParserOptionsWidget::radioButtonWhatToggled );
+  ui->checkBoxWhatComments->setProperty( ENUM_VAL_PROPERTY, CppParserSettings::CheckComments );
+  ui->checkBoxWhatLiterals->setProperty( ENUM_VAL_PROPERTY, CppParserSettings::CheckStringLiterals );
+  ui->checkBoxWhatIdentifiers->setProperty( ENUM_VAL_PROPERTY, CppParserSettings::CheckIdentifiers );
+  connect( ui->checkBoxWhatComments, &QAbstractButton::toggled, this, &CppParserOptionsWidget::checkBoxWhatToggled );
+  connect( ui->checkBoxWhatLiterals, &QAbstractButton::toggled, this, &CppParserOptionsWidget::checkBoxWhatToggled );
+  connect( ui->checkBoxWhatIdentifiers, &QAbstractButton::toggled, this, &CppParserOptionsWidget::checkBoxWhatToggled );
   /* Set up the options for Comments to Check */
   ui->radioButtonCommentsC->setProperty( ENUM_VAL_PROPERTY, CppParserSettings::CommentsC );
   ui->radioButtonCommentsCpp->setProperty( ENUM_VAL_PROPERTY, CppParserSettings::CommentsCpp );
@@ -101,11 +101,9 @@ const CppParserSettings& CppParserOptionsWidget::settings()
 }
 // --------------------------------------------------
 
-void CppParserOptionsWidget::radioButtonWhatToggled()
+void CppParserOptionsWidget::checkBoxWhatToggled()
 {
-  if( static_cast<QRadioButton*>( sender() )->isChecked() == true ) {
-    m_settings.whatToCheck = static_cast<CppParserSettings::WhatToCheckOptions>( sender()->property( ENUM_VAL_PROPERTY ).toInt() );
-  }
+  m_settings.whatToCheck.setFlag( static_cast<CppParserSettings::WhatToCheck>( sender()->property( ENUM_VAL_PROPERTY ).toInt() ), static_cast<QAbstractButton *>( sender() )->isChecked() );
 }
 // --------------------------------------------------
 
@@ -154,9 +152,10 @@ void CppParserOptionsWidget::updateWithSettings( const CppParserSettings* const
   ui->checkBoxRemoveEmailAddresses->setChecked( settings->removeEmailAddresses );
   ui->checkBoxIgnoreKeywords->setChecked( !settings->checkQtKeywords );
   ui->checkBoxIgnoreCaps->setChecked( !settings->checkAllCapsWords );
-  QRadioButton* whatButtons[] = { nullptr, ui->radioButtonWhatComments, ui->radioButtonWhatLiterals, ui->radioButtonWhatBoth };
-  whatButtons[settings->whatToCheck]->setChecked( true );
-  QRadioButton* commentButtons[] = { nullptr, ui->radioButtonCommentsC, ui->radioButtonCommentsCpp, ui->radioButtonCommentsBoth };
+  ui->checkBoxWhatComments->setChecked( settings->whatToCheck.testFlag( CppParserSettings::CheckComments ) );
+  ui->checkBoxWhatLiterals->setChecked( settings->whatToCheck.testFlag( CppParserSettings::CheckStringLiterals ) );
+  ui->checkBoxWhatIdentifiers->setChecked( settings->whatToCheck.testFlag( CppParserSettings::CheckIdentifiers ) );
+  QRadioButton *commentButtons[] = { nullptr, ui->radioButtonCommentsC, ui->radioButtonCommentsCpp, ui->radioButtonCommentsBoth };
   commentButtons[settings->commentsToCheck]->setChecked( true );
   QRadioButton* numberButtons[] = { ui->radioButtonNumbersRemove, ui->radioButtonNumbersSplit, ui->radioButtonNumbersLeave };
   numberButtons[settings->wordsWithNumberOption]->setChecked( true );
diff --git a/src/Parsers/CppParser/cppparseroptionswidget.h b/src/Parsers/CppParser/cppparseroptionswidget.h
index 29dcdfa..801232d 100644
--- a/src/Parsers/CppParser/cppparseroptionswidget.h
+++ b/src/Parsers/CppParser/cppparseroptionswidget.h
@@ -45,7 +45,7 @@ class CppParserOptionsWidget
   const CppParserSettings& settings();
 
 public slots:
-  void radioButtonWhatToggled();
+  void checkBoxWhatToggled();
   void radioButtonCommentsToggled();
   void radioButtonNumbersToggled();
   void radioButtonUnderscoresToggled();
diff --git a/src/Parsers/CppParser/cppparseroptionswidget.ui b/src/Parsers/CppParser/cppparseroptionswidget.ui
index 59c1c3b..55303d7 100644
--- a/src/Parsers/CppParser/cppparseroptionswidget.ui
+++ b/src/Parsers/CppParser/cppparseroptionswidget.ui
@@ -54,10 +54,10 @@
       <string notr="true">QScrollArea { padding: 3px }</string>
      </property>
      <property name="frameShape">
-      <enum>QFrame::NoFrame</enum>
+      <enum>QFrame::Shape::NoFrame</enum>
      </property>
      <property name="frameShadow">
-      <enum>QFrame::Sunken</enum>
+      <enum>QFrame::Shadow::Sunken</enum>
      </property>
      <property name="widgetResizable">
       <bool>true</bool>
@@ -68,7 +68,7 @@
         <x>0</x>
         <y>0</y>
         <width>801</width>
-        <height>1638</height>
+        <height>1843</height>
        </rect>
       </property>
       <property name="sizePolicy">
@@ -106,25 +106,25 @@
          </property>
          <layout class="QFormLayout" name="formLayout_10">
           <property name="fieldGrowthPolicy">
-           <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+           <enum>QFormLayout::FieldGrowthPolicy::AllNonFixedFieldsGrow</enum>
           </property>
           <property name="verticalSpacing">
            <number>0</number>
           </property>
           <item row="0" column="0" colspan="2">
-           <widget class="QRadioButton" name="radioButtonWhatComments">
+           <widget class="QCheckBox" name="checkBoxWhatComments">
             <property name="text">
-             <string>Comments only</string>
+             <string>Comments</string>
             </property>
            </widget>
           </item>
           <item row="1" column="0">
            <spacer name="horizontalSpacer_19">
             <property name="orientation">
-             <enum>Qt::Horizontal</enum>
+             <enum>Qt::Orientation::Horizontal</enum>
             </property>
             <property name="sizeType">
-             <enum>QSizePolicy::Fixed</enum>
+             <enum>QSizePolicy::Policy::Fixed</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
@@ -148,7 +148,7 @@
              </font>
             </property>
             <property name="text">
-             <string>Only Comments will be checked for spelling mistakes. This includes normal and doxygen comments. Eg: /* Comment to Check */</string>
+             <string>Comments will be checked for spelling mistakes. This includes normal and doxygen comments. Eg: /* Comment to Check */</string>
             </property>
             <property name="wordWrap">
              <bool>true</bool>
@@ -156,19 +156,19 @@
            </widget>
           </item>
           <item row="2" column="0" colspan="2">
-           <widget class="QRadioButton" name="radioButtonWhatLiterals">
+           <widget class="QCheckBox" name="checkBoxWhatLiterals">
             <property name="text">
-             <string>String Literals only</string>
+             <string>String Literals</string>
             </property>
            </widget>
           </item>
           <item row="3" column="0">
            <spacer name="horizontalSpacer_20">
             <property name="orientation">
-             <enum>Qt::Horizontal</enum>
+             <enum>Qt::Orientation::Horizontal</enum>
             </property>
             <property name="sizeType">
-             <enum>QSizePolicy::Fixed</enum>
+             <enum>QSizePolicy::Policy::Fixed</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
@@ -192,27 +192,20 @@
              </font>
             </property>
             <property name="text">
-             <string>Only String Literals will be checked for spelling mistakes. A String Literal is a string inside inverted commas. Eg: &quot;String to Check&quot;.</string>
+             <string>String Literals will be checked for spelling mistakes. A String Literal is a string inside inverted commas. Eg: &quot;String to Check&quot;.</string>
             </property>
             <property name="wordWrap">
              <bool>true</bool>
             </property>
            </widget>
           </item>
-          <item row="4" column="0" colspan="2">
-           <widget class="QRadioButton" name="radioButtonWhatBoth">
-            <property name="text">
-             <string>Comments and String Literals</string>
-            </property>
-           </widget>
-          </item>
-          <item row="5" column="0">
+          <item row="4" column="0">
            <spacer name="horizontalSpacer_21">
             <property name="orientation">
-             <enum>Qt::Horizontal</enum>
+             <enum>Qt::Orientation::Horizontal</enum>
             </property>
             <property name="sizeType">
-             <enum>QSizePolicy::Fixed</enum>
+             <enum>QSizePolicy::Policy::Fixed</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
@@ -222,10 +215,17 @@
             </property>
            </spacer>
           </item>
-          <item row="5" column="1">
-           <widget class="QLabel" name="label_21">
+          <item row="5" column="0" colspan="2">
+           <widget class="QCheckBox" name="checkBoxWhatIdentifiers">
+            <property name="text">
+             <string>Identifiers</string>
+            </property>
+           </widget>
+          </item>
+          <item row="7" column="1">
+           <widget class="QLabel" name="label">
             <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Ignored">
+             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
@@ -236,13 +236,26 @@
              </font>
             </property>
             <property name="text">
-             <string>Comments and String Literals will be checked. </string>
-            </property>
-            <property name="wordWrap">
-             <bool>true</bool>
+             <string>Identifiers, such as variable, type, and function names.</string>
             </property>
            </widget>
           </item>
+          <item row="7" column="0">
+           <spacer name="horizontalSpacer_25">
+            <property name="orientation">
+             <enum>Qt::Orientation::Horizontal</enum>
+            </property>
+            <property name="sizeType">
+             <enum>QSizePolicy::Policy::Fixed</enum>
+            </property>
+            <property name="sizeHint" stdset="0">
+             <size>
+              <width>40</width>
+              <height>0</height>
+             </size>
+            </property>
+           </spacer>
+          </item>
          </layout>
         </widget>
        </item>
@@ -259,7 +272,7 @@
          </property>
          <layout class="QFormLayout" name="formLayout_11">
           <property name="fieldGrowthPolicy">
-           <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+           <enum>QFormLayout::FieldGrowthPolicy::AllNonFixedFieldsGrow</enum>
           </property>
           <property name="verticalSpacing">
            <number>0</number>
@@ -274,10 +287,10 @@
           <item row="1" column="0">
            <spacer name="horizontalSpacer_22">
             <property name="orientation">
-             <enum>Qt::Horizontal</enum>
+             <enum>Qt::Orientation::Horizontal</enum>
             </property>
             <property name="sizeType">
-             <enum>QSizePolicy::Fixed</enum>
+             <enum>QSizePolicy::Policy::Fixed</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
@@ -318,10 +331,10 @@
           <item row="3" column="0">
            <spacer name="horizontalSpacer_23">
             <property name="orientation">
-             <enum>Qt::Horizontal</enum>
+             <enum>Qt::Orientation::Horizontal</enum>
             </property>
             <property name="sizeType">
-             <enum>QSizePolicy::Fixed</enum>
+             <enum>QSizePolicy::Policy::Fixed</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
@@ -362,10 +375,10 @@
           <item row="5" column="0">
            <spacer name="horizontalSpacer_24">
             <property name="orientation">
-             <enum>Qt::Horizontal</enum>
+             <enum>Qt::Orientation::Horizontal</enum>
             </property>
             <property name="sizeType">
-             <enum>QSizePolicy::Fixed</enum>
+             <enum>QSizePolicy::Policy::Fixed</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
@@ -411,7 +424,7 @@
           <string>First Comment</string>
          </property>
          <property name="alignment">
-          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+          <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter</set>
          </property>
          <property name="flat">
           <bool>false</bool>
@@ -421,7 +434,7 @@
          </property>
          <layout class="QFormLayout" name="formLayout_12">
           <property name="fieldGrowthPolicy">
-           <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+           <enum>QFormLayout::FieldGrowthPolicy::AllNonFixedFieldsGrow</enum>
           </property>
           <property name="verticalSpacing">
            <number>0</number>
@@ -436,10 +449,10 @@
           <item row="1" column="0">
            <spacer name="horizontalSpacer_18">
             <property name="orientation">
-             <enum>Qt::Horizontal</enum>
+             <enum>Qt::Orientation::Horizontal</enum>
             </property>
             <property name="sizeType">
-             <enum>QSizePolicy::Fixed</enum>
+             <enum>QSizePolicy::Policy::Fixed</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
@@ -487,7 +500,7 @@ A multi-line C++ comment will not behave as expected since all lines are interpr
           <string>Email Addresses</string>
          </property>
          <property name="alignment">
-          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+          <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter</set>
          </property>
          <property name="flat">
           <bool>false</bool>
@@ -497,7 +510,7 @@ A multi-line C++ comment will not behave as expected since all lines are interpr
          </property>
          <layout class="QFormLayout" name="formLayout_7">
           <property name="fieldGrowthPolicy">
-           <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+           <enum>QFormLayout::FieldGrowthPolicy::AllNonFixedFieldsGrow</enum>
           </property>
           <property name="verticalSpacing">
            <number>0</number>
@@ -512,10 +525,10 @@ A multi-line C++ comment will not behave as expected since all lines are interpr
           <item row="1" column="0">
            <spacer name="horizontalSpacer_17">
             <property name="orientation">
-             <enum>Qt::Horizontal</enum>
+             <enum>Qt::Orientation::Horizontal</enum>
             </property>
             <property name="sizeType">
-             <enum>QSizePolicy::Fixed</enum>
+             <enum>QSizePolicy::Policy::Fixed</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
@@ -562,7 +575,7 @@ The match pattern used is: %1</string>
           <string>Qt Keywords</string>
          </property>
          <property name="alignment">
-          <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+          <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignVCenter</set>
          </property>
          <property name="flat">
           <bool>false</bool>
@@ -572,7 +585,7 @@ The match pattern used is: %1</string>
          </property>
          <layout class="QFormLayout" name="formLayout">
           <property name="fieldGrowthPolicy">
-           <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+           <enum>QFormLayout::FieldGrowthPolicy::AllNonFixedFieldsGrow</enum>
           </property>
           <property name="verticalSpacing">
            <number>0</number>
@@ -587,10 +600,10 @@ The match pattern used is: %1</string>
           <item row="1" column="0">
            <spacer name="horizontalSpacer">
             <property name="orientation">
-             <enum>Qt::Horizontal</enum>
+             <enum>Qt::Orientation::Horizontal</enum>
             </property>
             <property name="sizeType">
-             <enum>QSizePolicy::Fixed</enum>
+             <enum>QSizePolicy::Policy::Fixed</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
@@ -637,7 +650,7 @@ The match pattern used is: %1</string>
          </property>
          <layout class="QFormLayout" name="formLayout_2">
           <property name="fieldGrowthPolicy">
-           <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+           <enum>QFormLayout::FieldGrowthPolicy::AllNonFixedFieldsGrow</enum>
           </property>
           <property name="verticalSpacing">
            <number>0</number>
@@ -673,10 +686,10 @@ The match pattern used is: %1</string>
           <item row="1" column="0">
            <spacer name="horizontalSpacer_2">
             <property name="orientation">
-             <enum>Qt::Horizontal</enum>
+             <enum>Qt::Orientation::Horizontal</enum>
             </property>
             <property name="sizeType">
-             <enum>QSizePolicy::Fixed</enum>
+             <enum>QSizePolicy::Policy::Fixed</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
@@ -702,7 +715,7 @@ The match pattern used is: %1</string>
          </property>
          <layout class="QFormLayout" name="formLayout_3">
           <property name="fieldGrowthPolicy">
-           <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+           <enum>QFormLayout::FieldGrowthPolicy::AllNonFixedFieldsGrow</enum>
           </property>
           <property name="verticalSpacing">
            <number>0</number>
@@ -717,10 +730,10 @@ The match pattern used is: %1</string>
           <item row="1" column="0">
            <spacer name="horizontalSpacer_3">
             <property name="orientation">
-             <enum>Qt::Horizontal</enum>
+             <enum>Qt::Orientation::Horizontal</enum>
             </property>
             <property name="sizeType">
-             <enum>QSizePolicy::Fixed</enum>
+             <enum>QSizePolicy::Policy::Fixed</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
@@ -761,10 +774,10 @@ The match pattern used is: %1</string>
           <item row="3" column="0">
            <spacer name="horizontalSpacer_4">
             <property name="orientation">
-             <enum>Qt::Horizontal</enum>
+             <enum>Qt::Orientation::Horizontal</enum>
             </property>
             <property name="sizeType">
-             <enum>QSizePolicy::Fixed</enum>
+             <enum>QSizePolicy::Policy::Fixed</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
@@ -805,10 +818,10 @@ The match pattern used is: %1</string>
           <item row="5" column="0">
            <spacer name="horizontalSpacer_5">
             <property name="orientation">
-             <enum>Qt::Horizontal</enum>
+             <enum>Qt::Orientation::Horizontal</enum>
             </property>
             <property name="sizeType">
-             <enum>QSizePolicy::Fixed</enum>
+             <enum>QSizePolicy::Policy::Fixed</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
@@ -855,7 +868,7 @@ The match pattern used is: %1</string>
          </property>
          <layout class="QFormLayout" name="formLayout_4">
           <property name="fieldGrowthPolicy">
-           <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+           <enum>QFormLayout::FieldGrowthPolicy::AllNonFixedFieldsGrow</enum>
           </property>
           <property name="verticalSpacing">
            <number>0</number>
@@ -870,10 +883,10 @@ The match pattern used is: %1</string>
           <item row="1" column="0">
            <spacer name="horizontalSpacer_6">
             <property name="orientation">
-             <enum>Qt::Horizontal</enum>
+             <enum>Qt::Orientation::Horizontal</enum>
             </property>
             <property name="sizeType">
-             <enum>QSizePolicy::Fixed</enum>
+             <enum>QSizePolicy::Policy::Fixed</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
@@ -914,10 +927,10 @@ The match pattern used is: %1</string>
           <item row="3" column="0">
            <spacer name="horizontalSpacer_7">
             <property name="orientation">
-             <enum>Qt::Horizontal</enum>
+             <enum>Qt::Orientation::Horizontal</enum>
             </property>
             <property name="sizeType">
-             <enum>QSizePolicy::Fixed</enum>
+             <enum>QSizePolicy::Policy::Fixed</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
@@ -958,10 +971,10 @@ The match pattern used is: %1</string>
           <item row="6" column="0">
            <spacer name="horizontalSpacer_8">
             <property name="orientation">
-             <enum>Qt::Horizontal</enum>
+             <enum>Qt::Orientation::Horizontal</enum>
             </property>
             <property name="sizeType">
-             <enum>QSizePolicy::Fixed</enum>
+             <enum>QSizePolicy::Policy::Fixed</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
@@ -1008,7 +1021,7 @@ The match pattern used is: %1</string>
          </property>
          <layout class="QFormLayout" name="formLayout_5">
           <property name="fieldGrowthPolicy">
-           <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+           <enum>QFormLayout::FieldGrowthPolicy::AllNonFixedFieldsGrow</enum>
           </property>
           <property name="verticalSpacing">
            <number>0</number>
@@ -1023,10 +1036,10 @@ The match pattern used is: %1</string>
           <item row="1" column="0">
            <spacer name="horizontalSpacer_9">
             <property name="orientation">
-             <enum>Qt::Horizontal</enum>
+             <enum>Qt::Orientation::Horizontal</enum>
             </property>
             <property name="sizeType">
-             <enum>QSizePolicy::Fixed</enum>
+             <enum>QSizePolicy::Policy::Fixed</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
@@ -1067,10 +1080,10 @@ The match pattern used is: %1</string>
           <item row="3" column="0">
            <spacer name="horizontalSpacer_10">
             <property name="orientation">
-             <enum>Qt::Horizontal</enum>
+             <enum>Qt::Orientation::Horizontal</enum>
             </property>
             <property name="sizeType">
-             <enum>QSizePolicy::Fixed</enum>
+             <enum>QSizePolicy::Policy::Fixed</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
@@ -1111,10 +1124,10 @@ The match pattern used is: %1</string>
           <item row="5" column="0">
            <spacer name="horizontalSpacer_11">
             <property name="orientation">
-             <enum>Qt::Horizontal</enum>
+             <enum>Qt::Orientation::Horizontal</enum>
             </property>
             <property name="sizeType">
-             <enum>QSizePolicy::Fixed</enum>
+             <enum>QSizePolicy::Policy::Fixed</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
@@ -1161,7 +1174,7 @@ The match pattern used is: %1</string>
          </property>
          <layout class="QFormLayout" name="formLayout_6">
           <property name="fieldGrowthPolicy">
-           <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+           <enum>QFormLayout::FieldGrowthPolicy::AllNonFixedFieldsGrow</enum>
           </property>
           <property name="verticalSpacing">
            <number>0</number>
@@ -1176,10 +1189,10 @@ The match pattern used is: %1</string>
           <item row="1" column="0">
            <spacer name="horizontalSpacer_12">
             <property name="orientation">
-             <enum>Qt::Horizontal</enum>
+             <enum>Qt::Orientation::Horizontal</enum>
             </property>
             <property name="sizeType">
-             <enum>QSizePolicy::Fixed</enum>
+             <enum>QSizePolicy::Policy::Fixed</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
@@ -1226,7 +1239,7 @@ The match pattern used is: %1</string>
          </property>
          <layout class="QFormLayout" name="formLayout_8">
           <property name="fieldGrowthPolicy">
-           <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+           <enum>QFormLayout::FieldGrowthPolicy::AllNonFixedFieldsGrow</enum>
           </property>
           <property name="verticalSpacing">
            <number>0</number>
@@ -1241,10 +1254,10 @@ The match pattern used is: %1</string>
           <item row="1" column="0">
            <spacer name="horizontalSpacer_14">
             <property name="orientation">
-             <enum>Qt::Horizontal</enum>
+             <enum>Qt::Orientation::Horizontal</enum>
             </property>
             <property name="sizeType">
-             <enum>QSizePolicy::Fixed</enum>
+             <enum>QSizePolicy::Policy::Fixed</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
@@ -1285,10 +1298,10 @@ The match pattern used is: %1</string>
           <item row="3" column="0">
            <spacer name="horizontalSpacer_15">
             <property name="orientation">
-             <enum>Qt::Horizontal</enum>
+             <enum>Qt::Orientation::Horizontal</enum>
             </property>
             <property name="sizeType">
-             <enum>QSizePolicy::Fixed</enum>
+             <enum>QSizePolicy::Policy::Fixed</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
@@ -1329,10 +1342,10 @@ The match pattern used is: %1</string>
           <item row="6" column="0">
            <spacer name="horizontalSpacer_16">
             <property name="orientation">
-             <enum>Qt::Horizontal</enum>
+             <enum>Qt::Orientation::Horizontal</enum>
             </property>
             <property name="sizeType">
-             <enum>QSizePolicy::Fixed</enum>
+             <enum>QSizePolicy::Policy::Fixed</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
@@ -1379,7 +1392,7 @@ The match pattern used is: %1</string>
          </property>
          <layout class="QFormLayout" name="formLayout_9">
           <property name="fieldGrowthPolicy">
-           <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+           <enum>QFormLayout::FieldGrowthPolicy::AllNonFixedFieldsGrow</enum>
           </property>
           <property name="verticalSpacing">
            <number>0</number>
@@ -1394,10 +1407,10 @@ The match pattern used is: %1</string>
           <item row="1" column="0">
            <spacer name="horizontalSpacer_13">
             <property name="orientation">
-             <enum>Qt::Horizontal</enum>
+             <enum>Qt::Orientation::Horizontal</enum>
             </property>
             <property name="sizeType">
-             <enum>QSizePolicy::Fixed</enum>
+             <enum>QSizePolicy::Policy::Fixed</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
@@ -1440,9 +1453,8 @@ The match pattern used is: %1</string>
  </widget>
  <tabstops>
   <tabstop>checkBoxDescriptions</tabstop>
-  <tabstop>radioButtonWhatComments</tabstop>
-  <tabstop>radioButtonWhatLiterals</tabstop>
-  <tabstop>radioButtonWhatBoth</tabstop>
+  <tabstop>checkBoxWhatComments</tabstop>
+  <tabstop>checkBoxWhatLiterals</tabstop>
   <tabstop>scrollArea</tabstop>
   <tabstop>radioButtonCommentsC</tabstop>
   <tabstop>radioButtonCommentsCpp</tabstop>
@@ -1771,70 +1783,6 @@ The match pattern used is: %1</string>
     </hint>
    </hints>
   </connection>
-  <connection>
-   <sender>checkBoxDescriptions</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>label_21</receiver>
-   <slot>setHidden(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>281</x>
-     <y>24</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>325</x>
-     <y>146</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>radioButtonWhatComments</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>groupBox_11</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>324</x>
-     <y>72</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>321</x>
-     <y>213</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>radioButtonWhatLiterals</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>groupBox_11</receiver>
-   <slot>setDisabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>424</x>
-     <y>103</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>386</x>
-     <y>205</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>radioButtonWhatBoth</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>groupBox_11</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>431</x>
-     <y>133</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>410</x>
-     <y>206</y>
-    </hint>
-   </hints>
-  </connection>
   <connection>
    <sender>checkBoxDescriptions</sender>
    <signal>toggled(bool)</signal>
@@ -1899,53 +1847,5 @@ The match pattern used is: %1</string>
     </hint>
    </hints>
   </connection>
-  <connection>
-   <sender>radioButtonWhatBoth</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>groupBox_13</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>152</x>
-     <y>128</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>120</x>
-     <y>298</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>radioButtonWhatLiterals</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>groupBox_13</receiver>
-   <slot>setDisabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>143</x>
-     <y>95</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>156</x>
-     <y>313</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>radioButtonWhatComments</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>groupBox_13</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>92</x>
-     <y>68</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>96</x>
-     <y>298</y>
-    </hint>
-   </hints>
-  </connection>
  </connections>
 </ui>
diff --git a/src/Parsers/CppParser/cppparsersettings.cpp b/src/Parsers/CppParser/cppparsersettings.cpp
index 9699c93..fdc56be 100644
--- a/src/Parsers/CppParser/cppparsersettings.cpp
+++ b/src/Parsers/CppParser/cppparsersettings.cpp
@@ -113,7 +113,7 @@ void CppParserSettings::saveToSetting(Utils::QtcSettings *settings ) const
 
 void CppParserSettings::setDefaults()
 {
-  whatToCheck                   = CheckBoth;
+  whatToCheck                   = { CheckComments | CheckStringLiterals };
   commentsToCheck               = CommentsBoth;
   removeEmailAddresses          = true;
   checkQtKeywords               = false;
diff --git a/src/Parsers/CppParser/cppparsersettings.h b/src/Parsers/CppParser/cppparsersettings.h
index 211b3ca..58723b7 100644
--- a/src/Parsers/CppParser/cppparsersettings.h
+++ b/src/Parsers/CppParser/cppparsersettings.h
@@ -40,10 +40,10 @@ class CppParserSettings
   ~CppParserSettings();
 
   enum WhatToCheck {
-    Tokens_NONE         = 0,        /*!< Invalid option needed for QFLAGS. */
-    CheckComments       = 1 << 0,   /*!< Check Comments. */
-    CheckStringLiterals = 1 << 1,   /*!< Check String Literals */
-    CheckBoth           = CheckComments | CheckStringLiterals
+    Tokens_NONE         = 0,      /*!< Invalid option needed for QFLAGS. */
+    CheckComments       = 1 << 0, /*!< Check Comments. */
+    CheckStringLiterals = 1 << 1, /*!< Check String Literals */
+    CheckIdentifiers    = 1 << 2, /*!< Check Identifiers */
   };
   Q_DECLARE_FLAGS( WhatToCheckOptions, WhatToCheck )