From f6a4a242248e68aa90de8997abab77268943253a Mon Sep 17 00:00:00 2001
From: guwirth <guenter.wirth@etas.com>
Date: Mon, 27 Nov 2017 18:10:56 +0100
Subject: [PATCH] second try

---
 .../src/main/java/org/sonar/plugins/c/CPlugin.java           | 5 ++---
 .../src/main/java/org/sonar/plugins/cxx/CxxPlugin.java       | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/sonar-c-plugin/src/main/java/org/sonar/plugins/c/CPlugin.java b/sonar-c-plugin/src/main/java/org/sonar/plugins/c/CPlugin.java
index 0796aba06c..4f61f090a1 100644
--- a/sonar-c-plugin/src/main/java/org/sonar/plugins/c/CPlugin.java
+++ b/sonar-c-plugin/src/main/java/org/sonar/plugins/c/CPlugin.java
@@ -34,7 +34,6 @@
 import org.sonar.api.platform.ServerFileSystem;
 import org.sonar.api.resources.Qualifiers;
 import org.sonar.api.server.rule.RulesDefinitionXmlLoader;
-import org.sonar.cxx.CxxLanguage;
 import org.sonar.cxx.sensors.clangtidy.CxxClangTidyRuleRepository;
 import org.sonar.cxx.sensors.clangtidy.CxxClangTidySensor;
 import org.sonar.cxx.sensors.clangsa.CxxClangSARuleRepository;
@@ -616,11 +615,11 @@ public CxxSquidSensorImpl(Configuration settings,
       super(new CLanguage(settings), fileLinesContextFactory, checkFactory);
     }
 
-    public CxxSquidSensorImpl(CxxLanguage language,
+    public CxxSquidSensorImpl(Configuration settings,
       FileLinesContextFactory fileLinesContextFactory,
       CheckFactory checkFactory,
       @Nullable CustomCxxRulesDefinition[] customRulesDefinition) {
-      super(language, fileLinesContextFactory, checkFactory, customRulesDefinition);
+      super(new CLanguage(settings), fileLinesContextFactory, checkFactory, customRulesDefinition);
     }
   }
 
diff --git a/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/CxxPlugin.java b/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/CxxPlugin.java
index cef321b00c..916eed863c 100644
--- a/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/CxxPlugin.java
+++ b/sonar-cxx-plugin/src/main/java/org/sonar/plugins/cxx/CxxPlugin.java
@@ -68,7 +68,6 @@
 
 import com.google.common.collect.ImmutableList;
 import javax.annotation.Nullable;
-import org.sonar.cxx.CxxLanguage;
 import org.sonar.cxx.sensors.squid.CustomCxxRulesDefinition;
 
 /**
@@ -645,11 +644,11 @@ public CxxSquidSensorImpl(Configuration settings,
       super(new CppLanguage(settings), fileLinesContextFactory, checkFactory);
     }
 
-    public CxxSquidSensorImpl(CxxLanguage language,
+    public CxxSquidSensorImpl(Configuration settings,
       FileLinesContextFactory fileLinesContextFactory,
       CheckFactory checkFactory,
       @Nullable CustomCxxRulesDefinition[] customRulesDefinition) {
-      super(language, fileLinesContextFactory, checkFactory, customRulesDefinition);
+      super(new CppLanguage(settings), fileLinesContextFactory, checkFactory, customRulesDefinition);
     }
   }